From ffd1555b4b05edcaef58106bac65ced99eb4beb5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 12 Feb 2013 18:31:38 +0100 Subject: [PATCH] systemd: split libudev into an independent pkg and move systemd-{devel,libs} to it. --- srcpkgs/libudev | 1 - srcpkgs/libudev-devel | 2 +- .../libudev-devel.template | 5 +-- .../systemd-devel.template | 7 ++-- srcpkgs/libudev/systemd-libs.template | 8 +++++ srcpkgs/libudev/template | 33 +++++++++++++++++++ srcpkgs/systemd-devel | 2 +- srcpkgs/systemd-libs | 2 +- srcpkgs/systemd/libudev.template | 12 ------- srcpkgs/systemd/systemd-libs.template | 12 ------- srcpkgs/systemd/template | 15 ++++++--- 11 files changed, 59 insertions(+), 40 deletions(-) delete mode 120000 srcpkgs/libudev rename srcpkgs/{systemd => libudev}/libudev-devel.template (64%) rename srcpkgs/{systemd => libudev}/systemd-devel.template (50%) create mode 100644 srcpkgs/libudev/systemd-libs.template create mode 100644 srcpkgs/libudev/template delete mode 100644 srcpkgs/systemd/libudev.template delete mode 100644 srcpkgs/systemd/systemd-libs.template diff --git a/srcpkgs/libudev b/srcpkgs/libudev deleted file mode 120000 index 1514658181..0000000000 --- a/srcpkgs/libudev +++ /dev/null @@ -1 +0,0 @@ -systemd \ No newline at end of file diff --git a/srcpkgs/libudev-devel b/srcpkgs/libudev-devel index 1514658181..32f7973021 120000 --- a/srcpkgs/libudev-devel +++ b/srcpkgs/libudev-devel @@ -1 +1 @@ -systemd \ No newline at end of file +libudev \ No newline at end of file diff --git a/srcpkgs/systemd/libudev-devel.template b/srcpkgs/libudev/libudev-devel.template similarity index 64% rename from srcpkgs/systemd/libudev-devel.template rename to srcpkgs/libudev/libudev-devel.template index 8126d04c1b..a81cc472c6 100644 --- a/srcpkgs/systemd/libudev-devel.template +++ b/srcpkgs/libudev/libudev-devel.template @@ -1,11 +1,8 @@ # Template file for 'libudev-devel'. # noarch=yes -depends="libudev" +depends="libudev>=${version}_${revision}" short_desc="udev shared library -- development files" -long_desc=" - This package contains the files needed for developing applications - that use libudev." do_install() { vmove usr/include/libudev.h usr/include diff --git a/srcpkgs/systemd/systemd-devel.template b/srcpkgs/libudev/systemd-devel.template similarity index 50% rename from srcpkgs/systemd/systemd-devel.template rename to srcpkgs/libudev/systemd-devel.template index 8d1c0c2900..839dbc9d06 100644 --- a/srcpkgs/systemd/systemd-devel.template +++ b/srcpkgs/libudev/systemd-devel.template @@ -1,12 +1,13 @@ # Template file for 'systemd-devel'. # -depends="systemd-libs>=${version}" -short_desc="${sourcepkg} - development files" +depends="systemd-libs>=${version}_${revision}" +short_desc="systemd development files" noarch=yes do_install() { vmove usr/include usr vmove usr/lib/pkgconfig usr/lib vmove usr/share/man/man3 usr/share/man - vmove usr/share/doc usr/share + rm -rf ${SRCPKGDESTDIR}/usr/share/man + vmove usr/share/pkgconfig usr/share } diff --git a/srcpkgs/libudev/systemd-libs.template b/srcpkgs/libudev/systemd-libs.template new file mode 100644 index 0000000000..343a3cb1ed --- /dev/null +++ b/srcpkgs/libudev/systemd-libs.template @@ -0,0 +1,8 @@ +# Template file for 'systemd-libs'. +# +short_desc="systemd runtime libraries" +replaces="systemd<43_1" + +do_install() { + vmove "usr/lib/libsystemd*.so*" usr/lib +} diff --git a/srcpkgs/libudev/template b/srcpkgs/libudev/template new file mode 100644 index 0000000000..3c015cf1d1 --- /dev/null +++ b/srcpkgs/libudev/template @@ -0,0 +1,33 @@ +# Template file for 'libudev' +pkgname=libudev +version=197 +revision=2 +wrksrc="systemd-${version}" +build_style=gnu-configure +configure_args="--libexecdir=/usr/lib --disable-selinux + --disable-static --disable-ima --enable-introspection=no + --disable-kmod --disable-blkid --disable-chkconfig + --disable-selinux --disable-tcpwrap --disable-pam + --disable-acl --disable-xattr --disable-audit + --disable-libcryptsetup --disable-qrencode --disable-microhttpd + --disable-binfmt --disable-vconsole --disable-readahead --disable-bootchart + --disable-quotacheck --disable-randomseed --disable-hostnamed + --disable-timedated --disable-localed --disable-coredump + --disable-myhostname --disable-gudev --disable-keymap --without-python" +makedepends="pkg-config intltool gperf dbus-devel libcap-devel liblzma-devel + libgcrypt-devel libxslt docbook-xsl" +subpackages="libudev-devel systemd-libs systemd-devel" +short_desc="udev shared library" +maintainer="Juan RP " +homepage="http://www.freedesktop.org/wiki/Software/systemd" +license="LGPL-2.1, GPL-2, MIT" +distfiles="http://www.freedesktop.org/software/systemd/systemd-${version}.tar.xz" +checksum=e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 + +post_install() { + # We are only interested in shlibs, headers and pc files. + rm -rf ${DESTDIR}/{etc,var} + rm -rf ${DESTDIR}/usr/{bin,sbin} + rm -rf ${DESTDIR}/usr/lib/{udev,systemd,tmpfiles.d} + rm -rf ${DESTDIR}/usr/share/{doc,polkit-1,dbus-1} +} diff --git a/srcpkgs/systemd-devel b/srcpkgs/systemd-devel index 1514658181..32f7973021 120000 --- a/srcpkgs/systemd-devel +++ b/srcpkgs/systemd-devel @@ -1 +1 @@ -systemd \ No newline at end of file +libudev \ No newline at end of file diff --git a/srcpkgs/systemd-libs b/srcpkgs/systemd-libs index 1514658181..32f7973021 120000 --- a/srcpkgs/systemd-libs +++ b/srcpkgs/systemd-libs @@ -1 +1 @@ -systemd \ No newline at end of file +libudev \ No newline at end of file diff --git a/srcpkgs/systemd/libudev.template b/srcpkgs/systemd/libudev.template deleted file mode 100644 index 96e78377c8..0000000000 --- a/srcpkgs/systemd/libudev.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'libudev'. -# -short_desc="udev shared library" -long_desc=" - udev is a daemon which dynamically creates and removes device nodes from - /dev/, handles hotplug events and loads drivers at boot time. - - This library provides access to udev device information." - -do_install() { - vmove "usr/lib/libudev.so*" usr/lib -} diff --git a/srcpkgs/systemd/systemd-libs.template b/srcpkgs/systemd/systemd-libs.template deleted file mode 100644 index a0382f4fe0..0000000000 --- a/srcpkgs/systemd/systemd-libs.template +++ /dev/null @@ -1,12 +0,0 @@ -# Template file for 'systemd-libs'. -# -short_desc="${sourcepkg} - runtime libraries" -long_desc="${long_desc} - - This package contains the runtime libraries." - -replaces="systemd<43_1" - -do_install() { - vmove "usr/lib/*.so*" usr/lib -} diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index 5fb89774c6..fd2179aab1 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,7 +1,7 @@ # Template file for 'systemd' pkgname=systemd version=197 -revision=1 +revision=2 build_style=gnu-configure configure_args="--libexecdir=/usr/lib --disable-selinux --disable-tcpwrap --with-rootprefix=/usr @@ -11,7 +11,7 @@ depends="dbus run-parts kbd libcap-progs" makedepends="pkg-config intltool gperf libxslt docbook-xsl acl-devel pam-devel dbus-devel libcap-devel libkmod-devel liblzma-devel cryptsetup-devel libblkid-devel glib-devel libgcrypt-devel python-devel qrencode-devel - gobject-introspection" + gobject-introspection which" short_desc="A system and service manager for Linux" maintainer="Juan RP " homepage="http://www.freedesktop.org/wiki/Software/systemd" @@ -20,9 +20,7 @@ distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz checksum=e6857ea21ae24d7056e7b0f4c2aaaba73b8bf57025b8949c0a8af0c1bc9774b5 replaces="nss-myhostname>=0" - -subpackages="libudev libudev-devel libgudev libgudev-devel - systemd-analyze systemd-devel systemd-libs systemd-python" +subpackages="libgudev libgudev-devel systemd-analyze systemd-python" conf_files=" /etc/hostname @@ -35,6 +33,13 @@ conf_files=" /etc/udev/udev.conf" post_install() { + # Remove files provided in libudev{,-devel} and systemd-{devel,libs}. + rm -rf ${DESTDIR}/usr/include/{libudev.h,systemd} + rm -rf ${DESTDIR}/usr/share/pkgconfig + rm -rf ${DESTDIR}/usr/share/man/man3 + rm -f ${DESTDIR}/usr/lib/lib{udev,systemd}* + rm -f ${DESTDIR}/usr/lib/pkgconfig/lib{udev,systemd}* + vinstall ${FILESDIR}/hostname 644 etc vinstall ${FILESDIR}/vconsole.conf 644 etc vinstall ${FILESDIR}/os-release 644 etc