# HG changeset patch # User Christopher Rogers # Date 1287079041 0 # Node ID 5b6e682d7c6257bbc02efb1251b99f4d356d6152 # Parent 37417e21084fa97dfedefe58c6da4078f182adde Fixed linux recepit so there will be not need for them to be repackage twiced. diff -r 37417e21084f -r 5b6e682d7c62 linux-dlm/receipt --- a/linux-dlm/receipt Thu Oct 14 13:00:07 2010 +0000 +++ b/linux-dlm/receipt Thu Oct 14 17:57:21 2010 +0000 @@ -11,7 +11,7 @@ CONFIG_FILES="/etc/filesystems" # Modules paths and list -MOD_PATH="/lib/modules/$VERSION-slitaz/kernel" +MOD_PATH="lib/modules/$VERSION-slitaz/kernel" MODULES="fs/dlm/dlm.ko.gz" # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 37417e21084f -r 5b6e682d7c62 linux-toshiba/receipt --- a/linux-toshiba/receipt Thu Oct 14 13:00:07 2010 +0000 +++ b/linux-toshiba/receipt Thu Oct 14 17:57:21 2010 +0000 @@ -10,7 +10,7 @@ WEB_SITE="http://www.kernel.org/" # Modules paths and list -MOD_PATH="/lib/modules/$VERSION-slitaz/kernel" +MOD_PATH="lib/modules/$VERSION-slitaz/kernel" MODULES="drivers/char/toshiba.ko.gz" # Rules to gen a SliTaz package suitable for Tazpkg. diff -r 37417e21084f -r 5b6e682d7c62 linux-video/receipt --- a/linux-video/receipt Thu Oct 14 13:00:07 2010 +0000 +++ b/linux-video/receipt Thu Oct 14 17:57:21 2010 +0000 @@ -10,7 +10,7 @@ WEB_SITE="http://www.kernel.org/" # Modules paths and list -MOD_PATH="/lib/modules/$VERSION-slitaz/kernel" +MOD_PATH="lib/modules/$VERSION-slitaz/kernel" MODULES="drivers/video/output.ko.gz drivers/video/backlight/lcd.ko.gz drivers/video/backlight/generic_bl.ko.gz diff -r 37417e21084f -r 5b6e682d7c62 linux/receipt --- a/linux/receipt Thu Oct 14 13:00:07 2010 +0000 +++ b/linux/receipt Thu Oct 14 17:57:21 2010 +0000 @@ -15,12 +15,20 @@ # Rules to configure and make the package. compile_rules() { - # Aufs2 from git repository - if [ ! -d aufs2 ]; then - git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2 - cd aufs2 && git checkout origin/aufs2-34 + local _AUFSVER="20101014" + [ -d "aufs2-$_AUFSVER-$VERSION" ] && rm -rf aufs2-$_AUFSVER-$VERSION + TARBALL=$SOURCES_REPOSITORY/aufs2-$_AUFSVER-$VERSION.tar.gz + if [ -f $TARBALL ]; then + tar xzf $TARBALL + cd aufs2-$_AUFSVER-$VERSION && git checkout origin/aufs2-34 + else + # Aufs2 from git repository + git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-$_AUFSVER-$VERSION + cd aufs2-$_AUFSVER-$VERSION && git checkout origin/aufs2-34 + tar czf $TARBALL aufs2-$_AUFSVER-$VERSION + fi - cd aufs2 + #cd aufs2-$_AUFSVER-$VERSION 2>/dev/null cp -a Documentation fs include $src cp -a *.patch ../stuff # We need the real GNU patch @@ -65,6 +73,8 @@ make INSTALL_MOD_PATH=$PWD/_pkg modules_install && make INSTALL_HDR_PATH=$PWD/_pkg/usr headers_install && [ -s arch/x86/boot/bzImage ] + # Compress all modules. + $WOK/$PACKAGE/stuff/gztazmod.sh $PWD/_pkg/lib/modules/$VERSION-slitaz } # Rules to gen a SliTaz package suitable for Tazpkg. @@ -75,7 +85,7 @@ cp -a $src/arch/x86/boot/bzImage \ $fs/boot/vmlinuz-$VERSION-slitaz # Compress all modules. - ./stuff/gztazmod.sh $_pkg/lib/modules/$VERSION-slitaz + #./stuff/gztazmod.sh $_pkg/lib/modules/$VERSION-slitaz path=$fs/lib/modules/$VERSION-slitaz/kernel mkdir -p $path cp -a $_pkg/lib/modules/$VERSION-slitaz/mo* \