diff options
Diffstat (limited to 'core/systemd/PKGBUILD')
-rw-r--r-- | core/systemd/PKGBUILD | 51 |
1 files changed, 27 insertions, 24 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index ad695a979..e25d29d5f 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -3,36 +3,28 @@ pkgbase=systemd pkgname=('systemd' 'systemd-sysvcompat') -pkgver=204 -pkgrel=3 +pkgver=208 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2' 'LGPL2.1' 'MIT') makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf' 'gtk-doc' 'intltool' 'kmod' 'libcap' 'libgcrypt' 'libmicrohttpd' 'libxslt' 'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz') -options=('!libtool' '!distcc') +options=('!libtool' 'strip' 'debug' '!distcc') source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch - 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 'initcpio-hook-udev' + 'initcpio-install-systemd' 'initcpio-install-udev' - 'initcpio-install-timestamp') -md5sums=('a07619bb19f48164fbf0761d12fd39a8' - '7f39f9fde1ff7b48293ed1e3d0a6c213' - '66e3162856ded8eb7dc7383405c6e0d6' - 'e99e9189aa2f6084ac28b8ddf605aeb8' - 'fb37e34ea006c79be1c54cbb0f803414' - 'df69615503ad293c9ddf9d8b7755282d') + '0001-fix-lingering-references-to-var-lib-backlight-random.patch') +md5sums=('df64550d92afbffb4f67a434193ee165' + '29245f7a240bfba66e2b1783b63b6b40' + '8b68b0218a3897d4d37a6ccf47914774' + 'bde43090d4ac0ef048e3eaee8202a407' + '1b191c4e7a209d322675fd199e3abc66') prepare() { cd "$pkgname-$pkgver" - - patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch" - - patch -Np1 <"$srcdir/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch" - - autoreconf + patch -Np1 -i ../0001-fix-lingering-references-to-var-lib-backlight-random.patch } build() { @@ -41,7 +33,6 @@ build() { [ "$CARCH" = "mips64el" ] && CFLAGS+=" -mno-plt" ./configure \ - --enable-static \ --libexecdir=/usr/lib \ --localstatedir=/var \ --sysconfdir=/etc \ @@ -63,6 +54,7 @@ check() { package_systemd() { pkgdesc="system and service manager" + license=('GPL2' 'LGPL2.1' 'MIT') depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'libgcrypt' 'pam' 'util-linux' 'xz') provides=("libsystemd=$pkgver" 'nss-myhostname' "systemd-tools=$pkgver" "udev=$pkgver" @@ -79,11 +71,13 @@ package_systemd() { etc/dbus-1/system.d/org.freedesktop.hostname1.conf etc/dbus-1/system.d/org.freedesktop.login1.conf etc/dbus-1/system.d/org.freedesktop.locale1.conf + etc/dbus-1/system.d/org.freedesktop.machine1.conf etc/dbus-1/system.d/org.freedesktop.timedate1.conf + etc/systemd/bootchart.conf + etc/systemd/journald.conf + etc/systemd/logind.conf etc/systemd/system.conf etc/systemd/user.conf - etc/systemd/logind.conf - etc/systemd/journald.conf etc/udev/udev.conf) install="systemd.install" @@ -101,7 +95,7 @@ package_systemd() { rmdir "$pkgdir/etc/systemd/system/getty.target.wants" # get rid of RPM macros - rm -r "$pkgdir/etc/rpm" + rm -r "$pkgdir/usr/lib/rpm" # add back tmpfiles.d/legacy.conf install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" @@ -112,19 +106,28 @@ package_systemd() { s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules # add mkinitcpio hooks + install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd" install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev" install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev" - install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp" + + # ensure proper permissions for /var/log/journal + chown root:systemd-journal "$pkgdir/var/log/journal" + chmod 2755 "$pkgdir/var/log/journal" ### split out manpages for sysvcompat rm -rf "$srcdir/_sysvcompat" install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$srcdir"/_sysvcompat/usr/share/man/man8 + + # include MIT license, since it's technically custom + install -Dm755 "$srcdir/$pkgname-$pkgver/LICENSE.MIT" \ + "$pkgdir/usr/share/licenses/systemd/LICENSE.MIT" } package_systemd-sysvcompat() { pkgdesc="sysvinit compat for systemd" + license=('GPL2') groups=('base') conflicts=('sysvinit') depends=('sysvinit-tools' 'systemd') |