From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 8D235E00DAC; Mon, 6 Jun 2016 00:00:35 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,HTML_MESSAGE, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, * medium trust * [147.11.1.11 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.0 HTML_MESSAGE BODY: HTML included in message Received: from mail.windriver.com (mail.windriver.com [147.11.1.11]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 41C19E00D8C for ; Mon, 6 Jun 2016 00:00:31 -0700 (PDT) Received: from ALA-HCA.corp.ad.wrs.com (ala-hca.corp.ad.wrs.com [147.11.189.40]) by mail.windriver.com (8.15.2/8.15.1) with ESMTPS id u5670RP2028013 (version=TLSv1 cipher=AES128-SHA bits=128 verify=FAIL); Mon, 6 Jun 2016 00:00:27 -0700 (PDT) Received: from [128.224.162.231] (128.224.162.231) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.3.248.2; Mon, 6 Jun 2016 00:00:26 -0700 To: Bruce Ashfield References: <20160601083543.23700-1-kai.kang@windriver.com> <5754E2FF.4050308@windriver.com> From: Kang Kai Message-ID: <57551F88.9080102@windriver.com> Date: Mon, 6 Jun 2016 15:00:24 +0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: Cc: "meta-virtualization@yoctoproject.org" , Mark Asselstine Subject: Re: [PATCH] criu: fix build-deps qa warning X-BeenThere: meta-virtualization@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Discussion of layer enabling hypervisor, virtualization tool stack, and cloud support" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jun 2016 07:00:35 -0000 Content-Type: multipart/alternative; boundary="------------020208000205050704050900" --------------020208000205050704050900 Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 8bit On 2016年06月06日 14:46, Bruce Ashfield wrote: > > > On Sun, Jun 5, 2016 at 10:42 PM, Kang Kai > wrote: > > On 2016年06月01日 16:35, kai.kang@windriver.com > wrote: > > From: Kai Kang > > > 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 > > --- > 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 > > + > +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" -- Regards, Neil | Kai Kang --------------020208000205050704050900 Content-Type: text/html; charset="utf-8" Content-Transfer-Encoding: 8bit
On 2016年06月06日 14:46, Bruce Ashfield wrote:


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.

Thanks.

--Kai


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"


-- 
Regards,
Neil | Kai Kang
--------------020208000205050704050900--