From 770a7b4c85ddc3285847bf51d9075c0e55a7a430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 15 Jan 2019 14:45:02 +0100 Subject: [PATCH] Add the 100-purge-grub-legacy-ec2-arm.chroot to ubuntu-cpc --- debian/changelog | 3 +++ .../hooks/100-purge-grub-legacy-ec2-arm.chroot | 10 ++++++++++ 2 files changed, 13 insertions(+) create mode 100755 live-build/ubuntu-cpc/hooks/100-purge-grub-legacy-ec2-arm.chroot diff --git a/debian/changelog b/debian/changelog index b81d41d8..07f96d78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,9 @@ livecd-rootfs (2.525.13) UNRELEASED; urgency=medium - Default to IMAGEFORMAT=ubuntu-image for raspi3 ubuntu-cpc builds. - Link the resulting raspi3 image to a filename that cdimage expects from a preinstalled image build. + * Add the 100-purge-grub-legacy-ec2-arm.chroot hook to remove + grub-legacy-ec2 from any ARM based ubuntu-cpc images we create. The package + is no longer in the server seed of newer series anyway. -- Łukasz 'sil2100' Zemczak Fri, 11 Jan 2019 14:53:10 +0100 diff --git a/live-build/ubuntu-cpc/hooks/100-purge-grub-legacy-ec2-arm.chroot b/live-build/ubuntu-cpc/hooks/100-purge-grub-legacy-ec2-arm.chroot new file mode 100755 index 00000000..ecfbe58b --- /dev/null +++ b/live-build/ubuntu-cpc/hooks/100-purge-grub-legacy-ec2-arm.chroot @@ -0,0 +1,10 @@ +#!/bin/sh -eux + +# Only execute the hack for ARM images +if [ "$ARCH" != "armhf" ] && [ "$ARCH" != "arm64" ]; then + exit 0 +fi + +export DEBIAN_FRONTEND=noninteractive +# Why is grub-legacy-ec2 even on the image? +apt-get remove --yes --purge grub-legacy-ec2 || true