MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

criu: fix build-deps qa warning

Browse Source 
It shows warning when build crius if libselinux has been built already:

  WARNING: QA Issue: criu rdepends on libselinux, but it isn't a build dependency? [build-deps]

Add a patch to disable selinux support when 'selinux' is not in PACKAGECONF.

And update indentation at same time.

Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
This commit is contained in:
Kai Kang 2016-06-01 16:35:43 +08:00 committed by Bruce Ashfield
parent 01aa8f1819
commit 06dccfa933
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
recipes-containers/criu/criu_git.bb
View File

@ -21,6 +21,7 @@ SRC_URI = "git://github.com/xemul/criu.git;protocol=git \
file://0001-criu-Fix-toolchain-hardcode.patch \ file://0001-criu-Fix-toolchain-hardcode.patch \
file://0002-criu-Skip-documentation-install.patch \ file://0002-criu-Skip-documentation-install.patch \
file://0001-criu-Change-libraries-install-directory.patch \ file://0001-criu-Change-libraries-install-directory.patch \
${@bb.utils.contains('PACKAGECONFIG', 'selinux', '', 'file://disable-selinux.patch', d)} \
" "
COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux" COMPATIBLE_HOST = "(x86_64|arm|aarch64).*-linux"
@ -51,6 +52,9 @@ export HOST_SYS
inherit setuptools inherit setuptools
PACKAGECONFIG ??= ""
PACKAGECONFIG[selinux] = ",,libselinux"
do_compile_prepend() { do_compile_prepend() {
rm -rf ${S}/protobuf/google/protobuf/descriptor.proto rm -rf ${S}/protobuf/google/protobuf/descriptor.proto
ln -s ${PKG_CONFIG_SYSROOT_DIR}/usr/include/google/protobuf/descriptor.proto ${S}/protobuf/google/protobuf/descriptor.proto ln -s ${PKG_CONFIG_SYSROOT_DIR}/usr/include/google/protobuf/descriptor.proto ${S}/protobuf/google/protobuf/descriptor.proto

26
recipes-containers/criu/files/disable-selinux.patch Normal file
View File

@ -0,0 +1,26 @@
Upstream-Status: Inappropriate [disable feature]
It shows warning when build crius if libselinux has been built already:
WARNING: QA Issue: criu rdepends on libselinux, but it isn't a build dependency? [build-deps]
Apply this patch to disable selinux support when 'selinux' is not in PACKAGECONF.
Signed-off-by: Kai Kang <kai.kang@windriver.com>
diff --git a/Makefile.config b/Makefile.config
index ce4b8d8..3ac2780 100644
--- a/Makefile.config
+++ b/Makefile.config
@@ -8,11 +8,6 @@ ifeq ($(call try-cc,$(LIBBSD_DEV_TEST),-lbsd),y)
DEFINES += -DCONFIG_HAS_LIBBSD
endif
-ifeq ($(call pkg-config-check,libselinux),y)
- LIBS := -lselinux $(LIBS)
- DEFINES += -DCONFIG_HAS_SELINUX
-endif
-
$(CONFIG): scripts/utilities.mak scripts/feature-tests.mak include/config-base.h
$(E) " GEN " $@
$(Q) @echo '#ifndef __CR_CONFIG_H__' > $@