From b46994281da15b2921f244f2ce53016d02624ea4 Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 2 Jul 2011 11:02:26 +0200 Subject: elinks, maj mds5um --- base/elinks/.md5sum.x86_64 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/elinks/.md5sum.x86_64 b/base/elinks/.md5sum.x86_64 index a17cdcf3e..fb502b259 100644 --- a/base/elinks/.md5sum.x86_64 +++ b/base/elinks/.md5sum.x86_64 @@ -1 +1 @@ -8fa502e298712e6ed2a717fa53469209 elinks-current-0.13.tar.bz2 +9b3f9ce50a9ab84384218b21427be497 elinks-current-0.13.tar.bz2 -- cgit v1.2.3-54-g00ecf From a3b6291d41abb49164c5f344c4e707d91919cee2 Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 2 Jul 2011 11:03:08 +0200 Subject: pas d'espace entre les dépendances binaires MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- extra/gconf/Pkgfile | 2 +- extra/libdvdnav/Pkgfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extra/gconf/Pkgfile b/extra/gconf/Pkgfile index 4a86be691..8bea701ed 100644 --- a/extra/gconf/Pkgfile +++ b/extra/gconf/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch # Depends on: orbit2, polkit, dbus-glib, gtk, libldap -# Run on: orbit2, polkit, dbus-glib, gtk, libldap +# Run on: orbit2,polkit,dbus-glib,gtk,libldap name=gconf version=2.32.1 diff --git a/extra/libdvdnav/Pkgfile b/extra/libdvdnav/Pkgfile index 4ecc2c019..f1c229a85 100644 --- a/extra/libdvdnav/Pkgfile +++ b/extra/libdvdnav/Pkgfile @@ -3,7 +3,7 @@ # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch # Depends on: libdvdread, libdvdcss -# Run on: libdvdread, libdvdcss +# Run on: libdvdread,libdvdcss name=libdvdnav version=4.1.3 -- cgit v1.2.3-54-g00ecf From 96b37eadc152350f36220213d90d44a6e83e626f Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 2 Jul 2011 14:06:54 +0200 Subject: kernel-35, ajout pilotes et ajustement initrd --- base/kernel-35/Pkgfile | 89 ++++++++++++++++++++++++++++++--------------- base/kernel-35/post-install | 42 ++++----------------- 2 files changed, 67 insertions(+), 64 deletions(-) diff --git a/base/kernel-35/Pkgfile b/base/kernel-35/Pkgfile index b560abbe5..e0d8a3ee8 100644 --- a/base/kernel-35/Pkgfile +++ b/base/kernel-35/Pkgfile @@ -1,4 +1,4 @@ -# Description: Le kernel +# Description: Le kernel version support à long terme # URL: http://www.kernel.org # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch @@ -6,23 +6,31 @@ name=kernel-35 version=2.6.35.13 _BaseVersion=2.6.35 -release=4 +release=5 PKGMK_NO_STRIP="yes" PKGMK_IGNORE_FOOTPRINT="yes" PKGMK_IGNORE_MD5SUM="yes" SCRIPT_VERSION="pakxe" INITRDBASE="nutyx-initrd" _extra=30052011 -_tools=24062011 +_tools=25062011 NVIDIA_VERSION=275.09.07 +VB_VERSION=4.0.10 +VB_BUILD=72479 +ATI_VERSION=11.6 [ "`uname -m`" == "i686" ] && _ARCH=x86 [ "`uname -m`" == "x86_64" ] && _ARCH=x86_64 -source=(ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/$version/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\ - http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\ - http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v${_BaseVersion}/patch-$version.bz2 \ - http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash \ - http://nutyx.meticul.eu/files/nutyx-initrd-`uname -m`-${_extra}.tar.bz2\ - http://nutyx.meticul.eu/files/installtools-${_tools}.tar.bz2) +[ "`uname -m`" == "i686" ] && VB_ARCH=x86 +[ "`uname -m`" == "x86_64" ] && VB_ARCH=amd64 +source=(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://nutyx.meticul.eu/files/patchs/ati/ati-${ATI_VERSION}.tar.gz \ + ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\ + http://www.kernel.org/pub/linux/kernel/v2.6/linux-${_BaseVersion}.tar.bz2 config_64 config\ + http://www.kernel.org/pub/linux/kernel/v2.6/longterm/v${_BaseVersion}/patch-$version.bz2 \ + http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash \ + http://nutyx.meticul.eu/files/nutyx-initrd-`uname -m`-${_extra}.tar.bz2\ + http://nutyx.meticul.eu/files/installtools-${_tools}.tar.bz2) build(){ unset MAKEFLAGS for i in setup-install setup-mirroir @@ -35,24 +43,33 @@ do sed -i "s|#VERSION#|MINI $SCRIPT_VERSION|g" \ $INITRDBASE/rootfs/install/$i done +if ! [ -d /usr/src/linux-${_BaseVersion} ]; then + mv linux-${_BaseVersion} /usr/src/ + ln -s /usr/src/linux-${_BaseVersion} linux-${_BaseVersion} + cd linux-${_BaseVersion} + if [ -f $SRC/patch-$version.bz2 ]; then + bzip2 -d -c $SRC/patch-$version.bz2 | patch -Np1 + fi + cd .. +else + rm -r linux-${_BaseVersion} +fi +ln -s /usr/src/linux-${_BaseVersion} linux-${_BaseVersion} cd linux-${_BaseVersion} -make mrproper +# make mrproper case `uname -m` in x86_64) mv $SRC/config_64 ./.config;; i?86) mv $SRC/config ./.config;; esac -if [ -f ../patch-$version.bz2 ]; then - bzip2 -d -c ../patch-$version.bz2 | patch -Np1 -fi sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile # make menuconfig case `uname -m` in x86_64) - cp .config `prt-get printf %p --filter=$name`/$name/config_64;; + cp .config `prt-get printf %p --filter=$name`/$name/config_64;; i?86) - cp .config `prt-get printf %p --filter=$name`/$name/config;; + cp .config `prt-get printf %p --filter=$name`/$name/config;; esac make case `uname -m` in @@ -67,10 +84,37 @@ sh NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run --extract-only cd NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}/kernel ln -s Makefile{.kbuild,} SYSSRC=$SRC/linux-${_BaseVersion} make module -install -m 0644 -D nvidia.ko $PKG/lib/modules/${_BaseVersion}/kernel/video/nvidia/nvidia.ko +install -m 0644 -D nvidia.ko $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/nvidia.ko +# Module ati +if [ "${_ARCH}" == "x86" ]; then + cd $SRC + sh ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run --extract ati + cd ati +# patch -Np1 -i ../makefile_compat.patch +# patch -Np1 -i ../2.6.39_bkl.patch +# patch -Np1 -i ../no_bkl.patch + cd common/lib/modules/fglrx/build_mod + cp 2.6.x/Makefile . + cp $SRC/ati/arch/${_ARCH}/lib/modules/fglrx/build_mod/libfglrx_ip.a . + make -C $SRC/linux-${_BaseVersion} SUBDIRS="`pwd`" modules + install -m 0644 -D fglrx.ko $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/fglrx.ko +fi +# Modules VB +cd $SRC +sh VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run --target vb --keep --noexec +cd vb +tar xfj VirtualBox.tar.bz2 +cd src/vboxhost/ +KERNELRELEASE=${_BaseVersion} KERN_DIR=$SRC/linux-${_BaseVersion} make +for i in *.ko +do + install -D -m0644 $i \ + $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/$i +done # Install modules cd $SRC/linux-${_BaseVersion} +sed -i "/rm\ -rf\ \$(MODLIB)\/kernel/d" Makefile make INSTALL_MOD_PATH=$PKG modules_install mkdir -p $PKG/boot case `uname -m` in @@ -95,18 +139,6 @@ rm {build,source} ln -sv /usr/src/linux-${_BaseVersion} build ln -sv /usr/src/linux-${_BaseVersion} source -mkdir -p $PKG/usr/src/linux-${_BaseVersion}/ -mv $SRC/linux-${_BaseVersion}/.config $PKG/usr/src/linux-${_BaseVersion}/ -mv $SRC/linux-${_BaseVersion}/Makefile $PKG/usr/src/linux-${_BaseVersion}/ -mkdir -p $PKG/usr/src/linux-${_BaseVersion}/kernel -mv $SRC/linux-${_BaseVersion}/scripts $PKG/usr/src/linux-${_BaseVersion}/ -chmod og-w -R $PKG/usr/src/linux-${_BaseVersion}/scripts -mv $SRC/linux-${_BaseVersion}/include $PKG/usr/src/linux-${_BaseVersion}/ -mkdir $PKG/usr/src/linux-${_BaseVersion}/arch -mv $SRC/linux-${_BaseVersion}/arch/x86 $PKG/usr/src/linux-${_BaseVersion}/arch -mv $SRC/linux-${_BaseVersion}/vmlinux $PKG/usr/src/linux-${_BaseVersion}/ -mv $SRC/linux-${_BaseVersion}/Module.symvers $PKG/usr/src/linux-${_BaseVersion}/ - # initrd cd $SRC mkdir -p $PKG/root/bin @@ -114,4 +146,3 @@ install -m755 $SRC/install-${SCRIPT_VERSION}.ash \ $PKG/root/bin/install-${SCRIPT_VERSION}.ash bsdtar -c "-J" -f $PKG/boot/nutyx-initrd.tar.xz $INITRDBASE } - diff --git a/base/kernel-35/post-install b/base/kernel-35/post-install index c7cdc2160..e57bd1c07 100644 --- a/base/kernel-35/post-install +++ b/base/kernel-35/post-install @@ -20,44 +20,16 @@ for i in setup-grub functions setup-main main.txt do sed -i "s|#VERSION#|$SCRIPT_VERSION|" $WDIR/rootfs/install/$i || exit 1 done + # Copie des modules kernels -mkdir -p $WDIR/rootfs/lib/modules/$version/kernel/{drivers,fs} -if [ -f /lib/modules/$version/kernel/crypto ]; then - cp -a /lib/modules/$version/kernel/crypto \ - $WDIR/rootfs/lib/modules/$version/kernel/ -fi -for i in ata block input ide hid message parport \ -serial misc net pcmcia scsi usb md rtc -do - if [ -d /lib/modules/$version/kernel/drivers/$i ]; then - cp -a /lib/modules/$version/kernel/drivers/$i \ - $WDIR/rootfs/lib/modules/$version/kernel/drivers/ - fi -done -for i in wireless irda wan bonding \ -hamradio appletalk cxgb3 mlx4 sfc -do - if [ -d $WDIR/rootfs/lib/modules/$version/kernel/drivers/net/$i ]; then - rm -r $WDIR/rootfs/lib/modules/$version/kernel/drivers/net/$i - fi -done -for i in fat ntfs smbfs vfat ext4 fs nfs nfs_common nfsd lockd -do - if [ -d /lib/modules/$version/kernel/fs/$i ]; then - cp -a /lib/modules/$version/kernel/fs/$i \ - $WDIR/rootfs/lib/modules/$version/kernel/fs/ - fi -done -if [ -d /lib/modules/$version/kernel/net/sunrpc ]; then - mkdir -p $WDIR/rootfs/lib/modules/${version}/kernel/net/ - cp -a /lib/modules/$version/kernel/net/sunrpc \ - $WDIR/rootfs/lib/modules/$version/kernel/net/ -fi -cp /root/bin/install-${SCRIPT_VERSION}.ash $WDIR/rootfs/install/ +mkdir -p $WDIR/rootfs/lib/modules +cp -a /lib/modules/${version}\ +$WDIR/rootfs/lib/modules/ -cp -a /lib/modules/${version}/modules* \ -$WDIR/rootfs/lib/modules/${version}/ +# Copie du script d'install +cp /root/bin/install-${SCRIPT_VERSION}.ash $WDIR/rootfs/install/ +# Création de l'initrd sh $WDIR/script/mkinitrd $WDIR cp $WDIR/iso/isolinux/initrd /boot/nutyx-initrd rm -r $SRC -- cgit v1.2.3-54-g00ecf