diff options
25 files changed, 112 insertions, 66 deletions
diff --git a/base/aaabasicfs/.md5sum.i686 b/base/aaabasicfs/.md5sum.i686 index 3219f4255..bc3a50562 100644 --- a/base/aaabasicfs/.md5sum.i686 +++ b/base/aaabasicfs/.md5sum.i686 @@ -2,7 +2,7 @@ 61ba4859757a54bf1f514de5213802e0 bash_profile f29eb765bd7c24471d055cc72b0edd4e bashrc 3974f1b4242908346f309b096a7a6ed6 bashrc.etc -deb0289f1ce9bac5cfd09c869648a6d3 blfs-bootscripts-20100825.tar.bz2 +8026923cf29639bf6ac5a2b77bec74dc blfs-bootscripts-20100825.tar.bz2 248d4faa838949085a51003b2c0c3f00 dircolors.sh ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh 64514eb39b4878f060065cab28191ee5 fstab @@ -10,7 +10,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh 2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc f05a15125a4c6008471d96b096445e21 lfs-bootscripts-03.patch 5041ee97992e3f10d3be44f46a6aeb76 lfs-bootscripts-20110424.tar.bz2 -6bd38769ed6f5df86e8046b68326f7f4 network +a4b9ef7206b92307c548bf789d6a997a network 4f193837349d63e6c98501f221904170 nu 210fdabd07248f79617508807715167b profile b860cf492e983f400666fa43c00f2954 rc diff --git a/base/aaabasicfs/.md5sum.x86_64 b/base/aaabasicfs/.md5sum.x86_64 index 3219f4255..bc3a50562 100644 --- a/base/aaabasicfs/.md5sum.x86_64 +++ b/base/aaabasicfs/.md5sum.x86_64 @@ -2,7 +2,7 @@ 61ba4859757a54bf1f514de5213802e0 bash_profile f29eb765bd7c24471d055cc72b0edd4e bashrc 3974f1b4242908346f309b096a7a6ed6 bashrc.etc -deb0289f1ce9bac5cfd09c869648a6d3 blfs-bootscripts-20100825.tar.bz2 +8026923cf29639bf6ac5a2b77bec74dc blfs-bootscripts-20100825.tar.bz2 248d4faa838949085a51003b2c0c3f00 dircolors.sh ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh 64514eb39b4878f060065cab28191ee5 fstab @@ -10,7 +10,7 @@ ad457024fe7ad91b8e9e0b4aad87df1f extrapaths.sh 2ca09cd10bcc4f6adb0c5b1521bfdb7e inputrc f05a15125a4c6008471d96b096445e21 lfs-bootscripts-03.patch 5041ee97992e3f10d3be44f46a6aeb76 lfs-bootscripts-20110424.tar.bz2 -6bd38769ed6f5df86e8046b68326f7f4 network +a4b9ef7206b92307c548bf789d6a997a network 4f193837349d63e6c98501f221904170 nu 210fdabd07248f79617508807715167b profile b860cf492e983f400666fa43c00f2954 rc diff --git a/base/aaabasicfs/Pkgfile b/base/aaabasicfs/Pkgfile index cfc75eea1..51efed108 100644 --- a/base/aaabasicfs/Pkgfile +++ b/base/aaabasicfs/Pkgfile @@ -5,14 +5,15 @@ name=aaabasicfs version=2011 -release=1 +release=2 scriptsversion=lfs-bootscripts-20110424 BLFSscriptsversion=20100825 XORG_PREFIX=/usr -source=(http://www.linuxfromscratch.org/lfs/downloads/development/$scriptsversion.tar.bz2 \ - http://www.linuxfromscratch.org/blfs/downloads/svn/blfs-bootscripts-$BLFSscriptsversion.tar.bz2 \ - fstab inittab inputrc network rc profile dircolors.sh extrapaths.sh bash_profile bashrc bashrc.etc \ - http://nutyx.meticul.eu/files/patchs/$name/lfs-bootscripts-03.patch nu readline.sh unmask.sh X.sh ) +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 \ + bash_profile bashrc bashrc.etc nu readline.sh unmask.sh X.sh ) build() { diff --git a/base/aaabasicfs/network b/base/aaabasicfs/network index ff268b03b..84ce546eb 100755 --- a/base/aaabasicfs/network +++ b/base/aaabasicfs/network @@ -6,22 +6,46 @@ . /etc/sysconfig/rc . $rc_functions -let TIME=30 + +# Network configuration +. /etc/sysconfig/network + +NM_PIDFILE=/var/run/NetworkManager.pid +WICD_PIDFILE= + +let TIME=$NETWORKDELAY case "$1" in start) - if [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then + 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 + if [ "${NETWORKWAIT}" == "yes" ]; then + [ -z "${LINKDELAY}" ] && LINKDELAY=10 + boot_mesg "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" + [ -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 if grep -v ^# /etc/fstab | grep _netdev > /dev/null; then - while ! grep "nameserver" /etc/resolv.conf ; - do - sleep 1 - echo -n . - let TIME=$TIME-1 - if [ $TIME -lt 1 ]; then - boot_mesg "Time out" - echo_failure - exit 1 + while ! grep "nameserver" /etc/resolv.conf ; + do + if [ $TIME -gt 0 ]; then + sleep 1 + echo -n . + let TIME=$TIME-1 + if [ $TIME -lt 1 ]; then + boot_mesg "Time out" + echo_failure + exit 1 + fi fi done boot_mesg "Network successfully configured..." @@ -36,18 +60,35 @@ case "$1" in ;; stop) - if [ -f /usr/share/wicd/daemon/wicd-daemon.py ]; then - boot_mesg "Stopping the wicd Daemon..." - loadproc /usr/share/wicd/daemon/wicd-daemon.py --kill + if [ "$MANAGER" == "networkmanager" ] && [ -x /usr/sbin/NetworkManager ]; then + boot_mesg "Stopping NetworkManager daemon..." + killproc -p $NM_PIDFILE NetworkManager + 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 else if [ -f /etc/rc.d/init.d/iplink ]; then - /etc/rc.d/init.d/iplink stop - fi + /etc/rc.d/init.d/iplink stop + fi + 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 fi ;; + restart) + ${0} stop + sleep 3 + ${0} start + ;; *) - echo "Usage: $0 {start|stop}" + echo "Usage: $0 {start|stop|restart|status}" exit 1 ;; esac diff --git a/base/kernel-firmware/.md5sum.i686 b/base/kernel-firmware/.md5sum.i686 deleted file mode 100644 index 48503a7af..000000000 --- a/base/kernel-firmware/.md5sum.i686 +++ /dev/null @@ -1 +0,0 @@ -6a92059aa8787b65d0da4fe181f31f32 kernel-firmware-f8ddc05.tar.gz diff --git a/base/kernel-firmware/.md5sum.x86_64 b/base/kernel-firmware/.md5sum.x86_64 deleted file mode 100644 index 48503a7af..000000000 --- a/base/kernel-firmware/.md5sum.x86_64 +++ /dev/null @@ -1 +0,0 @@ -6a92059aa8787b65d0da4fe181f31f32 kernel-firmware-f8ddc05.tar.gz diff --git a/base/kernel-firmware/Pkgfile b/base/kernel-firmware/Pkgfile deleted file mode 100644 index c5e994854..000000000 --- a/base/kernel-firmware/Pkgfile +++ /dev/null @@ -1,9 +0,0 @@ -name=kernel-firmware -version=f8ddc05 -release=1 -source=(http://nutyx.meticul.eu/files/patchs/$name/$name-$version.tar.gz) -build(){ - mkdir -p $PKG/lib/firmware - cd linux-firmware-$version - mv * $PKG/lib/firmware/ -} diff --git a/base/kernel-firmware/.footprint.i686 b/base/linux-firmware/.footprint.i686 index 53ed8b596..53ed8b596 100644 --- a/base/kernel-firmware/.footprint.i686 +++ b/base/linux-firmware/.footprint.i686 diff --git a/base/kernel-firmware/.footprint.x86_64 b/base/linux-firmware/.footprint.x86_64 index 53ed8b596..53ed8b596 100644 --- a/base/kernel-firmware/.footprint.x86_64 +++ b/base/linux-firmware/.footprint.x86_64 diff --git a/base/linux-firmware/.md5sum.i686 b/base/linux-firmware/.md5sum.i686 new file mode 100644 index 000000000..3badadb5d --- /dev/null +++ b/base/linux-firmware/.md5sum.i686 @@ -0,0 +1 @@ +6a92059aa8787b65d0da4fe181f31f32 linux-firmware-f8ddc05.tar.gz diff --git a/base/linux-firmware/.md5sum.x86_64 b/base/linux-firmware/.md5sum.x86_64 new file mode 100644 index 000000000..3badadb5d --- /dev/null +++ b/base/linux-firmware/.md5sum.x86_64 @@ -0,0 +1 @@ +6a92059aa8787b65d0da4fe181f31f32 linux-firmware-f8ddc05.tar.gz diff --git a/base/linux-firmware/Pkgfile b/base/linux-firmware/Pkgfile new file mode 100644 index 000000000..39c9c83a5 --- /dev/null +++ b/base/linux-firmware/Pkgfile @@ -0,0 +1,14 @@ +# Description: Jeu de firmware pour linux +# URL: http://www.kernel.org +# Maintainer: tnut at nutyx dot com +# Packager: tnut at nutyx dot com + +name=linux-firmware +version=f8ddc05 +release=1 +source=(http://nutyx.meticul.eu/files/patchs/$name/$name-$version.tar.gz) +build(){ + mkdir -p $PKG/lib/firmware + cd $name-$version + mv * $PKG/lib/firmware/ +} diff --git a/base/pkg-get/.md5sum.i686 b/base/pkg-get/.md5sum.i686 index 02cf16233..5f7021b76 100644 --- a/base/pkg-get/.md5sum.i686 +++ b/base/pkg-get/.md5sum.i686 @@ -1,4 +1,4 @@ -de73b2a7dc9155b655cd9e79cc92f693 pkg-get-awk.conf +f6315a1706ee8cee7dcd4b63b520a37a pkg-get-awk.conf c594d6ef62e81a176398d1c0cfd41e5d pkg-get.awk bf4713f8f6976dd4d2d860fe6b4b03d0 pkg-get.po 4d89f89107b269e1579a7e4a440eddb1 syn diff --git a/base/pkg-get/.md5sum.x86_64 b/base/pkg-get/.md5sum.x86_64 index 02cf16233..5f7021b76 100644 --- a/base/pkg-get/.md5sum.x86_64 +++ b/base/pkg-get/.md5sum.x86_64 @@ -1,4 +1,4 @@ -de73b2a7dc9155b655cd9e79cc92f693 pkg-get-awk.conf +f6315a1706ee8cee7dcd4b63b520a37a pkg-get-awk.conf c594d6ef62e81a176398d1c0cfd41e5d pkg-get.awk bf4713f8f6976dd4d2d860fe6b4b03d0 pkg-get.po 4d89f89107b269e1579a7e4a440eddb1 syn diff --git a/base/pkg-get/Pkgfile b/base/pkg-get/Pkgfile index c2fa3acc0..b2b88119e 100644 --- a/base/pkg-get/Pkgfile +++ b/base/pkg-get/Pkgfile @@ -5,7 +5,7 @@ name=pkg-get version=0.3.5 -release=2 +release=3 source=(syn pkg-get.awk pkg-get-awk.conf pkg-get.po) PKGMK_KEEP_LOCALES=yes diff --git a/base/pkg-get/pkg-get-awk.conf b/base/pkg-get/pkg-get-awk.conf index 8f18708ac..2c714e505 100644 --- a/base/pkg-get/pkg-get-awk.conf +++ b/base/pkg-get/pkg-get-awk.conf @@ -4,8 +4,8 @@ # pkg-get configuration file # Dépot des paquets NuTyX # Activez le dépot test pour profiter des mise à jour test -# pkgdir /srv/NuTyX/test|http://nutyx.meticul.eu/pakxe.1/uname-m/test -pkgdir /srv/NuTyX/release|http://nutyx.meticul.eu/pakxe.1/uname-m/release +# pkgdir /srv/NuTyX/test|http://nutyx.meticul.eu/pakxe.2/uname-m/test +pkgdir /srv/NuTyX/release|http://nutyx.meticul.eu/pakxe.2/uname-m/release # runscripts: if "yes" pre-post install scripts are # automatically executed. Handle with care. runscripts yes diff --git a/base/ports/.md5sum.i686 b/base/ports/.md5sum.i686 index 0d258c488..2dd3f21bb 100644 --- a/base/ports/.md5sum.i686 +++ b/base/ports/.md5sum.i686 @@ -1,6 +1,6 @@ -1ae3a1d2c25e3d03b21e952d777729fc base.rsync -62143d92fce219911d8f348264458dd5 extra.rsync -b1c6f35dd5f4fea0b12cd91cbd35f894 kde.rsync +981d852cfbbc792c7a6f64ba3c882ea5 base.rsync +2c7eaabfc11956e55470d8c1cac8dc28 extra.rsync +2940a36a7b22d629a9d1421ceb59c899 kde.rsync 1f178e2bb1beab9782993931c9832280 ports-1.5.tar.gz -93e07093b2e8a5b20f9ae4ecdc8ba5bb xfce.rsync -d025906a889951ed442b457cb7a9c40e xorg.rsync +e96384725a205bdec47cbfca76c71b2e xfce.rsync +c34639ed44265a274b750774c2a1603d xorg.rsync diff --git a/base/ports/.md5sum.x86_64 b/base/ports/.md5sum.x86_64 index 0d258c488..2dd3f21bb 100644 --- a/base/ports/.md5sum.x86_64 +++ b/base/ports/.md5sum.x86_64 @@ -1,6 +1,6 @@ -1ae3a1d2c25e3d03b21e952d777729fc base.rsync -62143d92fce219911d8f348264458dd5 extra.rsync -b1c6f35dd5f4fea0b12cd91cbd35f894 kde.rsync +981d852cfbbc792c7a6f64ba3c882ea5 base.rsync +2c7eaabfc11956e55470d8c1cac8dc28 extra.rsync +2940a36a7b22d629a9d1421ceb59c899 kde.rsync 1f178e2bb1beab9782993931c9832280 ports-1.5.tar.gz -93e07093b2e8a5b20f9ae4ecdc8ba5bb xfce.rsync -d025906a889951ed442b457cb7a9c40e xorg.rsync +e96384725a205bdec47cbfca76c71b2e xfce.rsync +c34639ed44265a274b750774c2a1603d xorg.rsync diff --git a/base/ports/Pkgfile b/base/ports/Pkgfile index 0eca50f8d..a99ee1448 100644 --- a/base/ports/Pkgfile +++ b/base/ports/Pkgfile @@ -1,12 +1,11 @@ # Description: Système de ports NuTyX -# URL: http://crux.nu +# URL: http://crux.nu # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed.ch -# Depends: name=ports version=1.5 -release=9 +release=10 source=(http://crux.nu/files/tools/ports/$name-$version.tar.gz \ base.rsync extra.rsync xorg.rsync xfce.rsync kde.rsync) diff --git a/base/ports/base.rsync b/base/ports/base.rsync index 0203735a8..10dbbbf44 100644 --- a/base/ports/base.rsync +++ b/base/ports/base.rsync @@ -1,3 +1,3 @@ -host=kiao.no-ip.info:22 -collection=ports/nutyx-pakxe/base/ +host=nutyx.meticul.eu +collection=nutyx/ports/nutyx-pakxe/base/ destination=/usr/ports/base diff --git a/base/ports/extra.rsync b/base/ports/extra.rsync index dfd92cfac..465520647 100644 --- a/base/ports/extra.rsync +++ b/base/ports/extra.rsync @@ -1,3 +1,3 @@ -host=kiao.no-ip.info:22 -collection=ports/nutyx-pakxe/extra/ +host=nutyx.meticul.eu +collection=nutyx/ports/nutyx-pakxe/extra/ destination=/usr/ports/extra diff --git a/base/ports/kde.rsync b/base/ports/kde.rsync index b064a8bd2..e9e7d7833 100644 --- a/base/ports/kde.rsync +++ b/base/ports/kde.rsync @@ -1,3 +1,3 @@ -host=kiao.no-ip.info:22 -collection=ports/nutyx-pakxe/kde/ +host=nutyx.meticul.eu +collection=nutyx/ports/nutyx-pakxe/kde/ destination=/usr/ports/kde diff --git a/base/ports/xfce.rsync b/base/ports/xfce.rsync index 28b668db9..7d646721e 100644 --- a/base/ports/xfce.rsync +++ b/base/ports/xfce.rsync @@ -1,3 +1,3 @@ -host=kiao.no-ip.info:22 -collection=ports/nutyx-pakxe/xfce/ +host=nutyx.meticul.eu +collection=nutyx/ports/nutyx-pakxe/xfce/ destination=/usr/ports/xfce diff --git a/base/ports/xorg.rsync b/base/ports/xorg.rsync index aa54e256d..403c1d3a8 100644 --- a/base/ports/xorg.rsync +++ b/base/ports/xorg.rsync @@ -1,3 +1,3 @@ -host=kiao.no-ip.info:22 -collection=ports/nutyx-pakxe/xorg/ +host=nutyx.meticul.eu +collection=nutyx/ports/nutyx-pakxe/xorg/ destination=/usr/ports/xorg diff --git a/extra/mysql/.md5sum.x86_64 b/extra/mysql/.md5sum.x86_64 index c4c9b0ab5..afef674fd 100644 --- a/extra/mysql/.md5sum.x86_64 +++ b/extra/mysql/.md5sum.x86_64 @@ -1,2 +1,2 @@ -cf3222ebc8fa313296536ca79e498abd blfs-bootscripts-20100825.tar.bz2 +9b56f614900b83c3fda541dc8694dc74 blfs-bootscripts-20100825.tar.bz2 306b5549c7bd72e8e705a890db0da82b mysql-5.5.15.tar.gz |