[PATCH 0/1] nss-myhostname: skip it when systemd

[PATCH 0/1] nss-myhostname: skip it when systemd

[Robert Yang]

The following changes since commit 16cedc3bce6fc37543e9ef053cd7c589e523ca1c:

  package_ipk.bbclass: Fix SRC_URI whitespace handling (2014-10-06 16:03:03 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/nss
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/nss

Robert Yang (1):
  nss-myhostname: skip it when systemd

 .../nss-myhostname/nss-myhostname_0.3.bb           |    6 ++++++
 1 file changed, 6 insertions(+)

-- 
1.7.9.5

[PATCH 1/1] nss-myhostname: skip it when systemd

[Robert Yang]

Fixed error when systemd is in DISTRO_FEATURES:
ERROR: The recipe systemd is trying to install files into a sharedarea when those files already exist. Those files and their manifestlocation are:
   /buildarea/lyang1/testss/tmp/sysroots/qemux86/usr/lib/libnss_myhostname.so.2
 Matched in manifest-qemux86-nss-myhostname.populate_sysroot
Please verify which recipe should provide theabove files.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../nss-myhostname/nss-myhostname_0.3.bb           |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
index 1237602..071e639 100644
--- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
+++ b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
@@ -13,6 +13,12 @@ SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67
 
 inherit autotools
 
+# The systemd has its own copy of nss-myhostname
+python () {
+	if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
+		raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
+}
+
 pkg_postinst_${PN} () {
 	sed -e '/^hosts:/s/\s*\<myhostname\>//' \
 		-e 's/\(^hosts:.*\)\(\<files\>\)\(.*\)\(\<dns\>\)\(.*\)/\1\2 myhostname \3\4\5/' \
-- 
1.7.9.5

Re: [PATCH 1/1] nss-myhostname: skip it when systemd

[Burton, Ross]

On 9 October 2014 10:45, Robert Yang <liezhi.yang@windriver.com> wrote:
> +python () {
> +       if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
> +               raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
> +}

Please use distro_features_check for conciseness.

Ross

Re: [PATCH 1/1] nss-myhostname: skip it when systemd

[Robert Yang]

On 10/09/2014 08:49 PM, Burton, Ross wrote:
> On 9 October 2014 10:45, Robert Yang <liezhi.yang@windriver.com> wrote:
>> +python () {
>> +       if bb.utils.contains ('DISTRO_FEATURES', 'systemd', True, False, d):
>> +               raise bb.parse.SkipPackage("'systemd' in DISTRO_FEATURES")
>> +}
>
> Please use distro_features_check for conciseness.

Sounds good, updated:
git://git.openembedded.org/openembedded-core-contrib rbt/nss

diff --git a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb 
b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
index 1237602..bbce9e9 100644
--- a/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
+++ b/meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb
@@ -11,7 +11,10 @@ SRC_URI = 
"http://0pointer.de/lennart/projects/nss-myhostname/nss-myhostname-${P
  SRC_URI[md5sum] = "d4ab9ac36c053ab8fb836db1cbd4a48f"
  SRC_URI[sha256sum] = 
"2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67e7caf2"

-inherit autotools
+inherit autotools distro_features_check
+
+# The systemd has its own copy of nss-myhostname
+CONFLICT_DISTRO_FEATURES = "systemd"

  pkg_postinst_${PN} () {
         sed -e '/^hosts:/s/\s*\<myhostname\>//' \


>
> Ross
>
>