summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpiernov <piernov@piernov.org>2012-03-04 17:41:06 +0000
committerpiernov <piernov@piernov.org>2012-03-04 17:41:06 +0000
commitb96171f6797c34a19feba65283ef0c286c321e28 (patch)
tree24966b1cbea479ab57b0e6b5b21d7916b20f5659
parent34c29cb6c0c0c90f86f60bea88f1abe5bc6d3eb8 (diff)
parent44c2fd1e9ddf04e05f00a2966817c020f8c589b8 (diff)
downloadnutyx-pakxe-b96171f6797c34a19feba65283ef0c286c321e28.tar.gz
nutyx-pakxe-b96171f6797c34a19feba65283ef0c286c321e28.tar.bz2
nutyx-pakxe-b96171f6797c34a19feba65283ef0c286c321e28.tar.xz
nutyx-pakxe-b96171f6797c34a19feba65283ef0c286c321e28.zip
Merge branch 'master' of git://piernov.org/nutyx-pakxe
-rw-r--r--aaabasicfs/.footprint.i68648
-rw-r--r--aaabasicfs/.footprint.x86_6446
-rw-r--r--aaabasicfs/.md5sum.i68610
-rw-r--r--aaabasicfs/.md5sum.x86_6410
-rw-r--r--aaabasicfs/Pkgfile30
-rw-r--r--aaabasicfs/inittab4
-rwxr-xr-xaaabasicfs/network155
-rwxr-xr-xaaabasicfs/rc286
-rw-r--r--kernel/Pkgfile42
-rw-r--r--kernel/README2
-rw-r--r--kernel/config5
-rw-r--r--kernel/config_645
-rw-r--r--kernel/post-install13
-rw-r--r--kernel/pre-install3
-rw-r--r--kmod/.footprint.i6866
-rw-r--r--kmod/.footprint.x86_646
-rw-r--r--kmod/.md5sum.i6862
-rw-r--r--kmod/.md5sum.x86_642
-rwxr-xr-xkmod/Pkgfile4
-rw-r--r--libgl/.md5sum.i6863
-rw-r--r--libgl/.md5sum.x86_643
-rw-r--r--libgl/Pkgfile26
-rw-r--r--libgl/llvm3.0.patch328
-rw-r--r--libusb/.footprint.i68612
-rw-r--r--libusb/.footprint.x86_6412
-rw-r--r--libusb/.md5sum.i6861
-rw-r--r--libusb/.md5sum.x86_641
-rwxr-xr-xlibusb/Pkgfile23
-rw-r--r--pkg-get/Pkgfile5
-rw-r--r--sysklogd/.footprint.i6866
-rw-r--r--sysklogd/.footprint.x86_646
-rw-r--r--sysklogd/.md5sum.i6862
-rw-r--r--sysklogd/.md5sum.x86_642
-rw-r--r--sysklogd/Pkgfile17
-rw-r--r--sysklogd/syslog.conf3
-rw-r--r--udev/.footprint.i68623
-rw-r--r--udev/.footprint.x86_6423
-rw-r--r--udev/.md5sum.i6864
-rw-r--r--udev/.md5sum.x86_644
-rw-r--r--udev/Pkgfile72
-rw-r--r--usbutils/.footprint.i68617
-rw-r--r--usbutils/.footprint.x86_6417
-rw-r--r--usbutils/.md5sum.i6861
-rw-r--r--usbutils/.md5sum.x86_641
-rwxr-xr-xusbutils/Pkgfile22
-rw-r--r--usbutils/post-install2
46 files changed, 646 insertions, 669 deletions
diff --git a/aaabasicfs/.footprint.i686 b/aaabasicfs/.footprint.i686
index b462f558b..9a697a0a4 100644
--- a/aaabasicfs/.footprint.i686
+++ b/aaabasicfs/.footprint.i686
@@ -11,6 +11,7 @@ drwxr-xr-x root/root etc/default/
-rw-r--r-- root/root etc/default/useradd
-rw-r--r-- root/root etc/fstab
-rw-r--r-- root/root etc/group
+lrwxrwxrwx root/root etc/init.d -> rc.d/init.d
-rw-r--r-- root/root etc/inittab
-rw-r--r-- root/root etc/inputrc
drwxr-xr-x root/root etc/modprobe.d/
@@ -30,7 +31,6 @@ drwxr-xr-x root/root etc/rc.d/init.d/
-rwxr-xr-- root/root etc/rc.d/init.d/checkfs
-rwxr-xr-- root/root etc/rc.d/init.d/cleanfs
-rwxr-xr-- root/root etc/rc.d/init.d/console
--rwxr-xr-- root/root etc/rc.d/init.d/consolelog
-rw-r--r-- root/root etc/rc.d/init.d/functions
-rwxr-xr-- root/root etc/rc.d/init.d/halt
-rwxr-xr-- root/root etc/rc.d/init.d/iplink
@@ -88,20 +88,19 @@ lrwxrwxrwx root/root etc/rc.d/rc6.d/S70swap -> ../init.d/swap
lrwxrwxrwx root/root etc/rc.d/rc6.d/S80mountfs -> ../init.d/mountfs
lrwxrwxrwx root/root etc/rc.d/rc6.d/S90localnet -> ../init.d/localnet
lrwxrwxrwx root/root etc/rc.d/rc6.d/S99reboot -> ../init.d/reboot
-drwxr-xr-x root/root etc/rc.d/rcsysinit.d/
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S01mountvirtfs -> ../init.d/mountvirtfs
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S02consolelog -> ../init.d/consolelog
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S05modules -> ../init.d/modules
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S10udev -> ../init.d/udev
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S15setclock -> ../init.d/setclock
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S20checkfs -> ../init.d/checkfs
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S30mountfs -> ../init.d/mountfs
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S40swap -> ../init.d/swap
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S45cleanfs -> ../init.d/cleanfs
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S50udev_retry -> ../init.d/udev_retry
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S70console -> ../init.d/console
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S80localnet -> ../init.d/localnet
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S90sysctl -> ../init.d/sysctl
+drwxr-xr-x root/root etc/rc.d/rcS.d/
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S01mountvirtfs -> ../init.d/mountvirtfs
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S05modules -> ../init.d/modules
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S08localnet -> ../init.d/localnet
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S10udev -> ../init.d/udev
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S15setclock -> ../init.d/setclock
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S20checkfs -> ../init.d/checkfs
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S30mountfs -> ../init.d/mountfs
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S40swap -> ../init.d/swap
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S45cleanfs -> ../init.d/cleanfs
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S50udev_retry -> ../init.d/udev_retry
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S70console -> ../init.d/console
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S90sysctl -> ../init.d/sysctl
-rw-r--r-- root/root etc/shells
drwxr-xr-x root/root etc/skel/
-rw-r--r-- root/root etc/skel/.bash_profile
@@ -110,16 +109,17 @@ drwxr-xr-x root/root etc/skel/
drwxr-xr-x root/root etc/skel/Desktop/
drwxr-xr-x root/root etc/sysconfig/
-rw-r--r-- root/root etc/sysconfig/modules
-drwxr-xr-x root/root etc/sysconfig/network-devices/
--rwxr-xr-- root/root etc/sysconfig/network-devices/ifdown
--rwxr-xr-- root/root etc/sysconfig/network-devices/ifup
-drwxr-xr-x root/root etc/sysconfig/network-devices/services/
--rwxr-xr-- root/root etc/sysconfig/network-devices/services/ipv4-static
--rwxr-xr-- root/root etc/sysconfig/network-devices/services/ipv4-static-route
-rw-r--r-- root/root etc/sysconfig/rc
+-rw-r--r-- root/root etc/sysconfig/rc.site
+-rw-r--r-- root/root etc/sysconfig/udev_retry
drwxr-xr-x root/root home/
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/firmware/
+lrwxrwxrwx root/root lib/lsb -> services
+drwxr-xr-x root/root lib/services/
+-rw-r--r-- root/root lib/services/init-functions
+-rwxr-xr-- root/root lib/services/ipv4-static
+-rwxr-xr-- root/root lib/services/ipv4-static-route
drwxr-xr-x root/root lib/udev/
drwxr-xr-x root/root lib/udev/devices/
crw------- root/root lib/udev/devices/console (5, 1)
@@ -127,6 +127,7 @@ crw-rw-rw- root/root lib/udev/devices/null (1, 3)
drwxr-xr-x root/root lib/udev/devices/pts/
drwxr-xr-x root/root lib/udev/devices/shm/
crw-rw-rw- root/root lib/udev/devices/zero (1, 5)
+lrwxrwxrwx root/root lib64 -> lib
drwxr-xr-x root/root media/
drwxr-xr-x root/root media/cdrom/
drwxr-xr-x root/root media/dvd/
@@ -164,6 +165,8 @@ lrwxrwxrwx root/root root/useradd -> ../etc/default/useradd
drwxr-xr-x root/root run/
-rw-rw-r-- root/utmp run/utmp (EMPTY)
drwxr-xr-x root/root sbin/
+-rwxr-xr-- root/root sbin/ifdown
+-rwxr-xr-- root/root sbin/ifup
drwxr-xr-x root/root srv/
drwxrwxrwt root/root srv/sources/
drwxr-xr-x root/root sys/
@@ -176,6 +179,7 @@ lrwxrwxrwx root/root usr/doc -> share/doc
drwxr-xr-x root/root usr/include/
lrwxrwxrwx root/root usr/info -> share/info
drwxr-xr-x root/root usr/lib/
+lrwxrwxrwx root/root usr/lib64 -> lib
drwxr-xr-x root/root usr/local/
drwxr-xr-x root/root usr/local/bin/
lrwxrwxrwx root/root usr/local/doc -> share/doc
@@ -218,6 +222,8 @@ drwxr-xr-x root/root usr/share/man/man5/
drwxr-xr-x root/root usr/share/man/man6/
drwxr-xr-x root/root usr/share/man/man7/
drwxr-xr-x root/root usr/share/man/man8/
+lrwxrwxrwx root/root usr/share/man/man8/ifdown.8.gz -> ifup.8.gz
+-rwxr-xr-- root/root usr/share/man/man8/ifup.8.gz
drwxr-xr-x root/root usr/share/misc/
drwxr-xr-x root/root usr/share/terminfo/
drwxr-xr-x root/root usr/share/zoneinfo/
diff --git a/aaabasicfs/.footprint.x86_64 b/aaabasicfs/.footprint.x86_64
index df967926b..9a697a0a4 100644
--- a/aaabasicfs/.footprint.x86_64
+++ b/aaabasicfs/.footprint.x86_64
@@ -11,6 +11,7 @@ drwxr-xr-x root/root etc/default/
-rw-r--r-- root/root etc/default/useradd
-rw-r--r-- root/root etc/fstab
-rw-r--r-- root/root etc/group
+lrwxrwxrwx root/root etc/init.d -> rc.d/init.d
-rw-r--r-- root/root etc/inittab
-rw-r--r-- root/root etc/inputrc
drwxr-xr-x root/root etc/modprobe.d/
@@ -30,7 +31,6 @@ drwxr-xr-x root/root etc/rc.d/init.d/
-rwxr-xr-- root/root etc/rc.d/init.d/checkfs
-rwxr-xr-- root/root etc/rc.d/init.d/cleanfs
-rwxr-xr-- root/root etc/rc.d/init.d/console
--rwxr-xr-- root/root etc/rc.d/init.d/consolelog
-rw-r--r-- root/root etc/rc.d/init.d/functions
-rwxr-xr-- root/root etc/rc.d/init.d/halt
-rwxr-xr-- root/root etc/rc.d/init.d/iplink
@@ -88,20 +88,19 @@ lrwxrwxrwx root/root etc/rc.d/rc6.d/S70swap -> ../init.d/swap
lrwxrwxrwx root/root etc/rc.d/rc6.d/S80mountfs -> ../init.d/mountfs
lrwxrwxrwx root/root etc/rc.d/rc6.d/S90localnet -> ../init.d/localnet
lrwxrwxrwx root/root etc/rc.d/rc6.d/S99reboot -> ../init.d/reboot
-drwxr-xr-x root/root etc/rc.d/rcsysinit.d/
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S01mountvirtfs -> ../init.d/mountvirtfs
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S02consolelog -> ../init.d/consolelog
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S05modules -> ../init.d/modules
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S10udev -> ../init.d/udev
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S15setclock -> ../init.d/setclock
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S20checkfs -> ../init.d/checkfs
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S30mountfs -> ../init.d/mountfs
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S40swap -> ../init.d/swap
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S45cleanfs -> ../init.d/cleanfs
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S50udev_retry -> ../init.d/udev_retry
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S70console -> ../init.d/console
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S80localnet -> ../init.d/localnet
-lrwxrwxrwx root/root etc/rc.d/rcsysinit.d/S90sysctl -> ../init.d/sysctl
+drwxr-xr-x root/root etc/rc.d/rcS.d/
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S01mountvirtfs -> ../init.d/mountvirtfs
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S05modules -> ../init.d/modules
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S08localnet -> ../init.d/localnet
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S10udev -> ../init.d/udev
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S15setclock -> ../init.d/setclock
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S20checkfs -> ../init.d/checkfs
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S30mountfs -> ../init.d/mountfs
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S40swap -> ../init.d/swap
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S45cleanfs -> ../init.d/cleanfs
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S50udev_retry -> ../init.d/udev_retry
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S70console -> ../init.d/console
+lrwxrwxrwx root/root etc/rc.d/rcS.d/S90sysctl -> ../init.d/sysctl
-rw-r--r-- root/root etc/shells
drwxr-xr-x root/root etc/skel/
-rw-r--r-- root/root etc/skel/.bash_profile
@@ -110,16 +109,17 @@ drwxr-xr-x root/root etc/skel/
drwxr-xr-x root/root etc/skel/Desktop/
drwxr-xr-x root/root etc/sysconfig/
-rw-r--r-- root/root etc/sysconfig/modules
-drwxr-xr-x root/root etc/sysconfig/network-devices/
--rwxr-xr-- root/root etc/sysconfig/network-devices/ifdown
--rwxr-xr-- root/root etc/sysconfig/network-devices/ifup
-drwxr-xr-x root/root etc/sysconfig/network-devices/services/
--rwxr-xr-- root/root etc/sysconfig/network-devices/services/ipv4-static
--rwxr-xr-- root/root etc/sysconfig/network-devices/services/ipv4-static-route
-rw-r--r-- root/root etc/sysconfig/rc
+-rw-r--r-- root/root etc/sysconfig/rc.site
+-rw-r--r-- root/root etc/sysconfig/udev_retry
drwxr-xr-x root/root home/
drwxr-xr-x root/root lib/
drwxr-xr-x root/root lib/firmware/
+lrwxrwxrwx root/root lib/lsb -> services
+drwxr-xr-x root/root lib/services/
+-rw-r--r-- root/root lib/services/init-functions
+-rwxr-xr-- root/root lib/services/ipv4-static
+-rwxr-xr-- root/root lib/services/ipv4-static-route
drwxr-xr-x root/root lib/udev/
drwxr-xr-x root/root lib/udev/devices/
crw------- root/root lib/udev/devices/console (5, 1)
@@ -165,6 +165,8 @@ lrwxrwxrwx root/root root/useradd -> ../etc/default/useradd
drwxr-xr-x root/root run/
-rw-rw-r-- root/utmp run/utmp (EMPTY)
drwxr-xr-x root/root sbin/
+-rwxr-xr-- root/root sbin/ifdown
+-rwxr-xr-- root/root sbin/ifup
drwxr-xr-x root/root srv/
drwxrwxrwt root/root srv/sources/
drwxr-xr-x root/root sys/
@@ -220,6 +222,8 @@ drwxr-xr-x root/root usr/share/man/man5/
drwxr-xr-x root/root usr/share/man/man6/
drwxr-xr-x root/root usr/share/man/man7/
drwxr-xr-x root/root usr/share/man/man8/
+lrwxrwxrwx root/root usr/share/man/man8/ifdown.8.gz -> ifup.8.gz
+-rwxr-xr-- root/root usr/share/man/man8/ifup.8.gz
drwxr-xr-x root/root usr/share/misc/
drwxr-xr-x root/root usr/share/terminfo/
drwxr-xr-x root/root usr/share/zoneinfo/
diff --git a/aaabasicfs/.md5sum.i686 b/aaabasicfs/.md5sum.i686
index 8695b73fd..fcc09fa56 100644
--- a/aaabasicfs/.md5sum.i686
+++ b/aaabasicfs/.md5sum.i686
@@ -2,17 +2,17 @@
61ba4859757a54bf1f514de5213802e0 bash_profile
f29eb765bd7c24471d055cc72b0edd4e bashrc
3974f1b4242908346f309b096a7a6ed6 bashrc.etc
-8026923cf29639bf6ac5a2b77bec74dc blfs-bootscripts-20100825.tar.bz2
+729c361edcbb1731cb1d7453f913edf9 blfs-bootscripts-20120217.tar.bz2
248d4faa838949085a51003b2c0c3f00 dircolors.sh
ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh
64514eb39b4878f060065cab28191ee5 fstab
-4e641aa7a51f285c0a832b8a7dd8ed29 inittab
+ccedc7098a844e92db6bd179f13f550b inittab
2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc
f05a15125a4c6008471d96b096445e21 lfs-bootscripts-03.patch
-5041ee97992e3f10d3be44f46a6aeb76 lfs-bootscripts-20110424.tar.bz2
-ca5159eb45e407362a6bf4ad47d8fc21 network
+9dd71c43f58143229d9f7b4025974dc9 lfs-bootscripts-20120229.tar.bz2
+f0d82fd62e5dfc628addb1c6f4617b6e network
c661d321ada89d6a2f1a1dde39f00a25 nu
210fdabd07248f79617508807715167b profile
-b860cf492e983f400666fa43c00f2954 rc
+30dd8d7e2b5749ab447e7c902e318248 rc
fa6ce99e0329c7854e0a83d022da6fe3 readline.sh
87a81331c2241707ab494584eb49a80b unmask.sh
diff --git a/aaabasicfs/.md5sum.x86_64 b/aaabasicfs/.md5sum.x86_64
index 8695b73fd..fcc09fa56 100644
--- a/aaabasicfs/.md5sum.x86_64
+++ b/aaabasicfs/.md5sum.x86_64
@@ -2,17 +2,17 @@
61ba4859757a54bf1f514de5213802e0 bash_profile
f29eb765bd7c24471d055cc72b0edd4e bashrc
3974f1b4242908346f309b096a7a6ed6 bashrc.etc
-8026923cf29639bf6ac5a2b77bec74dc blfs-bootscripts-20100825.tar.bz2
+729c361edcbb1731cb1d7453f913edf9 blfs-bootscripts-20120217.tar.bz2
248d4faa838949085a51003b2c0c3f00 dircolors.sh
ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh
64514eb39b4878f060065cab28191ee5 fstab
-4e641aa7a51f285c0a832b8a7dd8ed29 inittab
+ccedc7098a844e92db6bd179f13f550b inittab
2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc
f05a15125a4c6008471d96b096445e21 lfs-bootscripts-03.patch
-5041ee97992e3f10d3be44f46a6aeb76 lfs-bootscripts-20110424.tar.bz2
-ca5159eb45e407362a6bf4ad47d8fc21 network
+9dd71c43f58143229d9f7b4025974dc9 lfs-bootscripts-20120229.tar.bz2
+f0d82fd62e5dfc628addb1c6f4617b6e network
c661d321ada89d6a2f1a1dde39f00a25 nu
210fdabd07248f79617508807715167b profile
-b860cf492e983f400666fa43c00f2954 rc
+30dd8d7e2b5749ab447e7c902e318248 rc
fa6ce99e0329c7854e0a83d022da6fe3 readline.sh
87a81331c2241707ab494584eb49a80b unmask.sh
diff --git a/aaabasicfs/Pkgfile b/aaabasicfs/Pkgfile
index 7a476cd96..ec8976557 100644
--- a/aaabasicfs/Pkgfile
+++ b/aaabasicfs/Pkgfile
@@ -4,15 +4,15 @@
# Packager: thierryn1 at hispeed dot ch
name=aaabasicfs
-version=2011
-release=4
-scriptsversion=lfs-bootscripts-20110424
-BLFSscriptsversion=20100825
+version=2012
+release=1
+scriptsversion=lfs-bootscripts-20120229
+BLFSscriptsversion=20120217
XORG_PREFIX=/usr
-source=(http://nutyx.meticul.eu/files/patchs/$name/$scriptsversion.tar.bz2 \
- http://nutyx.meticul.eu/files/patchs/$name/blfs-bootscripts-$BLFSscriptsversion.tar.bz2 \
- http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-03.patch \
- fstab inittab inputrc network rc profile dircolors.sh extrapaths.sh \
+source=(http://www.linuxfromscratch.org/lfs/downloads/7.1/$scriptsversion.tar.bz2
+ http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2
+ http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-03.patch
+ fstab inittab inputrc network rc profile dircolors.sh extrapaths.sh
bash_profile bashrc bashrc.etc nu readline.sh unmask.sh X.sh )
@@ -162,7 +162,6 @@ EOF
chmod -v 664 $PKG/var/run/utmp $PKG/var/log/lastlog
# Bootscripts
cd $scriptsversion
- patch -Np1 -i ../lfs-bootscripts-03.patch
make DESTDIR=$PKG install
# Rename network script
mv $PKG/etc/rc.d/init.d/{network,iplink}
@@ -171,7 +170,7 @@ EOF
# We want to start the network when init 2
mv $PKG/etc/rc.d/rc2.d/{K80,S20}network
cd ..
- # Remove files which will be installed by xorg7
+ # Remove files which will be installed by xorg
rm $PKG/etc/sysconfig/createfiles
# Configuration files
@@ -231,9 +230,10 @@ EOF
mv $PKG/etc/rc.d/$i/S{80,70}swap
mv $PKG/etc/rc.d/$i/S{70,80}mountfs
done
- ln -s ../init.d/setclock $PKG/etc/rc.d/rcsysinit.d/S15setclock
- mv $PKG/etc/rc.d/rcsysinit.d/S{00,01}mountvirtfs
- mv $PKG/etc/rc.d/rcsysinit.d/S{20,40}swap
- mv $PKG/etc/rc.d/rcsysinit.d/S{30,20}checkfs
- mv $PKG/etc/rc.d/rcsysinit.d/S{40,30}mountfs
+ ln -s ../init.d/setclock $PKG/etc/rc.d/rcS.d/S15setclock
+ mv $PKG/etc/rc.d/rcS.d/S{00,01}mountvirtfs
+ mv $PKG/etc/rc.d/rcS.d/S{20,40}swap
+ mv $PKG/etc/rc.d/rcS.d/S{30,20}checkfs
+ mv $PKG/etc/rc.d/rcS.d/S{40,30}mountfs
+ sed "s|notmpfs,nosysfs,nodevtmpfs|notmpfs,nosysfs,nodevtmpfs,noproc|" -i $PKG/etc/rc.d/init.d/mountfs
}
diff --git a/aaabasicfs/inittab b/aaabasicfs/inittab
index d8dac783a..4b8364a98 100644
--- a/aaabasicfs/inittab
+++ b/aaabasicfs/inittab
@@ -5,7 +5,7 @@
id:3:initdefault:
-si::sysinit:/etc/rc.d/init.d/rc sysinit
+si::sysinit:/etc/rc.d/init.d/rc S
l0:0:wait:/etc/rc.d/init.d/rc 0
l1:S1:wait:/etc/rc.d/init.d/rc 1
@@ -19,7 +19,7 @@ ca:12345:ctrlaltdel:/sbin/shutdown -t1 -a -h now
su:S016:once:/sbin/sulogin
-1:2345:respawn:/sbin/agetty tty1 9600
+1:2345:respawn:/sbin/agetty --noclear tty1 9600
2:2345:respawn:/sbin/agetty tty2 9600
3:2345:respawn:/sbin/agetty tty3 9600
4:2345:respawn:/sbin/agetty tty4 9600
diff --git a/aaabasicfs/network b/aaabasicfs/network
index 8340cd68e..75531640b 100755
--- a/aaabasicfs/network
+++ b/aaabasicfs/network
@@ -1,39 +1,63 @@
#!/bin/sh
-# Begin $rc_base/init.d/network
+########################################################################
+# Begin network
+#
+# Description : Network Control Script
+#
+# Authors : Gerard Beekmans - gerard@linuxfromscratch.org
+# Nathan Coulson - nathan@linuxfromscratch.org
+# Kevin P. Fleming - kpfleming@linuxfromscratch.org
+# DJ Lucas - dj@linuxfromscratch.org
+# Update : Bruce Dubbs - bdubbs@linuxfromscratch.org
+#
+# Changes for NuTyX : piernov - piernov@piernov.org
+#
+# Version : LFS 7.0
+#
+########################################################################
-# Based on sysklogd script from LFS-3.1 and earlier.
-# Rewritten by thierryn1@hispeed.ch
+### BEGIN INIT INFO
+# Provides: $network
+# Required-Start: $local_fs swap localnet
+# Should-Start: $syslog
+# Required-Stop: $local_fs swap localnet
+# Should-Stop: $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Short-Description: Starts and configures network interfaces.
+# Description: Starts and configures network interfaces.
+# X-LFS-Provided-By: LFS
+### END INIT INFO
-. /etc/sysconfig/rc
-. $rc_functions
+. /lib/lsb/init-functions
# Network configuration
. /etc/sysconfig/network
NM_PIDFILE=/var/run/NetworkManager.pid
WICD_PIDFILE=
-
TIME=$NETWORKDELAY
-case "$1" in
- start)
+
+case "${1}" in
+ start)
if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
- boot_mesg "Setting network parameters... "
- sysctl -e -p /etc/sysctl.conf >/dev/null 2>&1
- echo_ok
- boot_mesg "Starting NetworkManager daemon..."
- loadproc NetworkManager --pid-file $NM_PIDFILE
+ log_info_msg "Starting NetworkManager daemon..."
+ start_daemon /usr/sbin/NetworkManager --pid-file $NM_PIDFILE
+ evaluate_retval
+
if [ "${NETWORKWAIT}" == "yes" ]; then
[ -z "${LINKDELAY}" ] && LINKDELAY=10
- boot_mesg "Waiting for network..."
+ log_info_msg "Waiting for network..."
nm-online -q --timeout=$LINKDELAY || nm-online -q -x --timeout=30
- [ "$?" = "0" ] && log_success_msg "Network startup" || log_failure_msg "Network startup"
+ evaluate_retval
[ -n "${NETWORKDELAY}" ] && /bin/sleep ${NETWORKDELAY}
fi
elif [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
- boot_mesg "Starting the wicd Daemon..."
- loadproc /usr/share/wicd/daemon/wicd-daemon.py
+ log_info_msg "Starting the wicd Daemon..."
+ start_daemon /usr/share/wicd/daemon/wicd-daemon.py
+ evaluate_retval
if grep -v ^# /etc/fstab | grep _netdev > /dev/null; then
while ! grep "nameserver" /etc/resolv.conf ;
do
@@ -42,55 +66,82 @@ case "$1" in
echo -n .
let TIME=$TIME-1
if [ $TIME -lt 1 ]; then
- boot_mesg "Time out"
- echo_failure
+ log_failure_msg "Time out"
exit 1
fi
fi
done
- boot_mesg "Network successfully configured..."
- echo_ok
+ log_success_msg "Network successfully configured..."
fi
- else
- if [ -f /etc/rc.d/init.d/iplink ]; then
- /etc/rc.d/init.d/iplink start
- fi
- fi
- ;;
+ else
+ # Start all network interfaces
+ for file in /etc/sysconfig/ifconfig.*
+ do
+ interface=${file##*/ifconfig.}
- stop)
- if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
- boot_mesg "Stopping NetworkManager daemon..."
- killproc -p $NM_PIDFILE NetworkManager
+ # Skip if $file is * (because nothing was found)
+ if [ "${interface}" = "*" ]
+ then
+ continue
+ fi
+
+ /sbin/ifup ${interface}
+ done
+ fi
+ ;;
+
+ stop)
+ if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
+ log_info_msg "Stopping NetworkManager daemon..."
+ killproc -p $NM_PIDFILE /usr/sbin/NetworkManager
+ evaluate_retval
elif [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
- boot_mesg "Stopping the wicd Daemon..."
- loadproc /usr/share/wicd/daemon/wicd-daemon.py --kill
+ log_info_msg "Stopping the wicd Daemon..."
+ /usr/share/wicd/daemon/wicd-daemon.py --kill
+ evaluate_retval
else
- if [ -f /etc/rc.d/init.d/iplink ]; then
- /etc/rc.d/init.d/iplink stop
- fi
- fi
- ;;
+ # Reverse list
+ net_files=""
+ for file in /etc/sysconfig/ifconfig.*
+ do
+ net_files="${file} ${net_files}"
+ done
+
+ # Stop all network interfaces
+ for file in ${net_files}
+ do
+ interface=${file##*/ifconfig.}
+
+ # Skip if $file is * (because nothing was found)
+ if [ "${interface}" = "*" ]
+ then
+ continue
+ fi
+
+ /sbin/ifdown ${interface}
+ done
+ fi
+ ;;
status)
if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then
statusproc -p $NM_PIDFILE NetworkManager
- else
- if [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
- statusproc -p /var/run/wicd/wicd.pid "/usr/bin/python2 /usr/share/wicd/daemon/wicd-daemon.py"
- fi
+ elif [ "$MANAGER" == "wicd" ] && [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then
+ statusproc -p /var/run/wicd/wicd.pid /usr/share/wicd/daemon/wicd-daemon.py
fi
;;
- restart)
- ${0} stop
- sleep 3
- ${0} start
- ;;
+ restart)
+ ${0} stop
+ sleep 3
+ ${0} start
+ ;;
- *)
- echo "Usage: $0 {start|stop|restart|status}"
- exit 1
- ;;
+ *)
+ echo "Usage: ${0} {start|stop|restart|status}"
+ exit 1
+ ;;
esac
-# End $rc_base/init.d/network
+exit 0
+
+# End network
diff --git a/aaabasicfs/rc b/aaabasicfs/rc
index 81736e9f5..0b201cbbf 100755
--- a/aaabasicfs/rc
+++ b/aaabasicfs/rc
@@ -1,112 +1,226 @@
#!/bin/sh
########################################################################
-# Begin $rc_base/init.d/rc
+# Begin rc
#
# Description : Main Run Level Control Script
#
# Authors : Gerard Beekmans - gerard@linuxfromscratch.org
+# : DJ Lucas - dj@linuxfromscratch.org
+# Update : Bruce Dubbs - bdubbs@linuxfromscratch.org
#
-# Version : 00.00
-#
-# Notes :
+# Version : LFS 7.0
#
########################################################################
-. /etc/sysconfig/rc
-. ${rc_functions}
+. /lib/lsb/init-functions
+
+print_error_msg()
+{
+ log_failure_msg
+ # $i is set when called
+ MSG="FAILURE:\n\nYou should not be reading this error message.\n\n"
+ MSG="${MSG}It means that an unforeseen error took place in\n"
+ MSG="${MSG}${i},\n"
+ MSG="${MSG}which exited with a return value of ${error_value}.\n"
+
+ MSG="${MSG}If you're able to track this error down to a bug in one of\n"
+ MSG="${MSG}the files provided by the files provided by\n"
+ MSG="${MSG}the ${DISDRI_MINI} book, please be so kind to inform us at\n"
+ MSG="${MSG}${DISTRO_CONTACT}.\n"
+ log_failure_msg "${MSG}"
+
+ log_info_msg "Press Enter to continue..."
+ wait_for_user
+}
-stty sane
+check_script_status()
+{
+ # $i is set when called
+ if [ ! -f ${i} ]; then
+ log_warning_msg "${i} is not a valid symlink."
+ continue
+ fi
+
+ if [ ! -x ${i} ]; then
+ log_warning_msg "${i} is not executable, skipping."
+ continue
+ fi
+}
+
+run()
+{
+ if [ -z $interactive ]; then
+ ${1} ${2}
+ return $?
+ fi
+
+ while true; do
+ read -p "Run ${1} ${2} (Yes/no/continue)? " -n 1 runit
+ echo
+
+ case ${runit} in
+ c | C)
+ interactive=""
+ ${i} ${2}
+ ret=${?}
+ break;
+ ;;
+
+ n | N)
+ return 0
+ ;;
+
+ y | Y)
+ ${i} ${2}
+ ret=${?}
+ break
+ ;;
+ esac
+ done
+
+ return $ret
+}
+# Read any local settings/overrides
+[ -r /etc/sysconfig/rc.site ] && source /etc/sysconfig/rc.site
+
+DISTRO=${DISTRO:-"NuTyX"}
+DISTRO_CONTACT=${DISTRO_CONTACT:-"http://nutyx.org/"}
+DISTRO_MINI=${DISTRO_MINI:-"NuTyX"}
+IPROMPT=${IPROMPT:-"no"}
+
+# These 3 signals will not cause our script to exit
trap "" INT QUIT TSTP
-[ "${1}" != "" ] && runlevel=${1}
-
-splashy_update_progress(){
- STEPS_DIR=/etc/splashy/steps_dir
- [ -r "/etc/default/splashy" ] && . "/etc/default/splashy"
- SPL_UPD=/sbin/splashy_update
- SPL_PRG=$STEPS_DIR/${runlevel}-progress
- # load some default variables
- if ! ( pidof splashy > /dev/null ); then
- /sbin/splashy boot 2>/dev/null
- sleep 1
- else
- PER=`sed -n 's+'${1}' ++ p' $SPL_PRG`
- $SPL_UPD "progress $PER"
- fi
-}
+[ "${1}" != "" ] && runlevel=${1}
-if [ "${runlevel}" = "" ]; then
- echo "Usage: ${0} <runlevel>" >&2
- exit 1
+if [ "${runlevel}" == "" ]; then
+ echo "Usage: ${0} <runlevel>" >&2
+ exit 1
fi
previous=${PREVLEVEL}
-[ "${previous}" = "" ] && previous=N
+[ "${previous}" == "" ] && previous=N
-if [ ! -d ${rc_base}/rc${runlevel}.d ]; then
- boot_mesg "${rc_base}/rc${runlevel}.d does not exist." ${WARNING}
- boot_mesg_flush
- exit 1
+if [ ! -d /etc/rc.d/rc${runlevel}.d ]; then
+ log_info_msg "/etc/rc.d/rc${runlevel}.d does not exist.\n"
+ exit 1
fi
-# Attempt to stop all service started by previous runlevel,
+
+if [ "$runlevel" == "6" -o "$runlevel" == "0" ]; then IPROMPT="no"; fi
+
+# Note: In ${LOGLEVEL:-7}, it is ':' 'dash' '7', not minus 7
+if [ "$runlevel" == "S" ]; then dmesg -n "${LOGLEVEL:-1}"; fi
+
+if [ "${IPROMPT}" == "yes" -a "${runlevel}" == "S" ]; then
+ # The total length of the distro welcome string, without escape codes
+ wlen=${wlen:-$(echo "Welcome to ${DISTRO}" | wc -c )}
+ welcome_message=${welcome_message:-"Welcome to ${INFO}${DISTRO}${NORMAL}"}
+
+ # The total length of the interactive string, without escape codes
+ ilen=${ilen:-$(echo "Press 'I' to enter interactive startup" | wc -c )}
+ i_message=${i_message:-"Press '${FAILURE}I${NORMAL}' to enter interactive startup"}
+
+
+ # dcol and icol are spaces before the message to center the message
+ # on screen. itime is the amount of wait time for the user to press a key
+ wcol=$(( ( ${COLUMNS} - ${wlen} ) / 2 ))
+ icol=$(( ( ${COLUMNS} - ${ilen} ) / 2 ))
+ itime=${itime:-"3"}
+
+ echo -e "\n\n"
+ echo -e "\\033[${wcol}G${welcome_message}"
+ echo -e "\\033[${icol}G${i_message}${NORMAL}"
+ echo ""
+ read -t "${itime}" -n 1 interactive 2>&1 > /dev/null
+fi
+
+# Make lower case
+[ "${interactive}" == "I" ] && interactive="i"
+[ "${interactive}" != "i" ] && interactive=""
+
+# Read the state file if it exists from runlevel S
+[ -r /var/run/interactive ] && source /var/run/interactive
+
+# Attempt to stop all services started by the previous runlevel,
# and killed in this runlevel
if [ "${previous}" != "N" ]; then
- for i in $(ls -v ${rc_base}/rc${runlevel}.d/K* 2> /dev/null)
- do
- check_script_status
-
- suffix=${i#$rc_base/rc$runlevel.d/K[0-9][0-9]}
- prev_start=$rc_base/rc$previous.d/S[0-9][0-9]$suffix
- sysinit_start=$rc_base/rcsysinit.d/S[0-9][0-9]$suffix
-
- if [ "${runlevel}" != "0" ] && [ "${runlevel}" != "6" ]; then
- if [ ! -f ${prev_start} ] && [ ! -f ${sysinit_start} ]; then
- boot_mesg -n "WARNING:\n\n${i} can't be" ${WARNING}
- boot_mesg -n " executed because it was not"
- boot_mesg -n " not started in the previous"
- boot_mesg -n " runlevel (${previous})."
- boot_mesg "" ${NORMAL}
- boot_mesg_flush
- continue
- fi
- fi
- ${i} stop
- error_value=${?}
-
- if [ "${error_value}" != "0" ]; then
- print_error_msg
- fi
- done
+ for i in $(ls -v /etc/rc.d/rc${runlevel}.d/K* 2> /dev/null)
+ do
+ check_script_status
+
+ suffix=${i#/etc/rc.d/rc$runlevel.d/K[0-9][0-9]}
+ prev_start=/etc/rc.d/rc$previous.d/S[0-9][0-9]$suffix
+ sysinit_start=/etc/rc.d/rcS.d/S[0-9][0-9]$suffix
+
+ if [ "${runlevel}" != "0" -a "${runlevel}" != "6" ]; then
+ if [ ! -f ${prev_start} -a ! -f ${sysinit_start} ]; then
+ MSG="WARNING:\n\n${i} can't be "
+ MSG="${MSG}executed because it was not "
+ MSG="${MSG}not started in the previous "
+ MSG="${MSG}runlevel (${previous})."
+ log_warning_msg "$MSG"
+ continue
+ fi
+ fi
+
+ run ${i} stop
+ error_value=${?}
+
+ if [ "${error_value}" != "0" ]; then print_error_msg; fi
+ done
+fi
+
+if [ "${previous}" == "N" ]; then export IN_BOOT=1; fi
+
+if [ "$runlevel" == "6" -a -n "${FASTBOOT}" ]; then
+ touch /fastboot
fi
-#Start all functions in this runlevel
-for i in $( ls -v ${rc_base}/rc${runlevel}.d/S* 2> /dev/null)
+
+# Start all functions in this runlevel
+for i in $( ls -v /etc/rc.d/rc${runlevel}.d/S* 2> /dev/null)
do
- if [ "${previous}" != "N" ]; then
- suffix=${i#$rc_base/rc$runlevel.d/S[0-9][0-9]}
- stop=$rc_base/rc$runlevel.d/K[0-9][0-9]$suffix
- prev_start=$rc_base/rc$previous.d/S[0-9][0-9]$suffix
-
- [ -f ${prev_start} ] && [ ! -f ${stop} ] && continue
- fi
-
- check_script_status
-
- case ${runlevel} in
- 0|6)
- [ -f /sbin/splashy ] && splashy_update_progress ${i}
- ${i} stop
- ;;
- *)
- [ -f /sbin/splashy ] && splashy_update_progress ${i}
- ${i} start
- ;;
- esac
- error_value=${?}
-
- if [ "${error_value}" != "0" ]; then
- print_error_msg
- fi
+ if [ "${previous}" != "N" ]; then
+ suffix=${i#/etc/rc.d/rc$runlevel.d/S[0-9][0-9]}
+ stop=/etc/rc.d/rc$runlevel.d/K[0-9][0-9]$suffix
+ prev_start=/etc/rc.d/rc$previous.d/S[0-9][0-9]$suffix
+
+ [ -f ${prev_start} -a ! -f ${stop} ] && continue
+ fi
+
+ check_script_status
+
+ case ${runlevel} in
+ 0|6)
+ run ${i} stop
+ ;;
+ *)
+ run ${i} start
+ ;;
+ esac
+
+ error_value=${?}
+
+ if [ "${error_value}" != "0" ]; then print_error_msg; fi
done
-# End $rc_base/init.d/rc
+
+# Store interactive variable on switch from runlevel S and remove if not
+if [ "${runlevel}" == "S" -a "${interactive}" == "i" ]; then
+ echo "interactive=\"i\"" > /var/run/interactive
+else
+ rm -f /var/run/interactive 2> /dev/null
+fi
+
+# Copy the boot log on initial boot only
+if [ "${previous}" == "N" -a "${runlevel}" != "S" ]; then
+ cat /run/var/bootlog >> /var/log/boot.log
+
+ # Mark the end of boot
+ echo "--------" >> /var/log/boot.log
+
+ # Remove the temporary file
+ rm -f /run/var/bootlog 2> /dev/null
+fi
+
+# End rc
diff --git a/kernel/Pkgfile b/kernel/Pkgfile
index 677b46710..55ebab24f 100644
--- a/kernel/Pkgfile
+++ b/kernel/Pkgfile
@@ -1,23 +1,23 @@
# Description: Le kernel avec les modules nvidia, ati, broadcom et virtualbox
# URL: http://www.kernel.org
-# Maintainer: Linus Torvalds, Greg KH
+# Maintainer: Linus Torvalds, Greg Kroah-Hartman and many more
# Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com
name=kernel
-version=3.2.6
+version=3.2.9
_BaseVersion=3.2
-release=2
+release=1
PKGMK_NO_STRIP="yes"
PKGMK_IGNORE_FOOTPRINT="yes"
PKGMK_IGNORE_MD5SUM="yes"
SCRIPT_VERSION="pakxe.3"
INITRDBASE="nutyx-initrd"
_extra=16022012
-_tools=16022012
+_tools=21022012
NVIDIA_VERSION=295.20
VB_VERSION=4.1.8
VB_BUILD=75467
-ATI_VERSION=11.11
+ATI_VERSION=12.1
[ "`uname -m`" == "i686" ] && _ARCH=x86
[ "`uname -m`" == "x86_64" ] && _ARCH=x86_64
@@ -27,7 +27,7 @@ ATI_VERSION=11.11
[ "`uname -m`" == "x86_64" ] && BC_ARCH=x86_64
source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_82_112.tar.gz \
http://download.virtualbox.org/virtualbox/${VB_VERSION}/VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run \
- http://www2.ati.com/drivers/linux/ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run \
+ http://www2.ati.com/drivers/linux/amd-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run \
makefile_compat.patch bc_wl_abiupdate.patch \
http://fr.download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\
http://www.kernel.org/pub/linux/kernel/v3.0/linux-${_BaseVersion}.tar.bz2 config_64 config\
@@ -36,17 +36,35 @@ source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_
http://nutyx.meticul.eu/files/nutyx-initrd-`uname -m`-${_extra}.tar.bz2\
http://nutyx.meticul.eu/files/installtools-${_tools}.tar.bz2)
build(){
-sed -i "s/^version=.\{1,\}/version=$version/" `prt-get printf %p --filter=$name`/$name/post-install
+
+sed -i "s/^SCRIPT_VERSION=.\{1,\}/SCRIPT_VERSION=\"$SCRIPT_VERSION\"/" `prt-get printf %p --filter=$name`/$name/post-install
+# firmware
+git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
+rm -r linux-firmware/.git
+
+cp -a linux-firmware $INITRDBASE/rootfs/lib/firmware
+
+mkdir -p $PKG/lib
+cp -a linux-firmware $PKG/lib/firmware
+
+# initrd
+cd $SRC
+
+sed -i "s|#VERSION#|$SCRIPT_VERSION|g" \
+$INITRDBASE/rootfs/install/functions
+
for i in setup-install setup-mirroir
do
sed -i "s|#INSTALL#|install-$SCRIPT_VERSION.ash|" \
$INITRDBASE/rootfs/install/$i || exit 1
done
-for i in main.txt functions setup-grub setup-grub
+for i in main.txt setup-grub
do
sed -i "s|#VERSION#|MINI $SCRIPT_VERSION|g" \
$INITRDBASE/rootfs/install/$i
done
+
+# kernel sources
if ! [ -d /usr/src/linux-${_BaseVersion} ]; then
mv linux-${_BaseVersion} /usr/src/
ln -s /usr/src/linux-${_BaseVersion} linux-${_BaseVersion}
@@ -60,7 +78,9 @@ else
fi
ln -s /usr/src/linux-${_BaseVersion} linux-${_BaseVersion}
cd linux-${_BaseVersion}
+
# make mrproper
+
case `uname -m` in
x86_64)
mv $SRC/config_64 ./.config;;
@@ -68,7 +88,9 @@ case `uname -m` in
mv $SRC/config ./.config;;
esac
sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile
-# make menuconfig
+# When a new patchlevel is release (3.2->3.3 for ex)
+# decomment and run make menuconfig
+make menuconfig
case `uname -m` in
x86_64)
cp .config `prt-get printf %p --filter=$name`/$name/config_64;;
@@ -98,7 +120,7 @@ install -m 0644 -D nvidia.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/nvi
# Module ati
cd $SRC
-sh ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract ati
+sh amd-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract ati
cd ati
patch -Np1 -i ../makefile_compat.patch
cd common/lib/modules/fglrx/build_mod
diff --git a/kernel/README b/kernel/README
new file mode 100644
index 000000000..53e1633dd
--- /dev/null
+++ b/kernel/README
@@ -0,0 +1,2 @@
+Pour la construction du kernel il est necessaire d'avoir git et prt-get
+d'installé.
diff --git a/kernel/config b/kernel/config
index 539d18451..d11811e89 100644
--- a/kernel/config
+++ b/kernel/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.2.1 Kernel Configuration
+# Linux/i386 3.2.9 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -1307,7 +1307,8 @@ CONFIG_NFC_WILINK=m
# Generic Driver Options
#
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
diff --git a/kernel/config_64 b/kernel/config_64
index 293deb3ff..6697784d9 100644
--- a/kernel/config_64
+++ b/kernel/config_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.2.1 Kernel Configuration
+# Linux/x86_64 3.2.9 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -1268,7 +1268,8 @@ CONFIG_NFC_WILINK=m
# Generic Driver Options
#
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_DEVTMPFS is not set
+CONFIG_DEVTMPFS=y
+# CONFIG_DEVTMPFS_MOUNT is not set
CONFIG_STANDALONE=y
CONFIG_PREVENT_FIRMWARE_BUILD=y
CONFIG_FW_LOADER=y
diff --git a/kernel/post-install b/kernel/post-install
index 2c4b74f3e..43ae9d4e1 100644
--- a/kernel/post-install
+++ b/kernel/post-install
@@ -1,14 +1,6 @@
-version=3.2.6
-if [ ! -d /lib/modules/${version} ]; then
- echo "post-install impossible"
- echo "/lib/modules/${version} pas trouvé"
- exit 1
-fi
SCRIPT_VERSION="pakxe.3"
SRC=/tmp/work
WDIR=$SRC/nutyx-initrd
-ARCH=`uname -m`
-depmod $version
if [ ! -d $SRC ]; then
mkdir -p $SRC
fi
@@ -28,9 +20,12 @@ done
# Copie des modules kernels
mkdir -p $WDIR/rootfs/lib/modules
-cp -a /lib/modules/${version} \
+cp -a /lib/modules/* \
$WDIR/rootfs/lib/modules/
+cp -a /lib/firmware \
+$WDIR/rootfs/lib/
+
# Copie du script d'install
cp /root/bin/install-${SCRIPT_VERSION}.ash $WDIR/rootfs/install/
diff --git a/kernel/pre-install b/kernel/pre-install
new file mode 100644
index 000000000..d875b6144
--- /dev/null
+++ b/kernel/pre-install
@@ -0,0 +1,3 @@
+for i in iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode linux-firmware rt2x00-rt61-fw rt2x00-rt71w-fw
+ do if ( /usr/bin/pkginfo -l $i > /dev/null 2>&1 ) ; then /usr/bin/pkgrm $i ;fi
+ done
diff --git a/kmod/.footprint.i686 b/kmod/.footprint.i686
index cfd1900ca..ab2771958 100644
--- a/kmod/.footprint.i686
+++ b/kmod/.footprint.i686
@@ -23,9 +23,9 @@ drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/libkmod.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libkmod.la
-lrwxrwxrwx root/root usr/lib/libkmod.so -> libkmod.so.2.0.0
-lrwxrwxrwx root/root usr/lib/libkmod.so.2 -> libkmod.so.2.0.0
--rwxr-xr-x root/root usr/lib/libkmod.so.2.0.0
+lrwxrwxrwx root/root usr/lib/libkmod.so -> libkmod.so.2.1.0
+lrwxrwxrwx root/root usr/lib/libkmod.so.2 -> libkmod.so.2.1.0
+-rwxr-xr-x root/root usr/lib/libkmod.so.2.1.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libkmod.pc
drwxr-xr-x root/root usr/share/
diff --git a/kmod/.footprint.x86_64 b/kmod/.footprint.x86_64
index cfd1900ca..ab2771958 100644
--- a/kmod/.footprint.x86_64
+++ b/kmod/.footprint.x86_64
@@ -23,9 +23,9 @@ drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/libkmod.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libkmod.la
-lrwxrwxrwx root/root usr/lib/libkmod.so -> libkmod.so.2.0.0
-lrwxrwxrwx root/root usr/lib/libkmod.so.2 -> libkmod.so.2.0.0
--rwxr-xr-x root/root usr/lib/libkmod.so.2.0.0
+lrwxrwxrwx root/root usr/lib/libkmod.so -> libkmod.so.2.1.0
+lrwxrwxrwx root/root usr/lib/libkmod.so.2 -> libkmod.so.2.1.0
+-rwxr-xr-x root/root usr/lib/libkmod.so.2.1.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libkmod.pc
drwxr-xr-x root/root usr/share/
diff --git a/kmod/.md5sum.i686 b/kmod/.md5sum.i686
index 8dbf3f244..1a8d89d44 100644
--- a/kmod/.md5sum.i686
+++ b/kmod/.md5sum.i686
@@ -1,5 +1,5 @@
7eac77556a1edc257b128e257f9aae57 blacklist-fb.conf
4b8cbcbc54b9029c99fd730e257d4436 depmod-search.conf
-b271c2ec54aba1c67bda63c8579d8c15 kmod-5.tar.xz
+bad08102fad212cd34405136d9a7eb94 kmod-6.tar.xz
cddff2da6f6e96b8a48943c8ce62a238 nouveau.conf
2249d7af8f86efc097c30b788667a4bd usb.conf
diff --git a/kmod/.md5sum.x86_64 b/kmod/.md5sum.x86_64
index 8dbf3f244..1a8d89d44 100644
--- a/kmod/.md5sum.x86_64
+++ b/kmod/.md5sum.x86_64
@@ -1,5 +1,5 @@
7eac77556a1edc257b128e257f9aae57 blacklist-fb.conf
4b8cbcbc54b9029c99fd730e257d4436 depmod-search.conf
-b271c2ec54aba1c67bda63c8579d8c15 kmod-5.tar.xz
+bad08102fad212cd34405136d9a7eb94 kmod-6.tar.xz
cddff2da6f6e96b8a48943c8ce62a238 nouveau.conf
2249d7af8f86efc097c30b788667a4bd usb.conf
diff --git a/kmod/Pkgfile b/kmod/Pkgfile
index d28055758..110010cdb 100755
--- a/kmod/Pkgfile
+++ b/kmod/Pkgfile
@@ -4,9 +4,9 @@
# Packager: piernov <piernov@piernov.org>
name=kmod
-version=5
+version=6
release=1
-source=(http://packages.profusion.mobi/$name/$name-$version.tar.xz
+source=(http://www.kernel.org/pub/linux/utils/kernel/$name/$name-$version.tar.xz
depmod-search.conf
nouveau.conf
blacklist-fb.conf
diff --git a/libgl/.md5sum.i686 b/libgl/.md5sum.i686
index 2b3937ced..f389fa425 100644
--- a/libgl/.md5sum.i686
+++ b/libgl/.md5sum.i686
@@ -1,2 +1 @@
-0837c52698fe3252369c3fdb5195afcc MesaLib-7.11.2.tar.bz2
-0c0b99f744547cd9ed72d5846dc3a7d9 llvm3.0.patch
+24eeebf66971809d8f40775a379b36c9 MesaLib-8.0.1.tar.bz2
diff --git a/libgl/.md5sum.x86_64 b/libgl/.md5sum.x86_64
index 2b3937ced..f389fa425 100644
--- a/libgl/.md5sum.x86_64
+++ b/libgl/.md5sum.x86_64
@@ -1,2 +1 @@
-0837c52698fe3252369c3fdb5195afcc MesaLib-7.11.2.tar.bz2
-0c0b99f744547cd9ed72d5846dc3a7d9 llvm3.0.patch
+24eeebf66971809d8f40775a379b36c9 MesaLib-8.0.1.tar.bz2
diff --git a/libgl/Pkgfile b/libgl/Pkgfile
index ef2401a8c..8e1d47582 100644
--- a/libgl/Pkgfile
+++ b/libgl/Pkgfile
@@ -6,25 +6,20 @@
# Run on: talloc,expat,libdrm,xorg-makedepend,xorg-libx11,xorg-libxext,xorg-libxxf86vm,xorg-libxt,xorg-libxdamage,xorg-libxmu,xorg-libxi
name=libgl
-version=7.11.2
+version=8.0.1
release=1
-source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2
- llvm3.0.patch)
+source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2)
build() {
cd Mesa-$version
-
- patch -p1 < ../llvm3.0.patch
-
sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" $(find $SRC -name '*.py')
sed -i -e "s|PYTHON2 = python|PYTHON2 = python2|" $SRC/Mesa-$version/configs/{default,autoconf.in}
sed -i -e "s|python|python2|" $SRC/Mesa-$version/src/gallium/auxiliary/Makefile
./configure $XORG_CONFIG \
- --with-driver=dri \
--with-dri-driverdir=$XORG_PREFIX/lib/dri \
- --with-dri-drivers="i810,i915,i965,mga,mach64,nouveau,r128,r200,r300,r600,radeon,savage,sis,unichrome,tdfx,swrast" \
- --with-gallium-drivers="r300,r600,nouveau,swrast" \
+ --with-dri-drivers="i915,i965,nouveau,r200,radeon,swrast" \
+ --with-gallium-drivers="i915,r300,r600,nouveau,swrast,svga" \
--enable-egl \
--enable-gles1 \
--enable-gles2 \
@@ -32,15 +27,16 @@ build() {
--enable-gallium-egl \
--enable-gallium-llvm \
--enable-texture-float \
- --enable-glut \
--enable-shared-glapi \
--enable-glx-tls \
- --enable-xcb \
- --enable-shared-dricore
-
- # La compilation multithread casse le dricore partagé.
+ --enable-dri \
+ --enable-shared-dricore \
+ --enable-osmesa \
+ --enable-xa \
+# --enable-gallium-g3dvl
+# --enable-d3d1x \
+# --enable-xorg
make
-
install -m755 -d $PKG/$XORG_PREFIX/lib{,/X11/modules/extensions}
bin/minstall lib/libGL.so* $PKG/$XORG_PREFIX/lib/
ln -s libglx.xorg $PKG/$XORG_PREFIX/lib/X11/modules/extensions/libglx.so
diff --git a/libgl/llvm3.0.patch b/libgl/llvm3.0.patch
deleted file mode 100644
index ff3e7d521..000000000
--- a/libgl/llvm3.0.patch
+++ /dev/null
@@ -1,328 +0,0 @@
---- a/src/gallium/auxiliary/gallivm/lp_bld_type.c
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.c
-@@ -325,8 +325,10 @@ lp_typekind_name(LLVMTypeKind t)
- return "LLVMArrayTypeKind";
- case LLVMPointerTypeKind:
- return "LLVMPointerTypeKind";
-+#if HAVE_LLVM < 0x0300
- case LLVMOpaqueTypeKind:
- return "LLVMOpaqueTypeKind";
-+#endif
- case LLVMVectorTypeKind:
- return "LLVMVectorTypeKind";
- case LLVMMetadataTypeKind:
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp 2011-10-15 08:43:58.000000000 +0800
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp 2011-12-05 17:19:25.000000000 +0800
-@@ -25,19 +25,27 @@
- *
- **************************************************************************/
-
-+#include <stddef.h>
-+
- #include <llvm-c/Core.h>
- #include <llvm/Target/TargetMachine.h>
--#include <llvm/Target/TargetRegistry.h>
--#include <llvm/Target/TargetSelect.h>
- #include <llvm/Target/TargetInstrInfo.h>
- #include <llvm/Support/raw_ostream.h>
- #include <llvm/Support/MemoryObject.h>
-
-+#if HAVE_LLVM >= 0x0300
-+#include <llvm/Support/TargetRegistry.h>
-+#include <llvm/Support/TargetSelect.h>
-+#else /* HAVE_LLVM < 0x0300 */
-+#include <llvm/Target/TargetRegistry.h>
-+#include <llvm/Target/TargetSelect.h>
-+#endif /* HAVE_LLVM < 0x0300 */
-+
- #if HAVE_LLVM >= 0x0209
- #include <llvm/Support/Host.h>
--#else
-+#else /* HAVE_LLVM < 0x0209 */
- #include <llvm/System/Host.h>
--#endif
-+#endif /* HAVE_LLVM < 0x0209 */
-
- #if HAVE_LLVM >= 0x0207
- #include <llvm/MC/MCDisassembler.h>
-@@ -180,7 +188,11 @@
- * Initialize all used objects.
- */
-
-+#if HAVE_LLVM >= 0x0301
-+ std::string Triple = sys::getDefaultTargetTriple();
-+#else
- std::string Triple = sys::getHostTriple();
-+#endif
-
- std::string Error;
- const Target *T = TargetRegistry::lookupTarget(Triple, Error);
-@@ -193,14 +205,23 @@
-
- InitializeAllDisassemblers();
-
-+#if HAVE_LLVM >= 0x0300
-+ OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple));
-+#else
- OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple));
-+#endif
-
- if (!AsmInfo) {
- debug_printf("error: no assembly info for target %s\n", Triple.c_str());
- return;
- }
-
-+#if HAVE_LLVM >= 0x0300
-+ const MCSubtargetInfo *STI = T->createMCSubtargetInfo(Triple, sys::getHostCPUName(), "");
-+ OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler(*STI));
-+#else
- OwningPtr<const MCDisassembler> DisAsm(T->createMCDisassembler());
-+#endif
- if (!DisAsm) {
- debug_printf("error: no disassembler for target %s\n", Triple.c_str());
- return;
-@@ -213,7 +234,11 @@
- #else
- int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
--#if HAVE_LLVM >= 0x0208
-+
-+#if HAVE_LLVM >= 0x0300
-+ OwningPtr<MCInstPrinter> Printer(
-+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
-+#elif HAVE_LLVM >= 0x0208
- OwningPtr<MCInstPrinter> Printer(
- T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo));
- #else
-@@ -253,7 +278,11 @@
-
- if (!DisAsm->getInstruction(Inst, Size, memoryObject,
- pc,
-- nulls())) {
-+#if HAVE_LLVM >= 0x0300
-+ nulls(), nulls())) {
-+#else
-+ nulls())) {
-+#endif
- debug_printf("invalid\n");
- pc += 1;
- }
-@@ -276,7 +305,9 @@
- * Print the instruction.
- */
-
--#if HAVE_LLVM >= 0x208
-+#if HAVE_LLVM >= 0x0300
-+ Printer->printInst(&Inst, Out, "");
-+#elif HAVE_LLVM >= 0x208
- Printer->printInst(&Inst, Out);
- #else
- Printer->printInst(&Inst);
-@@ -289,7 +320,11 @@
-
- pc += Size;
-
-+#if HAVE_LLVM >= 0x0300
-+ const MCInstrDesc &TID = TII->get(Inst.getOpcode());
-+#else
- const TargetInstrDesc &TID = TII->get(Inst.getOpcode());
-+#endif
-
- /*
- * Keep track of forward jumps to a nearby address.
---- a/src/gallium/auxiliary/draw/draw_llvm.c
-+++ b/src/gallium/auxiliary/draw/draw_llvm.c
-@@ -96,7 +96,7 @@ draw_llvm_generate_elts(struct draw_llvm *llvm, struct draw_llvm_variant *var);
- * Create LLVM type for struct draw_jit_texture
- */
- static LLVMTypeRef
--create_jit_texture_type(struct gallivm_state *gallivm)
-+create_jit_texture_type(struct gallivm_state *gallivm, const char *struct_name)
- {
- LLVMTargetDataRef target = gallivm->target;
- LLVMTypeRef texture_type;
-@@ -120,13 +120,21 @@ create_jit_texture_type(struct gallivm_state *gallivm)
- elem_types[DRAW_JIT_TEXTURE_BORDER_COLOR] =
- LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4);
-
-+#if HAVE_LLVM >= 0x0300
-+ texture_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+ LLVMStructSetBody(texture_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- texture_type = LLVMStructTypeInContext(gallivm->context, elem_types,
- Elements(elem_types), 0);
-
-+ LLVMAddTypeName(gallivm->module, struct_name, texture_type);
-+
- /* Make sure the target's struct layout cache doesn't return
- * stale/invalid data.
- */
- LLVMInvalidateStructLayout(gallivm->target, texture_type);
-+#endif
-
- LP_CHECK_MEMBER_OFFSET(struct draw_jit_texture, width,
- target, texture_type,
-@@ -176,7 +184,7 @@ create_jit_texture_type(struct gallivm_state *gallivm)
- */
- static LLVMTypeRef
- create_jit_context_type(struct gallivm_state *gallivm,
-- LLVMTypeRef texture_type)
-+ LLVMTypeRef texture_type, const char *struct_name)
- {
- LLVMTargetDataRef target = gallivm->target;
- LLVMTypeRef float_type = LLVMFloatTypeInContext(gallivm->context);
-@@ -189,11 +197,17 @@ create_jit_context_type(struct gallivm_state *gallivm,
- elem_types[3] = LLVMPointerType(float_type, 0); /* viewport */
- elem_types[4] = LLVMArrayType(texture_type,
- PIPE_MAX_VERTEX_SAMPLERS); /* textures */
--
-+#if HAVE_LLVM >= 0x0300
-+ context_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+ LLVMStructSetBody(context_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- context_type = LLVMStructTypeInContext(gallivm->context, elem_types,
- Elements(elem_types), 0);
-+ LLVMAddTypeName(gallivm->module, struct_name, context_type);
-
- LLVMInvalidateStructLayout(gallivm->target, context_type);
-+#endif
-
- LP_CHECK_MEMBER_OFFSET(struct draw_jit_context, vs_constants,
- target, context_type, 0);
-@@ -215,7 +229,7 @@ create_jit_context_type(struct gallivm_state *gallivm,
- * Create LLVM type for struct pipe_vertex_buffer
- */
- static LLVMTypeRef
--create_jit_vertex_buffer_type(struct gallivm_state *gallivm)
-+create_jit_vertex_buffer_type(struct gallivm_state *gallivm, const char *struct_name)
- {
- LLVMTargetDataRef target = gallivm->target;
- LLVMTypeRef elem_types[3];
-@@ -225,10 +239,17 @@ create_jit_vertex_buffer_type(struct gallivm_state *gallivm)
- elem_types[1] = LLVMInt32TypeInContext(gallivm->context);
- elem_types[2] = LLVMPointerType(LLVMInt8TypeInContext(gallivm->context), 0); /* vs_constants */
-
-+#if HAVE_LLVM >= 0x0300
-+ vb_type = LLVMStructCreateNamed(gallivm->context, struct_name);
-+ LLVMStructSetBody(vb_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- vb_type = LLVMStructTypeInContext(gallivm->context, elem_types,
- Elements(elem_types), 0);
-+ LLVMAddTypeName(gallivm->module, struct_name, vb_type);
-
- LLVMInvalidateStructLayout(gallivm->target, vb_type);
-+#endif
-
- LP_CHECK_MEMBER_OFFSET(struct pipe_vertex_buffer, stride,
- target, vb_type, 0);
-@@ -258,10 +279,17 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems)
- elem_types[1] = LLVMArrayType(LLVMFloatTypeInContext(gallivm->context), 4);
- elem_types[2] = LLVMArrayType(elem_types[1], data_elems);
-
-+#if HAVE_LLVM >= 0x0300
-+ vertex_header = LLVMStructCreateNamed(gallivm->context, struct_name);
-+ LLVMStructSetBody(vertex_header, elem_types,
-+ Elements(elem_types), 0);
-+#else
- vertex_header = LLVMStructTypeInContext(gallivm->context, elem_types,
- Elements(elem_types), 0);
-+ LLVMAddTypeName(gallivm->module, struct_name, vertex_header);
-
- LLVMInvalidateStructLayout(gallivm->target, vertex_header);
-+#endif
-
- /* these are bit-fields and we can't take address of them
- LP_CHECK_MEMBER_OFFSET(struct vertex_header, clipmask,
-@@ -284,8 +312,6 @@ create_jit_vertex_header(struct gallivm_state *gallivm, int data_elems)
- target, vertex_header,
- DRAW_JIT_VERTEX_DATA);
-
-- LLVMAddTypeName(gallivm->module, struct_name, vertex_header);
--
- return vertex_header;
- }
-
-@@ -299,19 +325,15 @@ create_jit_types(struct draw_llvm *llvm)
- struct gallivm_state *gallivm = llvm->gallivm;
- LLVMTypeRef texture_type, context_type, buffer_type, vb_type;
-
-- texture_type = create_jit_texture_type(gallivm);
-- LLVMAddTypeName(gallivm->module, "texture", texture_type);
-+ texture_type = create_jit_texture_type(gallivm, "texture");
-
-- context_type = create_jit_context_type(gallivm, texture_type);
-- LLVMAddTypeName(gallivm->module, "draw_jit_context", context_type);
-+ context_type = create_jit_context_type(gallivm, texture_type, "draw_jit_context");
- llvm->context_ptr_type = LLVMPointerType(context_type, 0);
-
- buffer_type = LLVMPointerType(LLVMIntTypeInContext(gallivm->context, 8), 0);
-- LLVMAddTypeName(gallivm->module, "buffer", buffer_type);
- llvm->buffer_ptr_type = LLVMPointerType(buffer_type, 0);
-
-- vb_type = create_jit_vertex_buffer_type(gallivm);
-- LLVMAddTypeName(gallivm->module, "pipe_vertex_buffer", vb_type);
-+ vb_type = create_jit_vertex_buffer_type(gallivm, "pipe_vertex_buffer");
- llvm->vb_ptr_type = LLVMPointerType(vb_type, 0);
- }
-
---- a/src/gallium/drivers/llvmpipe/lp_jit.c
-+++ b/src/gallium/drivers/llvmpipe/lp_jit.c
-@@ -68,10 +68,17 @@ lp_jit_create_types(struct llvmpipe_context *lp)
- elem_types[LP_JIT_TEXTURE_BORDER_COLOR] =
- LLVMArrayType(LLVMFloatTypeInContext(lc), 4);
-
-+#if HAVE_LLVM >= 0x0300
-+ texture_type = LLVMStructCreateNamed(gallivm->context, "texture");
-+ LLVMStructSetBody(texture_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- texture_type = LLVMStructTypeInContext(lc, elem_types,
- Elements(elem_types), 0);
-+ LLVMAddTypeName(gallivm->module, "texture", texture_type);
-
- LLVMInvalidateStructLayout(gallivm->target, texture_type);
-+#endif
-
- LP_CHECK_MEMBER_OFFSET(struct lp_jit_texture, width,
- gallivm->target, texture_type,
-@@ -112,8 +119,6 @@ lp_jit_create_types(struct llvmpipe_context *lp)
-
- LP_CHECK_STRUCT_SIZE(struct lp_jit_texture,
- gallivm->target, texture_type);
--
-- LLVMAddTypeName(gallivm->module, "texture", texture_type);
- }
-
- /* struct lp_jit_context */
-@@ -129,11 +134,19 @@ lp_jit_create_types(struct llvmpipe_context *lp)
- elem_types[LP_JIT_CTX_TEXTURES] = LLVMArrayType(texture_type,
- PIPE_MAX_SAMPLERS);
-
-+#if HAVE_LLVM >= 0x0300
-+ context_type = LLVMStructCreateNamed(gallivm->context, "context");
-+ LLVMStructSetBody(context_type, elem_types,
-+ Elements(elem_types), 0);
-+#else
- context_type = LLVMStructTypeInContext(lc, elem_types,
- Elements(elem_types), 0);
-
- LLVMInvalidateStructLayout(gallivm->target, context_type);
-
-+ LLVMAddTypeName(gallivm->module, "context", context_type);
-+#endif
-+
- LP_CHECK_MEMBER_OFFSET(struct lp_jit_context, constants,
- gallivm->target, context_type,
- LP_JIT_CTX_CONSTANTS);
-@@ -155,8 +168,6 @@ lp_jit_create_types(struct llvmpipe_context *lp)
- LP_CHECK_STRUCT_SIZE(struct lp_jit_context,
- gallivm->target, context_type);
-
-- LLVMAddTypeName(gallivm->module, "context", context_type);
--
- lp->jit_context_ptr_type = LLVMPointerType(context_type, 0);
- }
-
diff --git a/libusb/.footprint.i686 b/libusb/.footprint.i686
new file mode 100644
index 000000000..c21b80c7b
--- /dev/null
+++ b/libusb/.footprint.i686
@@ -0,0 +1,12 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/include/
+drwxr-xr-x root/root usr/include/libusb-1.0/
+-rw-r--r-- root/root usr/include/libusb-1.0/libusb.h
+drwxr-xr-x root/root usr/lib/
+-rw-r--r-- root/root usr/lib/libusb-1.0.a
+-rwxr-xr-x root/root usr/lib/libusb-1.0.la
+lrwxrwxrwx root/root usr/lib/libusb-1.0.so -> libusb-1.0.so.0.0.0
+lrwxrwxrwx root/root usr/lib/libusb-1.0.so.0 -> libusb-1.0.so.0.0.0
+-rwxr-xr-x root/root usr/lib/libusb-1.0.so.0.0.0
+drwxr-xr-x root/root usr/lib/pkgconfig/
+-rw-r--r-- root/root usr/lib/pkgconfig/libusb-1.0.pc
diff --git a/libusb/.footprint.x86_64 b/libusb/.footprint.x86_64
new file mode 100644
index 000000000..c21b80c7b
--- /dev/null
+++ b/libusb/.footprint.x86_64
@@ -0,0 +1,12 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/include/
+drwxr-xr-x root/root usr/include/libusb-1.0/
+-rw-r--r-- root/root usr/include/libusb-1.0/libusb.h
+drwxr-xr-x root/root usr/lib/
+-rw-r--r-- root/root usr/lib/libusb-1.0.a
+-rwxr-xr-x root/root usr/lib/libusb-1.0.la
+lrwxrwxrwx root/root usr/lib/libusb-1.0.so -> libusb-1.0.so.0.0.0
+lrwxrwxrwx root/root usr/lib/libusb-1.0.so.0 -> libusb-1.0.so.0.0.0
+-rwxr-xr-x root/root usr/lib/libusb-1.0.so.0.0.0
+drwxr-xr-x root/root usr/lib/pkgconfig/
+-rw-r--r-- root/root usr/lib/pkgconfig/libusb-1.0.pc
diff --git a/libusb/.md5sum.i686 b/libusb/.md5sum.i686
new file mode 100644
index 000000000..dacfd8056
--- /dev/null
+++ b/libusb/.md5sum.i686
@@ -0,0 +1 @@
+37d34e6eaa69a4b645a19ff4ca63ceef libusb-1.0.8.tar.bz2
diff --git a/libusb/.md5sum.x86_64 b/libusb/.md5sum.x86_64
new file mode 100644
index 000000000..dacfd8056
--- /dev/null
+++ b/libusb/.md5sum.x86_64
@@ -0,0 +1 @@
+37d34e6eaa69a4b645a19ff4ca63ceef libusb-1.0.8.tar.bz2
diff --git a/libusb/Pkgfile b/libusb/Pkgfile
new file mode 100755
index 000000000..8593549ea
--- /dev/null
+++ b/libusb/Pkgfile
@@ -0,0 +1,23 @@
+# Description: Librairie pour interface USB
+# URL: http://libusb.wiki.sourceforge.net/
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on:
+
+name=libusb
+version=1.0.8
+release=1
+source=( http://downloads.sourceforge.net/$name/$name-$version.tar.bz2)
+
+
+
+build() {
+ # build package
+ cd $name-$version
+ ./configure --prefix=/usr\
+ --disable-build-docs\
+ --mandir=/usr/share/man\
+ --infodir=/usr/share/info
+ make
+ make DESTDIR=$PKG install
+}
diff --git a/pkg-get/Pkgfile b/pkg-get/Pkgfile
index ffe129764..fd286c2e1 100644
--- a/pkg-get/Pkgfile
+++ b/pkg-get/Pkgfile
@@ -6,8 +6,8 @@
name=pkg-get
version=0.4.92
-release=1
-source=(http://nutyx.meticul.eu/files/$name-$version.tar.gz \
+release=2
+source=(http://nutyx.meticul.eu/files/$name-$version.tar.gz
syn)
build()
@@ -18,4 +18,5 @@ build()
make
make DESTDIR=$PKG install
install -m 755 ../syn $PKG/usr/bin/syn
+ sed "s|module-init-tools|kmod|" -i $PKG/etc/pkg-get.conf
}
diff --git a/sysklogd/.footprint.i686 b/sysklogd/.footprint.i686
index 72c0957b3..761a18dc2 100644
--- a/sysklogd/.footprint.i686
+++ b/sysklogd/.footprint.i686
@@ -1,9 +1,9 @@
drwxr-xr-x root/root etc/
-rw-r--r-- root/root etc/syslog.conf
+drwxr-xr-x root/root sbin/
+-r-x------ root/root sbin/klogd
+-r-x------ root/root sbin/syslogd
drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/sbin/
--r-x------ root/root usr/sbin/klogd
--r-x------ root/root usr/sbin/syslogd
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man5/
diff --git a/sysklogd/.footprint.x86_64 b/sysklogd/.footprint.x86_64
index 72c0957b3..761a18dc2 100644
--- a/sysklogd/.footprint.x86_64
+++ b/sysklogd/.footprint.x86_64
@@ -1,9 +1,9 @@
drwxr-xr-x root/root etc/
-rw-r--r-- root/root etc/syslog.conf
+drwxr-xr-x root/root sbin/
+-r-x------ root/root sbin/klogd
+-r-x------ root/root sbin/syslogd
drwxr-xr-x root/root usr/
-drwxr-xr-x root/root usr/sbin/
--r-x------ root/root usr/sbin/klogd
--r-x------ root/root usr/sbin/syslogd
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/man/
drwxr-xr-x root/root usr/share/man/man5/
diff --git a/sysklogd/.md5sum.i686 b/sysklogd/.md5sum.i686
index 851e7a0a3..8736ea366 100644
--- a/sysklogd/.md5sum.i686
+++ b/sysklogd/.md5sum.i686
@@ -1,2 +1,2 @@
e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz
-690de8562be59d4e4f7fb0946780dda2 syslog.conf
+e39f7bc604bad262410029d3a11de02b syslog.conf
diff --git a/sysklogd/.md5sum.x86_64 b/sysklogd/.md5sum.x86_64
index 851e7a0a3..8736ea366 100644
--- a/sysklogd/.md5sum.x86_64
+++ b/sysklogd/.md5sum.x86_64
@@ -1,2 +1,2 @@
e053094e8103165f98ddafe828f6ae4b sysklogd-1.5.tar.gz
-690de8562be59d4e4f7fb0946780dda2 syslog.conf
+e39f7bc604bad262410029d3a11de02b syslog.conf
diff --git a/sysklogd/Pkgfile b/sysklogd/Pkgfile
index 9ae3f5e8c..4b0315683 100644
--- a/sysklogd/Pkgfile
+++ b/sysklogd/Pkgfile
@@ -6,14 +6,15 @@
name=sysklogd
version=1.5
-release=2
-source=( http://www.infodrom.org/projects/$name/download/$name-$version.tar.gz \
- syslog.conf)
+release=3
+source=(http://www.infodrom.org/projects/$name/download/$name-$version.tar.gz
+ syslog.conf)
+
build() {
-cd $name-$version
-mkdir -p $PKG/{usr/sbin,etc,usr/share/man/man{5,8}}
+ cd $name-$version
+ mkdir -p $PKG/{sbin,etc,usr/share/man/man{5,8}}
-make RPM_OPT_FLAGS="$CFLAGS" all
-make BINDIR=$PKG/usr/sbin MANDIR=$PKG/usr/share/man install
-mv ../syslog.conf $PKG/etc/
+ make RPM_OPT_FLAGS="$CFLAGS" all
+ make BINDIR=$PKG/sbin MANDIR=$PKG/usr/share/man install
+ mv ../syslog.conf $PKG/etc/
}
diff --git a/sysklogd/syslog.conf b/sysklogd/syslog.conf
index 0c127aad8..b96800c71 100644
--- a/sysklogd/syslog.conf
+++ b/sysklogd/syslog.conf
@@ -16,4 +16,7 @@ cron.* -/var/log/cron.log
local7.* -/var/log/pkg-get.log
+# All messages on last terminal
+*.* /dev/tty12
+
# End /etc/syslog.conf
diff --git a/udev/.footprint.i686 b/udev/.footprint.i686
index 34d3c8df1..b3c7768d1 100644
--- a/udev/.footprint.i686
+++ b/udev/.footprint.i686
@@ -5,10 +5,10 @@ drwxr-xr-x root/root etc/udev/rules.d/
-rw-r--r-- root/root etc/udev/udev.conf
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/libgudev-1.0.so.0 -> libgudev-1.0.so.0.1.1
+-rwxr-xr-x root/root lib/libgudev-1.0.so.0.1.1
+lrwxrwxrwx root/root lib/libudev.so.0 -> libudev.so.0.13.1
+-rwxr-xr-x root/root lib/libudev.so.0.13.1
drwxr-xr-x root/root lib/udev/
-rwxr-xr-x root/root lib/udev/accelerometer
-rwxr-xr-x root/root lib/udev/ata_id
@@ -23,8 +23,6 @@ lrwxrwxrwx root/root lib/udev/devices/stderr -> /proc/self/fd/2
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/
@@ -44,12 +42,14 @@ drwxr-xr-x root/root lib/udev/keymaps/force-release/
-rw-r--r-- root/root lib/udev/keymaps/force-release/dell-touchpad
-rw-r--r-- root/root lib/udev/keymaps/force-release/hp-other
-rw-r--r-- root/root lib/udev/keymaps/force-release/samsung-other
+-rw-r--r-- root/root lib/udev/keymaps/fujitsu-amilo_li_2732
-rw-r--r-- root/root lib/udev/keymaps/fujitsu-amilo_pa_2548
-rw-r--r-- root/root lib/udev/keymaps/fujitsu-amilo_pro_edition_v3505
-rw-r--r-- root/root lib/udev/keymaps/fujitsu-amilo_pro_v3205
-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,13 +89,10 @@ 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
--rw-r--r-- root/root lib/udev/rules.d/50-firmware.rules
-rw-r--r-- root/root lib/udev/rules.d/50-udev-default.rules
-rw-r--r-- root/root lib/udev/rules.d/60-cdrom_id.rules
-rw-r--r-- root/root lib/udev/rules.d/60-persistent-alsa.rules
@@ -118,14 +115,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/usb-db
--rwxr-xr-x root/root lib/udev/usb_id
+-rwxr-xr-x root/root lib/udev/udevd
-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
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/gudev-1.0/
@@ -145,9 +140,9 @@ lrwxrwxrwx root/root usr/lib/ConsoleKit/run-seat.d/udev-acl.ck -> /lib/udev/udev
drwxr-xr-x root/root usr/lib/girepository-1.0/
-rw-r--r-- root/root usr/lib/girepository-1.0/GUdev-1.0.typelib
-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
+lrwxrwxrwx root/root usr/lib/libgudev-1.0.so -> ../../lib/libgudev-1.0.so.0.1.1
-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.1
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..b3c7768d1 100644
--- a/udev/.footprint.x86_64
+++ b/udev/.footprint.x86_64
@@ -5,10 +5,10 @@ drwxr-xr-x root/root etc/udev/rules.d/
-rw-r--r-- root/root etc/udev/udev.conf
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/libgudev-1.0.so.0 -> libgudev-1.0.so.0.1.1
+-rwxr-xr-x root/root lib/libgudev-1.0.so.0.1.1
+lrwxrwxrwx root/root lib/libudev.so.0 -> libudev.so.0.13.1
+-rwxr-xr-x root/root lib/libudev.so.0.13.1
drwxr-xr-x root/root lib/udev/
-rwxr-xr-x root/root lib/udev/accelerometer
-rwxr-xr-x root/root lib/udev/ata_id
@@ -23,8 +23,6 @@ lrwxrwxrwx root/root lib/udev/devices/stderr -> /proc/self/fd/2
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/
@@ -44,12 +42,14 @@ drwxr-xr-x root/root lib/udev/keymaps/force-release/
-rw-r--r-- root/root lib/udev/keymaps/force-release/dell-touchpad
-rw-r--r-- root/root lib/udev/keymaps/force-release/hp-other
-rw-r--r-- root/root lib/udev/keymaps/force-release/samsung-other
+-rw-r--r-- root/root lib/udev/keymaps/fujitsu-amilo_li_2732
-rw-r--r-- root/root lib/udev/keymaps/fujitsu-amilo_pa_2548
-rw-r--r-- root/root lib/udev/keymaps/fujitsu-amilo_pro_edition_v3505
-rw-r--r-- root/root lib/udev/keymaps/fujitsu-amilo_pro_v3205
-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,13 +89,10 @@ 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
--rw-r--r-- root/root lib/udev/rules.d/50-firmware.rules
-rw-r--r-- root/root lib/udev/rules.d/50-udev-default.rules
-rw-r--r-- root/root lib/udev/rules.d/60-cdrom_id.rules
-rw-r--r-- root/root lib/udev/rules.d/60-persistent-alsa.rules
@@ -118,14 +115,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/usb-db
--rwxr-xr-x root/root lib/udev/usb_id
+-rwxr-xr-x root/root lib/udev/udevd
-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
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/gudev-1.0/
@@ -145,9 +140,9 @@ lrwxrwxrwx root/root usr/lib/ConsoleKit/run-seat.d/udev-acl.ck -> /lib/udev/udev
drwxr-xr-x root/root usr/lib/girepository-1.0/
-rw-r--r-- root/root usr/lib/girepository-1.0/GUdev-1.0.typelib
-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
+lrwxrwxrwx root/root usr/lib/libgudev-1.0.so -> ../../lib/libgudev-1.0.so.0.1.1
-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.1
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..607340231 100644
--- a/udev/.md5sum.i686
+++ b/udev/.md5sum.i686
@@ -1,2 +1,2 @@
-91a88a359b60bbd074b024883cc0dbde udev-173.tar.bz2
-4baf57f6eda802d88ffc847f89286ab4 udev-config-20100128.tar.bz2
+0d7af750702620a871b9f9b98d8ad859 udev-181.tar.xz
+47d5c9ad41ac8964b1d845ec4a67375d udev-config-20100128.tar.bz2
diff --git a/udev/.md5sum.x86_64 b/udev/.md5sum.x86_64
index 30f720440..607340231 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
+0d7af750702620a871b9f9b98d8ad859 udev-181.tar.xz
+47d5c9ad41ac8964b1d845ec4a67375d udev-config-20100128.tar.bz2
diff --git a/udev/Pkgfile b/udev/Pkgfile
index 31d74e860..483d59b52 100644
--- a/udev/Pkgfile
+++ b/udev/Pkgfile
@@ -2,45 +2,53 @@
# URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html
# Maintainer: NuTyX core team
# Packager: thierryn1 at hispeed dot ch
-# Depends on: libusb-compat,usbutils,gobject-introspection,gperf,acl,pciutils
+# Depends on: libusb,usbutils,gobject-introspection,gperf,acl,pciutils
# Run on:
name=udev
-version=173
+version=181
release=1
_lfs_release=20100128
-source=( http://anduin.linuxfromscratch.org/sources/LFS/lfs-packages/conglomeration/$name/$name-$version.tar.bz2 \
-http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-${_lfs_release}.tar.bz2)
-build() {
-if ( pkginfo -i|grep "^glib " > /dev/null) then
- EXTRA="--with-pci-ids-path=/usr/share/pci.ids.gz --enable-udev_acl"
-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
+source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.xz
+ http://www.linuxfromscratch.org/lfs/downloads/development/udev-config-${_lfs_release}.tar.bz2)
+build() {
+ if ( pkginfo -i|grep "^glib " > /dev/null) then
+ EXTRA="--with-pci-ids-path=/usr/share/pci.ids.gz --enable-udev_acl"
+ else
+ EXTRA="--disable-extras --disable-introspection --disable-hwdb --disable-keymap"
+ fi
+ cd udev-$version
-./configure --prefix=/usr \
- --sysconfdir=/etc --sbindir=/sbin \
- --with-rootlibdir=/lib --libexecdir=/lib/udev \
- --docdir=/usr/share/doc/udev-$version \
- $EXTRA
+ 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
-make
+ BLKID_CFLAGS="-I/usr/include/blkid" \
+ BLKID_LIBS="-L/lib -lblkid" \
+ KMOD_CFLAGS="-I/usr/include" \
+ KMOD_LIBS="-L/lib -lkmod" \
+ ./configure --prefix=/usr \
+ --with-rootlibdir=/lib \
+ --docdir=/usr/share/doc/udev-$version \
+ --sbindir=/sbin \
+ --bindir=/sbin \
+ --libdir=/usr/lib \
+ --sysconfdir=/etc \
+ --libexecdir=/lib \
+ --enable-rule_generator \
+ --with-systemdsystemunitdir=no \
+ $EXTRA
+ make
-make install DESTDIR=$PKG mandir="/usr/share/man"
-install -m644 -v rules/misc/30-kernel-compat.rules \
- $PKG/lib/udev/rules.d/
-cd ../udev-config-${_lfs_release}
-make DESTDIR=$PKG install
-make DESTDIR=$PKG install-doc
-rm -r $PKG/usr/share/gtk-doc
-rm -r $PKG/usr/share/doc/udev-$version
+ make install DESTDIR=$PKG mandir="/usr/share/man"
+ install -m644 -v rules/misc/30-kernel-compat.rules $PKG/lib/udev/rules.d/
+ cd ../udev-config-${_lfs_release}
+ make DESTDIR=$PKG install
+ make DESTDIR=$PKG install-doc
+ rm -r $PKG/usr/share/gtk-doc
+ rm -r $PKG/usr/share/doc/udev-$version
}
diff --git a/usbutils/.footprint.i686 b/usbutils/.footprint.i686
new file mode 100644
index 000000000..6ac9edc9e
--- /dev/null
+++ b/usbutils/.footprint.i686
@@ -0,0 +1,17 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/lsusb
+-rwxr-xr-x root/root usr/bin/lsusb.py
+-rwxr-xr-x root/root usr/bin/usb-devices
+-rwxr-xr-x root/root usr/bin/usbhid-dump
+drwxr-xr-x root/root usr/sbin/
+-rwxr-xr-x root/root usr/sbin/update-usbids.sh
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/man1/
+-rw-r--r-- root/root usr/share/man/man1/usb-devices.1.gz
+drwxr-xr-x root/root usr/share/man/man8/
+-rw-r--r-- root/root usr/share/man/man8/lsusb.8.gz
+drwxr-xr-x root/root usr/share/pkgconfig/
+-rw-r--r-- root/root usr/share/pkgconfig/usbutils.pc
+-rw-r--r-- root/root usr/share/usb.ids
diff --git a/usbutils/.footprint.x86_64 b/usbutils/.footprint.x86_64
new file mode 100644
index 000000000..6ac9edc9e
--- /dev/null
+++ b/usbutils/.footprint.x86_64
@@ -0,0 +1,17 @@
+drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/bin/
+-rwxr-xr-x root/root usr/bin/lsusb
+-rwxr-xr-x root/root usr/bin/lsusb.py
+-rwxr-xr-x root/root usr/bin/usb-devices
+-rwxr-xr-x root/root usr/bin/usbhid-dump
+drwxr-xr-x root/root usr/sbin/
+-rwxr-xr-x root/root usr/sbin/update-usbids.sh
+drwxr-xr-x root/root usr/share/
+drwxr-xr-x root/root usr/share/man/
+drwxr-xr-x root/root usr/share/man/man1/
+-rw-r--r-- root/root usr/share/man/man1/usb-devices.1.gz
+drwxr-xr-x root/root usr/share/man/man8/
+-rw-r--r-- root/root usr/share/man/man8/lsusb.8.gz
+drwxr-xr-x root/root usr/share/pkgconfig/
+-rw-r--r-- root/root usr/share/pkgconfig/usbutils.pc
+-rw-r--r-- root/root usr/share/usb.ids
diff --git a/usbutils/.md5sum.i686 b/usbutils/.md5sum.i686
new file mode 100644
index 000000000..9b8f72a51
--- /dev/null
+++ b/usbutils/.md5sum.i686
@@ -0,0 +1 @@
+2e990265d472e2f6f0662356d654683b usbutils_005.orig.tar.gz
diff --git a/usbutils/.md5sum.x86_64 b/usbutils/.md5sum.x86_64
new file mode 100644
index 000000000..9b8f72a51
--- /dev/null
+++ b/usbutils/.md5sum.x86_64
@@ -0,0 +1 @@
+2e990265d472e2f6f0662356d654683b usbutils_005.orig.tar.gz
diff --git a/usbutils/Pkgfile b/usbutils/Pkgfile
new file mode 100755
index 000000000..09d8614be
--- /dev/null
+++ b/usbutils/Pkgfile
@@ -0,0 +1,22 @@
+# Description: Utilitaire pci pour liaison USB
+# URL: http://downloads.sourceforge.net/linux-usb/
+# Maintainer: NuTyX core team
+# Packager: thierryn1 at hispeed dot ch
+# Depends on: libusb
+# Run on: libusb
+
+name=usbutils
+version=005
+release=1
+source=(http://mirror.ovh.net/gentoo-distfiles/distfiles/${name}_$version.orig.tar.gz)
+
+
+build() {
+ cd $name-$version
+ sed "s|/usr/bin/env python|/usr/bin/env python2|" -i lsusb.py
+ ./autogen.sh
+ ./configure --prefix=/usr \
+ --disable-zlib
+ make
+ make DESTDIR=$PKG install
+}
diff --git a/usbutils/post-install b/usbutils/post-install
new file mode 100644
index 000000000..95748a8b4
--- /dev/null
+++ b/usbutils/post-install
@@ -0,0 +1,2 @@
+#!/bin/sh
+/usr/sbin/update-usbids.sh