Date: Wednesday, February 15, 2012 @ 20:26:10 Author: dreisner Revision: 150257
archrelease: copy trunk to extra-i686, extra-x86_64 Added: systemd/repos/extra-i686/PKGBUILD (from rev 150256, systemd/trunk/PKGBUILD) systemd/repos/extra-i686/os-release (from rev 150256, systemd/trunk/os-release) systemd/repos/extra-i686/systemd.install (from rev 150256, systemd/trunk/systemd.install) systemd/repos/extra-x86_64/PKGBUILD (from rev 150256, systemd/trunk/PKGBUILD) systemd/repos/extra-x86_64/os-release (from rev 150256, systemd/trunk/os-release) systemd/repos/extra-x86_64/systemd.install (from rev 150256, systemd/trunk/systemd.install) Deleted: systemd/repos/extra-i686/PKGBUILD systemd/repos/extra-i686/os-release systemd/repos/extra-i686/systemd.install systemd/repos/extra-x86_64/PKGBUILD systemd/repos/extra-x86_64/os-release systemd/repos/extra-x86_64/systemd.install ------------------------------+ extra-i686/PKGBUILD | 173 ++++++++++++++++++++--------------------- extra-i686/os-release | 10 +- extra-i686/systemd.install | 106 ++++++++++++------------- extra-x86_64/PKGBUILD | 173 ++++++++++++++++++++--------------------- extra-x86_64/os-release | 10 +- extra-x86_64/systemd.install | 106 ++++++++++++------------- 6 files changed, 290 insertions(+), 288 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2012-02-16 01:25:56 UTC (rev 150256) +++ extra-i686/PKGBUILD 2012-02-16 01:26:10 UTC (rev 150257) @@ -1,86 +0,0 @@ -# $Id$ -# Maintainer: Dave Reisner <dreis...@archlinux.org> - -pkgname=systemd -pkgver=42 -pkgrel=1 -pkgdesc="Session and Startup manager" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2') -depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'util-linux' 'udev' 'xz') -makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' 'linux-api-headers') -optdepends=('cryptsetup: required for encrypted block devices' - 'dbus-python: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' - 'python2-cairo: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') -options=('!libtool') -backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - 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.timedate1.conf - etc/systemd/system.conf - etc/systemd/user.conf - etc/systemd/systemd-logind.conf - etc/systemd/systemd-journald.conf) -install="$pkgname.install" -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release") -md5sums=('7686b44e368d2523901d3e903ed4dcea' - '752636def0db3c03f121f8b4f44a63cd') - -build() { - cd "$pkgname-$pkgver" - - # Don't unset locale in getty - # https://bugzilla.redhat.com/show_bug.cgi?id=663900 - sed -i -e '/^Environ.*LANG/s/^/#/' \ - -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 - - ./configure --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --libdir=/usr/lib \ - --localstatedir=/var \ - --with-rootprefix= \ - --with-rootlibdir=/lib - - make - - # fix .so links in manpages - sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8 - sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1 -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" - - # symlink to /bin/systemd for compat and sanity - ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd - - # fix systemd-analyze for python2 - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - - # rename man pages to avoid conflicts with sysvinit and initscripts - cd "$pkgdir/usr/share/man" - - # not building this with systemd - rm -f "man1/systemadm.1" - - manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - man5/{hostname,{vconsole,locale}.conf}.5) - - for manpage in "${manpages[@]}"; do - IFS='/' read section page <<< "$manpage" - mv "$manpage" "$section/systemd.$page" - done -} - -# vim: ft=sh syn=sh et Copied: systemd/repos/extra-i686/PKGBUILD (from rev 150256, systemd/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2012-02-16 01:26:10 UTC (rev 150257) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> + +pkgname=systemd +pkgver=43 +pkgrel=1 +pkgdesc="Session and Startup manager" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2') +depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'util-linux' 'udev' 'xz') +makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' 'linux-api-headers') +optdepends=('cryptsetup: required for encrypted block devices' + 'dbus-python: systemd-analyze' + 'initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: native boot and initialization scripts' + 'python2-cairo: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries') +options=('!libtool') +backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + 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.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/systemd-logind.conf + etc/systemd/systemd-journald.conf) +install="$pkgname.install" +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + "os-release") +md5sums=('446cc6db7625617af67e2d8e5f503a49' + '752636def0db3c03f121f8b4f44a63cd') + +build() { + cd "$pkgname-$pkgver" + + # Don't unset locale in getty + # https://bugzilla.redhat.com/show_bug.cgi?id=663900 + sed -i -e '/^Environ.*LANG/s/^/#/' \ + -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 + + ./configure --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --libdir=/usr/lib \ + --localstatedir=/var \ + --with-rootprefix= \ + --with-rootlibdir=/lib + + make + + # fix .so links in manpages + sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8 + sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1 +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" + printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + # symlink to /bin/systemd for compat and sanity + ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd + + # fix systemd-analyze for python2 + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + # rename man pages to avoid conflicts with sysvinit and initscripts + cd "$pkgdir/usr/share/man" + + # not building this with systemd + rm -f "man1/systemadm.1" + + manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 + man5/{hostname,{vconsole,locale}.conf}.5) + + for manpage in "${manpages[@]}"; do + IFS='/' read section page <<< "$manpage" + mv "$manpage" "$section/systemd.$page" + done +} + +# vim: ft=sh syn=sh et Deleted: extra-i686/os-release =================================================================== --- extra-i686/os-release 2012-02-16 01:25:56 UTC (rev 150256) +++ extra-i686/os-release 2012-02-16 01:26:10 UTC (rev 150257) @@ -1,5 +0,0 @@ -NAME="Arch Linux" -ID=arch -PRETTY_NAME="Arch Linux" -ANSI_COLOR="1;36" - Copied: systemd/repos/extra-i686/os-release (from rev 150256, systemd/trunk/os-release) =================================================================== --- extra-i686/os-release (rev 0) +++ extra-i686/os-release 2012-02-16 01:26:10 UTC (rev 150257) @@ -0,0 +1,5 @@ +NAME="Arch Linux" +ID=arch +PRETTY_NAME="Arch Linux" +ANSI_COLOR="1;36" + Deleted: extra-i686/systemd.install =================================================================== --- extra-i686/systemd.install 2012-02-16 01:25:56 UTC (rev 150256) +++ extra-i686/systemd.install 2012-02-16 01:26:10 UTC (rev 150257) @@ -1,53 +0,0 @@ -#!/bin/sh - -checkgroups() { - if ! getent group lock >/dev/null; then - groupadd -g 54 lock - fi -} - -sd_booted() { - [ -e sys/fs/cgroups/systemd ] -} - -post_install() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - echo "systemd has been installed to /bin/systemd. Please ensure you append" - echo "init=/bin/systemd to your kernel command line in your bootloader." -} - -post_upgrade() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - if sd_booted; then - systemctl daemon-reexec >/dev/null - fi - - newpkgver=${1%-*} - oldpkgver=${2%-*} - - # catch v31 need for restarting systemd-logind.service - 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 -} - -post_remove() { - if getent group lock >/dev/null; then - groupdel lock - fi -} - -# vim:set ts=2 sw=2 et: Copied: systemd/repos/extra-i686/systemd.install (from rev 150256, systemd/trunk/systemd.install) =================================================================== --- extra-i686/systemd.install (rev 0) +++ extra-i686/systemd.install 2012-02-16 01:26:10 UTC (rev 150257) @@ -0,0 +1,53 @@ +#!/bin/sh + +checkgroups() { + if ! getent group lock >/dev/null; then + groupadd -g 54 lock + fi +} + +sd_booted() { + [ -e sys/fs/cgroups/systemd ] +} + +post_install() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + echo "systemd has been installed to /bin/systemd. Please ensure you append" + echo "init=/bin/systemd to your kernel command line in your bootloader." +} + +post_upgrade() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + if sd_booted; then + systemctl daemon-reexec >/dev/null + fi + + newpkgver=${1%-*} + oldpkgver=${2%-*} + + # catch v31 need for restarting systemd-logind.service + 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 +} + +post_remove() { + if getent group lock >/dev/null; then + groupdel lock + fi +} + +# vim:set ts=2 sw=2 et: Deleted: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2012-02-16 01:25:56 UTC (rev 150256) +++ extra-x86_64/PKGBUILD 2012-02-16 01:26:10 UTC (rev 150257) @@ -1,86 +0,0 @@ -# $Id$ -# Maintainer: Dave Reisner <dreis...@archlinux.org> - -pkgname=systemd -pkgver=42 -pkgrel=1 -pkgdesc="Session and Startup manager" -arch=('i686' 'x86_64') -url="http://www.freedesktop.org/wiki/Software/systemd" -license=('GPL2') -depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'util-linux' 'udev' 'xz') -makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' 'linux-api-headers') -optdepends=('cryptsetup: required for encrypted block devices' - 'dbus-python: systemd-analyze' - 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' - 'python2-cairo: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts') -options=('!libtool') -backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf - 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.timedate1.conf - etc/systemd/system.conf - etc/systemd/user.conf - etc/systemd/systemd-logind.conf - etc/systemd/systemd-journald.conf) -install="$pkgname.install" -source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" - "os-release") -md5sums=('7686b44e368d2523901d3e903ed4dcea' - '752636def0db3c03f121f8b4f44a63cd') - -build() { - cd "$pkgname-$pkgver" - - # Don't unset locale in getty - # https://bugzilla.redhat.com/show_bug.cgi?id=663900 - sed -i -e '/^Environ.*LANG/s/^/#/' \ - -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 - - ./configure --sysconfdir=/etc \ - --libexecdir=/usr/lib \ - --libdir=/usr/lib \ - --localstatedir=/var \ - --with-rootprefix= \ - --with-rootlibdir=/lib - - make - - # fix .so links in manpages - sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8 - sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1 -} - -package() { - cd "$pkgname-$pkgver" - - make DESTDIR="$pkgdir" install - - install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" - printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" - - # symlink to /bin/systemd for compat and sanity - ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd - - # fix systemd-analyze for python2 - sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - - # rename man pages to avoid conflicts with sysvinit and initscripts - cd "$pkgdir/usr/share/man" - - # not building this with systemd - rm -f "man1/systemadm.1" - - manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 - man5/{hostname,{vconsole,locale}.conf}.5) - - for manpage in "${manpages[@]}"; do - IFS='/' read section page <<< "$manpage" - mv "$manpage" "$section/systemd.$page" - done -} - -# vim: ft=sh syn=sh et Copied: systemd/repos/extra-x86_64/PKGBUILD (from rev 150256, systemd/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2012-02-16 01:26:10 UTC (rev 150257) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Dave Reisner <dreis...@archlinux.org> + +pkgname=systemd +pkgver=43 +pkgrel=1 +pkgdesc="Session and Startup manager" +arch=('i686' 'x86_64') +url="http://www.freedesktop.org/wiki/Software/systemd" +license=('GPL2') +depends=('acl' 'dbus-core' 'kbd' 'kmod' 'libcap' 'util-linux' 'udev' 'xz') +makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' 'linux-api-headers') +optdepends=('cryptsetup: required for encrypted block devices' + 'dbus-python: systemd-analyze' + 'initscripts: legacy support for hostname and vconsole setup' + 'initscripts-systemd: native boot and initialization scripts' + 'python2-cairo: systemd-analyze' + 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' + 'systemd-sysvcompat: symlink package to provide sysvinit binaries') +options=('!libtool') +backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf + 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.timedate1.conf + etc/systemd/system.conf + etc/systemd/user.conf + etc/systemd/systemd-logind.conf + etc/systemd/systemd-journald.conf) +install="$pkgname.install" +source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz" + "os-release") +md5sums=('446cc6db7625617af67e2d8e5f503a49' + '752636def0db3c03f121f8b4f44a63cd') + +build() { + cd "$pkgname-$pkgver" + + # Don't unset locale in getty + # https://bugzilla.redhat.com/show_bug.cgi?id=663900 + sed -i -e '/^Environ.*LANG/s/^/#/' \ + -e '/^ExecStart/s/agetty/& -8/' units/getty@.service.m4 + + ./configure --sysconfdir=/etc \ + --libexecdir=/usr/lib \ + --libdir=/usr/lib \ + --localstatedir=/var \ + --with-rootprefix= \ + --with-rootlibdir=/lib + + make + + # fix .so links in manpages + sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8 + sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1 +} + +package() { + cd "$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install + + install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release" + printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf" + + # symlink to /bin/systemd for compat and sanity + ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd + + # fix systemd-analyze for python2 + sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" + + # rename man pages to avoid conflicts with sysvinit and initscripts + cd "$pkgdir/usr/share/man" + + # not building this with systemd + rm -f "man1/systemadm.1" + + manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 + man5/{hostname,{vconsole,locale}.conf}.5) + + for manpage in "${manpages[@]}"; do + IFS='/' read section page <<< "$manpage" + mv "$manpage" "$section/systemd.$page" + done +} + +# vim: ft=sh syn=sh et Deleted: extra-x86_64/os-release =================================================================== --- extra-x86_64/os-release 2012-02-16 01:25:56 UTC (rev 150256) +++ extra-x86_64/os-release 2012-02-16 01:26:10 UTC (rev 150257) @@ -1,5 +0,0 @@ -NAME="Arch Linux" -ID=arch -PRETTY_NAME="Arch Linux" -ANSI_COLOR="1;36" - Copied: systemd/repos/extra-x86_64/os-release (from rev 150256, systemd/trunk/os-release) =================================================================== --- extra-x86_64/os-release (rev 0) +++ extra-x86_64/os-release 2012-02-16 01:26:10 UTC (rev 150257) @@ -0,0 +1,5 @@ +NAME="Arch Linux" +ID=arch +PRETTY_NAME="Arch Linux" +ANSI_COLOR="1;36" + Deleted: extra-x86_64/systemd.install =================================================================== --- extra-x86_64/systemd.install 2012-02-16 01:25:56 UTC (rev 150256) +++ extra-x86_64/systemd.install 2012-02-16 01:26:10 UTC (rev 150257) @@ -1,53 +0,0 @@ -#!/bin/sh - -checkgroups() { - if ! getent group lock >/dev/null; then - groupadd -g 54 lock - fi -} - -sd_booted() { - [ -e sys/fs/cgroups/systemd ] -} - -post_install() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - echo "systemd has been installed to /bin/systemd. Please ensure you append" - echo "init=/bin/systemd to your kernel command line in your bootloader." -} - -post_upgrade() { - checkgroups - - if [ ! -f etc/machine-id ]; then - systemd-machine-id-setup - fi - - if sd_booted; then - systemctl daemon-reexec >/dev/null - fi - - newpkgver=${1%-*} - oldpkgver=${2%-*} - - # catch v31 need for restarting systemd-logind.service - 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 -} - -post_remove() { - if getent group lock >/dev/null; then - groupdel lock - fi -} - -# vim:set ts=2 sw=2 et: Copied: systemd/repos/extra-x86_64/systemd.install (from rev 150256, systemd/trunk/systemd.install) =================================================================== --- extra-x86_64/systemd.install (rev 0) +++ extra-x86_64/systemd.install 2012-02-16 01:26:10 UTC (rev 150257) @@ -0,0 +1,53 @@ +#!/bin/sh + +checkgroups() { + if ! getent group lock >/dev/null; then + groupadd -g 54 lock + fi +} + +sd_booted() { + [ -e sys/fs/cgroups/systemd ] +} + +post_install() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + echo "systemd has been installed to /bin/systemd. Please ensure you append" + echo "init=/bin/systemd to your kernel command line in your bootloader." +} + +post_upgrade() { + checkgroups + + if [ ! -f etc/machine-id ]; then + systemd-machine-id-setup + fi + + if sd_booted; then + systemctl daemon-reexec >/dev/null + fi + + newpkgver=${1%-*} + oldpkgver=${2%-*} + + # catch v31 need for restarting systemd-logind.service + 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 +} + +post_remove() { + if getent group lock >/dev/null; then + groupdel lock + fi +} + +# vim:set ts=2 sw=2 et: