From f358c181a75be8ae5c5bf33e81cd48e3526924ab Mon Sep 17 00:00:00 2001 From: Jonathan Riddell Date: Tue, 7 Sep 2021 13:09:44 +0100 Subject: [PATCH] add hook to remove gnome --- .../099-calamares-settings.chroot | 11 +++++++++++ .../build-hooks-neon-mobile/91-apt-update.chroot | 6 ------ .../config-hooks-neon-mobile/30-remove-gnome.sh | 3 +++ .../config-hooks-neon-mobile/30-remove-linux.sh | 3 +++ 4 files changed, 17 insertions(+), 6 deletions(-) create mode 100755 nci/imager/build-hooks-neon-mobile/099-calamares-settings.chroot delete mode 100755 nci/imager/build-hooks-neon-mobile/91-apt-update.chroot create mode 100644 nci/imager/config-hooks-neon-mobile/30-remove-gnome.sh create mode 100644 nci/imager/config-hooks-neon-mobile/30-remove-linux.sh diff --git a/nci/imager/build-hooks-neon-mobile/099-calamares-settings.chroot b/nci/imager/build-hooks-neon-mobile/099-calamares-settings.chroot new file mode 100755 index 000000000..2621cdeea --- /dev/null +++ b/nci/imager/build-hooks-neon-mobile/099-calamares-settings.chroot @@ -0,0 +1,11 @@ +#!/bin/sh + +# SPDX-FileCopyrightText: 2020 Jonathan Riddell +# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL + +set -e + +echo 'installing calamares-setings' + +# calamares-settings-debian seems to want to install on testing so force this here +apt install -y calamares-settings diff --git a/nci/imager/build-hooks-neon-mobile/91-apt-update.chroot b/nci/imager/build-hooks-neon-mobile/91-apt-update.chroot deleted file mode 100755 index 9d131244e..000000000 --- a/nci/imager/build-hooks-neon-mobile/91-apt-update.chroot +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -set -e - -#refresh apt cache including appstream cache -apt-get update diff --git a/nci/imager/config-hooks-neon-mobile/30-remove-gnome.sh b/nci/imager/config-hooks-neon-mobile/30-remove-gnome.sh new file mode 100644 index 000000000..003d65308 --- /dev/null +++ b/nci/imager/config-hooks-neon-mobile/30-remove-gnome.sh @@ -0,0 +1,3 @@ +# For some reason it installs gnome so remove it +apt remove -y ubuntu-session +apt -y autoremove diff --git a/nci/imager/config-hooks-neon-mobile/30-remove-linux.sh b/nci/imager/config-hooks-neon-mobile/30-remove-linux.sh new file mode 100644 index 000000000..2fb39c3c2 --- /dev/null +++ b/nci/imager/config-hooks-neon-mobile/30-remove-linux.sh @@ -0,0 +1,3 @@ +# We now use 20.04 HWE linux but this one still gets isntalled for some reason, jriddell 2021-06-15 +apt remove -y linux-image-5.4.0-74-generic linux-headers-5.4.0-74-generic linux-headers-5.4.0-74 linux-generic linux-headers-generic +