Skip to contentSkip to conversation

Recipe bug fixes

PATCH New Jussi Kukkonen 1 participant 4 messages Oct 31, 2016

lore
Share & tools
lore
#0 lore raw

cover Recipe bug fixes

avahi,distcc: Don't remove users/groups on postrm
e2fsprogs: Fix a build issue noticed on autobuilder

Thanks,
Jussi

The following changes since commit 927ed6cbefbaea2905919e158ceda9546e3e710e:

maintainers.inc: remove SGML recipes (2016-10-28 16:32:31 +0100)

are available in the git repository at:

git://git.yoctoproject.org/poky-contrib jku/fixes
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/fixes

Jussi Kukkonen (3):
e2fsprogs: Depend on attr
avahi: Don't remove users/groups in postrm
distcc: Don't remove users/groups in postrm

 meta/recipes-connectivity/avahi/avahi.inc     | 10 ----------
 meta/recipes-devtools/distcc/distcc_3.2.bb    |  4 ----
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc |  2 +-
 3 files changed, 1 insertion(+), 15 deletions(-)
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/3 e2fsprogs: Depend on attr

e2fsprogs builds fine with or without attr but it's possible to end up with this sequence:
* e2fsprogs configure finds attr/xattr.h (coming from sstate)
* attr starts rebuild, attr/xattr.h is removed from sysroot
* e2fsprogs compile fails: "attr/xattr.h: No such file or directory"

Depend on attr to ensure reproducible build.

---
 meta/recipes-devtools/e2fsprogs/e2fsprogs.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/e2fsprogs/e2fsprogs.inc +1 -1
index 74e92f6..81d90a1 100644
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=b48f21d765b875bd10400975d12c1ca2 \
                       file://lib/et/et_name.c;beginline=1;endline=11;md5=ead236447dac7b980dbc5b4804d8c836 \
                       file://lib/ss/ss.h;beginline=1;endline=20;md5=6e89ad47da6e75fecd2b5e0e81e1d4a6"
 SECTION = "base"
-DEPENDS = "util-linux"
+DEPENDS = "util-linux attr"
 
 SRC_URI = "git://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git"
 S = "${WORKDIR}/git"
Signature · 1 line
2.1.4
#2 lore raw

PATCH 2/3 avahi: Don't remove users/groups in postrm

There's no way to ensure that files owned by the users aren't left on the system at postrm time: Removing the user would mean those files are now owned by a non-existing user, and later may be owned by a completely unrelated new user.

[YOCTO #10442]

---
 meta/recipes-connectivity/avahi/avahi.inc | 10 ----------
 1 file changed, 10 deletions(-)
meta/recipes-connectivity/avahi/avahi.inc +0 -10
index cb36802..faa8741 100644
@@ -153,13 +153,3 @@ if [ -z "$D" ]; then
 	killall -q -HUP dbus-daemon || true
 fi
 }
-
-pkg_postrm_avahi-daemon () {
-	deluser avahi || true
-	delgroup avahi || true
-}
-
-pkg_postrm_avahi-autoipd () {
-	deluser avahi-autoipd || true
-	delgroup avahi-autoipd || true
-}
Signature · 1 line
2.1.4
#3 lore raw

PATCH 3/3 distcc: Don't remove users/groups in postrm

In reply to Jussi Kukkonen

There's no way to ensure that files owned by the users aren't left on the system at postrm time: Removing the user would mean those files are now owned by a non-existing user, and later may be owned by a completely unrelated new user.

---
 meta/recipes-devtools/distcc/distcc_3.2.bb | 4 ----
 1 file changed, 4 deletions(-)
meta/recipes-devtools/distcc/distcc_3.2.bb +0 -4
index c084ad2..ea3d7c1 100644
@@ -65,7 +65,3 @@ FILES_${PN} = " ${sysconfdir} \
 		${systemd_unitdir}/system/distcc.service"
 FILES_distcc-distmon-gnome = "  ${bindir}/distccmon-gnome \
 				${datadir}/distcc"
-
-pkg_postrm_${PN} () {
-	deluser distcc || true
-}
Signature · 1 line
2.1.4