mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-05-07 05:10:20 +00:00
Code Issues Projects Releases Wiki Activity

systemd: bump SRCREV and fix postinst

Browse Source 
The u-a class gets in the way of the addgroup, so do things manually

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
2011-06-06 10:24:33 +02:00
parent accc0d62ae
commit 5b27dc8974
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-oe/recipes-core/systemd/systemd_git.bb
+9 -14
View File
@@ -17,9 +17,9 @@ PKGV = "v${GITPKGVTAG}"
PV = "git" PV = "git"
PR = "r4" PR = "r4"
inherit autotools vala update-alternatives inherit autotools vala
SRCREV = "9a66640832d103f906c2ef609a1d19d43fc542f6" SRCREV = "78e39b43b89c6bf9ce401d6030939a004a23c850"
SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \ SRC_URI = "git://anongit.freedesktop.org/systemd;protocol=git \
file://execute.patch \ file://execute.patch \
@@ -54,11 +54,6 @@ do_install_append() {
fi fi
} }
ALTERNATIVE_NAME = "init"
ALTERNATIVE_LINK = "${base_sbindir}/init"
ALTERNATIVE_PATH = "${base_bindir}/systemd"
ALTERNATIVE_PRIORITY = "80"
PACKAGES =+ "${PN}-gui ${PN}-serialgetty" PACKAGES =+ "${PN}-gui ${PN}-serialgetty"
FILES_${PN}-gui = "${bindir}/systemadm" FILES_${PN}-gui = "${bindir}/systemadm"
@@ -101,17 +96,17 @@ RRECOMMENDS_${PN} += "kbd kbd-consolefonts \
# u-a for runlevel and telinit # u-a for runlevel and telinit
pkg_postinst_${PN} () { pkg_postinst_${PN} () {
# can't do this offline, but we need the u-a bits update-alternatives --install ${base_sbindir}/init init ${base_bindir}/systemd 300
if [ "x$D" != "x" ]; then
echo "can't do addgroup offline"
else
grep "^lock:" /etc/group > /dev/null || addgroup lock
fi
update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl 300 update-alternatives --install ${base_sbindir}/halt halt ${base_bindir}/systemctl 300
update-alternatives --install ${base_sbindir}/reboot reboot ${base_bindir}/systemctl 300 update-alternatives --install ${base_sbindir}/reboot reboot ${base_bindir}/systemctl 300
update-alternatives --install ${base_sbindir}/shutdown shutdown ${base_bindir}/systemctl 300 update-alternatives --install ${base_sbindir}/shutdown shutdown ${base_bindir}/systemctl 300
update-alternatives --install ${base_sbindir}/poweroff poweroff ${base_bindir}/systemctl 300 update-alternatives --install ${base_sbindir}/poweroff poweroff ${base_bindir}/systemctl 300
# can't do this offline, but we need the u-a bits above
if [ "x$D" != "x" ]; then
echo "can't do addgroup offline" ; exit 1
else
grep "^lock:" /etc/group > /dev/null || addgroup lock
fi
} }