From b3b9e4229e0a80a4b92392ef5489a8dd128ba74b Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Fri, 28 Feb 2020 12:28:22 -0600 Subject: [PATCH] Ubuntu: drop trusty Signed-off-by: Robert Nelson --- lib/distro.conf | 3 +- lib/trusty-preseed.cfg | 83 ------------------------------------------ mk_mmc.sh | 4 -- 3 files changed, 1 insertion(+), 89 deletions(-) delete mode 100644 lib/trusty-preseed.cfg diff --git a/lib/distro.conf b/lib/distro.conf index c27039f..fbf506d 100755 --- a/lib/distro.conf +++ b/lib/distro.conf @@ -4,8 +4,7 @@ unset UBOOTWRAPPER NETIMAGE="current" NETINSTALL="initrd.gz" case "${DISTARCH}-${debian_boot}" in -trusty-armhf-netboot|xenial-armhf-netboot|bionic-armhf-netboot) - #http://ports.ubuntu.com/dists/trusty/main/installer-armhf/ +xenial-armhf-netboot|bionic-armhf-netboot) #http://ports.ubuntu.com/dists/xenial/main/installer-armhf/ #http://ports.ubuntu.com/dists/bionic/main/installer-armhf/ HTTP_IMAGE="http://ports.ubuntu.com/ubuntu-ports/dists" diff --git a/lib/trusty-preseed.cfg b/lib/trusty-preseed.cfg deleted file mode 100644 index 4a71bca..0000000 --- a/lib/trusty-preseed.cfg +++ /dev/null @@ -1,83 +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 - -# Keyboard selection. -# Disable automatic (interactive) keymap detection. -d-i console-setup/ask_detect boolean false - -# If you select ftp, the mirror/country string does not need to be set. -#d-i mirror/protocol string ftp -d-i mirror/country string manual -d-i mirror/http/hostname string ports.ubuntu.com -d-i mirror/http/directory string /ubuntu-ports - -#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 Ubuntu from installing random kernel choice -d-i base-installer/kernel/image select none - -# Additional repositories, local[0-9] available -#d-i apt-setup/local0/repository string \ -# http://local.server/debian stable main -#d-i apt-setup/local0/comment string local server -# Enable deb-src lines -#d-i apt-setup/local0/source boolean true -# URL to the public key of the local repository; you must provide a key or -# apt will complain about the unauthenticated repository and so the -# sources.list line will be left commented out -#d-i apt-setup/local0/key string http://local.server/key - -d-i apt-setup/local0/repository string deb http://repos.rcn-ee.com/ubuntu/ trusty main - -#apt-cacher-ng allows "custom.gpg" -d-i apt-setup/local0/key string http://repos.rcn-ee.com/ubuntu/conf/custom.gpg - -# 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 dosfstools initramfs-tools ntpdate rcn-ee-archive-keyring util-linux wget - -# Whether to upgrade packages after debootstrap. -# Allowed values: none, safe-upgrade, full-upgrade -d-i pkgsel/upgrade select safe-upgrade - -# Policy for applying updates. May be "none" (no automatic updates), -# "unattended-upgrades" (install security updates automatically), or -# "landscape" (manage system with Landscape). -d-i pkgsel/update-policy select none - -# 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 d35c1e4..6e3d51d 100755 --- a/mk_mmc.sh +++ b/mk_mmc.sh @@ -1432,10 +1432,6 @@ check_distro () { ARCH="armhf" case "${DISTRO_TYPE}" in - trusty|trusty-armhf) - DIST="trusty" - deb_distribution="ubuntu" - ;; xenial|xenial-armhf) DIST="xenial" deb_distribution="ubuntu"