Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

8 files changed, 25 insertions, 32 deletions

diff --git a/kernel/Pkgfile b/kernel/Pkgfile
index 858968f99..434ae90e3 100644
--- a/kernel/Pkgfile
+++ b/kernel/Pkgfile
@@ -6,14 +6,14 @@
 name=kernel
 version=3.2.16
 _BaseVersion=3.2
-release=1
+release=3
 PKGMK_NO_STRIP="yes"
 PKGMK_IGNORE_FOOTPRINT="yes"
 PKGMK_IGNORE_MD5SUM="yes"
 SCRIPT_VERSION="pakxe.4"
 INITRDBASE="nutyx-initrd"
 _extra=11032012
-_tools=18042012
+_tools=24042012
 NVIDIA_VERSION=295.40
 VB_VERSION=4.1.14
 VB_BUILD=77440
diff --git a/kernel/post-install b/kernel/post-install
index a746f6719..e8f4819f6 100644
--- a/kernel/post-install
+++ b/kernel/post-install
@@ -19,10 +19,12 @@ do
 done
 
 # Copie des modules kernels
+echo "Copie des modules kernels"
 mkdir -p $WDIR/rootfs/lib/modules
 cp -a /lib/modules/* \
 $WDIR/rootfs/lib/modules/
 
+echo "Copie des firmwares"
 cp -a /lib/firmware \
 $WDIR/rootfs/lib/
 
@@ -30,6 +32,7 @@ $WDIR/rootfs/lib/
 cp /root/bin/install-${SCRIPT_VERSION}.ash $WDIR/rootfs/install/
 
 # Création de l'initrd
+echo "Création de l'initrd"
 sh $WDIR/script/mkinitrd $WDIR
 cp $WDIR/iso/isolinux/initrd /boot/nutyx-initrd
 rm -r $SRC
diff --git a/udev/.footprint.i686 b/udev/.footprint.i686
index 34d3c8df1..89b752837 100644
--- a/udev/.footprint.i686
+++ b/udev/.footprint.i686
@@ -7,8 +7,8 @@ drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/firmware/
 lrwxrwxrwx	root/root	lib/libgudev-1.0.so.0 -> libgudev-1.0.so.0.1.0
 -rwxr-xr-x	root/root	lib/libgudev-1.0.so.0.1.0
-lrwxrwxrwx	root/root	lib/libudev.so.0 -> libudev.so.0.12.0
--rwxr-xr-x	root/root	lib/libudev.so.0.12.0
+lrwxrwxrwx	root/root	lib/libudev.so.0 -> libudev.so.0.13.0
+-rwxr-xr-x	root/root	lib/libudev.so.0.13.0
 drwxr-xr-x	root/root	lib/udev/
 -rwxr-xr-x	root/root	lib/udev/accelerometer
 -rwxr-xr-x	root/root	lib/udev/ata_id
@@ -24,7 +24,6 @@ lrwxrwxrwx	root/root	lib/udev/devices/stdin -> /proc/self/fd/0
 lrwxrwxrwx	root/root	lib/udev/devices/stdout -> /proc/self/fd/1
 -rwxr-xr-x	root/root	lib/udev/findkeyboards
 -rwxr-xr-x	root/root	lib/udev/firmware
--rwxr-xr-x	root/root	lib/udev/input_id
 -rwxr-xr-x	root/root	lib/udev/keyboard-force-release.sh
 -rwxr-xr-x	root/root	lib/udev/keymap
 drwxr-xr-x	root/root	lib/udev/keymaps/
@@ -50,6 +49,7 @@ drwxr-xr-x	root/root	lib/udev/keymaps/force-release/
 -rw-r--r--	root/root	lib/udev/keymaps/fujitsu-amilo_si_1520
 -rw-r--r--	root/root	lib/udev/keymaps/fujitsu-esprimo_mobile_v5
 -rw-r--r--	root/root	lib/udev/keymaps/fujitsu-esprimo_mobile_v6
+-rw-r--r--	root/root	lib/udev/keymaps/genius-slimstar-320
 -rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard
 -rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-2510p_2530p
 -rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-compaq_elitebook
@@ -89,9 +89,7 @@ drwxr-xr-x	root/root	lib/udev/keymaps/force-release/
 -rw-r--r--	root/root	lib/udev/keymaps/toshiba-satellite_m30x
 -rw-r--r--	root/root	lib/udev/keymaps/zepto-znote
 -rwxr-xr-x	root/root	lib/udev/mtd_probe
--rwxr-xr-x	root/root	lib/udev/path_id
 -rwxr-xr-x	root/root	lib/udev/pci-db
--rw-r--r--	root/root	lib/udev/rule_generator.functions
 drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/30-kernel-compat.rules
 -rw-r--r--	root/root	lib/udev/rules.d/42-qemu-usb.rules
@@ -106,9 +104,7 @@ drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/60-persistent-v4l.rules
 -rw-r--r--	root/root	lib/udev/rules.d/61-accelerometer.rules
 -rw-r--r--	root/root	lib/udev/rules.d/70-udev-acl.rules
--rw-r--r--	root/root	lib/udev/rules.d/75-cd-aliases-generator.rules
 -rw-r--r--	root/root	lib/udev/rules.d/75-net-description.rules
--rw-r--r--	root/root	lib/udev/rules.d/75-persistent-net-generator.rules
 -rw-r--r--	root/root	lib/udev/rules.d/75-probe_mtd.rules
 -rw-r--r--	root/root	lib/udev/rules.d/75-tty-description.rules
 -rw-r--r--	root/root	lib/udev/rules.d/78-sound-card.rules
@@ -118,14 +114,12 @@ drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/95-udev-late.rules
 -rwxr-xr-x	root/root	lib/udev/scsi_id
 -rwxr-xr-x	root/root	lib/udev/udev-acl
+-rwxr-xr-x	root/root	lib/udev/udevd
 -rwxr-xr-x	root/root	lib/udev/usb-db
--rwxr-xr-x	root/root	lib/udev/usb_id
 -rwxr-xr-x	root/root	lib/udev/v4l_id
--rwxr-xr-x	root/root	lib/udev/write_cd_rules
--rwxr-xr-x	root/root	lib/udev/write_net_rules
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/udevadm
--rwxr-xr-x	root/root	sbin/udevd
+lrwxrwxrwx	root/root	sbin/udevd -> ../lib/udev/udevd
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/gudev-1.0/
@@ -147,7 +141,7 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rwxr-xr-x	root/root	usr/lib/libgudev-1.0.la
 lrwxrwxrwx	root/root	usr/lib/libgudev-1.0.so -> ../../lib/libgudev-1.0.so.0.1.0
 -rwxr-xr-x	root/root	usr/lib/libudev.la
-lrwxrwxrwx	root/root	usr/lib/libudev.so -> ../../lib/libudev.so.0.12.0
+lrwxrwxrwx	root/root	usr/lib/libudev.so -> ../../lib/libudev.so.0.13.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gudev-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libudev.pc
diff --git a/udev/.footprint.x86_64 b/udev/.footprint.x86_64
index 34d3c8df1..89b752837 100644
--- a/udev/.footprint.x86_64
+++ b/udev/.footprint.x86_64
@@ -7,8 +7,8 @@ drwxr-xr-x	root/root	lib/
 drwxr-xr-x	root/root	lib/firmware/
 lrwxrwxrwx	root/root	lib/libgudev-1.0.so.0 -> libgudev-1.0.so.0.1.0
 -rwxr-xr-x	root/root	lib/libgudev-1.0.so.0.1.0
-lrwxrwxrwx	root/root	lib/libudev.so.0 -> libudev.so.0.12.0
--rwxr-xr-x	root/root	lib/libudev.so.0.12.0
+lrwxrwxrwx	root/root	lib/libudev.so.0 -> libudev.so.0.13.0
+-rwxr-xr-x	root/root	lib/libudev.so.0.13.0
 drwxr-xr-x	root/root	lib/udev/
 -rwxr-xr-x	root/root	lib/udev/accelerometer
 -rwxr-xr-x	root/root	lib/udev/ata_id
@@ -24,7 +24,6 @@ lrwxrwxrwx	root/root	lib/udev/devices/stdin -> /proc/self/fd/0
 lrwxrwxrwx	root/root	lib/udev/devices/stdout -> /proc/self/fd/1
 -rwxr-xr-x	root/root	lib/udev/findkeyboards
 -rwxr-xr-x	root/root	lib/udev/firmware
--rwxr-xr-x	root/root	lib/udev/input_id
 -rwxr-xr-x	root/root	lib/udev/keyboard-force-release.sh
 -rwxr-xr-x	root/root	lib/udev/keymap
 drwxr-xr-x	root/root	lib/udev/keymaps/
@@ -50,6 +49,7 @@ drwxr-xr-x	root/root	lib/udev/keymaps/force-release/
 -rw-r--r--	root/root	lib/udev/keymaps/fujitsu-amilo_si_1520
 -rw-r--r--	root/root	lib/udev/keymaps/fujitsu-esprimo_mobile_v5
 -rw-r--r--	root/root	lib/udev/keymaps/fujitsu-esprimo_mobile_v6
+-rw-r--r--	root/root	lib/udev/keymaps/genius-slimstar-320
 -rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard
 -rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-2510p_2530p
 -rw-r--r--	root/root	lib/udev/keymaps/hewlett-packard-compaq_elitebook
@@ -89,9 +89,7 @@ drwxr-xr-x	root/root	lib/udev/keymaps/force-release/
 -rw-r--r--	root/root	lib/udev/keymaps/toshiba-satellite_m30x
 -rw-r--r--	root/root	lib/udev/keymaps/zepto-znote
 -rwxr-xr-x	root/root	lib/udev/mtd_probe
--rwxr-xr-x	root/root	lib/udev/path_id
 -rwxr-xr-x	root/root	lib/udev/pci-db
--rw-r--r--	root/root	lib/udev/rule_generator.functions
 drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/30-kernel-compat.rules
 -rw-r--r--	root/root	lib/udev/rules.d/42-qemu-usb.rules
@@ -106,9 +104,7 @@ drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/60-persistent-v4l.rules
 -rw-r--r--	root/root	lib/udev/rules.d/61-accelerometer.rules
 -rw-r--r--	root/root	lib/udev/rules.d/70-udev-acl.rules
--rw-r--r--	root/root	lib/udev/rules.d/75-cd-aliases-generator.rules
 -rw-r--r--	root/root	lib/udev/rules.d/75-net-description.rules
--rw-r--r--	root/root	lib/udev/rules.d/75-persistent-net-generator.rules
 -rw-r--r--	root/root	lib/udev/rules.d/75-probe_mtd.rules
 -rw-r--r--	root/root	lib/udev/rules.d/75-tty-description.rules
 -rw-r--r--	root/root	lib/udev/rules.d/78-sound-card.rules
@@ -118,14 +114,12 @@ drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/95-udev-late.rules
 -rwxr-xr-x	root/root	lib/udev/scsi_id
 -rwxr-xr-x	root/root	lib/udev/udev-acl
+-rwxr-xr-x	root/root	lib/udev/udevd
 -rwxr-xr-x	root/root	lib/udev/usb-db
--rwxr-xr-x	root/root	lib/udev/usb_id
 -rwxr-xr-x	root/root	lib/udev/v4l_id
--rwxr-xr-x	root/root	lib/udev/write_cd_rules
--rwxr-xr-x	root/root	lib/udev/write_net_rules
 drwxr-xr-x	root/root	sbin/
 -rwxr-xr-x	root/root	sbin/udevadm
--rwxr-xr-x	root/root	sbin/udevd
+lrwxrwxrwx	root/root	sbin/udevd -> ../lib/udev/udevd
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/gudev-1.0/
@@ -147,7 +141,7 @@ drwxr-xr-x	root/root	usr/lib/girepository-1.0/
 -rwxr-xr-x	root/root	usr/lib/libgudev-1.0.la
 lrwxrwxrwx	root/root	usr/lib/libgudev-1.0.so -> ../../lib/libgudev-1.0.so.0.1.0
 -rwxr-xr-x	root/root	usr/lib/libudev.la
-lrwxrwxrwx	root/root	usr/lib/libudev.so -> ../../lib/libudev.so.0.12.0
+lrwxrwxrwx	root/root	usr/lib/libudev.so -> ../../lib/libudev.so.0.13.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/gudev-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libudev.pc
diff --git a/udev/.md5sum.i686 b/udev/.md5sum.i686
index 30f720440..a00d693fe 100644
--- a/udev/.md5sum.i686
+++ b/udev/.md5sum.i686
@@ -1,2 +1,2 @@
-91a88a359b60bbd074b024883cc0dbde  udev-173.tar.bz2
-4baf57f6eda802d88ffc847f89286ab4  udev-config-20100128.tar.bz2
+ed5b71f863c7b48b9174f82728449dcb  udev-174.tar.gz
+6d7f62ec08643a0aba4e64f95a740068  udev-config-20100128.tar.bz2
diff --git a/udev/.md5sum.x86_64 b/udev/.md5sum.x86_64
index 30f720440..a00d693fe 100644
--- a/udev/.md5sum.x86_64
+++ b/udev/.md5sum.x86_64
@@ -1,2 +1,2 @@
-91a88a359b60bbd074b024883cc0dbde  udev-173.tar.bz2
-4baf57f6eda802d88ffc847f89286ab4  udev-config-20100128.tar.bz2
+ed5b71f863c7b48b9174f82728449dcb  udev-174.tar.gz
+6d7f62ec08643a0aba4e64f95a740068  udev-config-20100128.tar.bz2
diff --git a/udev/Pkgfile b/udev/Pkgfile
index 31d74e860..2e960afb1 100644
--- a/udev/Pkgfile
+++ b/udev/Pkgfile
@@ -6,10 +6,10 @@
 # Run on:
 
 name=udev
-version=173
+version=174
 release=1
 _lfs_release=20100128
-source=( http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration/$name/$name-$version.tar.bz2 \
+source=( http://www.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.gz \
 http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-${_lfs_release}.tar.bz2)
 build() {
 if ( pkginfo -i|grep "^glib " > /dev/null) then
@@ -43,4 +43,5 @@ make DESTDIR=$PKG install
 make DESTDIR=$PKG install-doc
 rm -r $PKG/usr/share/gtk-doc
 rm -r $PKG/usr/share/doc/udev-$version
+ln -s ../lib/udev/udevd $PKG/sbin
 }
diff --git a/udev/post-install b/udev/post-install
new file mode 100644
index 000000000..187adcea3
--- /dev/null
+++ b/udev/post-install
@@ -0,0 +1 @@
+sed -i "s/--type=failed//" /etc/rc.d/init.d/udev_retry