wok-next diff linux/receipt @ rev 5685
busybox: add httpd_helper.sh
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Jun 04 17:12:30 2010 +0200 (2010-06-04) |
parents | 33dfd49cdf84 |
children | 003ddfde863e |
line diff
1.1 --- a/linux/receipt Thu May 13 21:39:07 2010 +0200 1.2 +++ b/linux/receipt Fri Jun 04 17:12:30 2010 +0200 1.3 @@ -1,7 +1,7 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="linux" 1.7 -VERSION="2.6.33.4" 1.8 +VERSION="2.6.34" 1.9 CATEGORY="base-system" 1.10 SHORT_DESC="The Linux kernel and modules." 1.11 DEPENDS="depmod" 1.12 @@ -18,13 +18,12 @@ 1.13 # Aufs2 from git repository 1.14 if [ ! -d aufs2 ]; then 1.15 git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2 1.16 - cd aufs2 && git checkout origin/aufs2-33 1.17 - #Use a well known version rather than the last one... 1.18 - #cd aufs2 && git checkout ee5557abdf9bb6fda673c19d239bb85869418045 1.19 + cd aufs2 && git checkout origin/aufs2-34 1.20 fi 1.21 cd aufs2 1.22 cp -a Documentation fs include $src 1.23 cp -a *.patch ../stuff 1.24 + # We need the real GNU patch 1.25 [ -L /usr/bin/patch ] && tazpkg get-install patch --forced 1.26 cd $src 1.27 # SliTaz db 1.28 @@ -33,10 +32,9 @@ 1.29 echo "$WGET_URL" > slitaz/url 1.30 cp ../stuff/gztazmod.sh ../stuff/list_modules.sh slitaz 1.31 cp ../stuff/bootloader.sh slitaz 1.32 - # Misc patches from pascal 1.33 + # Apply patches 1.34 while read patch_file; do 1.35 echo "$patch_file" >> slitaz/patches 1.36 - #cp ../stuff/$patch_file slitaz/$patch_file 1.37 cp ../stuff/$patch_file slitaz 1.38 if [ -f done.$patch_file ]; then 1.39 echo "Skipping $patch_file" 1.40 @@ -74,14 +72,15 @@ 1.41 { 1.42 local path 1.43 mkdir $fs/boot 1.44 - cp -a $src/arch/x86/boot/bzImage $fs/boot/vmlinuz-$VERSION-slitaz 1.45 + cp -a $src/arch/x86/boot/bzImage \ 1.46 + $fs/boot/vmlinuz-$VERSION-slitaz 1.47 # Compress all modules. 1.48 - # Package module-init-tools is compiled with zlib support. 1.49 - # 1.50 ./stuff/gztazmod.sh $_pkg/lib/modules/$VERSION-slitaz 1.51 path=$fs/lib/modules/$VERSION-slitaz/kernel 1.52 mkdir -p $path 1.53 - cp -a $_pkg/lib/modules/$VERSION-slitaz/mo* $fs/lib/modules/$VERSION-slitaz 1.54 + cp -a $_pkg/lib/modules/$VERSION-slitaz/mo* \ 1.55 + $fs/lib/modules/$VERSION-slitaz 1.56 + # Get the base modules 1.57 export src 1.58 export _pkg 1.59 $src/slitaz/list_modules.sh \ 1.60 @@ -104,16 +103,17 @@ 1.61 do 1.62 echo tazwok cook ${i%/receipt} 1.63 done 1.64 - # check and echo any module in kernel .config that's not added to one of linux-* pkgs 1.65 + # Check and echo any module in kernel .config that's not added to 1.66 + # one of linux-* pkgs 1.67 ./stuff/check_modules.sh 1.68 } 1.69 1.70 # Pre and post install commands for Tazpkg. 1.71 -# GRUB stuf. 1.72 post_install() 1.73 { 1.74 echo "Processing post-install commands..." 1.75 chroot "$1/" depmod -a $VERSION-slitaz 1.76 + # GRUB stuff. 1.77 if [ -f "$1/boot/grub/menu.lst" ]; then 1.78 root_dev=`cat $1/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1` 1.79 grub_dev=`cat $1/boot/grub/menu.lst | grep "root (" | head -n 1` 1.80 @@ -142,4 +142,6 @@ 1.81 clean_wok() 1.82 { 1.83 rm -rf aufs2 1.84 + rm stuff/aufs2-* 1.85 + rm -rf stuff/tmp 1.86 }