Bump sysdig to 0.29.2

PATCH Applied Francis Laniel 2 participants 6 messages May 3, 2022 – May 4, 2022

lore

Share & tools

lore

Francis Laniel

author

2022-05-03 14:27 UTC #0 lore raw

cover Bump sysdig to 0.29.2

Hi.

In my last contribution, I wrote a mistake in sysdig.mk which leaded DRIVER_NAME to be empty [1]...
(The machine where I built is not the same than the one where I wrote and send the patch...)
So, in this series, I fixed my previous error and bumped sysdig to its latest version.

I was, of course, able to build and run sysdig within a VM based on qemu_x86_64_defconfig:
Welcome to Buildroot
buildroot login: root

# sysdig --version
sysdig version 0.29.2
# sysdig | head
scap: loading out-of-tree module taints kernel.
scap: driver loading, scap
scap: adding new consumer (____ptrval____)
scap: initializing ring buffer for CPU 0
scap: CPU buffer initialized, size=8388608
scap: starting capture
4 14:21:45.440896991 0 <NA> (114) > switch next=10 pgft_maj=7 pgft_min=1300 vm_size=45464 vm_rss=18460 vm_swap=0
...
91 14:21:45.449639600 0 <NA> (0) > switch next=114(<NA>) pgft_maj=0 pgft_min=0 vm_size=0 vm_rss=0 vm_swap=0
scap: deallocating consumer (____ptrval____)
scap: no more consumers, stopping capture

If you see any way to improve this contribution, feel free to share it!

Francis Laniel (2):
package/sysdig: fix DRIVER_NAME definition
package/sysdig: bump to version 0.29.2

 package/sysdig/sysdig.hash | 2 +-
 package/sysdig/sysdig.mk   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

Best regards and thank you in advance.
---
[1] https://git.buildroot.net/buildroot/commit/?id=ea86757e51cf424566f79896335d31d15b89d0d9

Signature · 6 lines

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Francis Laniel

author

2022-05-03 14:27 UTC #1 lore raw

PATCH 1/2 package/sysdig: fix DRIVER_NAME definition

When I wrote the previous commit, I was not fully focused and wrote:
-DDRIVER_NAME=$(FALCOSECURITY_LIBS_DRIVER_NAME.)
Which leaded to DRIVER_NAME to be empty.
So, it was not possible to use sysdig due to the following error message:
error opening device /dev/0. Make sure you have root credentials and that the module is loaded.

Fixes ea86757e51cf ("package/sysdig: bump to 0.29.1")

Signed-off-by Francis Laniel <[email protected]>

---
 package/sysdig/sysdig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/sysdig/sysdig.mk +1 -1

index 76cabcaeca..318746d44a 100644
@@ -28,7 +28,7 @@ SYSDIG_DEPENDENCIES = \
 SYSDIG_CONF_OPTS += -DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR) \
 	-DBUILD_DRIVER=OFF \
 	-DGRPC_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin \
-	-DDRIVER_NAME=$(FALCOSECURITY_LIBS_DRIVER_NAME.) \
+	-DDRIVER_NAME=$(FALCOSECURITY_LIBS_DRIVER_NAME) \
 	-DENABLE_DKMS=OFF \
 	-DUSE_BUNDLED_DEPS=OFF \
 	-DWITH_CHISEL=ON \

Signature · 6 lines

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Yann E. MORIN

Applied

2022-05-03 19:15 UTC #2 lore raw

Re: [Buildroot] [PATCH 1/2] package/sysdig: fix DRIVER_NAME definition

Francis, All,

On 2022-05-03 15:27 +0100, Francis Laniel spake thusly:

Quoted 8 lines

When I wrote the previous commit, I was not fully focused and wrote:
-DDRIVER_NAME=$(FALCOSECURITY_LIBS_DRIVER_NAME.)
Which leaded to DRIVER_NAME to be empty.
So, it was not possible to use sysdig due to the following error message:
error opening device /dev/0. Make sure you have root credentials and that the module is loaded.
Fixes ea86757e51cf ("package/sysdig: bump to 0.29.1")
Signed-off-by Francis Laniel <[email protected]>

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 24 lines

---
 package/sysdig/sysdig.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

package/sysdig/sysdig.mk +1 -1

index 76cabcaeca..318746d44a 100644
@@ -28,7 +28,7 @@ SYSDIG_DEPENDENCIES = \
 SYSDIG_CONF_OPTS += -DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR) \
 	-DBUILD_DRIVER=OFF \
 	-DGRPC_CPP_PLUGIN=$(HOST_DIR)/bin/grpc_cpp_plugin \
-	-DDRIVER_NAME=$(FALCOSECURITY_LIBS_DRIVER_NAME.) \
+	-DDRIVER_NAME=$(FALCOSECURITY_LIBS_DRIVER_NAME) \
 	-DENABLE_DKMS=OFF \
 	-DUSE_BUNDLED_DEPS=OFF \
 	-DWITH_CHISEL=ON \

Signature · 6 lines

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Signature · 10 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Francis Laniel

author

2022-05-03 14:27 UTC #3 lore raw

PATCH 2/2 package/sysdig: bump to version 0.29.2

In reply to Francis Laniel

Signed-off-by Francis Laniel <[email protected]>

---
 package/sysdig/sysdig.hash | 2 +-
 package/sysdig/sysdig.mk   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

package/sysdig/sysdig.hash +1 -1

index 380c9dce1e..c953421f27 100644
@@ -1,3 +1,3 @@
 # sha256 locally computed
-sha256  3721c97f0da43c1a68d2962d30363525d8532ab5f2534dfefc86d175e17e423e  sysdig-0.29.1.tar.gz
+sha256  38ea602085f706af5d07630189216fa240064122650a81456cb092579313ae8e  sysdig-0.29.2.tar.gz
 sha256  a88fbf820b38b1c7fabc6efe291b8259e02ae21326f56fe31c6c9adf374b2702  COPYING

package/sysdig/sysdig.mk +3 -2

index 318746d44a..2d57c0043f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSDIG_VERSION = 0.29.1
+SYSDIG_VERSION = 0.29.2
 SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION))
 SYSDIG_LICENSE = Apache-2.0
 SYSDIG_LICENSE_FILE = COPYING

@@ -32,6 +32,7 @@ SYSDIG_CONF_OPTS += -DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR)
 	-DENABLE_DKMS=OFF \
 	-DUSE_BUNDLED_DEPS=OFF \
 	-DWITH_CHISEL=ON \
-	-DVALIJSON_INCLUDE=$(BUILD_DIR)/valijson-0.6/include/valijson
+	-DVALIJSON_INCLUDE=$(BUILD_DIR)/valijson-0.6/include/valijson \
+	-DSYSDIG_VERSION=$(SYSDIG_VERSION)
 
 $(eval $(cmake-package))

Signature · 6 lines

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Yann E. MORIN

Applied

2022-05-03 19:22 UTC #4 lore raw

Re: [Buildroot] [PATCH 2/2] package/sysdig: bump to version 0.29.2

Francis, All,

On 2022-05-03 15:27 +0100, Francis Laniel spake thusly:

Quoted 29 lines

Signed-off-by Francis Laniel <[email protected]>

---
 package/sysdig/sysdig.hash | 2 +-
 package/sysdig/sysdig.mk   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

package/sysdig/sysdig.hash +1 -1

index 380c9dce1e..c953421f27 100644
@@ -1,3 +1,3 @@
 # sha256 locally computed
-sha256  3721c97f0da43c1a68d2962d30363525d8532ab5f2534dfefc86d175e17e423e  sysdig-0.29.1.tar.gz
+sha256  38ea602085f706af5d07630189216fa240064122650a81456cb092579313ae8e  sysdig-0.29.2.tar.gz
 sha256  a88fbf820b38b1c7fabc6efe291b8259e02ae21326f56fe31c6c9adf374b2702  COPYING

package/sysdig/sysdig.mk +1 -1

index 318746d44a..2d57c0043f 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-SYSDIG_VERSION = 0.29.1
+SYSDIG_VERSION = 0.29.2
 SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION))
 SYSDIG_LICENSE = Apache-2.0
 SYSDIG_LICENSE_FILE = COPYING

package/sysdig/sysdig.mk SYSDIG_CONF_OPTS += -DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR) · line 36

Quoted 6 lines

package/sysdig/sysdig.mk +2 -1

@@ -32,6 +32,7 @@ SYSDIG_CONF_OPTS += -DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR)
 	-DENABLE_DKMS=OFF \
 	-DUSE_BUNDLED_DEPS=OFF \
 	-DWITH_CHISEL=ON \
-	-DVALIJSON_INCLUDE=$(BUILD_DIR)/valijson-0.6/include/valijson
+	-DVALIJSON_INCLUDE=$(BUILD_DIR)/valijson-0.6/include/valijson \
+	-DSYSDIG_VERSION=$(SYSDIG_VERSION)

I've extended the commit log to explain why we need to explicitly set the version string.

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 8 lines

package/sysdig/sysdig.mk +0 -0

 $(eval $(cmake-package))

Signature · 6 lines

2.25.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Signature · 10 lines

.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

Francis Laniel

author

2022-05-04 12:28 UTC #5 lore raw

Re: [Buildroot] [PATCH 2/2] package/sysdig: bump to version 0.29.2

Hi!

Quoted 46 lines · Le mardi 3 mai 2022, 20:22:16 BST Yann E. MORIN a écrit :

Francis, All,
On 2022-05-03 15:27 +0100, Francis Laniel spake thusly:
Quoted 43 lines
Signed-off-by Francis Laniel <[email protected]>
---
 package/sysdig/sysdig.hash | 2 +-
 package/sysdig/sysdig.mk   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
package/sysdig/sysdig.hash +0 -1
index 380c9dce1e..c953421f27 100644
@@ -1,3 +1,3 @@
 
 # sha256 locally computed
 
-sha256  3721c97f0da43c1a68d2962d30363525d8532ab5f2534dfefc86d175e17e423e 
sysdig-0.29.1.tar.gz +sha256 38ea602085f706af5d07630189216fa240064122650a81456cb092579313ae8e sysdig-0.29.2.tar.gz>
sha256 a88fbf820b38b1c7fabc6efe291b8259e02ae21326f56fe31c6c9adf374b2702 COPYING>
package/sysdig/sysdig.mk +1 -1
index 318746d44a..2d57c0043f 100644
@@ -4,7 +4,7 @@
 
 #
 #########################################################################
 #######> 
-SYSDIG_VERSION = 0.29.1
+SYSDIG_VERSION = 0.29.2
 
 SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION))
SYSDIG_LICENSE = Apache-2.0
SYSDIG_LICENSE_FILE = COPYING
package/sysdig/sysdig.mk +0 -1
@@ -32,6 +32,7 @@ SYSDIG_CONF_OPTS +=
-DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR)> 
 	-DENABLE_DKMS=OFF \
 	-DUSE_BUNDLED_DEPS=OFF \
 	-DWITH_CHISEL=ON \
 

Quoted 8 lines

package/sysdig/sysdig.mk SYSDIG_CONF_OPTS += -DFALCOSECURITY_LIBS_SOURCE_DIR=$(FALCOSECURITY_LIBS_SRCDIR) · line 36
Quoted 3 lines
package/sysdig/sysdig.mk +2 -1
-	-DVALIJSON_INCLUDE=$(BUILD_DIR)/valijson-0.6/include/valijson
+	-DVALIJSON_INCLUDE=$(BUILD_DIR)/valijson-0.6/include/valijson \
+	-DSYSDIG_VERSION=$(SYSDIG_VERSION)
I've extended the commit log to explain why we need to explicitly set the version string.
Applied to master, thanks.

Thank you a lot for the merges and still sorry for the nit in previous commit...
I will take more care next time!

Quoted 4 lines

Regards,
Yann E. MORIN.
Quoted 1 line
$(eval $(cmake-package))

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot