From dc92d5f922d5f6b157c091267d2828336727b8e2 Mon Sep 17 00:00:00 2001 From: piernov Date: Tue, 17 Jul 2012 01:44:52 +0200 Subject: systemd 186-2 correction port --- systemd/Pkgfile | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) (limited to 'systemd/Pkgfile') diff --git a/systemd/Pkgfile b/systemd/Pkgfile index 2168950d8..87ccdf65b 100644 --- a/systemd/Pkgfile +++ b/systemd/Pkgfile @@ -1,38 +1,25 @@ # Description: Gestionnaire de démarrage et de service remplaçant SysVinit. # URL: http://www.freedesktop.org/software/systemd/ -# Maintainer: cgit.freedesktop.org/systemd/systemd/ +# Maintainer: http://cgit.freedesktop.org/systemd/systemd/ # Packager: piernov -# Depends on: libusbx,usbutils,gobject-introspection,gperf,acl,pciutils, intltool, libcap -# Run on: libcap +# Depends on: libusbx, usbutils, gobject-introspection, gperf, pciutils, intltool, dbus, libcap, syslog-ng, sysvinit +# Run on: dbus,libcap,syslog-ng,sysvinit,acl name=systemd version=186 -release=1 -#_lfs_release=20100128 -source=(http://www.freedesktop.org/software/$name/$name-$version.tar.xz) -# http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-${_lfs_release}.tar.bz2) +release=2 +source=(http://www.freedesktop.org/software/$name/$name-$version.tar.xz + NuTyX.patch + os-release) build() { -# if ( pkginfo -i|grep "^glib " > /dev/null) then -# EXTRA="--with-pci-ids-path=/usr/share/pci.ids" -# else -# EXTRA="--disable-extras --disable-introspection --disable-hwdb --disable-keymap" -# fi -# cd udev-$version - -# install -dv $PKG/lib/{firmware,udev/devices/{pts,shm}} -# ln -s /proc/self/fd $PKG/lib/udev/devices/fd -# ln -s /proc/self/fd/0 $PKG/lib/udev/devices/stdin -# ln -s /proc/self/fd/1 $PKG/lib/udev/devices/stdout -# ln -s /proc/self/fd/2 $PKG/lib/udev/devices/stderr -# ln -s /proc/kcore $PKG/lib/udev/devices/core cd $name-$version -# sed 's|usergeneratordir = $(pkglibexecdir)/user-generators|usergeneratordir=/usr/lib/systemd/user-generators|' -i Makefile.in + patch -p0 < ../NuTyX.patch + + autoreconf - SYSTEM_SYSVRCND_PATH=/etc/rc.d \ - SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d \ ./configure --prefix=/usr \ --sysconfdir=/etc \ --libexecdir=/usr/lib \ @@ -42,7 +29,7 @@ build() { --disable-audit \ --disable-ima \ --with-pamlibdir=/lib/security \ - --with-distro=other \ + --with-distro=nutyx \ --with-pci-ids-path=/usr/share/pci.ids \ --with-usb-ids-path=/usr/share/usb.ids \ --with-firmware-path=/lib/firmware @@ -59,18 +46,17 @@ build() { for tool in runlevel reboot shutdown poweroff halt telinit; do ln -s '/usr/bin/systemctl' $PKG/sbin/$tool done - ln -s '../usr/lib/systemd/systemd' $PKG/sbin/init + + ln -s '../usr/lib/systemd/systemd' $PKG/sbin/systemd ln -s ../usr/bin/udevadm $PKG/sbin/udevadm ln -s ../../usr/lib/systemd/systemd-udevd $PKG/usr/bin/udevd install -m644 tmpfiles.d/legacy.conf $PKG/usr/lib/tmpfiles.d -# sed -i '1s/python$/python2/' $PKG/usr/bin/systemd-analyze - -# cd ../udev-config-${_lfs_release} -# make DESTDIR=$PKG install -# make DESTDIR=$PKG install-doc + sed -i '1s/python$/python2/' $PKG/usr/bin/systemd-analyze echo "d /run/var 0755 root root -" >> $PKG/usr/lib/tmpfiles.d/legacy.conf + + install -m644 ../os-release $PKG/etc/os-release } -- cgit v1.2.3-70-g09d2