SliTaz Repositories

     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/flavors/rpi/rootfs/boot/cmdline.txt	Tue Mar 11 00:10:34 2014 +0100
     1.3 @@ -0,0 +1,1 @@
     1.4 +root=/dev/mmcblk0p3 rootwait quiet

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/flavors/rpi/rootfs/boot/config.txt	Tue Mar 11 00:10:34 2014 +0100
     2.3 @@ -0,0 +1,1 @@
     2.4 +kernel=kernel.img

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/flavors/rpi/rootfs/etc/fstab	Tue Mar 11 00:10:34 2014 +0100
     3.3 @@ -0,0 +1,7 @@
     3.4 +# /etc/fstab: Slitaz ARM static filesystems.
     3.5 +#
     3.6 +proc              /proc       proc     defaults           0 0
     3.7 +sysfs             /sys        sysfs    defaults           0 0
     3.8 +/dev/mmcblk0p1    /boot       auto     noauto,noatime     1 2
     3.9 +/dev/mmcblk0p2    none        swap     sw                 0 0
    3.10 +/dev/mmcblk0p3    /           btrfs    noatime            0 1

     4.1 --- a/rpi/rootfs/boot/cmdline.txt	Mon Mar 10 22:56:34 2014 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,1 +0,0 @@
     4.4 -root=/dev/mmcblk0p3 rootwait quiet

     5.1 --- a/rpi/rootfs/boot/config.txt	Mon Mar 10 22:56:34 2014 +0100
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,1 +0,0 @@
     5.4 -kernel=kernel.img

     6.1 --- a/rpi/rootfs/etc/fstab	Mon Mar 10 22:56:34 2014 +0100
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,7 +0,0 @@
     6.4 -# /etc/fstab: Slitaz ARM static filesystems.
     6.5 -#
     6.6 -proc              /proc       proc     defaults           0 0
     6.7 -sysfs             /sys        sysfs    defaults           0 0
     6.8 -/dev/mmcblk0p1    /boot       auto     noauto,noatime     1 2
     6.9 -/dev/mmcblk0p2    none        swap     sw                 0 0
    6.10 -/dev/mmcblk0p3    /           btrfs    noatime            0 1

     7.1 --- a/sat	Mon Mar 10 22:56:34 2014 +0100
     7.2 +++ b/sat	Tue Mar 11 00:10:34 2014 +0100
     7.3 @@ -48,7 +48,7 @@
     7.4    --spk      Clean or include Spk package manager in the distro
     7.5    --noinit   Don't create the compressed initramfs
     7.6    --work=    Path to work dir with packages and rootfs
     7.7 -  --size=    Specify optional vdisk size (default 20Mb)
     7.8 +  --size=    Specify optional vdisk size (default 50Mb)
     7.9    --init=    Specify the initramfs compression: gz bz2 xz
    7.10    --flavor=  Generate specific SliTaz ARM flavor
    7.11    --append=  SliTaz and Kernel bootime arguments for Qemu
    7.12 @@ -148,18 +148,6 @@
    7.13  			status
    7.14  		fi
    7.15  
    7.16 -		# Move kernel outside the distro
    7.17 -		if [ -d "$rootfs/boot" ]; then
    7.18 -			mv -f ${rootfs}/boot/linux-* ${distro}/linux-arm
    7.19 -			chmod -x ${distro}/linux-arm
    7.20 -		else
    7.21 -			# RPi uses a custom Kernel: --rpi
    7.22 -			if [ ! "$rpi" ]; then
    7.23 -				echo -n "Missing Kernel directory: rootfs/boot/"; false
    7.24 -				status
    7.25 -			fi
    7.26 -		fi
    7.27 -
    7.28  		# SLITAZ_ARCH
    7.29  		if [ -f "${rootfs}/etc/slitaz/slitaz.conf" ]; then
    7.30  			echo -n "Setting SliTaz arch to: arm"
    7.31 @@ -226,6 +214,21 @@
    7.32  			cp -f ${cache}/flavor.conf ${rootfs}/etc/slitaz
    7.33  			status
    7.34  		fi
    7.35 +		
    7.36 +		# Move /boot outside the rootfs
    7.37 +		if [ "$(ls $rootfs/boot | wc -l)" != 0 ]; then
    7.38 +			echo -n "Moving /boot outside the rootfs..."
    7.39 +			mkdir -p ${distro}/boot
    7.40 +			mv -f ${rootfs}/boot/* ${distro}/boot
    7.41 +			status
    7.42 +			
    7.43 +			# ! wok/linux pkg must be modified to install /boot/kernel.img
    7.44 +			if ls ${distro}/boot/linux-* >/dev/null 2>/dev/null; then
    7.45 +				mv ${distro}/boot/linux-* ${distro}/boot/kernel.img
    7.46 +				chmod -x ${distro}/boot/kernel.img
    7.47 +			fi
    7.48 +			
    7.49 +		fi
    7.50  
    7.51  		# Rootfs cpio: gzip xz --> /usr/lib/slitaz/liblive.sh ???
    7.52  		if [ ! "$noinit" ]; then
    7.53 @@ -242,14 +245,14 @@
    7.54  		[ "$debug" ] || rm -rf ${cache}
    7.55  		
    7.56  		# Summary
    7.57 +		time=$(($(date +%s) - $time))
    7.58 +		rootfs_size="$(du -sh ${rootfs} | awk '{print $1}')"
    7.59 +		pkgs_count="$(ls $db/installed | wc -l)"
    7.60 +		[ "$noinit" ] || \
    7.61 +			initramfs_size="$(du -sh $distro/$initramfs | awk '{print $1}')"
    7.62  		separator && newline
    7.63  		boldify "SliTaz ARM distro summary"
    7.64  		separator
    7.65 -		time=$(($(date +%s) - $time))
    7.66 -		[ "$noinit" ] || \
    7.67 -			initramfs_size="$(du -sh $distro/$initramfs | awk '{print $1}')"
    7.68 -		rootfs_size="$(du -sh ${rootfs} | awk '{print $1}')"
    7.69 -		pkgs_count="$(ls $db/installed | wc -l)"
    7.70  		[ "$FLAVOR" ] && echo "Flavor name    : $FLAVOR"
    7.71  		echo "Build time     : ${time}s"
    7.72  		[ "$noinit" ] || echo "Initramfs      : $initramfs"
    7.73 @@ -317,14 +320,13 @@
    7.74  	vdisk)
    7.75  		# Lets use and HD in Qemu to store files|packages|whatever
    7.76  		vdisk="vdisk.img"
    7.77 -		: ${size=20}
    7.78 +		: ${size=50}
    7.79  		newline
    7.80  		echo "Creating virtual disk: $vdisk"
    7.81  		cd $work
    7.82  		dd if=/dev/zero of=$vdisk bs=1M count=$size
    7.83 -		#mkfs.ext3 -q -T ext3 -L "SliTaz" -F $vdisk 
    7.84  		# Partition
    7.85 -		echo "Creating partition with: fdisk"
    7.86 +		echo "Creating a partition with: fdisk"
    7.87  		fdisk ${vdisk} >/dev/null << EOT
    7.88  o
    7.89  n
    7.90 @@ -340,7 +342,7 @@
    7.91  		[ "$append" ] && append="-append ${append}"
    7.92  		qemu-system-arm -m 256 ${opts} \
    7.93  			-M versatilepb -cpu arm1176 \
    7.94 -			-kernel ${distro}/linux-arm \
    7.95 +			-kernel ${distro}/boot/kernel.img \
    7.96  			-initrd ${distro}/${initramfs} ${append} ;;
    7.97  	
    7.98  	mirror)
    7.99 @@ -354,7 +356,7 @@
   7.100  		
   7.101  		echo -n "URL: " && colorize 34 "$mirror"
   7.102  		if ! check_mirror_id; then
   7.103 -			newline && exit 0
   7.104 +			exit 0
   7.105  		fi
   7.106  		for list in packages.list packages.desc packages.md5; do
   7.107  			echo -n "Fetching: $list"

     8.1 --- a/sat-rpi	Mon Mar 10 22:56:34 2014 +0100
     8.2 +++ b/sat-rpi	Tue Mar 11 00:10:34 2014 +0100
     8.3 @@ -237,7 +237,7 @@
     8.4  		
     8.5  		# We may want to simply regenerate the RPi distro
     8.6  		if [ ! "$nosat" ]; then
     8.7 -			sat gen --work="$work" --flavor="$flavor" --kmap --noinit --rpi
     8.8 +			sat gen --work="$work" --flavor="$flavor" --kmap --noinit --nolinux
     8.9  		fi
    8.10  		
    8.11  		header "SliTaz Raspberry Pi distro"
    8.12 @@ -251,21 +251,6 @@
    8.13  		done
    8.14  		status
    8.15  		
    8.16 -		# SliTaz Raspberry Pi custom rootfs files. Make sure all files 
    8.17 -		# belong to root
    8.18 -		if [ -d "$rpi/rootfs" ]; then
    8.19 -			size=$(du -sh $rpi/rootfs | awk '{print $1}')
    8.20 -			echo -n "Copying: SliTaz RPi rootfs ($size)"
    8.21 -			tmp=${distro}/tmp-$$
    8.22 -			mkdir -p ${tmp}
    8.23 -			cp -r ${rpi}/rootfs/* ${tmp}
    8.24 -			chown -R root.root ${tmp}
    8.25 -			cp -a ${tmp}/* ${rootfs} && rm -rf ${tmp}
    8.26 -			# Move files to $boot
    8.27 -			mv -f ${rootfs}/boot/* ${boot}
    8.28 -			status
    8.29 -		fi
    8.30 -		
    8.31  		# TazBerry
    8.32  		echo -n "Installing TazBerry..."
    8.33  			cp -f ${rpi}/tazberry ${rootfs}/usr/bin
    8.34 @@ -318,7 +303,7 @@
    8.35  			cp -f files.list md5sum receipt ${kpkg}
    8.36  			status
    8.37  		else
    8.38 -			echo "RPi Kernel: not used"
    8.39 +			echo "SliTaz RPi Kernel: not used"
    8.40  		fi
    8.41  		
    8.42  		separator
    8.43 @@ -353,7 +338,7 @@
    8.44  			make ARCH=arm CROSS_COMPILE=${HOST_SYSTEM}- \
    8.45  				INSTALL_MOD_PATH=${install} modules_install || exit 1
    8.46  			mkdir -p ${install}/boot
    8.47 -			cp -a arch/arm/boot/zImage ${install}/boot
    8.48 +			cp -a arch/arm/boot/zImage ${install}/boot/kernel.img
    8.49  		fi
    8.50  		
    8.51  		# Kernel version
    8.52 @@ -366,25 +351,29 @@
    8.53  		newline
    8.54  		echo "Compressing kernel modules: $mods"
    8.55  		find . -name "*.ko$" -exec gzip '{}' \; #2> /dev/null
    8.56 -		#find . -name "*.ko" -exec rm '{}' \;
    8.57 +		
    8.58  		# Rebuild modules.dep
    8.59  		cd ${install}
    8.60  		depmod -b . ${kvers%+}-slitaz-rpi+
    8.61  		
    8.62 -		# Pack
    8.63 +		# Kernel
    8.64  		fs="$data/linux-$kvers/fs"
    8.65  		echo "Kernel version: $kvers"
    8.66  		if [ -d "$install" ]; then
    8.67  			rm -rf ${data}/linux-${kvers}
    8.68  			mkdir -p ${data}/linux-${kvers}
    8.69  			cp -a ${install} ${fs}
    8.70 -			rm -f ${fs}/lib/modules/*/build ${fs}/lib/modules/*/source
    8.71 +			rm -f ${fs}/lib/modules/*/build \
    8.72 +				${fs}/lib/modules/*/source
    8.73  		fi
    8.74 -		get_tools
    8.75 -		echo "Compressing: zImage to kernel.img"
    8.76 -		cd ${tools}
    8.77 -		python imagetool-uncompressed.py ${fs}/boot/zImage
    8.78 -		mv -f kernel.img ${fs}/boot && rm ${fs}/boot/zImage
    8.79 +		
    8.80 +		#get_tools
    8.81 +		#echo "Compressing: zImage to kernel.img"
    8.82 +		#cd ${tools}
    8.83 +		#python imagetool-uncompressed.py ${fs}/boot/zImage
    8.84 +		#mv -f kernel.img ${fs}/boot && rm ${fs}/boot/zImage
    8.85 +		
    8.86 +		# Pack .tazpkg
    8.87  		cd ${data}
    8.88  		echo "Creating package: receipt"
    8.89  		cat > linux-$kvers/receipt << EOT