wok rev 5048
slitaz-loram*: be FAST_BOOT_X aware
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Fri Mar 05 17:52:43 2010 +0100 (2010-03-05) |
parents | b792559721d1 |
children | 75f96d7120f9 |
files | slitaz-loram-cdrom/receipt slitaz-loram-cdrom/stuff/loram.rootfs slitaz-loram-http/receipt slitaz-loram/receipt slitaz-loram/stuff/loram.iso slitaz-loram/stuff/loram.rootfs |
line diff
1.1 --- a/slitaz-loram-cdrom/receipt Fri Mar 05 09:08:38 2010 +0000 1.2 +++ b/slitaz-loram-cdrom/receipt Fri Mar 05 17:52:43 2010 +0100 1.3 @@ -171,12 +171,16 @@ 1.4 post_install() 1.5 { 1.6 set_patch "$1" 1.7 + 1.8 + # Don't support FAST_BOOT_X yet 1.9 + sed -i 's/FAST_BOOT_X=.*/FAST_BOOT_X="no"/' $1/etc/rcS.conf 1.10 + 1.11 cat <<EOF 1.12 ---- 1.13 'tazlito gen-distro' will create a loram-cdrom flavor 1.14 while this package is installed. 1.15 EOF 1.16 - if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs ]; then 1.17 + if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs-utils ]; then 1.18 cat <<EOF 1.19 ---- 1.20 You will build a live CD with /usr mounted read-only.
2.1 --- a/slitaz-loram-cdrom/stuff/loram.rootfs Fri Mar 05 09:08:38 2010 +0000 2.2 +++ b/slitaz-loram-cdrom/stuff/loram.rootfs Fri Mar 05 17:52:43 2010 +0100 2.3 @@ -33,7 +33,7 @@ 2.4 done 2.5 echo "$(du -hs ./usr/.moved | cut -f1) have been moved into /usr" 2.6 usr=usr 2.7 -if [ -x bin/funionfs -o -d /var/lib/tazpkg/installed/aufs ]; then 2.8 +if [ -x bin/funionfs -o -d /var/lib/tazpkg/installed/aufs-utils ]; then 2.9 usr=.usr.ro 2.10 mkdir .usr.ro .usr.rw 2.11 fi
3.1 --- a/slitaz-loram-http/receipt Fri Mar 05 09:08:38 2010 +0000 3.2 +++ b/slitaz-loram-http/receipt Fri Mar 05 17:52:43 2010 +0100 3.3 @@ -129,6 +129,10 @@ 3.4 post_install() 3.5 { 3.6 set_patch "$1" 3.7 + 3.8 + # Don't support FAST_BOOT_X yet 3.9 + sed -i 's/FAST_BOOT_X=.*/FAST_BOOT_X="no"/' $1/etc/rcS.conf 3.10 + 3.11 cat <<EOF 3.12 ---- 3.13 'tazlito gen-distro' will create a loram-http flavor
4.1 --- a/slitaz-loram/receipt Fri Mar 05 09:08:38 2010 +0000 4.2 +++ b/slitaz-loram/receipt Fri Mar 05 17:52:43 2010 +0100 4.3 @@ -1,7 +1,7 @@ 4.4 # SliTaz package receipt. 4.5 4.6 PACKAGE="slitaz-loram" 4.7 -VERSION="1.5" 4.8 +VERSION="1.6" 4.9 CATEGORY="misc" 4.10 SHORT_DESC="Rules to build low ram rootfs.gz." 4.11 MAINTAINER="pascal.bellard@slitaz.org" 4.12 @@ -21,7 +21,7 @@ 4.13 local line 4.14 local len 4.15 local i 4.16 - tag="/dev/cdrom if need" 4.17 + tag="Fast boot into X" 4.18 i=$(grep -n "$tag" $1/etc/init.d/rcS | cut -d: -f1) 4.19 i=$(($i-1)) 4.20 len=38 4.21 @@ -99,7 +99,7 @@ 4.22 ---- 4.23 'tazlito gen-distro' will create a loram flavor while this package is installed. 4.24 EOF 4.25 - if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs ]; then 4.26 + if [ ! -x $1/bin/funionfs -a ! -d $1/var/lib/tazpkg/installed/aufs-utils ]; then 4.27 cat <<EOF 4.28 ---- 4.29 You will build a live CD with /usr mounted read-only.
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/slitaz-loram/stuff/loram.iso Fri Mar 05 17:52:43 2010 +0100 5.3 @@ -0,0 +1,8 @@ 5.4 +if [ -s $1/rootfs.gz2 ]; then 5.5 + local rem 5.6 + rem=$(( $(stat -c "%s" $1/boot/rootfs.gz) % 4 )) 5.7 + [ $rem -ne 0 ] && 5.8 + dd if=/dev/zero bs=1 count=$(( 4 - $rem )) >> $1/boot/rootfs.gz 5.9 + cat $1/rootfs.gz2 >> $1/boot/rootfs.gz 5.10 + rm -f $1/rootfs.gz2 5.11 +fi
6.1 --- a/slitaz-loram/stuff/loram.rootfs Fri Mar 05 09:08:38 2010 +0000 6.2 +++ b/slitaz-loram/stuff/loram.rootfs Fri Mar 05 17:52:43 2010 +0100 6.3 @@ -30,7 +30,7 @@ 6.4 else 6.5 usr/sbin/mksquashfs usr .usr.sqfs -comp lzma 6.6 fi 6.7 -if [ -x bin/funionfs -o -d /var/lib/tazpkg/installed/aufs ]; then 6.8 +if [ -x bin/funionfs -o -d /var/lib/tazpkg/installed/aufs-utils ]; then 6.9 mkdir .usr.rw .usr.ro 6.10 usr=.usr.ro 6.11 fi 6.12 @@ -39,9 +39,10 @@ 6.13 fi 6.14 rm -rf usr 6.15 mkdir usr 6.16 -COMPRESSION="gzip" 6.17 echo "$(du -hs ./.usr.*fs | cut -f1) are used by /usr after compression" 6.18 for ii in bin/vcsa2txt bin/awk bin/script bin/cut bin/readlink bin/du bin/free \ 6.19 bin/killall5 bin/seq bin/find bin/xargs bin/patch; do 6.20 [ -e $ii ] || ln -s busybox $ii 6.21 done 6.22 +echo .usr.*fs | cpio -o -H newc > $1/rootfs.gz2 6.23 +rm -f .usr.*fs