# HG changeset patch # User Christopher Rogers # Date 1288241909 0 # Node ID a1cd19a9e26946b87c4aa3e4c9fa1da3dd1bfc95 # Parent 18ac2ae967052318ed8cbb171d65752c048393e9 Fixed linux-source. Instead of auto downloading kernel source in post_install i added that code into a script called get-linux-source. All patches are also in /usr/src/kernel-patches now. diff -r 18ac2ae96705 -r a1cd19a9e269 linux-source/receipt --- a/linux-source/receipt Wed Oct 27 20:56:33 2010 +0000 +++ b/linux-source/receipt Thu Oct 28 04:58:29 2010 +0000 @@ -12,82 +12,19 @@ # Rules to gen a SliTaz package suitable for Tazpkg. genpkg_rules() { - mkdir -p $fs/usr/src/linux-$VERSION-slitaz \ - $fs/lib/modules/$VERSION-slitaz/ - ln -s linux-$VERSION-slitaz $fs/usr/src/linux - cp -a $src/Module.symvers $fs/usr/src/linux-$VERSION-slitaz - cp -a $src/slitaz $fs/usr/src/linux-$VERSION-slitaz - cp -a stuff/buildtaz $fs/usr/src/linux-$VERSION-slitaz/slitaz - cp -a stuff/make-tazpkg.u $fs/usr/src/linux-$VERSION-slitaz/slitaz + mkdir -p $fs/usr/src/kernel-patches + cp -a $src/slitaz $fs/usr/src/kernel-patches + cp -a stuff/buildtaz $fs/usr/src/kernel-patches/slitaz + cp -a stuff/make-tazpkg.u $fs/usr/src/kernel-patches/slitaz + cp -a stuff/get-linux-source $fs/usr/bin + sed -i "s|=XXX|=$VERSION|g" $fs/usr/bin/get-linux-source # Copy Aufs2 source files if [ -d $WOK/$WANTED/aufs2 ]; then - mkdir $fs/usr/src/linux-$VERSION-slitaz/slitaz/aufs2 + mkdir $fs/usr/src/kernel-patches/slitaz/aufs2 cp -a $WOK/$WANTED/aufs2/Documentation \ $WOK/$WANTED/aufs2/fs $WOK/$WANTED/aufs2/include \ - $fs/usr/src/linux-$VERSION-slitaz/slitaz/aufs2 + $fs/usr/src/kernel-patches/slitaz/aufs2 fi ln -s /usr/src/linux-$VERSION-slitaz \ $fs/lib/modules/$VERSION-slitaz/source - ln -s /usr/src/linux-$VERSION-slitaz \ - $fs/lib/modules/$VERSION-slitaz/build } - -# Post install/remove commands for Tazpkg. -post_install() -{ - local url - local patch_file - cd $1/usr/src/ - url=$(cat linux-$VERSION-slitaz/slitaz/url) - wget -c $url - tar xjf $(basename $url) - mv linux-$VERSION-slitaz/slitaz linux-$VERSION - rm -rf linux-$VERSION-slitaz - mv linux-$VERSION linux-$VERSION-slitaz - cd linux-$VERSION-slitaz - cp -pa slitaz/aufs2/* . - # Add tazpkg support - if [ -d "scripts/package" ]; then - cp -pa slitaz/buildtaz scripts/package - patch -p1 -i slitaz/make-tazpkg.u - fi - - while read patch_file; do - echo "Apply $patch_file" - patch -p1 < slitaz/$patch_file - done < slitaz/patches - [ ! -f System.map ] && cp slitaz/config .config && - make oldconfig && make modules_prepare - cat < /dev/null || true -} - -post_remove() -{ - rm -rf /usr/src/linux-$VERSION-slitaz -} - - diff -r 18ac2ae96705 -r a1cd19a9e269 linux-source/stuff/get-linux-source --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/linux-source/stuff/get-linux-source Thu Oct 28 04:58:29 2010 +0000 @@ -0,0 +1,54 @@ +#!/bin/sh + +source /etc/tazwok.conf +VERSION=XXX + +url=$(cat /usr/src/linux-$VERSION-slitaz/url) + +if [ -f $SOURCES_REPOSITORY/$(basename $url) ]; then + cd /usr/src/ + tar xjf $(basename $url) +else + wget -O $SOURCES_REPOSITORY/$(basename $url) + cd /usr/src/ + tar xjf $(basename $url) +fi + +cp -a /usr/src/kernel-patches/slitaz /usr/src/linux-$VERSION + +cp -pa /usr/src/linux-$VERSION/slitaz/aufs2/* /usr/src/linux-$VERSION +# Add tazpkg support +if [ -d "/usr/src/linux-$VERSION/scripts/package" ]; then + cp -pa /usr/src/linux-$VERSION/slitaz/buildtaz /usr/src/linux-$VERSION/scripts/package + cd /usr/src/linux-$VERSION + patch -p1 -i slitaz/make-tazpkg.u +fi + +cd /usr/src/linux-$VERSION +while read patch_file; do + echo "Apply $patch_file" + patch -p1 < slitaz/$patch_file +done < slitaz/patches +[ ! -f System.map ] && cp slitaz/config .config && +make oldconfig && make modules_prepare + + cat <