diff options
| -rwxr-xr-x | auto/config | 8 | ||||
| -rwxr-xr-x | config/hooks/depmod.sh.chroot | 11 | ||||
| -rwxr-xr-x | config/hooks/kernel-image.sh.binary | 21 | ||||
| -rwxr-xr-x | config/hooks/kernel-image.sh.chroot | 41 | ||||
| -rw-r--r-- | config/hooks/mkdir_live.sh.chroot | 9 | ||||
| -rw-r--r-- | config/package-lists/debug.list.chroot | 4 | ||||
| -rw-r--r-- | config/package-lists/novena.list.chroot (renamed from config/package-lists/dreamplug.list.chroot) | 2 |
7 files changed, 18 insertions, 78 deletions
diff --git a/auto/config b/auto/config index 68a3b95..98c24de 100755 --- a/auto/config +++ b/auto/config @@ -3,8 +3,8 @@ lb config noauto \ --build-with-chroot false \ --distribution "torouter" \ - --architectures armel \ - --linux-flavours kirkwood \ + --architectures armhf \ + --linux-flavours mx5 \ --apt-secure true \ --apt-recommends false \ --binary-images hdd \ @@ -18,10 +18,10 @@ lb config noauto \ --distribution wheezy \ --parent-distribution wheezy \ --binary-filesystem ext3 \ - --chroot-filesystem squashfs \ + --chroot-filesystem none \ --security true \ --debian-installer-gui false \ - --bootstrap-qemu-arch armel \ + --bootstrap-qemu-arch armhf \ --bootstrap-qemu-static /usr/bin/qemu-arm-static \ --keyring-packages "debian-archive-keyring deb.torproject.org-keyring" \ --bootappend-live "console=ttyS0,115200" \ diff --git a/config/hooks/depmod.sh.chroot b/config/hooks/depmod.sh.chroot deleted file mode 100755 index eb28a0c..0000000 --- a/config/hooks/depmod.sh.chroot +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -# Need to run depmod after hacking in uap8xxx.ko (DreamPlug WiFi). -# -# Unfortunately, this build step is relatively slow :( -set -e - -echo "It's depmod time!" -KERNELVERSION=`ls /boot/vmlinuz-* | sed -e "s/\/boot\/vmlinuz-//"` -dpkg-reconfigure linux-image-$KERNELVERSION - diff --git a/config/hooks/kernel-image.sh.binary b/config/hooks/kernel-image.sh.binary deleted file mode 100755 index 65ed75a..0000000 --- a/config/hooks/kernel-image.sh.binary +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -set -e - -# This script is necessary for squashfs (or any not-plainroot) builds, where -# the usual /live images end up inside the filesystem. - -# In these cases the kernel ships in three places, which is inefficient: -# enclosing binary /live (mangled) -# rootfs /live (mangled) -# rootfs /boot (original) - -echo "(re)Copying in kernel images..." -cp -a chroot/live/uInitrd chroot/live/uImage chroot/live/dtb binary/live/ - -# This reduces final image size significantly; original raw kernel files are -# still duplicated in /boot. -# Don't stop on errors, because this script may have already been run. -echo "Removing redundant kernel images..." -rm binary/live/vmlinuz-* || true -rm binary/live/initrd.img-* || true diff --git a/config/hooks/kernel-image.sh.chroot b/config/hooks/kernel-image.sh.chroot deleted file mode 100755 index 84de114..0000000 --- a/config/hooks/kernel-image.sh.chroot +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -set -e - -# This script adds the DreamPlug's device tree file to the kernel image, -# generates uImage and uInitrd style files (for use with u-boot, as opposed to -# syslinux-style images), and moves those files to /live. - -# See also kernel-image.sh.binary, which recopies files at the final binary -# assembly stage. - -KERNELVERSION=`ls /boot/vmlinuz-* | sed -e "s/\/boot\/vmlinuz-//"` - -echo "Mangling kernel..." -# TBD: is it necessary to do this first stage of mangling which removes the -# conf/param.conf file, which may or may not be clobbering kernel boot -# arguments? -mkdir -p /tmp/initrd-repack -(cd /tmp/initrd-repack ; \ - zcat /boot/initrd.img-$KERNELVERSION | cpio -i ; \ - rm -f conf/param.conf ; \ - find . | cpio --quiet -o -H newc | \ - gzip -9 > /boot/initrd.img) -rm -rf /tmp/initrd-repack - -(cd /boot ; \ - cp /usr/lib/linux-image-*/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 ($KERNELVERSION)" \ - -d initrd.img uInitrd ) -rm /boot/initrd.img - -# Useful to to this here because sometimes /live doesn't get created -# otherwise... -echo "Creating /live and copying in boot images..." -mkdir -p /live -mv /boot/uInitrd /boot/uImage /boot/dtb /live diff --git a/config/hooks/mkdir_live.sh.chroot b/config/hooks/mkdir_live.sh.chroot new file mode 100644 index 0000000..ba47be4 --- /dev/null +++ b/config/hooks/mkdir_live.sh.chroot @@ -0,0 +1,9 @@ +#!/bin/sh + +set -e + +# Useful to to this here because sometimes /live doesn't get created +# otherwise... +echo "Creating /live and copying in boot images..." +mkdir -p /live + diff --git a/config/package-lists/debug.list.chroot b/config/package-lists/debug.list.chroot new file mode 100644 index 0000000..16b0e13 --- /dev/null +++ b/config/package-lists/debug.list.chroot @@ -0,0 +1,4 @@ +pciutils +usbutils +iperf +dnsutils diff --git a/config/package-lists/dreamplug.list.chroot b/config/package-lists/novena.list.chroot index 1757229..3122bdc 100644 --- a/config/package-lists/dreamplug.list.chroot +++ b/config/package-lists/novena.list.chroot @@ -1,4 +1,4 @@ flash-kernel u-boot-tools u-boot -wireless-tools +initramfs-tools |