diff options
Diffstat (limited to 'freedom-maker')
| -rwxr-xr-x | freedom-maker/bin/install.sh | 18 | ||||
| -rwxr-xr-x | freedom-maker/bin/packages-chroot | 4 | ||||
| -rwxr-xr-x | freedom-maker/buildrootfs.sh | 4 |
3 files changed, 14 insertions, 12 deletions
diff --git a/freedom-maker/bin/install.sh b/freedom-maker/bin/install.sh index 615f6a4..2c3385d 100755 --- a/freedom-maker/bin/install.sh +++ b/freedom-maker/bin/install.sh @@ -14,7 +14,7 @@ export FK_MACHINE="Globalscale Technologies Dreamplug" # configure all packages unpacked earlier by multistrap dpkg --configure -a -echo "Adding source packages to filesystem" +echo "[NOT] Adding source packages to filesystem" dpkg --get-selections > /tmp/selections mkdir -p /sourcecode cd sourcecode @@ -50,24 +50,24 @@ echo "Running torouter_preboot.sh..." echo "Mangling kernel..." mkdir /tmp/initrd-repack (cd /tmp/initrd-repack ; \ - zcat /boot/initrd.img-3.2.0-3-kirkwood | cpio -i ; \ + zcat /boot/initrd.img-$kernelversion | cpio -i ; \ rm -f conf/param.conf ; \ find . | cpio --quiet -o -H newc | \ - gzip -9 > /boot/initrd.img-3.2.0-3-kirkwood ) + gzip -9 > /boot/initrd.img-$kernelversion) rm -rf /tmp/initrd-repack (cd /boot ; \ - cp /usr/lib/linux-image-3.2.0-3-kirkwood/kirkwood-dreamplug.dtb dtb ; \ - cat vmlinuz-3.2.0-3-kirkwood dtb >> temp-kernel ; \ - mkimage -A arm -O linux -T kernel -n 'Debian kernel 3.2.0-3-kirkwood' \ + cp /usr/lib/linux-image-$kernelversion/kirkwood-dreamplug.dtb dtb ; \ + cat vmlinuz-$kernelversion dtb >> temp-kernel ; \ + mkimage -A arm -O linux -T kernel -n 'Debian kernel $kernelversion' \ -C none -a 0x8000 -e 0x8000 -d temp-kernel uImage ; \ rm -f temp-kernel ; \ mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 \ - -n 'Debian ramdisk 3.2.0-3-kirkwood' \ - -d initrd.img-3.2.0-3-kirkwood uInitrd ) + -n 'Debian ramdisk $kernelversion' \ + -d initrd.img-$kernelversion uInitrd ) # Establish an initial root password -echo "Set root password to "$rootpassword +echo "Set root password to $rootpassword" echo root:$rootpassword | /usr/sbin/chpasswd # Create a default user diff --git a/freedom-maker/bin/packages-chroot b/freedom-maker/bin/packages-chroot index f2f0e4c..29a7ae4 100755 --- a/freedom-maker/bin/packages-chroot +++ b/freedom-maker/bin/packages-chroot @@ -1,8 +1,8 @@ -#! /bin/sh +#!/bin/sh # try to install locally-sourced torouter .deb files dpkg -i /tmp/dpkg/*.deb # try to install libertas_uap hack -cd /tmp/uap_hack/dreamplug_libertas_$(uname -r) && ./install.sh +cd /tmp/uap_hack/dreamplug_libertas_$kernelversion && ./install.sh diff --git a/freedom-maker/buildrootfs.sh b/freedom-maker/buildrootfs.sh index 10ba598..b3dc568 100755 --- a/freedom-maker/buildrootfs.sh +++ b/freedom-maker/buildrootfs.sh @@ -35,11 +35,13 @@ # We don't tolerate errors. set -e -architecture=armel +architecture='armel' +kernelversion='3.2.0-3-kirkwood' if [ -n "$1" ] then architecture=$1 fi +export kernelversion config=multistrap-configs/torouter-$architecture.conf if [ -n "$2" ] |