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

systemd: switch to /usr.

Browse source
This commit is contained in:
Juan RP 2012-07-09 15:40:04 +02:00
parent 2f81f468f5
commit f8fc1976d3
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
srcpkgs/systemd/template
View file

@ -1,12 +1,12 @@
# Template file for 'systemd' # Template file for 'systemd'
pkgname=systemd pkgname=systemd
version=186 version=186
revision=1 revision=2
distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz"
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-distro=other --with-rootprefix= configure_args="--with-distro=other --libexecdir=/usr/lib
--with-pamlibdir=/lib/security --disable-selinux --disable-tcpwrap --disable-selinux --disable-tcpwrap --with-rootprefix=/usr
--with-sysvinit-path= --with-sysvrcd-path= --disable-audit --libexecdir=/lib --with-sysvinit-path= --with-sysvrcd-path= --disable-audit
--with-usb-ids-path=/usr/share/hwdata/usb.ids --with-usb-ids-path=/usr/share/hwdata/usb.ids
--with-pci-ids-path=/usr/share/hwdata/pci.ids" --with-pci-ids-path=/usr/share/hwdata/pci.ids"
depends="dbus run-parts kbd>=1.15.3_5 systemd-libs>=$version udev>=$version" depends="dbus run-parts kbd>=1.15.3_5 systemd-libs>=$version udev>=$version"
@ -51,10 +51,10 @@ post_install() {
for f in etc/binfmt.d etc/sysctl.d etc/modules-load.d etc/tmpfiles.d \ for f in etc/binfmt.d etc/sysctl.d etc/modules-load.d etc/tmpfiles.d \
etc/systemd/user etc/systemd/system/local-fs.target.wants \ etc/systemd/user etc/systemd/system/local-fs.target.wants \
etc/systemd/system/sysinit.target.wants \ etc/systemd/system/sysinit.target.wants \
lib/systemd/system-shutdown \ usr/lib/systemd/system-shutdown \
lib/systemd/system/graphical.target.wants \ usr/lib/systemd/system/graphical.target.wants \
lib/systemd/user-generators \ usr/lib/systemd/user-generators \
lib/systemd/system-sleep \ usr/lib/systemd/system-sleep \
usr/lib/binfmt.d usr/lib/sysctl.d usr/lib/modules-load.d; do usr/lib/binfmt.d usr/lib/sysctl.d usr/lib/modules-load.d; do
vmkdir ${f} vmkdir ${f}
touch ${DESTDIR}/${f}/.owned touch ${DESTDIR}/${f}/.owned
@ -71,20 +71,20 @@ post_install() {
# Create halt, reboot, shutdown, poweroff compat symlinks. Some # Create halt, reboot, shutdown, poweroff compat symlinks. Some
# applications expect them for "normal" use! # applications expect them for "normal" use!
vmkdir sbin vmkdir usr/sbin
for f in halt poweroff shutdown reboot; do for f in halt poweroff shutdown reboot; do
ln -sf /bin/systemctl ${DESTDIR}/sbin/${f} ln -sf /usr/bin/systemctl ${DESTDIR}/usr/sbin/${f}
done done
# Create /sbin/init for compatibility. # Create /sbin/init for compatibility.
ln -sf /lib/systemd/systemd ${DESTDIR}/sbin/init ln -sf /usr/lib/systemd/systemd ${DESTDIR}/usr/sbin/init
# Do not use /sbin/sulogin, sysvinit has been fully removed. # Do not use /sbin/sulogin, sysvinit has been fully removed.
for f in console-shell emergency rescue; do for f in console-shell emergency rescue; do
sed -i -e "s|/sbin/sulogin|/bin/sh|" \ sed -i -e "s|/sbin/sulogin|/bin/sh|" \
${DESTDIR}/lib/systemd/system/${f}.service ${DESTDIR}/usr/lib/systemd/system/${f}.service
done done
# Install and enable local-d.service for multi-user.target by default. # Install and enable local-d.service for multi-user.target by default.
vinstall ${FILESDIR}/local-d.service 644 lib/systemd/system vinstall ${FILESDIR}/local-d.service 644 usr/lib/systemd/system
ln -sf /lib/systemd/system/local-d.service \ ln -sf /usr/lib/systemd/system/local-d.service \
${DESTDIR}/lib/systemd/system/multi-user.target.wants/local-d.service ${DESTDIR}/usr/lib/systemd/system/multi-user.target.wants/local-d.service
} }

12
srcpkgs/systemd/udev.template
View file

@ -9,18 +9,18 @@ long_desc="
do_install() { do_install() {
vmove etc/udev etc vmove etc/udev etc
vmove usr/bin/udevadm usr/bin vmove usr/bin/udevadm usr/bin
vmove lib/udev lib vmove usr/lib/udev usr/lib
vmove usr/share/man/man7/udev.7 usr/share/man/man7 vmove usr/share/man/man7/udev.7 usr/share/man/man7
for f in udevadm systemd-udevd; do for f in udevadm systemd-udevd; do
vmove usr/share/man/man8/${f}.8 usr/share/man/man8 vmove usr/share/man/man8/${f}.8 usr/share/man/man8
done done
vmove usr/share/pkgconfig/udev.pc usr/share/pkgconfig vmove usr/share/pkgconfig/udev.pc usr/share/pkgconfig
vmove lib/systemd/systemd-udevd lib/systemd vmove usr/lib/systemd/systemd-udevd usr/lib/systemd
for f in udevd.service udevd-control.socket udevd-kernel.socket \ for f in udevd.service udevd-control.socket udevd-kernel.socket \
udev-trigger.service udev-settle.service; do udev-trigger.service udev-settle.service; do
vmove lib/systemd/system/systemd-${f} lib/systemd/system vmove usr/lib/systemd/system/systemd-${f} usr/lib/systemd/system
done done
# Create /sbin/udev symlink just for compatibility. # Create /usr/sbin/udev symlink just for compatibility.
vmkdir sbin vmkdir usr/sbin
ln -sf /lib/systemd/systemd-udevd ${DESTDIR}/sbin/udevd ln -sf /usr/lib/systemd/systemd-udevd ${DESTDIR}/usr/sbin/udevd
} }