From 910b19fef4e47ce9c29065b59b715487ee99802a Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sun, 5 May 2013 08:53:39 -0500 Subject: [PATCH] distro: drop squeeze Signed-off-by: Robert Nelson --- INSTALL.Debian | 4 +-- README | 1 - lib/distro.conf | 9 ------- lib/squeeze-preseed.cfg | 60 ----------------------------------------- mk_mmc.sh | 19 +++---------- 5 files changed, 5 insertions(+), 88 deletions(-) delete mode 100644 lib/squeeze-preseed.cfg diff --git a/INSTALL.Debian b/INSTALL.Debian index e4e05bf..6f86bd1 100644 --- a/INSTALL.Debian +++ b/INSTALL.Debian @@ -35,7 +35,7 @@ $ sudo ./mk_mmc.sh --mmc /dev/sdb/ You'll need to also provide the correct argument to the --uboot and the --distro arguments. In my case, I did this; -$ sudo ./mk_mmc.sh --mmc /dev/sdb/ --uboot beagle --distro squeeze +$ sudo ./mk_mmc.sh --mmc /dev/sdb/ --uboot beagle_xm --distro wheezy-armhf You'll need to be root because the script is going to call fdisk which usually lives under /sbin/ @@ -57,7 +57,7 @@ Required Options: Optional: --distro Debian: - squeeze + wheezy-armhf Ubuntu maverick natty diff --git a/README b/README index a4f70aa..87e6b66 100644 --- a/README +++ b/README @@ -36,7 +36,6 @@ Required Options: Optional: --distro Debian: - squeeze (armv4) wheezy-armhf (armv7-a) Ubuntu: oneiric (11.10 - End Of Life: April 2013) (armv7-a) diff --git a/lib/distro.conf b/lib/distro.conf index d8cfea5..ab02872 100755 --- a/lib/distro.conf +++ b/lib/distro.conf @@ -41,15 +41,6 @@ raring-armhf-netboot) UBOOTWRAPPER=1 NETINSTALL="uInitrd" ;; -squeeze-armel-netboot) - #26-Sep-2012: 6.0.4+b2 - #http://ftp.us.debian.org/debian/dists/squeeze/main/installer-armel/ - NETIMAGE="20110106+squeeze4+b2" - TEST_MD5SUM="8daf11d54b16527404837acda915f32a" - HTTP_IMAGE="http://ftp.debian.org/debian/dists" - BASE_IMAGE="versatile/netboot" - NETINSTALL="initrd.gz" - ;; wheezy-armel-netboot) #1-May-2013 #http://ftp.us.debian.org/debian/dists/wheezy/main/installer-armel/ diff --git a/lib/squeeze-preseed.cfg b/lib/squeeze-preseed.cfg deleted file mode 100644 index 0eaeae5..0000000 --- a/lib/squeeze-preseed.cfg +++ /dev/null @@ -1,60 +0,0 @@ -### 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 - -# Squeeze only: (doesn't seem to effect maverick/natty/oneiric/precise..) -# (working around a gcc/bug, where netinstall locks up here, cross compiled *.deb would work fine...) -# Note: this workaround is disabled 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 - -# 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 uboot-mkimage 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 fd0ac1f..0615634 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -915,7 +915,7 @@ initrd_preseed_settings () { flash_kernel_broken ;; - squeeze|wheezy) + wheezy) cp -v "${DIR}/lib/debian-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh ;; esac @@ -924,13 +924,6 @@ initrd_preseed_settings () { setup_parition_recipe cp -v "${DIR}/lib/${DIST}-preseed.cfg" ${TEMPDIR}/initrd-tree/preseed.cfg - if [ "${SERIAL_MODE}" ] ; then - #Squeeze: keymaps aren't an issue with serial mode so disable preseed workaround: - sed -i -e 's:d-i console-tools:#d-i console-tools:g' ${TEMPDIR}/initrd-tree/preseed.cfg - sed -i -e 's:d-i debian-installer:#d-i debian-installer:g' ${TEMPDIR}/initrd-tree/preseed.cfg - sed -i -e 's:d-i console-keymaps-at:#d-i console-keymaps-at:g' ${TEMPDIR}/initrd-tree/preseed.cfg - fi - cd "${DIR}"/ } @@ -1650,10 +1643,6 @@ check_distro () { exit fi ;; - squeeze) - DIST="squeeze" - ARCH="armel" - ;; wheezy-armel) DIST="wheezy" ARCH="armel" @@ -1670,8 +1659,7 @@ check_distro () { ----------------------------- --distro Debian: - squeeze (armv4) - wheezy-armhf (armv7-a) + wheezy-armhf (armv7-a) Ubuntu: oneiric (11.10 - End Of Life: April 2013) (armv7-a) precise-armhf (12.04) (armv7-a) @@ -1707,8 +1695,7 @@ usage () { Optional: --distro Debian: - squeeze (armv4) - wheezy-armhf (armv7-a) + wheezy-armhf (armv7-a) Ubuntu: oneiric (11.10 - End Of Life: April 2013) (armv7-a) precise-armhf (12.04) (armv7-a)