archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2025-02-27 00:10:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/systemd to 44-7

Browse source
This commit is contained in:
Kevin Mihelich 2012-05-05 13:41:51 -04:00
parent 00462363c5
commit 81bcd5f223
2 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extra/systemd/PKGBUILD
View file

@ -9,10 +9,10 @@ plugrel=1
pkgbase=systemd pkgbase=systemd
pkgname=('systemd' 'libsystemd') pkgname=('systemd' 'libsystemd')
pkgver=44 pkgver=44
pkgrel=5 pkgrel=7
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd" url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2') license=('GPL2' 'LGPL2.1' 'MIT')
makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool' makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gperf' 'intltool'
'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz') 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'udev' 'xz')
options=('!libtool') options=('!libtool')
@ -32,10 +32,10 @@ md5sums=('11f44ff74c87850064e4351518bcff17'
build() { build() {
cd "$pkgname-$pkgver" cd "$pkgname-$pkgver"
# https://bugzilla.redhat.com/show_bug.cgi?id=803358 # https://bugzilla.redhat.com/show_bug.cgi?id=803358 (upstream 5ebff53375)
patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch" patch -Np1 <"$srcdir/0001-util-never-follow-symlinks-in-rm_rf_children.patch"
# https://bugs.archlinux.org/task/28386 # https://bugs.archlinux.org/task/28386 (upstream 75c8e3cffd)
patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch" patch -Np1 <"$srcdir/0001-logind-close-FIFO-before-ending-sessions-cleanly.patch"
# Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49) # Fix broken 'systemctl list-unit-files' (upstream fb5ef067c49)
@ -46,10 +46,11 @@ build() {
./configure --sysconfdir=/etc \ ./configure --sysconfdir=/etc \
--libexecdir=/usr/lib \ --libexecdir=/usr/lib \
--with-pamlibdir=/lib/security \ --with-pamlibdir=/usr/lib/security \
--localstatedir=/var \ --localstatedir=/var \
--with-distro=arch \ --with-distro=arch \
--enable-split-usr --enable-split-usr \
--disable-ima
make make
} }
@ -85,9 +86,8 @@ package_systemd() {
chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf" chmod 644 "$pkgdir/usr/lib/tmpfiles.d/console.conf"
# symlink to /bin/systemd for compat and sanity # symlink to /bin/systemd for compat and sanity
install -dm755 "$pkgdir/bin" "$pkgdir/lib/systemd" install -dm755 "$pkgdir/bin"
ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd" ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
ln -s ../../usr/lib/systemd/systemd "$pkgdir/lib/systemd/systemd"
# use python2 for systemd-analyze # use python2 for systemd-analyze
sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"

20
extra/systemd/systemd.install
View file

@ -29,18 +29,14 @@ post_upgrade() {
fi fi
if sd_booted; then if sd_booted; then
systemctl daemon-reload # we moved the binary in 44-2 to /usr, so a reexec leads to a
systemctl daemon-reexec # coredump. refuse this reexec and warn the user that they should
fi # reboot instead.
if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then
newpkgver=${1%-*} echo "warning: refusing to reexec systemd. the system should be rebooted."
oldpkgver=${2%-*} else
systemctl daemon-reload
# catch v31 need for restarting systemd-logind.service systemctl daemon-reexec
if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
# but only if systemd is running
if sd_booted; then
systemctl try-restart systemd-logind.service
fi fi
fi fi
} }