mirror of
https://git.busybox.net/buildroot.git
synced 2024-12-13 07:13:32 +08:00
bd4c86806e
conmon unconditionally uses seccomp_notif_sizes which is only available since kernel 5.0 and6a21cc50f0resulting in the following build failure since the addition of the package in commit06f50ff1bf: In file included from src/seccomp_notify.h:4, from src/seccomp_notify.c:26: src/seccomp_notify_plugin.h:33:78: warning: 'struct seccomp_notif_sizes' declared inside parameter list will not be visible outside of this definition or declaration 33 | typedef int (*run_oci_seccomp_notify_handle_request_cb)(void *opaque, struct seccomp_notif_sizes *sizes, struct seccomp_notif *sreq, | ^~~~~~~~~~~~~~~~~~~ src/seccomp_notify.c:47:36: error: field 'sizes' has incomplete type 47 | struct seccomp_notif_sizes sizes; | ^~~~~ Fixes: - http://autobuild.buildroot.org/results/cbfa2f3a585b7feecd902137bc589a1ec15cbefe Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
37 lines
1023 B
Makefile
37 lines
1023 B
Makefile
################################################################################
|
|
#
|
|
# conmon
|
|
#
|
|
################################################################################
|
|
|
|
CONMON_VERSION = 2.1.8
|
|
CONMON_SITE = $(call github,containers,conmon,v$(CONMON_VERSION))
|
|
CONMON_LICENSE = Apache-2.0
|
|
CONMON_LICENSE_FILES = LICENSE
|
|
|
|
CONMON_DEPENDENCIES = host-pkgconf libglib2
|
|
|
|
ifeq ($(BR2_PACKAGE_LIBSECCOMP)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0):$(BR2_STATIC_LIBS),yy:)
|
|
CONMON_DISABLE_SECCOMP = 0
|
|
CONMON_DEPENDENCIES += libseccomp
|
|
else
|
|
CONMON_DISABLE_SECCOMP = 1
|
|
endif
|
|
|
|
define CONMON_CONFIGURE_CMDS
|
|
printf '#!/bin/bash\necho "$(CONMON_DISABLE_SECCOMP)"\n' > \
|
|
$(@D)/hack/seccomp-notify.sh
|
|
chmod +x $(@D)/hack/seccomp-notify.sh
|
|
endef
|
|
|
|
define CONMON_BUILD_CMDS
|
|
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
|
|
LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) bin/conmon
|
|
endef
|
|
|
|
define CONMON_INSTALL_TARGET_CMDS
|
|
$(INSTALL) -D -m 755 $(@D)/bin/conmon $(TARGET_DIR)/usr/bin/conmon
|
|
endef
|
|
|
|
$(eval $(generic-package))
|