# HG changeset patch # User Christophe Lincoln # Date 1394142134 -3600 # Node ID 1066913cc1c40fd7098ded192c79893ac72ca873 # Parent b38c9a3fca9a3915f055d3340d19052e1dd8af77 Few fixes to sat and spi + add dropbear to base flavor diff -r b38c9a3fca9a -r 1066913cc1c4 flavors/base/packages.list --- a/flavors/base/packages.list Thu Mar 06 18:40:58 2014 +0000 +++ b/flavors/base/packages.list Thu Mar 06 22:42:14 2014 +0100 @@ -15,3 +15,4 @@ libcomerr e2fsprogs dialog +dropbear diff -r b38c9a3fca9a -r 1066913cc1c4 flavors/rpi/flavor.conf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flavors/rpi/flavor.conf Thu Mar 06 22:42:14 2014 +0100 @@ -0,0 +1,8 @@ +# SliTaz ARM Flavor configuration file. +# + +FLAVOR="rpi" +VERSION="20140304" +MAINTAINER="pankso@slitaz.org" +SHORT_DESC="SliTaz ARM Raspberry Pi flavor" +WEB_SITE="http://arm.slitaz.org" diff -r b38c9a3fca9a -r 1066913cc1c4 flavors/rpi/packages.list --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flavors/rpi/packages.list Thu Mar 06 22:42:14 2014 +0100 @@ -0,0 +1,19 @@ +busybox +gcc-lib-base +gettext-base +glibc-base +kbd-base +slitaz-base-files +slitaz-boot-scripts +slitaz-tools +tazirc +util-linux-blkid +util-linux-uuid +ncurses-common +ncursesw +libcomerr +e2fsprogs +dialog +dropbear +nano +clex diff -r b38c9a3fca9a -r 1066913cc1c4 sat --- a/sat Thu Mar 06 18:40:58 2014 +0000 +++ b/sat Thu Mar 06 22:42:14 2014 +0100 @@ -232,21 +232,22 @@ *.gz) find . | cpio -o -H newc | gzip -9 > ../$initramfs ;; *.xz) find . | cpio -o -H newc | xz -9 --format=lzma > ../$initramfs ;; esac + status fi # Summary - status separator && newline boldify "SliTaz ARM distro summary" separator time=$(($(date +%s) - $time)) - initramfs_size="$(du -sh $distro/$initramfs | awk '{print $1}')" + [ "$noinit" ] || \ + initramfs_size="$(du -sh $distro/$initramfs | awk '{print $1}')" rootfs_size="$(du -sh ${rootfs} | awk '{print $1}')" pkgs_count="$(ls $db/installed | wc -l)" [ "$FLAVOR" ] && echo "Flavor name : $FLAVOR" echo "Build time : ${time}s" - echo "Initramfs : $initramfs" - echo "Initramfs size : $initramfs_size" + [ "$noinit" ] || echo "Initramfs : $initramfs" + [ "$noinit" ] || echo "Initramfs size : $initramfs_size" echo "Rootfs size : $rootfs_size" echo "Packages : $pkgs_count" separator && newline ;; diff -r b38c9a3fca9a -r 1066913cc1c4 spi --- a/spi Thu Mar 06 18:40:58 2014 +0000 +++ b/spi Thu Mar 06 22:42:14 2014 +0100 @@ -41,7 +41,7 @@ info Display paths and distro info install Install SliTaz RPi to sdcard gen Generate a new SliTaz RPi distro - linux Build the Raspberry Pi Linux kernel + cooklinux Build the Raspberry Pi Linux kernel get-fw Download or update RPi Firmware get-tools Download or update RPi Tools (mkimage) get-prebuilt Get a prebuilt SliTaz ARM toolchain @@ -215,7 +215,8 @@ fi [ "$clean" ] && sat clean --work="$work" if [ ! -d "$distro/rootfs/etc" ]; then - sat gen --work="$work" --flavor="$flavor" --kmap --spk --rpi + sat gen --work="$work" --flavor="$flavor" \ + --kmap --spk --noinit --rpi fi header "SliTaz Raspberry Pi distro" dsize="$(du -sh ${distro}/rootfs | awk '{print $1}')" @@ -269,6 +270,13 @@ echo "RPi Kernel: not used" fi mkdir -p ${rootfs}/boot + + # RPi VC libraries + if [ "$vc" ]; then + echo "Installing: VC libraries" + echo "TODO" + fi + separator echo -n "Boot: $(du -sh $boot | awk '{print $1}') " echo "- Rootfs: $(du -sh $rootfs | awk '{print $1}')"