diff --git a/CONFIG/etc/udev/udev.conf b/CONFIG/etc/udev/udev.conf new file mode 100644 index 0000000..47d1433 --- /dev/null +++ b/CONFIG/etc/udev/udev.conf @@ -0,0 +1,3 @@ +# see udev.conf(5) for details + +#udev_log="info" diff --git a/Makefile b/Makefile index a90d8a9..52c6d11 100644 --- a/Makefile +++ b/Makefile @@ -9,14 +9,14 @@ # GNU General Public License for more details. export SRCPKG = eudev -export DEPENDS = glibc,kmod,util-linux +export DEPENDS = glibc,initscripts,kmod,mkinitramfs,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 = 0 +SNAPVER = 1 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -80,14 +80,10 @@ $(ROOT): $(SRCDIR)/src/udev/udevd @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ 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 644 $(PWD)/SNAP/udev.conf $(ROOT)/etc/udev/udev.conf - - @install -v -d $(DEV)/SNAP && \ - install -v -d $(DEVROOT) && \ - for file in `find $(ROOT)|egrep 'pkgconfig\/|\.a$$|\.h$$'`; do \ + mv -v $(ROOT)/etc/udev/udev.conf $(CONFIGDIR)/etc/udev && \ + install -v -d $(DEV)/SNAP $(DEVROOT) && \ + for file in `find $(ROOT)|egrep 'pkgconfig\/|\.(a|h|la)$$'`; do \ path=`dirname $$file|sed "s[$(ROOT)[$(DEVROOT)["`; \ mkdir -p $$path; \ mv $$file $$path; \ @@ -95,7 +91,6 @@ $(ROOT): $(SRCDIR)/src/udev/udevd find $(ROOT) -type d -empty -delete && \ cd $(DEV) && make -f ../Makefile.eudev-dev && mv *.snap ../ - @install -v -d -m 755 $(ROOT)/etc/udev/rules.d test: $(ROOT) @cd $(SRCDIR); \ diff --git a/SNAP/usher b/SNAP/usher index 25a6708..34f9877 100755 --- a/SNAP/usher +++ b/SNAP/usher @@ -7,17 +7,10 @@ case $1 in exit 0 ;; postinst) - if [ ! -f /etc/udev/udev.conf ]; then - install -m 644 /usr/share/eudev/udev.conf /etc/udev/udev.conf - fi - if [ "$(stat -c %d/%i /)" = "$(stat -Lc %d/%i \ /proc/1/root 2>/dev/null)" ]; then /etc/init.d/udevd restart fi - - update-rc enable udevd - mkinitramfs all ;; prerm) exit 0