jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

systemd: make lib{,g}udev-devel noarch, merge udev.

Browse source
This commit is contained in:
Juan RP 2012-10-05 20:58:02 +02:00
parent 197409a20d
commit 2d4bec2933
9 changed files with 43 additions and 70 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
srcpkgs/systemd/files/systemd-dirs.tmpfiles Normal file
View file

@ -0,0 +1,19 @@
d /etc/udev/rules.d 0755 root root
d /etc/binfmt.d 0755 root root
d /etc/sysctl.d 0755 root root
d /etc/modules-load.d 0755 root root
d /etc/tmpfiles.d 0755 root root
d /etc/local.d 0755 root root
d /etc/systemd/ntp-units.d 0755 root root
d /etc/systemd/user 0755 root root
d /etc/systemd/system/local-fs.target.wants 0755 root root
d /etc/systemd/system/sysinit.target.wants 0755 root root
d /usr/lib/systemd/system-shutdown 0755 root root
d /usr/lib/systemd/system-sleep 0755 root root
d /usr/lib/systemd/system/graphical.target.wants 0755 root root
d /usr/lib/systemd/user-generators 0755 root root
d /usr/lib/systemd/ntp-units.d 0755 root root
d /usr/lib/binfmt.d 0755 root root
d /usr/lib/sysctl.d 0755 root root
d /usr/lib/modules-load.d 0755 root root
d /var/lib/systemd 0755 root root

4
srcpkgs/systemd/libgudev-devel.template
View file

@ -1,5 +1,6 @@
# Template file for 'libgudev-devel'.
#
noarch=yes
depends="glib-devel libudev-devel>=$version libgudev>=$version"
short_desc="GObject-based wrapper library for libudev - development files"
long_desc="
@ -9,6 +10,5 @@ long_desc="
do_install() {
vmove usr/include/gudev-1.0 usr/include
vmove "usr/lib/pkgconfig/gudev*" usr/lib/pkgconfig
vmove "usr/lib/libgudev*.a" usr/lib
vmove usr/share/gir-1.0/GUdev-1.0.gir usr/share/gir-1.0
vmove usr/share/gir-1.0 usr/share
}

2
srcpkgs/systemd/libgudev.template
View file

@ -9,5 +9,5 @@ long_desc="
do_install() {
vmove "usr/lib/libgudev*.so*" usr/lib
vmove usr/lib/girepository-1.0/GUdev-1.0.typelib usr/lib/girepository-1.0
vmove usr/lib/girepository-1.0 usr/lib
}

2
srcpkgs/systemd/libudev-devel.template
View file

@ -1,5 +1,6 @@
# Template file for 'libudev-devel'.
#
noarch=yes
depends="libudev>=$version"
short_desc="udev shared library -- development files"
long_desc="
@ -9,5 +10,4 @@ long_desc="
do_install() {
vmove usr/include/libudev.h usr/include
vmove usr/lib/pkgconfig/libudev.pc usr/lib/pkgconfig
vmove "usr/lib/libudev*.a" usr/lib
}

2
srcpkgs/systemd/systemd.rshlibs
View file

@ -1,3 +1,4 @@
libblkid.so.1
libgcrypt.so.11
libcap.so.2
librt.so.1
@ -14,3 +15,4 @@ libkmod.so.2
libsystemd-daemon.so.0
libcryptsetup.so.4
libudev.so.1
libm.so.6

46
srcpkgs/systemd/template
View file

@ -1,20 +1,17 @@
# Template file for 'systemd'
pkgname=systemd
version=194
revision=3
revision=5
build_style=gnu-configure
configure_args="--with-distro=other --libexecdir=/usr/lib
--disable-selinux --disable-tcpwrap --with-rootprefix=/usr
--with-sysvinit-path= --with-sysvrcd-path= --disable-audit
--with-usb-ids-path=/usr/share/hwdata/usb.ids
--with-pci-ids-path=/usr/share/hwdata/pci.ids"
depends="dbus run-parts kbd>=1.15.3_5 systemd-libs>=${version}_${revision}
udev>=${version}_${revision}"
--with-pci-ids-path=/usr/share/hwdata/pci.ids --disable-static"
depends="dbus run-parts kbd>=1.15.3_5 systemd-libs>=${version}_${revision}"
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 gobject-introspection"
subpackages="udev libudev libudev-devel libgudev libgudev-devel
systemd-analyze systemd-devel systemd-libs systemd-python"
short_desc="A system and service manager for Linux"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.freedesktop.org/wiki/Software/systemd"
@ -30,6 +27,12 @@ long_desc="
implements an elaborate transactional dependency-based service control logic.
It can work as a drop-in replacement for sysvinit."
provides="udev-${version}"
replaces="udev>=0"
subpackages="libudev libudev-devel libgudev libgudev-devel
systemd-analyze systemd-devel systemd-libs systemd-python"
conf_files="
/etc/hostname
/etc/vconsole.conf
@ -37,28 +40,8 @@ conf_files="
/etc/systemd/system.conf
/etc/systemd/user.conf
/etc/systemd/journald.conf
/etc/systemd/logind.conf"
# Required empty dirs to be created.
make_dirs="
/etc/binfmt.d 0755 root root
/etc/sysctl.d 0755 root root
/etc/modules-load.d 0755 root root
/etc/tmpfiles.d 0755 root root
/etc/local.d 0755 root root
/etc/systemd/ntp-units.d 0755 root root
/etc/systemd/user 0755 root root
/etc/systemd/system/local-fs.target.wants 0755 root root
/etc/systemd/system/sysinit.target.wants 0755 root root
/usr/lib/systemd/system-shutdown 0755 root root
/usr/lib/systemd/system-sleep 0755 root root
/usr/lib/systemd/system/graphical.target.wants 0755 root root
/usr/lib/systemd/user-generators 0755 root root
/usr/lib/systemd/ntp-units.d 0755 root root
/usr/lib/binfmt.d 0755 root root
/usr/lib/sysctl.d 0755 root root
/usr/lib/modules-load.d 0755 root root
/var/lib/systemd 0755 root root"
/etc/systemd/logind.conf
/etc/udev/udev.conf"
post_install() {
vinstall ${FILESDIR}/hostname 644 etc
@ -87,4 +70,11 @@ post_install() {
# Disable units in /etc; we do this at post-install time.
rm -rf ${DESTDIR}/etc/systemd/system/getty.target.wants
# Create /usr/sbin/udev symlink just for compatibility.
ln -sf /usr/lib/systemd/systemd-udevd ${DESTDIR}/usr/sbin/udevd
# Required dirs at run time.
vinstall ${FILESDIR}/systemd-dirs.tmpfiles 644 \
usr/lib/tmpfiles.d systemd-dirs.conf
}

9
srcpkgs/systemd/udev.rshlibs
View file

@ -1,9 +0,0 @@
libblkid.so.1
libkmod.so.2
libacl.so.1
librt.so.1
libc.so.6
ld-linux-x86-64.so.2
ld-linux.so.2 i686
libudev.so.1
libm.so.6

28
srcpkgs/systemd/udev.template
View file

@ -1,28 +0,0 @@
# Template file for 'libudev'.
#
conf_files="/etc/udev/udev.conf"
short_desc="udev daemon"
long_desc="
udev is a daemon which dynamically creates and removes device nodes from
/dev/, handles hotplug events and loads drivers at boot time."
make_dirs="/etc/udev/rules.d 0755 root root"
do_install() {
vmove etc/udev etc
vmove usr/bin/udevadm usr/bin
vmove usr/lib/udev usr/lib
vmove usr/share/man/man7/udev.7 usr/share/man/man7
for f in udevadm systemd-udevd; do
vmove usr/share/man/man8/${f}.8 usr/share/man/man8
done
vmove usr/share/pkgconfig/udev.pc usr/share/pkgconfig
vmove usr/lib/systemd/systemd-udevd usr/lib/systemd
for f in udevd.service udevd-control.socket udevd-kernel.socket \
udev-trigger.service udev-settle.service; do
vmove usr/lib/systemd/system/systemd-${f} usr/lib/systemd/system
done
# Create /usr/sbin/udev symlink just for compatibility.
vmkdir usr/sbin
ln -sf /usr/lib/systemd/systemd-udevd ${DESTDIR}/usr/sbin/udevd
}

1
srcpkgs/udev
View file

@ -1 +0,0 @@
systemd