* [PATCH] criu: fix build-deps qa warning
@ 2016-06-01 8:35 kai.kang
2016-06-06 2:42 ` Kang Kai
0 siblings, 1 reply; 4+ messages in thread
From: kai.kang @ 2016-06-01 8:35 UTC (permalink / raw)
To: meta-virtualization
From: Kai Kang <kai.kang@windriver.com>
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>
---
recipes-containers/criu/criu_git.bb | 12 ++++++----
.../criu/files/disable-selinux.patch | 26 ++++++++++++++++++++++
2 files changed, 34 insertions(+), 4 deletions(-)
create mode 100644 recipes-containers/criu/files/disable-selinux.patch
diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
index 816c806..c8be78f 100644
--- a/recipes-containers/criu/criu_git.bb
+++ b/recipes-containers/criu/criu_git.bb
@@ -18,10 +18,11 @@ PR = "r0"
PV = "1.6+git${SRCPV}"
SRC_URI = "git://github.com/xemul/criu.git;protocol=git \
- file://0001-criu-Fix-toolchain-hardcode.patch \
- file://0002-criu-Skip-documentation-install.patch \
- file://0001-criu-Change-libraries-install-directory.patch \
- "
+ file://0001-criu-Fix-toolchain-hardcode.patch \
+ file://0002-criu-Skip-documentation-install.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"
@@ -51,6 +52,9 @@ export HOST_SYS
inherit setuptools
+PACKAGECONFIG ??= ""
+PACKAGECONFIG[selinux] = ",,libselinux"
+
do_compile_prepend() {
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
diff --git a/recipes-containers/criu/files/disable-selinux.patch b/recipes-containers/criu/files/disable-selinux.patch
new file mode 100644
index 0000000..da881dd
--- /dev/null
+++ b/recipes-containers/criu/files/disable-selinux.patch
@@ -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__' > $@
--
2.6.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] criu: fix build-deps qa warning
2016-06-01 8:35 [PATCH] criu: fix build-deps qa warning kai.kang
@ 2016-06-06 2:42 ` Kang Kai
2016-06-06 6:46 ` Bruce Ashfield
0 siblings, 1 reply; 4+ messages in thread
From: Kang Kai @ 2016-06-06 2:42 UTC (permalink / raw)
To: meta-virtualization, Bruce Ashfield; +Cc: Mark Asselstine
On 2016年06月01日 16:35, kai.kang@windriver.com wrote:
> From: Kai Kang <kai.kang@windriver.com>
>
> 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.
Hi Bruce,
Any comment on this commit, please?
Regards,
Kai
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com>
> ---
> recipes-containers/criu/criu_git.bb | 12 ++++++----
> .../criu/files/disable-selinux.patch | 26 ++++++++++++++++++++++
> 2 files changed, 34 insertions(+), 4 deletions(-)
> create mode 100644 recipes-containers/criu/files/disable-selinux.patch
>
> diff --git a/recipes-containers/criu/criu_git.bb b/recipes-containers/criu/criu_git.bb
> index 816c806..c8be78f 100644
> --- a/recipes-containers/criu/criu_git.bb
> +++ b/recipes-containers/criu/criu_git.bb
> @@ -18,10 +18,11 @@ PR = "r0"
> PV = "1.6+git${SRCPV}"
>
> SRC_URI = "git://github.com/xemul/criu.git;protocol=git \
> - file://0001-criu-Fix-toolchain-hardcode.patch \
> - file://0002-criu-Skip-documentation-install.patch \
> - file://0001-criu-Change-libraries-install-directory.patch \
> - "
> + file://0001-criu-Fix-toolchain-hardcode.patch \
> + file://0002-criu-Skip-documentation-install.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"
>
> @@ -51,6 +52,9 @@ export HOST_SYS
>
> inherit setuptools
>
> +PACKAGECONFIG ??= ""
> +PACKAGECONFIG[selinux] = ",,libselinux"
> +
> do_compile_prepend() {
> 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
> diff --git a/recipes-containers/criu/files/disable-selinux.patch b/recipes-containers/criu/files/disable-selinux.patch
> new file mode 100644
> index 0000000..da881dd
> --- /dev/null
> +++ b/recipes-containers/criu/files/disable-selinux.patch
> @@ -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__' > $@
--
Regards,
Neil | Kai Kang
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] criu: fix build-deps qa warning
2016-06-06 2:42 ` Kang Kai
@ 2016-06-06 6:46 ` Bruce Ashfield
2016-06-06 7:00 ` Kang Kai
0 siblings, 1 reply; 4+ messages in thread
From: Bruce Ashfield @ 2016-06-06 6:46 UTC (permalink / raw)
To: Kang Kai; +Cc: meta-virtualization@yoctoproject.org, Mark Asselstine
[-- Attachment #1: Type: text/plain, Size: 4059 bytes --]
On Sun, Jun 5, 2016 at 10:42 PM, Kang Kai <Kai.Kang@windriver.com> wrote:
> On 2016年06月01日 16:35, kai.kang@windriver.com wrote:
>
>> From: Kai Kang <kai.kang@windriver.com>
>>
>> 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.
>>
>
> Hi Bruce,
>
> Any comment on this commit, please?
>
I just hadn't gotten to it yet.
This looks fine to me, and is now merged to master.
Bruce
>
>
> Regards,
> Kai
>
>
>
>> Signed-off-by: Kai Kang <kai.kang@windriver.com>
>> ---
>> recipes-containers/criu/criu_git.bb | 12 ++++++----
>> .../criu/files/disable-selinux.patch | 26
>> ++++++++++++++++++++++
>> 2 files changed, 34 insertions(+), 4 deletions(-)
>> create mode 100644 recipes-containers/criu/files/disable-selinux.patch
>>
>> diff --git a/recipes-containers/criu/criu_git.bb
>> b/recipes-containers/criu/criu_git.bb
>> index 816c806..c8be78f 100644
>> --- a/recipes-containers/criu/criu_git.bb
>> +++ b/recipes-containers/criu/criu_git.bb
>> @@ -18,10 +18,11 @@ PR = "r0"
>> PV = "1.6+git${SRCPV}"
>> SRC_URI = "git://github.com/xemul/criu.git;protocol=git \
>> - file://0001-criu-Fix-toolchain-hardcode.patch \
>> - file://0002-criu-Skip-documentation-install.patch \
>> - file://0001-criu-Change-libraries-install-directory.patch \
>> - "
>> + file://0001-criu-Fix-toolchain-hardcode.patch \
>> + file://0002-criu-Skip-documentation-install.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"
>> @@ -51,6 +52,9 @@ export HOST_SYS
>> inherit setuptools
>> +PACKAGECONFIG ??= ""
>> +PACKAGECONFIG[selinux] = ",,libselinux"
>> +
>> do_compile_prepend() {
>> 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
>> diff --git a/recipes-containers/criu/files/disable-selinux.patch
>> b/recipes-containers/criu/files/disable-selinux.patch
>> new file mode 100644
>> index 0000000..da881dd
>> --- /dev/null
>> +++ b/recipes-containers/criu/files/disable-selinux.patch
>> @@ -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__' > $@
>>
>
>
> --
> Regards,
> Neil | Kai Kang
>
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>
--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee
at its end"
[-- Attachment #2: Type: text/html, Size: 6165 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] criu: fix build-deps qa warning
2016-06-06 6:46 ` Bruce Ashfield
@ 2016-06-06 7:00 ` Kang Kai
0 siblings, 0 replies; 4+ messages in thread
From: Kang Kai @ 2016-06-06 7:00 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: meta-virtualization@yoctoproject.org, Mark Asselstine
[-- Attachment #1: Type: text/plain, Size: 5222 bytes --]
On 2016年06月06日 14:46, Bruce Ashfield wrote:
>
>
> On Sun, Jun 5, 2016 at 10:42 PM, Kang Kai <Kai.Kang@windriver.com
> <mailto:Kai.Kang@windriver.com>> wrote:
>
> On 2016年06月01日 16:35, kai.kang@windriver.com
> <mailto:kai.kang@windriver.com> wrote:
>
> From: Kai Kang <kai.kang@windriver.com
> <mailto:kai.kang@windriver.com>>
>
> 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.
>
>
> Hi Bruce,
>
> Any comment on this commit, please?
>
>
>
> I just hadn't gotten to it yet.
>
> This looks fine to me, and is now merged to master.
Thanks.
--Kai
>
> Bruce
>
>
>
> Regards,
> Kai
>
>
>
> Signed-off-by: Kai Kang <kai.kang@windriver.com
> <mailto:kai.kang@windriver.com>>
> ---
> recipes-containers/criu/criu_git.bb <http://criu_git.bb>
> | 12 ++++++----
> .../criu/files/disable-selinux.patch | 26
> ++++++++++++++++++++++
> 2 files changed, 34 insertions(+), 4 deletions(-)
> create mode 100644
> recipes-containers/criu/files/disable-selinux.patch
>
> diff --git a/recipes-containers/criu/criu_git.bb
> <http://criu_git.bb> b/recipes-containers/criu/criu_git.bb
> <http://criu_git.bb>
> index 816c806..c8be78f 100644
> --- a/recipes-containers/criu/criu_git.bb <http://criu_git.bb>
> +++ b/recipes-containers/criu/criu_git.bb <http://criu_git.bb>
> @@ -18,10 +18,11 @@ PR = "r0"
> PV = "1.6+git${SRCPV}"
> SRC_URI = "git://github.com/xemul/criu.git;protocol=git
> <http://github.com/xemul/criu.git;protocol=git> \
> - file://0001-criu-Fix-toolchain-hardcode.patch \
> - file://0002-criu-Skip-documentation-install.patch \
> - file://0001-criu-Change-libraries-install-directory.patch \
> - "
> + file://0001-criu-Fix-toolchain-hardcode.patch \
> + file://0002-criu-Skip-documentation-install.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"
> @@ -51,6 +52,9 @@ export HOST_SYS
> inherit setuptools
> +PACKAGECONFIG ??= ""
> +PACKAGECONFIG[selinux] = ",,libselinux"
> +
> do_compile_prepend() {
> 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
> diff --git
> a/recipes-containers/criu/files/disable-selinux.patch
> b/recipes-containers/criu/files/disable-selinux.patch
> new file mode 100644
> index 0000000..da881dd
> --- /dev/null
> +++ b/recipes-containers/criu/files/disable-selinux.patch
> @@ -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
> <mailto: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__' > $@
>
>
>
> --
> Regards,
> Neil | Kai Kang
>
>
> --
> _______________________________________________
> meta-virtualization mailing list
> meta-virtualization@yoctoproject.org
> <mailto:meta-virtualization@yoctoproject.org>
> https://lists.yoctoproject.org/listinfo/meta-virtualization
>
>
>
>
> --
> "Thou shalt not follow the NULL pointer, for chaos and madness await
> thee at its end"
--
Regards,
Neil | Kai Kang
[-- Attachment #2: Type: text/html, Size: 11785 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-06-06 7:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-01 8:35 [PATCH] criu: fix build-deps qa warning kai.kang
2016-06-06 2:42 ` Kang Kai
2016-06-06 6:46 ` Bruce Ashfield
2016-06-06 7:00 ` Kang Kai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.