diff --git a/Makefile b/Makefile index 1682e03..a90d8a9 100644 --- a/Makefile +++ b/Makefile @@ -12,10 +12,11 @@ export SRCPKG = eudev export DEPENDS = glibc,kmod,util-linux export ARCH = x86_64 export URL = http://www.gentoo.org/proj/en/eudev/ +export REPO = core BRIEF = Fork of udev DESC = eudev is a fork of system-udev with the goal of obtaining better \ compatibility with existing software -SNAPVER = 9 +SNAPVER = 0 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -61,7 +62,6 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --with-rootprefix= \ --with-rootlibdir=/lib \ --enable-split-usr \ - --disable-static \ --enable-manpages \ --enable-rule-generator \ --build=x86_64-snap-linux-gnu \ @@ -82,7 +82,8 @@ $(ROOT): $(SRCDIR)/src/udev/udevd install -v -d -m 755 $(ROOT)/etc/init.d && \ install -v -d -m 755 $(ROOT)/usr/share/eudev && \ mv -v $(ROOT)/etc/udev/udev.conf $(ROOT)/usr/share/eudev && \ - install -v -m 755 $(PWD)/SNAP/udevd.init $(ROOT)/etc/init.d/udevd + install -v -m 755 $(PWD)/SNAP/udevd.init $(ROOT)/etc/init.d/udevd && \ + install -v -m 644 $(PWD)/SNAP/udev.conf $(ROOT)/etc/udev/udev.conf @install -v -d $(DEV)/SNAP && \ install -v -d $(DEVROOT) && \ diff --git a/SNAP/usher b/SNAP/usher index 125a7f2..25a6708 100755 --- a/SNAP/usher +++ b/SNAP/usher @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e @@ -7,17 +7,17 @@ case $1 in exit 0 ;; postinst) - if [ ! -f ${TARGET}/etc/udev/udev.conf ]; then - install -m 644 ${TARGET}/usr/share/eudev/udev.conf \ - ${TARGET}/etc/udev/udev.conf + if [ ! -f /etc/udev/udev.conf ]; then + install -m 644 /usr/share/eudev/udev.conf /etc/udev/udev.conf fi - if [[ ! ${TARGET} ]]; then + if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i \ + /proc/1/root 2>/dev/null)" ]; then /etc/init.d/udevd restart - update-rc enable udevd - else - chroot ${TARGET} update-rc enable udevd fi + + update-rc enable udevd + mkinitramfs all ;; prerm) exit 0 diff --git a/SRC/eudev-3.2.tar.gz b/SRC/eudev-3.2.tar.gz deleted file mode 100644 index 8854002..0000000 Binary files a/SRC/eudev-3.2.tar.gz and /dev/null differ diff --git a/SRC/eudev-3.2.tar.gz.asc b/SRC/eudev-3.2.tar.gz.asc deleted file mode 100644 index 879d7bd..0000000 --- a/SRC/eudev-3.2.tar.gz.asc +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iQIcBAABCAAGBQJXTy0eAAoJEGYZIgZZJvHWUZEP/1Zla1UrClRO335ClvQZNbcQ -GiFAsAue9EbfQc6ljiYwgVZPQ0N9NzbNI7A5By+pALw0w/NQFpYMYt4MqkRoK5SH -++/GzGIePIh4/f0+C+7uoTinGYjcoOIR6OMUYIzJD+oRxWRHWVd4ZVT/5mNgwW4z -8gEl7Ayj5Zxm0rK0m2EbIoUq80vrcJJmfnYO0mAI2mv1cDKK9H76IiHg2daHy58g -Yc3rG3/sxMfEmG8w3TFaJroF8KZVJcClTKs8ijQuosFVZtNvV1H18xhhCUA2FX09 -3dNvfXhS0g9Hcb/OReCxGM7Ga6sm/KUv54WIWvtO5AMj+H1TFyyxc1IA6s4ttXjs -J8VLI8DCBlFfGcid2MvVyR7bkCs350Dt++wWVhdZ3uRgqasANcfq7DuzlNfGc3bW -fI04BZhCWGhqroVq/rLmYFm8bx2ZKqqtmvMCHZeXXbgZuyP8xwelM/90zT5c27eR -41zxq+CYWLp364RyVoKqxnjcLLlAim83e5jtC5HnTZJ6+YjGUxeU6X+qv+m/nLVv -cHvpKCSoOAtLckQSf/2276QKsHA5tgjayAWGzM6Ct8GwNQmqp5vIoZMmcSMAJvQP -20kqAEuK+qWq88bT5UYUdSuSQh7JLFM77xG4kHiFs2/PjCJAYFDJsTJ0f3xKyJbJ -9pVqWMR9BcAicbtS/Ipk -=SOmd ------END PGP SIGNATURE-----