[neon/infrastructure/pangea-data] imager/build-hooks-neon-developer: adapt to new dummy packages that have replaced the old neon-ubuntu-advantage-tools masks

Carlos De Maine null at kde.org
Tue Mar 26 06:59:49 GMT 2024


Git commit babcce8a32eb418468eee27dda11c2b2a26796c8 by Carlos De Maine.
Committed on 26/03/2024 at 06:59.
Pushed by carlosdem into branch 'master'.

adapt to new dummy packages that have replaced the old neon-ubuntu-advantage-tools masks

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

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

diff --git a/imager/build-hooks-neon-developer/009-neon-masks.chroot b/imager/build-hooks-neon-developer/009-neon-masks.chroot
index 12dca72..1e39c5c 100644
--- a/imager/build-hooks-neon-developer/009-neon-masks.chroot
+++ b/imager/build-hooks-neon-developer/009-neon-masks.chroot
@@ -22,17 +22,6 @@
 
 set -e
 
-# 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