diff options
| -rwxr-xr-x | freedom-maker/bin/install.sh | 7 | ||||
| -rwxr-xr-x | freedom-maker/bin/packages-chroot | 2 | ||||
| -rw-r--r-- | freedom-maker/multistrap-configs/torouter-base.conf | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/freedom-maker/bin/install.sh b/freedom-maker/bin/install.sh index 480e135..08932af 100755 --- a/freedom-maker/bin/install.sh +++ b/freedom-maker/bin/install.sh @@ -1,6 +1,9 @@ echo "Preconfiguring dash - else dash and bash will be left in a broken state" /var/lib/dpkg/info/dash.preinst install +kernelversion='3.2.0-3-kirkwood' +export kernelversion + # don't leave target image containing apt config of the build host echo "Configuring all packages" export DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true @@ -59,11 +62,11 @@ rm -rf /tmp/initrd-repack (cd /boot ; \ 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' \ + 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 $kernelversion' \ + -n "Debian ramdisk $kernelversion" \ -d initrd.img-$kernelversion uInitrd ) # Establish an initial root password diff --git a/freedom-maker/bin/packages-chroot b/freedom-maker/bin/packages-chroot index 3617331..247126f 100755 --- a/freedom-maker/bin/packages-chroot +++ b/freedom-maker/bin/packages-chroot @@ -4,5 +4,5 @@ echo "Installing extra/local override .deb files..." dpkg -i /tmp/dpkg/*.deb echo "Installing libertas_uap hack..." -cd /tmp/uap_hack/dreamplug_libertas && ./install.sh $kernelversion +cd /tmp/uap_hack/dreamplug_libertas && ./install.sh "3.2.0-3-kirkwood" diff --git a/freedom-maker/multistrap-configs/torouter-base.conf b/freedom-maker/multistrap-configs/torouter-base.conf index 835bdf4..d73e145 100644 --- a/freedom-maker/multistrap-configs/torouter-base.conf +++ b/freedom-maker/multistrap-configs/torouter-base.conf @@ -6,7 +6,7 @@ debootstrap=Debian torproject torouter aptsources=Debian torproject torouter [Debian] -packages=base-files netbase openssh-server zile wget iproute net-tools hostname module-init-tools wget resolvconf udev isc-dhcp-client ifupdown devio initramfs-tools uboot-mkimage parted dosfstools apt iputils-ping haveged python pandoc python-simplejson make dialog locales-all uaputl uapevent dnsmasq iptables vim-nox less screen lsof tcptraceroute traceroute mtr-tiny openntpd dnsmasq unbound python-augeas python-flask python-daemon cron iw python-setuptools apt-util python-distribute +packages=base-files netbase openssh-server zile wget iproute net-tools hostname module-init-tools wget resolvconf udev isc-dhcp-client ifupdown devio initramfs-tools uboot-mkimage parted dosfstools apt iputils-ping haveged python pandoc python-simplejson make dialog locales-all uaputl uapevent dnsmasq iptables vim-nox less screen lsof tcptraceroute traceroute mtr-tiny openntpd dnsmasq unbound python-augeas python-flask python-daemon cron iw python-setuptools apt-utils source=http://http.debian.net/debian/ keyring=debian-archive-keyring suite=wheezy |