[neon/infrastructure/pangea-data] imager/build-hooks-neon: remove neon-ubuntu-advantage-tools in favour of just an empty ubuntu-advantage-tools package so no need for this check

Jonathan Riddell null at kde.org
Wed Mar 20 17:51:40 GMT 2024


Git commit e73be6ff508f4ae79bab4407e3641ab5f22c261d by Jonathan Riddell.
Committed on 20/03/2024 at 17:51.
Pushed by jriddell into branch 'master'.

remove neon-ubuntu-advantage-tools in favour of just an empty ubuntu-advantage-tools package so no need for this check

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

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

diff --git a/imager/build-hooks-neon/009-neon-masks.chroot b/imager/build-hooks-neon/009-neon-masks.chroot
index 072caaa..9d34450 100644
--- a/imager/build-hooks-neon/009-neon-masks.chroot
+++ b/imager/build-hooks-neon/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