From 005f7902854338020dca8edf0128c9128cc21903 Mon Sep 17 00:00:00 2001 From: tnut Date: Mon, 20 Feb 2012 22:58:05 +0100 Subject: kernel, maj maintenance --- kernel/Pkgfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kernel/Pkgfile b/kernel/Pkgfile index 677b46710..92bacee0a 100644 --- a/kernel/Pkgfile +++ b/kernel/Pkgfile @@ -6,14 +6,14 @@ name=kernel version=3.2.6 _BaseVersion=3.2 -release=2 +release=3 PKGMK_NO_STRIP="yes" PKGMK_IGNORE_FOOTPRINT="yes" PKGMK_IGNORE_MD5SUM="yes" SCRIPT_VERSION="pakxe.3" INITRDBASE="nutyx-initrd" _extra=16022012 -_tools=16022012 +_tools=20022012 NVIDIA_VERSION=295.20 VB_VERSION=4.1.8 VB_BUILD=75467 @@ -37,12 +37,16 @@ source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_ 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|#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 -- cgit v1.2.3-70-g09d2 From 7bd63b8d152328c6cf141b428e83204eea461211 Mon Sep 17 00:00:00 2001 From: tnut Date: Tue, 21 Feb 2012 00:24:12 +0100 Subject: kernel, ajout firmware ds la maintenance --- kernel/Pkgfile | 9 ++++++++- kernel/README | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 kernel/README diff --git a/kernel/Pkgfile b/kernel/Pkgfile index 92bacee0a..ba0f76815 100644 --- a/kernel/Pkgfile +++ b/kernel/Pkgfile @@ -13,7 +13,7 @@ PKGMK_IGNORE_MD5SUM="yes" SCRIPT_VERSION="pakxe.3" INITRDBASE="nutyx-initrd" _extra=16022012 -_tools=20022012 +_tools=21022012 NVIDIA_VERSION=295.20 VB_VERSION=4.1.8 VB_BUILD=75467 @@ -150,6 +150,13 @@ rm {build,source} ln -sv /usr/src/linux-${_BaseVersion} build ln -sv /usr/src/linux-${_BaseVersion} source +cd $SRC + +# firmware +cd $INITRDBASE/rootfs/lib +git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +mv linux-firmware firmware + # initrd cd $SRC mkdir -p $PKG/root/bin 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é. -- cgit v1.2.3-70-g09d2 From 16320b5cb8702f103730ea3974ca05d3a0f557fa Mon Sep 17 00:00:00 2001 From: tnut Date: Tue, 21 Feb 2012 00:26:26 +0100 Subject: kernel, maj 3.2.7-1 --- kernel/Pkgfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/Pkgfile b/kernel/Pkgfile index ba0f76815..658242f63 100644 --- a/kernel/Pkgfile +++ b/kernel/Pkgfile @@ -4,9 +4,9 @@ # Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com name=kernel -version=3.2.6 +version=3.2.7 _BaseVersion=3.2 -release=3 +release=1 PKGMK_NO_STRIP="yes" PKGMK_IGNORE_FOOTPRINT="yes" PKGMK_IGNORE_MD5SUM="yes" -- cgit v1.2.3-70-g09d2 From 13ee9171beee3ba1d3c3b2bde1049e399c8b0d3d Mon Sep 17 00:00:00 2001 From: tnut Date: Tue, 21 Feb 2012 07:23:32 +0100 Subject: kernel ajust, post-install --- kernel/post-install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/post-install b/kernel/post-install index 2c4b74f3e..fe0aec922 100644 --- a/kernel/post-install +++ b/kernel/post-install @@ -1,4 +1,4 @@ -version=3.2.6 +version=3.2.7 if [ ! -d /lib/modules/${version} ]; then echo "post-install impossible" echo "/lib/modules/${version} pas trouvé" -- cgit v1.2.3-70-g09d2 From c924455f9385345ca20996f2e7a2d6b90615de23 Mon Sep 17 00:00:00 2001 From: tnut Date: Thu, 23 Feb 2012 22:48:57 +0100 Subject: kernel, maj 3.2.7-2 --- kernel/Pkgfile | 33 ++++++++++++++++++++++----------- kernel/list | 11 +++++++++++ kernel/post-install | 10 +--------- kernel/pre-install | 3 +++ 4 files changed, 37 insertions(+), 20 deletions(-) create mode 100644 kernel/list create mode 100644 kernel/pre-install diff --git a/kernel/Pkgfile b/kernel/Pkgfile index 658242f63..f92a979e6 100644 --- a/kernel/Pkgfile +++ b/kernel/Pkgfile @@ -1,12 +1,12 @@ # 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.7 _BaseVersion=3.2 -release=1 +release=2 PKGMK_NO_STRIP="yes" PKGMK_IGNORE_FOOTPRINT="yes" PKGMK_IGNORE_MD5SUM="yes" @@ -17,7 +17,7 @@ _tools=21022012 NVIDIA_VERSION=295.20 VB_VERSION=4.1.8 VB_BUILD=75467 -ATI_VERSION=11.11 +ATI_VERSION=11.12 [ "`uname -m`" == "i686" ] && _ARCH=x86 [ "`uname -m`" == "x86_64" ] && _ARCH=x86_64 @@ -36,7 +36,19 @@ 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 @@ -51,6 +63,8 @@ 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} @@ -64,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;; @@ -72,6 +88,8 @@ case `uname -m` in mv $SRC/config ./.config;; esac sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile +# 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) @@ -150,13 +168,6 @@ rm {build,source} ln -sv /usr/src/linux-${_BaseVersion} build ln -sv /usr/src/linux-${_BaseVersion} source -cd $SRC - -# firmware -cd $INITRDBASE/rootfs/lib -git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git -mv linux-firmware firmware - # initrd cd $SRC mkdir -p $PKG/root/bin diff --git a/kernel/list b/kernel/list new file mode 100644 index 000000000..041cda3fa --- /dev/null +++ b/kernel/list @@ -0,0 +1,11 @@ +aaabasicfs +ipw2100-fw +ipw2200-fw +iwlwifi-3945-ucode +iwlwifi-4965-ucode +iwlwifi-5000-ucode +iwlwifi-5150-ucode +linux-firmware +rt2x00-rt61-fw +rt2x00-rt71w-fw +udev diff --git a/kernel/post-install b/kernel/post-install index fe0aec922..07ac8fbd5 100644 --- a/kernel/post-install +++ b/kernel/post-install @@ -1,14 +1,6 @@ -version=3.2.7 -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,7 +20,7 @@ done # Copie des modules kernels mkdir -p $WDIR/rootfs/lib/modules -cp -a /lib/modules/${version} \ +cp -a /lib/modules/* \ $WDIR/rootfs/lib/modules/ # Copie du script d'install diff --git a/kernel/pre-install b/kernel/pre-install new file mode 100644 index 000000000..bd0b0feeb --- /dev/null +++ b/kernel/pre-install @@ -0,0 +1,3 @@ +for i in ipw2100-fw ipw2200-fw 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 -- cgit v1.2.3-70-g09d2 From dd3f518b7e6a99c634c87b8bddf11b14904dac51 Mon Sep 17 00:00:00 2001 From: tnut Date: Thu, 23 Feb 2012 23:16:02 +0100 Subject: kernel correction pre-install et suppression fichier obsolète MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/list | 11 ----------- kernel/pre-install | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 kernel/list diff --git a/kernel/list b/kernel/list deleted file mode 100644 index 041cda3fa..000000000 --- a/kernel/list +++ /dev/null @@ -1,11 +0,0 @@ -aaabasicfs -ipw2100-fw -ipw2200-fw -iwlwifi-3945-ucode -iwlwifi-4965-ucode -iwlwifi-5000-ucode -iwlwifi-5150-ucode -linux-firmware -rt2x00-rt61-fw -rt2x00-rt71w-fw -udev diff --git a/kernel/pre-install b/kernel/pre-install index bd0b0feeb..d875b6144 100644 --- a/kernel/pre-install +++ b/kernel/pre-install @@ -1,3 +1,3 @@ -for i in ipw2100-fw ipw2200-fw iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-5000-ucode iwlwifi-5150-ucode linux-firmware rt2x00-rt61-fw rt2x00-rt71w-fw +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 -- cgit v1.2.3-70-g09d2 From b015cac27626b8d3b911e2f22c53d6bfbc16d980 Mon Sep 17 00:00:00 2001 From: tnut Date: Fri, 24 Feb 2012 18:29:34 +0100 Subject: kernel, correction post-install --- kernel/Pkgfile | 2 +- kernel/post-install | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/kernel/Pkgfile b/kernel/Pkgfile index f92a979e6..c235037e5 100644 --- a/kernel/Pkgfile +++ b/kernel/Pkgfile @@ -6,7 +6,7 @@ name=kernel version=3.2.7 _BaseVersion=3.2 -release=2 +release=3 PKGMK_NO_STRIP="yes" PKGMK_IGNORE_FOOTPRINT="yes" PKGMK_IGNORE_MD5SUM="yes" diff --git a/kernel/post-install b/kernel/post-install index 07ac8fbd5..43ae9d4e1 100644 --- a/kernel/post-install +++ b/kernel/post-install @@ -23,6 +23,9 @@ mkdir -p $WDIR/rootfs/lib/modules 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/ -- cgit v1.2.3-70-g09d2 From b2857c2d0d0b3634ddb498a25c60a1c90a89ceb9 Mon Sep 17 00:00:00 2001 From: orchidman Date: Tue, 28 Feb 2012 13:13:15 +0100 Subject: kernel 3.2.8-1 maj --- kernel/Pkgfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/Pkgfile b/kernel/Pkgfile index c235037e5..3050a33bd 100644 --- a/kernel/Pkgfile +++ b/kernel/Pkgfile @@ -4,9 +4,9 @@ # Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com name=kernel -version=3.2.7 +version=3.2.8 _BaseVersion=3.2 -release=3 +release=1 PKGMK_NO_STRIP="yes" PKGMK_IGNORE_FOOTPRINT="yes" PKGMK_IGNORE_MD5SUM="yes" -- cgit v1.2.3-70-g09d2 From 212242b885a4df4d0a566a6a70b01736526efa63 Mon Sep 17 00:00:00 2001 From: orchidman Date: Thu, 1 Mar 2012 09:12:05 +0100 Subject: kernel 3.2.9-1 maj --- kernel/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/Pkgfile b/kernel/Pkgfile index 3050a33bd..81dea9fd6 100644 --- a/kernel/Pkgfile +++ b/kernel/Pkgfile @@ -4,7 +4,7 @@ # Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com name=kernel -version=3.2.8 +version=3.2.9 _BaseVersion=3.2 release=1 PKGMK_NO_STRIP="yes" -- cgit v1.2.3-70-g09d2 From 0c9d3117cda60d1ec64c40ad2a7f73d23aa83a80 Mon Sep 17 00:00:00 2001 From: orchidman Date: Thu, 1 Mar 2012 11:26:12 +0100 Subject: kernel 3.2.7-1 downgrade --- kernel/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/Pkgfile b/kernel/Pkgfile index 81dea9fd6..f6a7bc538 100644 --- a/kernel/Pkgfile +++ b/kernel/Pkgfile @@ -4,7 +4,7 @@ # Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com name=kernel -version=3.2.9 +version=3.2.7 _BaseVersion=3.2 release=1 PKGMK_NO_STRIP="yes" -- cgit v1.2.3-70-g09d2