From ce784911188c27f0fb83476698eda70420a54431 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Wed, 19 Mar 2014 10:14:51 -0500 Subject: [PATCH] distro: add ALPHA support for jessie, tested on wand-dual Signed-off-by: Robert Nelson --- README | 1 + lib/debian-finish.sh | 3 +++ lib/distro.conf | 9 +++++++ lib/jessie-preseed.cfg | 61 ++++++++++++++++++++++++++++++++++++++++++ mk_mmc.sh | 9 ++++++- 5 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 lib/jessie-preseed.cfg diff --git a/README b/README index c16bb5d..9a0e5c1 100644 --- a/README +++ b/README @@ -33,6 +33,7 @@ Optional: Debian: wheezy-armel wheezy-armhf (armv7-a) + jessie-armhf (armv7-a) (alpha) Ubuntu: oneiric (11.10) (armv7-a) (EOL: May 2013) precise-armhf (12.04) (armv7-a) (EOL: April 2017) diff --git a/lib/debian-finish.sh b/lib/debian-finish.sh index 0c18f7f..73c3416 100644 --- a/lib/debian-finish.sh +++ b/lib/debian-finish.sh @@ -145,6 +145,9 @@ if [ -f /boot/uboot/linux-image-*_1.0*_arm*.deb ] ; then cp /boot/vmlinuz-`uname -r` /boot/uboot/zImage cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img rm -f /boot/uboot/linux-image-*_1.0*_arm*.deb || true + if [ -f /boot/uboot/vmlinuz- ] ; then + rm -f /boot/uboot/vmlinuz- || true + fi #Cleanup: mv /boot/uboot/bootdrive /boot/uboot/backup/ || true diff --git a/lib/distro.conf b/lib/distro.conf index 4b6711c..c2ea7b4 100755 --- a/lib/distro.conf +++ b/lib/distro.conf @@ -70,4 +70,13 @@ wheezy-armhf-netboot) UBOOTWRAPPER=1 NETINSTALL="uInitrd" ;; +jessie-armhf-netboot) + #08-Feb-2014 + #http://ftp.us.debian.org/debian/dists/jessie/main/installer-armhf/ + NETIMAGE="20140316" + TEST_MD5SUM="20f33daac341aeed83f1d2b5b814dac6" + HTTP_IMAGE="http://ftp.debian.org/debian/dists" + BASE_IMAGE="armmp/netboot" + NETINSTALL="initrd.gz" + ;; esac diff --git a/lib/jessie-preseed.cfg b/lib/jessie-preseed.cfg new file mode 100644 index 0000000..2fb54c1 --- /dev/null +++ b/lib/jessie-preseed.cfg @@ -0,0 +1,61 @@ +### Apt setup +# You can choose to install non-free and contrib software. +d-i apt-setup/non-free boolean true +d-i apt-setup/contrib boolean true + +# The Wheezy, USB disabled (no keyboard access) till after you select keymap bug... +#(this is not needed in serial mode) +#d-i console-tools/archs string skip-config +#d-i debian-installer/locale string en_US +#d-i console-keymaps-at/keymap select us + +#Removes the prompt about missing modules: +# Continue without installing a kernel? +d-i base-installer/kernel/skip-install boolean true +# Continue the install without loading kernel modules? +d-i anna/no_kernel_modules boolean true + +# Stop Debian from installing random kernel choice +d-i base-installer/kernel/image select none + +# Controls whether to use NTP to set the clock during the install +d-i clock-setup/ntp boolean true +# NTP server to use. The default is almost always fine here. +d-i clock-setup/ntp-server string pool.ntp.org + +### Partitioning +## Partitioning example +# If the system has free space you can choose to only partition that space. +# This is only honoured if partman-auto/method (below) is not set. +d-i partman-auto/init_automatically_partition select biggest_free + +# Alternatively, you may specify a disk to partition. If the system has only +# one disk the installer will default to using that, but otherwise the device +# name must be given in traditional, non-devfs format (so e.g. /dev/hda or +# /dev/sda, and not e.g. /dev/discs/disc0/disc). +# For example, to use the first SCSI/SATA hard disk: +d-i partman-auto/disk string /dev/mmcblk0 + +# Or provide a recipe of your own... +# If you have a way to get a recipe file into the d-i environment, you can +# just point at it. +d-i partman-auto/expert_recipe_file string /partition_recipe + +# Individual additional packages to install +d-i pkgsel/include string bash fbset initramfs-tools ntpdate parted pastebinit util-linux u-boot-tools wget + +# Whether to upgrade packages after debootstrap. +# Allowed values: none, safe-upgrade, full-upgrade +d-i pkgsel/upgrade select safe-upgrade + +# Controls whether to use NTP to set the clock during the install +d-i clock-setup/ntp boolean true + +# During installations from serial console, the regular virtual consoles +# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next +# line to prevent this. +d-i finish-install/keep-consoles boolean true + +# Avoid that last message about the install being complete. +d-i finish-install/reboot_in_progress note + diff --git a/mk_mmc.sh b/mk_mmc.sh index c3c2b2a..ba74214 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -687,6 +687,8 @@ initrd_cleanup () { rm -rf ${TEMPDIR}/initrd-tree/lib/modules/*-mx5 || true rm -rf ${TEMPDIR}/initrd-tree/lib/modules/*-generic || true rm -rf ${TEMPDIR}/initrd-tree/lib/firmware/*-versatile/ || true + #jessie: + rm -rf ${TEMPDIR}/initrd-tree/lib/modules/*-armmp || true echo "NetInstall: Final size [`du -ch ${TEMPDIR}/initrd-tree/ | grep total`]" } @@ -909,7 +911,7 @@ initrd_preseed_settings () { flash_kernel_broken patch_linux_version ;; - wheezy) + wheezy|jessie) cp -v "${DIR}/lib/debian-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh ;; esac @@ -1517,6 +1519,9 @@ check_distro () { wheezy-armhf) DIST="wheezy" ;; + jessie-armhf) + DIST="jessie" + ;; *) IN_VALID_DISTRO=1 cat <<-__EOF__ @@ -1528,6 +1533,7 @@ check_distro () { Debian: wheezy-armel wheezy-armhf (armv7-a) + jessie-armhf (armv7-a) (alpha) Ubuntu: oneiric (11.10 - End Of Life: April 2013) (armv7-a) precise-armhf (12.04) (armv7-a) @@ -1577,6 +1583,7 @@ usage () { Debian: wheezy-armel wheezy-armhf (armv7-a) + jessie-armhf (armv7-a) (alpha) Ubuntu: oneiric (11.10 - End Of Life: April 2013) (armv7-a) precise-armhf (12.04) (armv7-a)