slitaz-arm rev 33
Few fixes to sat and spi + add dropbear to base flavor
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Thu Mar 06 22:42:14 2014 +0100 (2014-03-06) |
| parents | b38c9a3fca9a |
| children | eeb23d633529 |
| files | flavors/base/packages.list flavors/rpi/flavor.conf flavors/rpi/packages.list sat spi |
line diff
1.1 --- a/flavors/base/packages.list Thu Mar 06 18:40:58 2014 +0000 1.2 +++ b/flavors/base/packages.list Thu Mar 06 22:42:14 2014 +0100 1.3 @@ -15,3 +15,4 @@ 1.4 libcomerr 1.5 e2fsprogs 1.6 dialog 1.7 +dropbear
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/flavors/rpi/flavor.conf Thu Mar 06 22:42:14 2014 +0100 2.3 @@ -0,0 +1,8 @@ 2.4 +# SliTaz ARM Flavor configuration file. 2.5 +# 2.6 + 2.7 +FLAVOR="rpi" 2.8 +VERSION="20140304" 2.9 +MAINTAINER="pankso@slitaz.org" 2.10 +SHORT_DESC="SliTaz ARM Raspberry Pi flavor" 2.11 +WEB_SITE="http://arm.slitaz.org"
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/flavors/rpi/packages.list Thu Mar 06 22:42:14 2014 +0100 3.3 @@ -0,0 +1,19 @@ 3.4 +busybox 3.5 +gcc-lib-base 3.6 +gettext-base 3.7 +glibc-base 3.8 +kbd-base 3.9 +slitaz-base-files 3.10 +slitaz-boot-scripts 3.11 +slitaz-tools 3.12 +tazirc 3.13 +util-linux-blkid 3.14 +util-linux-uuid 3.15 +ncurses-common 3.16 +ncursesw 3.17 +libcomerr 3.18 +e2fsprogs 3.19 +dialog 3.20 +dropbear 3.21 +nano 3.22 +clex
4.1 --- a/sat Thu Mar 06 18:40:58 2014 +0000 4.2 +++ b/sat Thu Mar 06 22:42:14 2014 +0100 4.3 @@ -232,21 +232,22 @@ 4.4 *.gz) find . | cpio -o -H newc | gzip -9 > ../$initramfs ;; 4.5 *.xz) find . | cpio -o -H newc | xz -9 --format=lzma > ../$initramfs ;; 4.6 esac 4.7 + status 4.8 fi 4.9 4.10 # Summary 4.11 - status 4.12 separator && newline 4.13 boldify "SliTaz ARM distro summary" 4.14 separator 4.15 time=$(($(date +%s) - $time)) 4.16 - initramfs_size="$(du -sh $distro/$initramfs | awk '{print $1}')" 4.17 + [ "$noinit" ] || \ 4.18 + initramfs_size="$(du -sh $distro/$initramfs | awk '{print $1}')" 4.19 rootfs_size="$(du -sh ${rootfs} | awk '{print $1}')" 4.20 pkgs_count="$(ls $db/installed | wc -l)" 4.21 [ "$FLAVOR" ] && echo "Flavor name : $FLAVOR" 4.22 echo "Build time : ${time}s" 4.23 - echo "Initramfs : $initramfs" 4.24 - echo "Initramfs size : $initramfs_size" 4.25 + [ "$noinit" ] || echo "Initramfs : $initramfs" 4.26 + [ "$noinit" ] || echo "Initramfs size : $initramfs_size" 4.27 echo "Rootfs size : $rootfs_size" 4.28 echo "Packages : $pkgs_count" 4.29 separator && newline ;;
5.1 --- a/spi Thu Mar 06 18:40:58 2014 +0000 5.2 +++ b/spi Thu Mar 06 22:42:14 2014 +0100 5.3 @@ -41,7 +41,7 @@ 5.4 info Display paths and distro info 5.5 install Install SliTaz RPi to sdcard 5.6 gen Generate a new SliTaz RPi distro 5.7 - linux Build the Raspberry Pi Linux kernel 5.8 + cooklinux Build the Raspberry Pi Linux kernel 5.9 get-fw Download or update RPi Firmware 5.10 get-tools Download or update RPi Tools (mkimage) 5.11 get-prebuilt Get a prebuilt SliTaz ARM toolchain 5.12 @@ -215,7 +215,8 @@ 5.13 fi 5.14 [ "$clean" ] && sat clean --work="$work" 5.15 if [ ! -d "$distro/rootfs/etc" ]; then 5.16 - sat gen --work="$work" --flavor="$flavor" --kmap --spk --rpi 5.17 + sat gen --work="$work" --flavor="$flavor" \ 5.18 + --kmap --spk --noinit --rpi 5.19 fi 5.20 header "SliTaz Raspberry Pi distro" 5.21 dsize="$(du -sh ${distro}/rootfs | awk '{print $1}')" 5.22 @@ -269,6 +270,13 @@ 5.23 echo "RPi Kernel: not used" 5.24 fi 5.25 mkdir -p ${rootfs}/boot 5.26 + 5.27 + # RPi VC libraries 5.28 + if [ "$vc" ]; then 5.29 + echo "Installing: VC libraries" 5.30 + echo "TODO" 5.31 + fi 5.32 + 5.33 separator 5.34 echo -n "Boot: $(du -sh $boot | awk '{print $1}') " 5.35 echo "- Rootfs: $(du -sh $rootfs | awk '{print $1}')"