diff options
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/Pkgfile | 42 | ||||
| -rw-r--r-- | kernel/README | 2 | ||||
| -rw-r--r-- | kernel/config | 5 | ||||
| -rw-r--r-- | kernel/config_64 | 5 | ||||
| -rw-r--r-- | kernel/post-install | 13 | ||||
| -rw-r--r-- | kernel/pre-install | 3 |
6 files changed, 47 insertions, 23 deletions
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 |