diff --git a/debian/changelog b/debian/changelog index 81b38938..5f3c5f88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ livecd-rootfs (2.590) UNRELEASED; urgency=medium * Drop dead wubi subproject. * Drop dead jasper subproject. + * Drop old arm platforms. -- Dimitri John Ledkov Thu, 30 May 2019 11:04:02 +0100 diff --git a/live-build/auto/build b/live-build/auto/build index 4f7393af..245fff9c 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -838,36 +838,6 @@ if [ "$NUMFLAVOURS" = 1 ] && [ "$LB_LINUX_FLAVOURS" != "none" ]; then fi case $SUBARCH in - ac100) - # create the md5sum and size files for which we are actually doing all this - md5sum $PREFIX.rootfs.tar.gz >chroot/installer.md5 - wc -c $PREFIX.rootfs.tar.gz >chroot/installer.size - - INFO_DESC="$(lsb_release -d -s)" - INFO_STAMP=$(date +20%y%m%d-%H:%M) - - echo "$INFO_DESC - $ARCH ($INFO_STAMP)" >chroot/media-info - - # make sure update-initramfs feels cosy and warm in the environment - lb chroot_proc install "$@" - lb chroot_sysfs install "$@" - lb chroot_devpts install "$@" - - # re-create initrd to contain the installer.md5 file - Chroot chroot "env FLASH_KERNEL_SKIP=1 update-initramfs -k all -t -u -v" - - # create boot.img - Chroot chroot "abootimg --create /boot/installer-${KVERS}.img -f /boot/bootimg.cfg-$SUBARCH -r /boot/initrd.img-${KVERS} -k /boot/vmlinuz-${KVERS}" - - # clean up - lb chroot_devpts remove "$@" - lb chroot_sysfs remove "$@" - lb chroot_proc remove "$@" - - cp "chroot/boot/installer-${KVERS}.img" "$PREFIX.bootimg-$FLAVOUR" - ln -sf "$PREFIX.bootimg-$FLAVOUR" "$PREFIX.bootimg" - ;; - raspi2|raspi3) # copy the kernel and initrd to a predictable directory for # ubuntu-image consumption. In some cases, like in pi2/3 diff --git a/live-build/auto/config b/live-build/auto/config index 9465d6b2..a52bda69 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -942,39 +942,9 @@ case $PROJECT in esac case $ARCH in - armel|armhf|arm64) + armhf|arm64) KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}" case $SUBARCH in - dove) - BINARY_REMOVE_LINUX=false - ;; - omap) - add_package install u-boot-linaro-omap3-beagle u-boot-tools - BINARY_REMOVE_LINUX=false - ;; - omap4) - case $PROJECT in - ubuntu-server|ubuntu-core|base) - add_package install u-boot-linaro-omap4-panda u-boot-tools - ;; - *) - add_package install u-boot-linaro-omap4-panda u-boot-tools pvr-omap4 - ;; - esac - BINARY_REMOVE_LINUX=false - ;; - mx5) - COMPONENTS='main restricted universe' - KERNEL_FLAVOURS=linaro-lt-mx5 - add_package install flash-kernel u-boot-linaro-mx53loco u-boot-tools - BINARY_REMOVE_LINUX=false - ;; - ac100) - COMPONENTS='main restricted universe multiverse' - add_package install zram-config abootimg - add_package live ac100-tarball-installer - BINARY_REMOVE_LINUX=false - ;; raspi2) COMPONENTS='main restricted universe multiverse' add_package install linux-firmware-raspi2 u-boot-rpi flash-kernel u-boot-tools wpasupplicant