From b52f55b08787d7793fc484476809e73b64914ed9 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 26 Jun 2011 16:17:46 +0200 Subject: [PATCH] systemd: do not play dirty tricks with /lib64, subpkgs for optdepends. --- srcpkgs/systemd-admin | 1 + srcpkgs/systemd-gnome-passwd-agent | 1 + srcpkgs/systemd/systemd-admin.template | 17 +++++++++ .../systemd-gnome-passwd-agent.template | 19 ++++++++++ srcpkgs/systemd/template | 37 +++++++++++++------ 5 files changed, 64 insertions(+), 11 deletions(-) create mode 120000 srcpkgs/systemd-admin create mode 120000 srcpkgs/systemd-gnome-passwd-agent create mode 100644 srcpkgs/systemd/systemd-admin.template create mode 100644 srcpkgs/systemd/systemd-gnome-passwd-agent.template diff --git a/srcpkgs/systemd-admin b/srcpkgs/systemd-admin new file mode 120000 index 0000000000..1514658181 --- /dev/null +++ b/srcpkgs/systemd-admin @@ -0,0 +1 @@ +systemd \ No newline at end of file diff --git a/srcpkgs/systemd-gnome-passwd-agent b/srcpkgs/systemd-gnome-passwd-agent new file mode 120000 index 0000000000..1514658181 --- /dev/null +++ b/srcpkgs/systemd-gnome-passwd-agent @@ -0,0 +1 @@ +systemd \ No newline at end of file diff --git a/srcpkgs/systemd/systemd-admin.template b/srcpkgs/systemd/systemd-admin.template new file mode 100644 index 0000000000..b74d71dc56 --- /dev/null +++ b/srcpkgs/systemd/systemd-admin.template @@ -0,0 +1,17 @@ +# Template file for 'systemd-admin'. +# +short_desc="${sourcepkg} - system administration GUI" +long_desc="${long_desc} + + This package contains systemadm, a GTK+2 application to administer systemd." + +Add_dependency run glibc +Add_dependency run glib +Add_dependency run gtk+ +Add_dependency run systemd + +do_install() +{ + install -d ${DESTDIR}/usr/bin + mv ${SRCPKGDESTDIR}/usr/bin/systemadm ${DESTDIR}/usr/bin +} diff --git a/srcpkgs/systemd/systemd-gnome-passwd-agent.template b/srcpkgs/systemd/systemd-gnome-passwd-agent.template new file mode 100644 index 0000000000..5f755d4431 --- /dev/null +++ b/srcpkgs/systemd/systemd-gnome-passwd-agent.template @@ -0,0 +1,19 @@ +# Template file for 'systemd-gnome-passwd-aggent'. +# +short_desc="${sourcepkg} - GNOME password agent helper" +long_desc="${long_desc} + + This package contains systemd-gnome-ask-password-agent, a GNOME + helper to assist in password changes with systemd." + +Add_dependency run glibc +Add_dependency run glib +Add_dependency run gtk+ +Add_dependency run libnotify +Add_dependency run systemd + +do_install() +{ + install -d ${DESTDIR}/usr/bin + mv ${SRCPKGDESTDIR}/usr/bin/systemd-gnome* ${DESTDIR}/usr/bin +} diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index 4de0c55d96..237eb9c2f9 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -3,7 +3,8 @@ pkgname=systemd version=29 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.bz2" build_style=gnu_configure -configure_args="--with-distro=other --prefix=/usr --with-rootdir= --localstatedir=/var" +configure_args="--with-distro=other --with-rootdir= --localstatedir=/var +--with-pamlibdir=/lib/security --disable-selinux" short_desc="systemd is a system and service manager for Linux" maintainer="Mike Rosset " homepage="http://www.freedesktop.org/wiki/Software/systemd" @@ -16,26 +17,40 @@ long_desc=" daemons, keeps track of processes using Linux cgroups, supports snapshotting and restoring of the system state, maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. - It can work as a drop-in replacement for sysvinit. -" + It can work as a drop-in replacement for sysvinit." +subpackages="systemd-admin systemd-gnome-passwd-agent" +conf_files="/etc/systemd/system.conf" -Add_dependency run dbus-libs Add_dependency run glibc -Add_dependency run libcap Add_dependency run libudev +Add_dependency run tcp_wrappers-libs +Add_dependency run pam +Add_dependency run libcap +Add_dependency run dbus-libs -Add_dependency build dbus-devel -Add_dependency build glibc-devel -Add_dependency build libcap-devel -Add_dependency build libnotify-devel -Add_dependency build libudev-devel Add_dependency build m4 +Add_dependency build pkg-config +Add_dependency build libudev-devel +Add_dependency build pam-devel +Add_dependency build dbus-devel +Add_dependency build libcap-devel +Add_dependency build tcp_wrappers-devel +Add_dependency build glib-devel +Add_dependency build gtk+-devel +Add_dependency build libnotify-devel + +pre_install() +{ + install -d ${DESTDIR} + ln -sf /lib ${DESTDIR}/lib64 +} post_install() { + rm -f ${DESTDIR}/lib64 cd ${DESTDIR}/usr/share/man/man8 for manpage in telinit halt reboot poweroff runlevel shutdown; do - mv {,systemd.}"$manpage.8" + mv ${manpage}.8 ${manpage}-systemd.8 done }