nss-myhostname: skip it when systemd

PATCH In review Robert Yang 2 participants 4 messages Oct 9, 2014

lore

Share & tools

lore

Robert Yang

author

2014-10-09 09:45 UTC #0 lore raw

cover nss-myhostname: skip it when systemd

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(+)

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-10-09 09:45 UTC #1 lore raw

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

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 <[email protected]>

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

meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb +6 -0

index 1237602..071e639 100644
@@ -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/' \

Signature · 1 line

1.7.9.5

Burton, Ross

2014-10-09 12:50 UTC #2 lore raw

meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb SRC_URI[sha256sum] = "2ba744ea8d578d1c57c85884e94a3042ee17843a5294434d3a7f6c4d67 · line 20

Quoted 4 lines · Robert Yang

meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb +4 -0

+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

Robert Yang

author

2014-10-09 13:26 UTC #3 lore raw

Quoted 7 lines · Ross

Review
Quoted 4 lines · Robert Yang
(quoted diff) +4 -0
+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

meta/recipes-support/nss-myhostname/nss-myhostname_0.3.bb +0 -0

index 1237602..bbce9e9 100644
@@ -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\>//' \

Quoted 4 lines

Ross