[neon/infrastructure/pangea-data] imager/build-hooks-neon-arm64: adapt to new ubuntu-pro-client dummy packages

Carlos De Maine null at kde.org
Thu Mar 21 08:10:33 GMT 2024


Git commit 9690474b29c096b0fc3d9832f0c4b0d7a3c3fab5 by Carlos De Maine.
Committed on 21/03/2024 at 08:10.
Pushed by carlosdem into branch 'master'.

adapt to new ubuntu-pro-client dummy packages

M  +0    -11   imager/build-hooks-neon-arm64/009-neon-masks.chroot

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/9690474b29c096b0fc3d9832f0c4b0d7a3c3fab5

diff --git a/imager/build-hooks-neon-arm64/009-neon-masks.chroot b/imager/build-hooks-neon-arm64/009-neon-masks.chroot
index 8531c42..f0d26b5 100644
--- a/imager/build-hooks-neon-arm64/009-neon-masks.chroot
+++ b/imager/build-hooks-neon-arm64/009-neon-masks.chroot
@@ -8,17 +8,6 @@ set -e
 
 . /etc/os-release
 
-# This is canonical support stuff. Not useful and probably also not offered.
-# Our mask removes the ubuntu version.
-# It's being installed by debootstrap, so we'll have to manually rip it out
-# again as apt wouldn't prefer our provides variant over it.
-apt-get install --purge -y neon-ubuntu-advantage-tools
-apt-mark auto neon-ubuntu-advantage-tools
-if dpkg -s ubuntu-advantage-tools; then
-  echo 'ubuntu-advantage-tools is still installed. It is expected to be masked!'
-  exit 1
-fi
-
 # Make sure adwaita is masked. Depending on dep resolution we may hav ended
 # up with the real adwaita
 apt-get install --purge -y neon-adwaita


More information about the Neon-commits mailing list