Merge branch 'master' of ssh://piernov.org/srv/git/nutyx-multimedia

1 files changed, 52 insertions, 47 deletions

diff --git a/kernel-rt/Pkgfile b/kernel-rt/Pkgfile
index 32bc2ea..f639103 100644
--- a/kernel-rt/Pkgfile
+++ b/kernel-rt/Pkgfile
@@ -4,21 +4,20 @@
 # Packager: thierryn1 at hispeed dot ch, tyrry33 at gmail dot com
 
 name=kernel-rt
-version=3.2.1
+version=3.2.17
 _BaseVersion=3.2
-release=rt10-1
+release=rt27-1
 PKGMK_NO_STRIP="yes"
 PKGMK_IGNORE_FOOTPRINT="yes"
 PKGMK_IGNORE_MD5SUM="yes"
-SCRIPT_VERSION="pakxe.3"
+SCRIPT_VERSION="pakxe.4"
 INITRDBASE="nutyx-initrd"
-_extra=30052011
-_tools=08112011
-NVIDIA_VERSION=290.10
-VB_VERSION=4.1.8
-VB_BUILD=75467
-ATI_VERSION=11.11
-RT_PATCH=rt10
+_extra=11032012
+_tools=24042012
+VB_VERSION=4.1.14
+VB_BUILD=77440
+RT_VERSION=3.2.16
+RT_PATCH=rt27
 
 [ "`uname -m`" == "i686"   ] && _ARCH=x86
 [ "`uname -m`" == "x86_64"   ] && _ARCH=x86_64
@@ -26,43 +25,67 @@ RT_PATCH=rt10
 [ "`uname -m`" == "x86_64"   ] && VB_ARCH=amd64
 [ "`uname -m`" == "i686"   ] && BC_ARCH=x86_32
 [ "`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 \
-	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\
-	http://www.kernel.org/pub/linux/kernel/v3.0/patch-$version.bz2 \
-	http://nutyx.meticul.eu/install-${SCRIPT_VERSION}.ash \
-	http://nutyx.meticul.eu/files/nutyx-initrd-`uname -m`-${_extra}.tar.bz2\
+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://www.kernel.org/pub/linux/kernel/v3.0/linux-${_BaseVersion}.tar.xz
+	http://www.kernel.org/pub/linux/kernel/v3.0/patch-$version.xz
+	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
-	http://www.kernel.org/pub/linux/kernel/projects/rt/${_BaseVersion}/patch-${_BaseVersion}-${RT_PATCH}.patch.xz)
+	http://www.kernel.org/pub/linux/kernel/projects/rt/${RT_VERSION%.*}/patch-${RT_VERSION}-${RT_PATCH}.patch.xz
+	makefile_compat.patch
+	bc_wl_abiupdate.patch
+	config_64
+	config
+)
+
 build(){
+
+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}
         cd linux-${_BaseVersion}
-        if [ -f $SRC/patch-$version.bz2 ]; then
-                bzip2 -d -c  $SRC/patch-$version.bz2 | patch -Np1
+        if [ -f $SRC/patch-$version.xz ]; then
+                xzcat $SRC/patch-$version.xz | patch -Np1
         fi
-	xzcat $SRC/patch-${_BaseVersion}-${RT_PATCH}.patch.xz | patch -p1
+        xzcat $SRC/patch-${RT_VERSION}-${RT_PATCH}.patch.xz | patch -p1
         cd ..
 else
         rm -r linux-${_BaseVersion}
 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;;
@@ -70,7 +93,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;;
@@ -88,26 +113,7 @@ esac
 cd $SRC
 patch -p0 src/wl/sys/wl_linux.c < bc_wl_abiupdate.patch
 KBUILD_NOPEDANTIC=1 make -C $SRC/linux-${_BaseVersion} M=`pwd`
-install -m 0644 -D wl.ko $PKG/lib/modules/${version}/kernel/drivers/zzzz/wl.ko
-
-# Module nvidia
-#cd $SRC
-#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/${version}/kernel/drivers/zzzz/nvidia.ko
-
-## Module ati
-#cd $SRC
-#sh ati-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
-#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/${version}/kernel/drivers/zzzz/fglrx.ko
+install -m 0644 -D wl.ko $PKG/lib/modules/${version}-${RT_PATCH}/kernel/drivers/zzzz/wl.ko
 
 # Modules VB
 cd $SRC
@@ -144,8 +150,7 @@ case `uname -m` in
 esac
 ln -sf kernel-$version $PKG/boot/kernel
 cd $PKG/lib/modules/${version}-${RT_PATCH}/
-if [ -d build ]; then rm build; fi
-if [ -d source ]; then rm source; fi
+rm {build,source}
 ln -sv /usr/src/linux-${_BaseVersion} build
 ln -sv /usr/src/linux-${_BaseVersion} source