[neon/infrastructure/pangea-data] imager: sync all the different editions
Carlos De Maine
null at kde.org
Mon Aug 19 03:31:36 BST 2024
Git commit 75f7b11bf7478677f29b90599dc1adbaa9134b9d by Carlos De Maine.
Committed on 19/08/2024 at 02:31.
Pushed by carlosdem into branch 'master'.
sync all the different editions
M +2 -6 imager/build-hooks-neon-arm64/009-neon-masks.chroot
M +1 -0 imager/build-hooks-neon-arm64/010-neon-forks.chroot
M +2 -1 imager/build-hooks-neon-arm64/011-fuse.chroot
M +1 -1 imager/build-hooks-neon-arm64/011-fuse.chroot_early
M +19 -2 imager/build-hooks-neon-arm64/012-firefox.chroot
M +1 -1 imager/build-hooks-neon-arm64/013-fuse.chroot_early
M +2 -2 imager/build-hooks-neon-arm64/051-zfs.chroot
M +2 -1 imager/build-hooks-neon-arm64/091-apt-update.chroot
M +2 -1 imager/build-hooks-neon-arm64/092-apt-blacklist.chroot
M +10 -9 imager/build-hooks-neon-arm64/093-preinstalled-pool.chroot
M +3 -3 imager/build-hooks-neon-arm64/099-calamares-settings.chroot
M +2 -1 imager/build-hooks-neon-arm64/100-grubster.binary
M +6 -5 imager/build-hooks-neon-arm64/999-md5sum.binary
M +11 -19 imager/build-hooks-neon-developer/009-neon-masks.chroot
M +1 -0 imager/build-hooks-neon-developer/010-neon-forks.chroot
M +5 -1 imager/build-hooks-neon-developer/011-fuse.chroot
C +1 -1 imager/build-hooks-neon-developer/011-fuse.chroot_early [from: imager/build-hooks-neon-mobile/011-fuse.chroot_early - 097% similarity]
C +19 -2 imager/build-hooks-neon-developer/012-firefox.chroot [from: imager/build-hooks-neon-arm64/012-firefox.chroot - 056% similarity]
M +1 -1 imager/build-hooks-neon-developer/013-fuse.chroot_early
M +2 -2 imager/build-hooks-neon-developer/051-zfs.chroot
M +2 -1 imager/build-hooks-neon-developer/091-apt-update.chroot
M +22 -1 imager/build-hooks-neon-developer/092-apt-blacklist.chroot
M +6 -6 imager/build-hooks-neon-developer/093-preinstalled-pool.chroot
C +3 -2 imager/build-hooks-neon-developer/099-calamares-settings.chroot [from: imager/build-hooks-neon-mobile/099-calamares-settings.chroot - 073% similarity]
M +2 -1 imager/build-hooks-neon-developer/100-grubster.binary
D +0 -6 imager/build-hooks-neon-developer/91-apt-update.chroot
D +0 -6 imager/build-hooks-neon-developer/92-apt-blacklist.chroot
D +0 -25 imager/build-hooks-neon-developer/99-no-gnome.chroot
M +3 -1 imager/build-hooks-neon-developer/999-md5sum.binary
M +7 -2 imager/build-hooks-neon-ko/000_language-fixes.chroot
M +11 -19 imager/build-hooks-neon-ko/009-neon-masks.chroot
M +1 -0 imager/build-hooks-neon-ko/010-neon-forks.chroot
M +5 -1 imager/build-hooks-neon-ko/011-fuse.chroot
C +1 -1 imager/build-hooks-neon-ko/011-fuse.chroot_early [from: imager/build-hooks-neon-mobile/011-fuse.chroot_early - 097% similarity]
C +19 -2 imager/build-hooks-neon-ko/012-firefox.chroot [from: imager/build-hooks-neon-arm64/012-firefox.chroot - 056% similarity]
C +1 -1 imager/build-hooks-neon-ko/013-fuse.chroot_early [from: imager/build-hooks-neon-arm64/013-fuse.chroot_early - 096% similarity]
M +2 -2 imager/build-hooks-neon-ko/051-zfs.chroot
M +2 -1 imager/build-hooks-neon-ko/091-apt-update.chroot
M +22 -1 imager/build-hooks-neon-ko/092-apt-blacklist.chroot
M +6 -8 imager/build-hooks-neon-ko/093-preinstalled-pool.chroot
C +3 -2 imager/build-hooks-neon-ko/099-calamares-settings.chroot [from: imager/build-hooks-neon-mobile/099-calamares-settings.chroot - 073% similarity]
M +2 -1 imager/build-hooks-neon-ko/100-grubster.binary
D +0 -6 imager/build-hooks-neon-ko/91-apt-update.chroot
D +0 -6 imager/build-hooks-neon-ko/92-apt-blacklist.chroot
M +3 -1 imager/build-hooks-neon-ko/999-md5sum.binary
M +2 -1 imager/build-hooks-neon-mobile/009-neon-masks.chroot
M +1 -0 imager/build-hooks-neon-mobile/010-neon-forks.chroot
M +2 -1 imager/build-hooks-neon-mobile/011-fuse.chroot
M +1 -1 imager/build-hooks-neon-mobile/011-fuse.chroot_early
M +19 -2 imager/build-hooks-neon-mobile/012-firefox.chroot
C +1 -1 imager/build-hooks-neon-mobile/013-fuse.chroot_early [from: imager/build-hooks-neon-arm64/013-fuse.chroot_early - 096% similarity]
M +2 -2 imager/build-hooks-neon-mobile/051-zfs.chroot
M +2 -1 imager/build-hooks-neon-mobile/091-apt-update.chroot
M +2 -1 imager/build-hooks-neon-mobile/092-apt-blacklist.chroot
M +8 -0 imager/build-hooks-neon-mobile/092-apt-remove-unnecessary.chroot
M +6 -6 imager/build-hooks-neon-mobile/093-preinstalled-pool.chroot
M +3 -2 imager/build-hooks-neon-mobile/099-calamares-settings.chroot
M +2 -1 imager/build-hooks-neon-mobile/100-grubster.binary
M +3 -1 imager/build-hooks-neon-mobile/999-md5sum.binary
M +3 -1 imager/config-hooks-neon-arm64/00-debconf-preseed.sh
M +3 -0 imager/config-hooks-neon-arm64/00-neon-forks.sh
M +7 -0 imager/config-hooks-neon-arm64/20_package_list.sh
M +3 -0 imager/config-hooks-neon-arm64/99-grub-deps.sh
M +21 -4 imager/config-hooks-neon-arm64/99-preinstalled-pool.sh
M +7 -0 imager/config-hooks-neon-arm64/apt.conf.sh
M +64 -6 imager/config-hooks-neon-arm64/repo.sh
M +3 -1 imager/config-hooks-neon-bigscreen/00-debconf-preseed.sh
M +3 -0 imager/config-hooks-neon-bigscreen/00-neon-forks.sh
M +8 -2 imager/config-hooks-neon-bigscreen/20_package_list.sh
D +0 -11 imager/config-hooks-neon-bigscreen/20_package_list.sh~
M +3 -0 imager/config-hooks-neon-bigscreen/99-grub-deps.sh
M +19 -2 imager/config-hooks-neon-bigscreen/99-preinstalled-pool.sh
M +7 -0 imager/config-hooks-neon-bigscreen/apt.conf.sh
M +64 -6 imager/config-hooks-neon-bigscreen/repo.sh
M +3 -1 imager/config-hooks-neon-developer/00-debconf-preseed.sh
M +3 -0 imager/config-hooks-neon-developer/00-neon-forks.sh
M +7 -0 imager/config-hooks-neon-developer/20_package_list.sh
M +3 -0 imager/config-hooks-neon-developer/99-grub-deps.sh
D +0 -4 imager/config-hooks-neon-developer/99-no-gnome.sh
M +19 -2 imager/config-hooks-neon-developer/99-preinstalled-pool.sh
M +7 -0 imager/config-hooks-neon-developer/apt.conf.sh
M +64 -6 imager/config-hooks-neon-developer/repo.sh
M +3 -1 imager/config-hooks-neon-ko/00-debconf-preseed.sh
M +3 -0 imager/config-hooks-neon-ko/00-neon-forks.sh
M +7 -0 imager/config-hooks-neon-ko/20_package_list.sh
M +3 -0 imager/config-hooks-neon-ko/99-grub-deps.sh
M +24 -7 imager/config-hooks-neon-ko/99-preinstalled-pool.sh
M +7 -0 imager/config-hooks-neon-ko/apt.conf.sh
M +64 -6 imager/config-hooks-neon-ko/repo.sh
M +3 -1 imager/config-hooks-neon-mobile/00-debconf-preseed.sh
M +3 -0 imager/config-hooks-neon-mobile/00-neon-forks.sh
M +8 -1 imager/config-hooks-neon-mobile/20_package_list.sh
M +7 -0 imager/config-hooks-neon-mobile/30_no_source.sh
M +3 -0 imager/config-hooks-neon-mobile/99-grub-deps.sh
M +19 -2 imager/config-hooks-neon-mobile/99-preinstalled-pool.sh
M +7 -0 imager/config-hooks-neon-mobile/apt.conf.sh
M +64 -6 imager/config-hooks-neon-mobile/repo.sh
M +4 -0 imager/config-hooks-neon/repo.sh
M +14 -1 imager/config-settings-neon-arm64.sh
M +15 -2 imager/config-settings-neon-bigscreen.sh
M +15 -2 imager/config-settings-neon-mobile.sh
https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/75f7b11bf7478677f29b90599dc1adbaa9134b9d
diff --git a/imager/build-hooks-neon-arm64/009-neon-masks.chroot b/imager/build-hooks-neon-arm64/009-neon-masks.chroot
index f0d26b5..2c22394 100644
--- a/imager/build-hooks-neon-arm64/009-neon-masks.chroot
+++ b/imager/build-hooks-neon-arm64/009-neon-masks.chroot
@@ -4,7 +4,8 @@
# Mask certain packages which aren't getting properly covered by dependencies.
-set -e
+set -ex
+echo "build-hooks-neon -- running 009-neon-masks-chroot"
. /etc/os-release
@@ -17,8 +18,3 @@ apt-mark auto neon-adwaita
if [[ ${VERSION,,} = unstable* ]]; then
apt-get install -y kde-nomodeset
fi
-
-# TODO HACK temporary measure to test calamares bieng installed on arm @carlosd
-if [[ ${VERSION,,} = unstable* ]]; then
- apt-get install -y calamares
-fi
diff --git a/imager/build-hooks-neon-arm64/010-neon-forks.chroot b/imager/build-hooks-neon-arm64/010-neon-forks.chroot
index 81c9cec..4739c66 100755
--- a/imager/build-hooks-neon-arm64/010-neon-forks.chroot
+++ b/imager/build-hooks-neon-arm64/010-neon-forks.chroot
@@ -1,6 +1,7 @@
#!/bin/bash
set -ex
+echo "build-hooks-neon -- running 010-neon-forks.chroot"
UBIQUITY=`apt-cache policy ubiquity | grep http | head -n 1 | awk '{print $2}' | sed 's,[a-z]*$,,'`
LIVE_BUILD=`apt-cache policy live-build | grep http | head -n 1 | awk '{print $2}' | sed 's,[a-z]*$,,'`
diff --git a/imager/build-hooks-neon-arm64/011-fuse.chroot b/imager/build-hooks-neon-arm64/011-fuse.chroot
index 24d53e1..da9aa23 100644
--- a/imager/build-hooks-neon-arm64/011-fuse.chroot
+++ b/imager/build-hooks-neon-arm64/011-fuse.chroot
@@ -27,7 +27,8 @@
# only available on unstable and testing for now but enable universally when it has a real release
-set -e
+set -ex
+echo "build-hooks-neon -- running 011-fuse.chroot"
if grep -q Unstable /etc/os-release; then
apt-get install -y kio-fuse fuse3
diff --git a/imager/build-hooks-neon-arm64/011-fuse.chroot_early b/imager/build-hooks-neon-arm64/011-fuse.chroot_early
index f9a9158..856ed71 100644
--- a/imager/build-hooks-neon-arm64/011-fuse.chroot_early
+++ b/imager/build-hooks-neon-arm64/011-fuse.chroot_early
@@ -28,7 +28,7 @@
# only available on unstable and testing for now but enable universally when it has a real release
set -ex
-echo 011-fuse.chroot_early
+echo "build-hooks-neon -- 011-fuse.chroot_early"
if grep -q Unstable /etc/os-release; then
apt-get install -y neon-ubuntu-advantage-tools fuse3
diff --git a/imager/build-hooks-neon-arm64/012-firefox.chroot b/imager/build-hooks-neon-arm64/012-firefox.chroot
index a2adbf2..f5322e0 100644
--- a/imager/build-hooks-neon-arm64/012-firefox.chroot
+++ b/imager/build-hooks-neon-arm64/012-firefox.chroot
@@ -4,11 +4,14 @@
# Mask certain packages which aren't getting properly covered by dependencies.
-set -e
+set -ex
+
+echo "build-hooks-neon -- running 012-firefox.chroot"
+echo "Installing Firefox from PPA"
. /etc/os-release
-echo "Installing Firefox from PPA"
+if [ "$VERSION_CODENAME" = "jammy" ]; then
mv /etc/apt/apt.conf.d/00http-proxy /tmp/
sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
@@ -18,3 +21,17 @@ mv /tmp/00http-proxy /etc/apt/apt.conf.d/
sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
apt-get update
apt-cache policy firefox
+
+else
+
+# firefox has transitioned to the mozilla provided debs in noble
+mv /etc/apt/apt.conf.d/00http-proxy /tmp/
+sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-get -y --allow-downgrades install firefox
+mv /tmp/00http-proxy /etc/apt/apt.conf.d/
+sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-cache policy firefox
+
+fi
diff --git a/imager/build-hooks-neon-arm64/013-fuse.chroot_early b/imager/build-hooks-neon-arm64/013-fuse.chroot_early
index 359a97f..5e393f6 100644
--- a/imager/build-hooks-neon-arm64/013-fuse.chroot_early
+++ b/imager/build-hooks-neon-arm64/013-fuse.chroot_early
@@ -28,7 +28,7 @@
# only available on unstable and testing for now but enable universally when it has a real release
set -ex
-echo "running 013-fuse.chroot_early"
+echo "build-hooks-neon -- running 013-fuse.chroot_early"
if grep -q Unstable /etc/os-release; then
apt-get install -y neon-settings-2
diff --git a/imager/build-hooks-neon-arm64/051-zfs.chroot b/imager/build-hooks-neon-arm64/051-zfs.chroot
index 750b796..d5085a1 100755
--- a/imager/build-hooks-neon-arm64/051-zfs.chroot
+++ b/imager/build-hooks-neon-arm64/051-zfs.chroot
@@ -1,8 +1,8 @@
#!/bin/sh
-set -e
+set -ex
+echo "build-hooks-neon -- 051-zfs.chroot"
# Illegal to distribute
-
rm -f /lib/modules/*/kernel/zfs/zfs/zfs.ko
rm -f /lib/modules/*/kernel/zfs/zfs/zfs.ko
diff --git a/imager/build-hooks-neon-arm64/091-apt-update.chroot b/imager/build-hooks-neon-arm64/091-apt-update.chroot
index 9d13124..7f26c1f 100755
--- a/imager/build-hooks-neon-arm64/091-apt-update.chroot
+++ b/imager/build-hooks-neon-arm64/091-apt-update.chroot
@@ -1,6 +1,7 @@
#!/bin/sh
-set -e
+set -ex
+echo "build-hooks-neon -- 091-apt-update.chroot"
#refresh apt cache including appstream cache
apt-get update
diff --git a/imager/build-hooks-neon-arm64/092-apt-blacklist.chroot b/imager/build-hooks-neon-arm64/092-apt-blacklist.chroot
index e49a588..c6a72ef 100644
--- a/imager/build-hooks-neon-arm64/092-apt-blacklist.chroot
+++ b/imager/build-hooks-neon-arm64/092-apt-blacklist.chroot
@@ -2,7 +2,8 @@
set -ex
-echo 'running blacklist hook'
+echo "build-hooks-neon -- 092-apt-blacklist.chroot"
+echo "running blacklist hook"
# Drop blacklisted nonesense pulled in via recommends or platform seed.
apt-get purge -y unattended-upgrades || true
diff --git a/imager/build-hooks-neon-arm64/093-preinstalled-pool.chroot b/imager/build-hooks-neon-arm64/093-preinstalled-pool.chroot
index d84fd79..dca59a9 100644
--- a/imager/build-hooks-neon-arm64/093-preinstalled-pool.chroot
+++ b/imager/build-hooks-neon-arm64/093-preinstalled-pool.chroot
@@ -1,8 +1,9 @@
#!/bin/sh
-set -e
+set -ex
-echo 'running preinstalled pool hoook'
+echo "build-hooks-neon -- 093-preinstalled-pool.chroot"
+echo "running preinstalled pool hook"
mkdir -p /var/lib/preinstalled-pool/pool/
cd /var/lib/preinstalled-pool/pool/
@@ -26,25 +27,25 @@ apt-get \
dkms \
fakeroot \
libfakeroot \
- libc6-i386-cross \
+ libc6-i386 \
grub-efi \
- grub-efi-arm64 \
- grub-efi-arm64-bin \
- grub-efi-arm64-signed \
+ grub-efi-amd64 \
+ grub-efi-amd64-bin \
+ grub-efi-amd64-signed \
mokutil \
patch \
setserial \
shim \
shim-signed \
user-setup \
- oem-config \
- oem-config-kde
+ bcmwl-kernel-source
apt-get \
-o Debug::NoLocking=true \
-o Dir::Cache::Archives=`pwd`/cache \
--download-only \
-y \
install \
- grub2-common
+ oem-config \
+ oem-config-kde
mv cache/*.deb .
rm -r cache
diff --git a/imager/build-hooks-neon-arm64/099-calamares-settings.chroot b/imager/build-hooks-neon-arm64/099-calamares-settings.chroot
index 4ca1d97..7b24ec0 100755
--- a/imager/build-hooks-neon-arm64/099-calamares-settings.chroot
+++ b/imager/build-hooks-neon-arm64/099-calamares-settings.chroot
@@ -3,10 +3,10 @@
# SPDX-FileCopyrightText: 2020 Jonathan Riddell <jr at jriddell.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
-echo 'installing calamares-setings'
+echo "build-hooks-neon -- 099-calamres-settingss.chroot"
+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/imager/build-hooks-neon-arm64/100-grubster.binary b/imager/build-hooks-neon-arm64/100-grubster.binary
index ff444f8..5f801ca 100644
--- a/imager/build-hooks-neon-arm64/100-grubster.binary
+++ b/imager/build-hooks-neon-arm64/100-grubster.binary
@@ -2,8 +2,9 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
+echo "build-hooks-neon -- 100-grubster.binary"
echo "Finalizing Grub"
# This could kinda be done by live-build, but I don't trust ubuntu's ancient
diff --git a/imager/build-hooks-neon-arm64/999-md5sum.binary b/imager/build-hooks-neon-arm64/999-md5sum.binary
index d2b4ecc..9cee001 100644
--- a/imager/build-hooks-neon-arm64/999-md5sum.binary
+++ b/imager/build-hooks-neon-arm64/999-md5sum.binary
@@ -2,9 +2,11 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
+echo "build-hooks-neon -- 999-md5sum.binary"
echo "Generating md5sum.txt"
+
# is used on focal+ to verify ISO data integrity.
# we exlcude md5sum.txt for obvious reasons (still being written and changing)
@@ -14,7 +16,6 @@ echo "Generating md5sum.txt"
# (I think) livecd-rootfs. Should that change we would want to not have this
# filter anymore.
-#arm64 doesn't use isolinux
-#cd binary
-#find . -type f ! -name "md5sum.txt" ! -name 'isolinux.bin' | xargs md5sum >> md5sum.txt
-#cd ..
+cd binary
+find . -type f ! -name "md5sum.txt" ! -name 'isolinux.bin' | xargs md5sum >> md5sum.txt
+cd ..
diff --git a/imager/build-hooks-neon-developer/009-neon-masks.chroot b/imager/build-hooks-neon-developer/009-neon-masks.chroot
index 1e39c5c..2c22394 100644
--- a/imager/build-hooks-neon-developer/009-neon-masks.chroot
+++ b/imager/build-hooks-neon-developer/009-neon-masks.chroot
@@ -1,28 +1,20 @@
#!/bin/bash
-#
-# Copyright (C) 2018 Harald Sitter <sitter at kde.org>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) version 3, or any
-# later version accepted by the membership of KDE e.V. (or its
-# successor approved by the membership of KDE e.V.), which shall
-# act as a proxy defined in Section 6 of version 3 of the license.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library. If not, see <http://www.gnu.org/licenses/>.
+# SPDX-FileCopyrightText: 2018-2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
# Mask certain packages which aren't getting properly covered by dependencies.
-set -e
+set -ex
+echo "build-hooks-neon -- running 009-neon-masks-chroot"
+
+. /etc/os-release
# 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
apt-mark auto neon-adwaita
+
+# TODO HACK temporary measure to test nomodeset without having it install for regular seeds @sitter
+if [[ ${VERSION,,} = unstable* ]]; then
+ apt-get install -y kde-nomodeset
+fi
diff --git a/imager/build-hooks-neon-developer/010-neon-forks.chroot b/imager/build-hooks-neon-developer/010-neon-forks.chroot
index 81c9cec..4739c66 100755
--- a/imager/build-hooks-neon-developer/010-neon-forks.chroot
+++ b/imager/build-hooks-neon-developer/010-neon-forks.chroot
@@ -1,6 +1,7 @@
#!/bin/bash
set -ex
+echo "build-hooks-neon -- running 010-neon-forks.chroot"
UBIQUITY=`apt-cache policy ubiquity | grep http | head -n 1 | awk '{print $2}' | sed 's,[a-z]*$,,'`
LIVE_BUILD=`apt-cache policy live-build | grep http | head -n 1 | awk '{print $2}' | sed 's,[a-z]*$,,'`
diff --git a/imager/build-hooks-neon-developer/011-fuse.chroot b/imager/build-hooks-neon-developer/011-fuse.chroot
index 5a98308..da9aa23 100644
--- a/imager/build-hooks-neon-developer/011-fuse.chroot
+++ b/imager/build-hooks-neon-developer/011-fuse.chroot
@@ -27,7 +27,8 @@
# only available on unstable and testing for now but enable universally when it has a real release
-set -e
+set -ex
+echo "build-hooks-neon -- running 011-fuse.chroot"
if grep -q Unstable /etc/os-release; then
apt-get install -y kio-fuse fuse3
@@ -35,3 +36,6 @@ fi
if grep -q Testing /etc/os-release; then
apt-get install -y kio-fuse fuse3
fi
+if grep -q User /etc/os-release; then
+ apt-get install -y kio-fuse fuse3
+fi
diff --git a/imager/build-hooks-neon-mobile/011-fuse.chroot_early b/imager/build-hooks-neon-developer/011-fuse.chroot_early
similarity index 97%
copy from imager/build-hooks-neon-mobile/011-fuse.chroot_early
copy to imager/build-hooks-neon-developer/011-fuse.chroot_early
index f9a9158..856ed71 100644
--- a/imager/build-hooks-neon-mobile/011-fuse.chroot_early
+++ b/imager/build-hooks-neon-developer/011-fuse.chroot_early
@@ -28,7 +28,7 @@
# only available on unstable and testing for now but enable universally when it has a real release
set -ex
-echo 011-fuse.chroot_early
+echo "build-hooks-neon -- 011-fuse.chroot_early"
if grep -q Unstable /etc/os-release; then
apt-get install -y neon-ubuntu-advantage-tools fuse3
diff --git a/imager/build-hooks-neon-arm64/012-firefox.chroot b/imager/build-hooks-neon-developer/012-firefox.chroot
similarity index 56%
copy from imager/build-hooks-neon-arm64/012-firefox.chroot
copy to imager/build-hooks-neon-developer/012-firefox.chroot
index a2adbf2..f5322e0 100644
--- a/imager/build-hooks-neon-arm64/012-firefox.chroot
+++ b/imager/build-hooks-neon-developer/012-firefox.chroot
@@ -4,11 +4,14 @@
# Mask certain packages which aren't getting properly covered by dependencies.
-set -e
+set -ex
+
+echo "build-hooks-neon -- running 012-firefox.chroot"
+echo "Installing Firefox from PPA"
. /etc/os-release
-echo "Installing Firefox from PPA"
+if [ "$VERSION_CODENAME" = "jammy" ]; then
mv /etc/apt/apt.conf.d/00http-proxy /tmp/
sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
@@ -18,3 +21,17 @@ mv /tmp/00http-proxy /etc/apt/apt.conf.d/
sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
apt-get update
apt-cache policy firefox
+
+else
+
+# firefox has transitioned to the mozilla provided debs in noble
+mv /etc/apt/apt.conf.d/00http-proxy /tmp/
+sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-get -y --allow-downgrades install firefox
+mv /tmp/00http-proxy /etc/apt/apt.conf.d/
+sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-cache policy firefox
+
+fi
diff --git a/imager/build-hooks-neon-developer/013-fuse.chroot_early b/imager/build-hooks-neon-developer/013-fuse.chroot_early
index 359a97f..5e393f6 100644
--- a/imager/build-hooks-neon-developer/013-fuse.chroot_early
+++ b/imager/build-hooks-neon-developer/013-fuse.chroot_early
@@ -28,7 +28,7 @@
# only available on unstable and testing for now but enable universally when it has a real release
set -ex
-echo "running 013-fuse.chroot_early"
+echo "build-hooks-neon -- running 013-fuse.chroot_early"
if grep -q Unstable /etc/os-release; then
apt-get install -y neon-settings-2
diff --git a/imager/build-hooks-neon-developer/051-zfs.chroot b/imager/build-hooks-neon-developer/051-zfs.chroot
index 750b796..d5085a1 100755
--- a/imager/build-hooks-neon-developer/051-zfs.chroot
+++ b/imager/build-hooks-neon-developer/051-zfs.chroot
@@ -1,8 +1,8 @@
#!/bin/sh
-set -e
+set -ex
+echo "build-hooks-neon -- 051-zfs.chroot"
# Illegal to distribute
-
rm -f /lib/modules/*/kernel/zfs/zfs/zfs.ko
rm -f /lib/modules/*/kernel/zfs/zfs/zfs.ko
diff --git a/imager/build-hooks-neon-developer/091-apt-update.chroot b/imager/build-hooks-neon-developer/091-apt-update.chroot
index 9d13124..7f26c1f 100755
--- a/imager/build-hooks-neon-developer/091-apt-update.chroot
+++ b/imager/build-hooks-neon-developer/091-apt-update.chroot
@@ -1,6 +1,7 @@
#!/bin/sh
-set -e
+set -ex
+echo "build-hooks-neon -- 091-apt-update.chroot"
#refresh apt cache including appstream cache
apt-get update
diff --git a/imager/build-hooks-neon-developer/092-apt-blacklist.chroot b/imager/build-hooks-neon-developer/092-apt-blacklist.chroot
index d4405ad..c6a72ef 100644
--- a/imager/build-hooks-neon-developer/092-apt-blacklist.chroot
+++ b/imager/build-hooks-neon-developer/092-apt-blacklist.chroot
@@ -2,9 +2,30 @@
set -ex
-echo 'running blacklist hook'
+echo "build-hooks-neon -- 092-apt-blacklist.chroot"
+echo "running blacklist hook"
# Drop blacklisted nonesense pulled in via recommends or platform seed.
apt-get purge -y unattended-upgrades || true
+# colord gets removed because it would get dragged in by cups but after
+# discussion with Rohan Garg I've come to the conclusion that colord makes
+# no sense by default. If the user wants to do color profile management, sure,
+# but this is a very specific desire usually requiring very specific hardware
+# to perform the calibration. Without a profile colord adds no value so
+# we may as well not ship it by default as it has no effect until the user
+# sets it up with a profile.
+# This is using a slightly dirty trick. For whatever reason we cannot easily
+# keep it from installating initially, so instead we'll purge it via dpkg.
+# This will fail if it'd break dependencies. Furthermore we'll check apt
+# consistency afterwards to make double sure nothing broke.
+# Should this break in the future colord may have become a require depends and
+# we need to track down why that happend and discuss what to do about it.
+dpkg --purge colord
+apt-get check
+
+# Drop now excess deps
+apt-get --purge autoremove -s
+apt-get check
+
echo 'blacklist done'
diff --git a/imager/build-hooks-neon-developer/093-preinstalled-pool.chroot b/imager/build-hooks-neon-developer/093-preinstalled-pool.chroot
index 9807dce..dca59a9 100644
--- a/imager/build-hooks-neon-developer/093-preinstalled-pool.chroot
+++ b/imager/build-hooks-neon-developer/093-preinstalled-pool.chroot
@@ -1,8 +1,9 @@
#!/bin/sh
-set -e
+set -ex
-echo 'running preinstalled pool hoook'
+echo "build-hooks-neon -- 093-preinstalled-pool.chroot"
+echo "running preinstalled pool hook"
mkdir -p /var/lib/preinstalled-pool/pool/
cd /var/lib/preinstalled-pool/pool/
@@ -37,15 +38,14 @@ apt-get \
shim \
shim-signed \
user-setup \
- bcmwl-kernel-source \
- oem-config \
- oem-config-kde
+ bcmwl-kernel-source
apt-get \
-o Debug::NoLocking=true \
-o Dir::Cache::Archives=`pwd`/cache \
--download-only \
-y \
install \
- grub-pc
+ oem-config \
+ oem-config-kde
mv cache/*.deb .
rm -r cache
diff --git a/imager/build-hooks-neon-mobile/099-calamares-settings.chroot b/imager/build-hooks-neon-developer/099-calamares-settings.chroot
similarity index 73%
copy from imager/build-hooks-neon-mobile/099-calamares-settings.chroot
copy to imager/build-hooks-neon-developer/099-calamares-settings.chroot
index 2621cde..7b24ec0 100755
--- a/imager/build-hooks-neon-mobile/099-calamares-settings.chroot
+++ b/imager/build-hooks-neon-developer/099-calamares-settings.chroot
@@ -3,9 +3,10 @@
# SPDX-FileCopyrightText: 2020 Jonathan Riddell <jr at jriddell.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
-echo 'installing calamares-setings'
+echo "build-hooks-neon -- 099-calamres-settingss.chroot"
+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/imager/build-hooks-neon-developer/100-grubster.binary b/imager/build-hooks-neon-developer/100-grubster.binary
index ff444f8..5f801ca 100644
--- a/imager/build-hooks-neon-developer/100-grubster.binary
+++ b/imager/build-hooks-neon-developer/100-grubster.binary
@@ -2,8 +2,9 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
+echo "build-hooks-neon -- 100-grubster.binary"
echo "Finalizing Grub"
# This could kinda be done by live-build, but I don't trust ubuntu's ancient
diff --git a/imager/build-hooks-neon-developer/91-apt-update.chroot b/imager/build-hooks-neon-developer/91-apt-update.chroot
deleted file mode 100755
index 9d13124..0000000
--- a/imager/build-hooks-neon-developer/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/imager/build-hooks-neon-developer/92-apt-blacklist.chroot b/imager/build-hooks-neon-developer/92-apt-blacklist.chroot
deleted file mode 100644
index 87916ab..0000000
--- a/imager/build-hooks-neon-developer/92-apt-blacklist.chroot
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Drop blacklisted nonesense pulled in via recommends or platform seed.
-apt-get purge -y unattended-upgrades || true
diff --git a/imager/build-hooks-neon-developer/99-no-gnome.chroot b/imager/build-hooks-neon-developer/99-no-gnome.chroot
deleted file mode 100644
index 6567d96..0000000
--- a/imager/build-hooks-neon-developer/99-no-gnome.chroot
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2020 Jonathan Riddell <jr at jriddell.org>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) version 3, or any
-# later version accepted by the membership of KDE e.V. (or its
-# successor approved by the membership of KDE e.V.), which shall
-# act as a proxy defined in Section 6 of version 3 of the license.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library. If not, see <http://www.gnu.org/licenses/>.
-
-# focal developer edition installs gnome shell, quick workaround to remove it, jriddell
-
-set -e
-
-apt-get remove -y ubuntu-session gnome-shell
diff --git a/imager/build-hooks-neon-developer/999-md5sum.binary b/imager/build-hooks-neon-developer/999-md5sum.binary
index 523e979..9cee001 100644
--- a/imager/build-hooks-neon-developer/999-md5sum.binary
+++ b/imager/build-hooks-neon-developer/999-md5sum.binary
@@ -2,9 +2,11 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
+echo "build-hooks-neon -- 999-md5sum.binary"
echo "Generating md5sum.txt"
+
# is used on focal+ to verify ISO data integrity.
# we exlcude md5sum.txt for obvious reasons (still being written and changing)
diff --git a/imager/build-hooks-neon-ko/000_language-fixes.chroot b/imager/build-hooks-neon-ko/000_language-fixes.chroot
index 2e3cf6e..32a1254 100755
--- a/imager/build-hooks-neon-ko/000_language-fixes.chroot
+++ b/imager/build-hooks-neon-ko/000_language-fixes.chroot
@@ -1,6 +1,11 @@
-#!/bin/sh
+#!/bin/bash
+# SPDX-FileCopyrightText: 2018-2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+# Mask certain packages which aren't getting properly covered by dependencies.
+
+set -ex
+echo "build-hooks-neon -- running 000-language-fixes"
# mangle the pkg_depends file so we don't get fcitx as sho prefers ibus
diff --git a/imager/build-hooks-neon-ko/009-neon-masks.chroot b/imager/build-hooks-neon-ko/009-neon-masks.chroot
index 1e39c5c..2c22394 100644
--- a/imager/build-hooks-neon-ko/009-neon-masks.chroot
+++ b/imager/build-hooks-neon-ko/009-neon-masks.chroot
@@ -1,28 +1,20 @@
#!/bin/bash
-#
-# Copyright (C) 2018 Harald Sitter <sitter at kde.org>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) version 3, or any
-# later version accepted by the membership of KDE e.V. (or its
-# successor approved by the membership of KDE e.V.), which shall
-# act as a proxy defined in Section 6 of version 3 of the license.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this library. If not, see <http://www.gnu.org/licenses/>.
+# SPDX-FileCopyrightText: 2018-2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
# Mask certain packages which aren't getting properly covered by dependencies.
-set -e
+set -ex
+echo "build-hooks-neon -- running 009-neon-masks-chroot"
+
+. /etc/os-release
# 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
apt-mark auto neon-adwaita
+
+# TODO HACK temporary measure to test nomodeset without having it install for regular seeds @sitter
+if [[ ${VERSION,,} = unstable* ]]; then
+ apt-get install -y kde-nomodeset
+fi
diff --git a/imager/build-hooks-neon-ko/010-neon-forks.chroot b/imager/build-hooks-neon-ko/010-neon-forks.chroot
index 81c9cec..4739c66 100755
--- a/imager/build-hooks-neon-ko/010-neon-forks.chroot
+++ b/imager/build-hooks-neon-ko/010-neon-forks.chroot
@@ -1,6 +1,7 @@
#!/bin/bash
set -ex
+echo "build-hooks-neon -- running 010-neon-forks.chroot"
UBIQUITY=`apt-cache policy ubiquity | grep http | head -n 1 | awk '{print $2}' | sed 's,[a-z]*$,,'`
LIVE_BUILD=`apt-cache policy live-build | grep http | head -n 1 | awk '{print $2}' | sed 's,[a-z]*$,,'`
diff --git a/imager/build-hooks-neon-ko/011-fuse.chroot b/imager/build-hooks-neon-ko/011-fuse.chroot
index 5a98308..da9aa23 100644
--- a/imager/build-hooks-neon-ko/011-fuse.chroot
+++ b/imager/build-hooks-neon-ko/011-fuse.chroot
@@ -27,7 +27,8 @@
# only available on unstable and testing for now but enable universally when it has a real release
-set -e
+set -ex
+echo "build-hooks-neon -- running 011-fuse.chroot"
if grep -q Unstable /etc/os-release; then
apt-get install -y kio-fuse fuse3
@@ -35,3 +36,6 @@ fi
if grep -q Testing /etc/os-release; then
apt-get install -y kio-fuse fuse3
fi
+if grep -q User /etc/os-release; then
+ apt-get install -y kio-fuse fuse3
+fi
diff --git a/imager/build-hooks-neon-mobile/011-fuse.chroot_early b/imager/build-hooks-neon-ko/011-fuse.chroot_early
similarity index 97%
copy from imager/build-hooks-neon-mobile/011-fuse.chroot_early
copy to imager/build-hooks-neon-ko/011-fuse.chroot_early
index f9a9158..856ed71 100644
--- a/imager/build-hooks-neon-mobile/011-fuse.chroot_early
+++ b/imager/build-hooks-neon-ko/011-fuse.chroot_early
@@ -28,7 +28,7 @@
# only available on unstable and testing for now but enable universally when it has a real release
set -ex
-echo 011-fuse.chroot_early
+echo "build-hooks-neon -- 011-fuse.chroot_early"
if grep -q Unstable /etc/os-release; then
apt-get install -y neon-ubuntu-advantage-tools fuse3
diff --git a/imager/build-hooks-neon-arm64/012-firefox.chroot b/imager/build-hooks-neon-ko/012-firefox.chroot
similarity index 56%
copy from imager/build-hooks-neon-arm64/012-firefox.chroot
copy to imager/build-hooks-neon-ko/012-firefox.chroot
index a2adbf2..f5322e0 100644
--- a/imager/build-hooks-neon-arm64/012-firefox.chroot
+++ b/imager/build-hooks-neon-ko/012-firefox.chroot
@@ -4,11 +4,14 @@
# Mask certain packages which aren't getting properly covered by dependencies.
-set -e
+set -ex
+
+echo "build-hooks-neon -- running 012-firefox.chroot"
+echo "Installing Firefox from PPA"
. /etc/os-release
-echo "Installing Firefox from PPA"
+if [ "$VERSION_CODENAME" = "jammy" ]; then
mv /etc/apt/apt.conf.d/00http-proxy /tmp/
sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
@@ -18,3 +21,17 @@ mv /tmp/00http-proxy /etc/apt/apt.conf.d/
sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
apt-get update
apt-cache policy firefox
+
+else
+
+# firefox has transitioned to the mozilla provided debs in noble
+mv /etc/apt/apt.conf.d/00http-proxy /tmp/
+sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-get -y --allow-downgrades install firefox
+mv /tmp/00http-proxy /etc/apt/apt.conf.d/
+sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-cache policy firefox
+
+fi
diff --git a/imager/build-hooks-neon-arm64/013-fuse.chroot_early b/imager/build-hooks-neon-ko/013-fuse.chroot_early
similarity index 96%
copy from imager/build-hooks-neon-arm64/013-fuse.chroot_early
copy to imager/build-hooks-neon-ko/013-fuse.chroot_early
index 359a97f..5e393f6 100644
--- a/imager/build-hooks-neon-arm64/013-fuse.chroot_early
+++ b/imager/build-hooks-neon-ko/013-fuse.chroot_early
@@ -28,7 +28,7 @@
# only available on unstable and testing for now but enable universally when it has a real release
set -ex
-echo "running 013-fuse.chroot_early"
+echo "build-hooks-neon -- running 013-fuse.chroot_early"
if grep -q Unstable /etc/os-release; then
apt-get install -y neon-settings-2
diff --git a/imager/build-hooks-neon-ko/051-zfs.chroot b/imager/build-hooks-neon-ko/051-zfs.chroot
index 750b796..d5085a1 100755
--- a/imager/build-hooks-neon-ko/051-zfs.chroot
+++ b/imager/build-hooks-neon-ko/051-zfs.chroot
@@ -1,8 +1,8 @@
#!/bin/sh
-set -e
+set -ex
+echo "build-hooks-neon -- 051-zfs.chroot"
# Illegal to distribute
-
rm -f /lib/modules/*/kernel/zfs/zfs/zfs.ko
rm -f /lib/modules/*/kernel/zfs/zfs/zfs.ko
diff --git a/imager/build-hooks-neon-ko/091-apt-update.chroot b/imager/build-hooks-neon-ko/091-apt-update.chroot
index 9d13124..7f26c1f 100755
--- a/imager/build-hooks-neon-ko/091-apt-update.chroot
+++ b/imager/build-hooks-neon-ko/091-apt-update.chroot
@@ -1,6 +1,7 @@
#!/bin/sh
-set -e
+set -ex
+echo "build-hooks-neon -- 091-apt-update.chroot"
#refresh apt cache including appstream cache
apt-get update
diff --git a/imager/build-hooks-neon-ko/092-apt-blacklist.chroot b/imager/build-hooks-neon-ko/092-apt-blacklist.chroot
index d4405ad..c6a72ef 100644
--- a/imager/build-hooks-neon-ko/092-apt-blacklist.chroot
+++ b/imager/build-hooks-neon-ko/092-apt-blacklist.chroot
@@ -2,9 +2,30 @@
set -ex
-echo 'running blacklist hook'
+echo "build-hooks-neon -- 092-apt-blacklist.chroot"
+echo "running blacklist hook"
# Drop blacklisted nonesense pulled in via recommends or platform seed.
apt-get purge -y unattended-upgrades || true
+# colord gets removed because it would get dragged in by cups but after
+# discussion with Rohan Garg I've come to the conclusion that colord makes
+# no sense by default. If the user wants to do color profile management, sure,
+# but this is a very specific desire usually requiring very specific hardware
+# to perform the calibration. Without a profile colord adds no value so
+# we may as well not ship it by default as it has no effect until the user
+# sets it up with a profile.
+# This is using a slightly dirty trick. For whatever reason we cannot easily
+# keep it from installating initially, so instead we'll purge it via dpkg.
+# This will fail if it'd break dependencies. Furthermore we'll check apt
+# consistency afterwards to make double sure nothing broke.
+# Should this break in the future colord may have become a require depends and
+# we need to track down why that happend and discuss what to do about it.
+dpkg --purge colord
+apt-get check
+
+# Drop now excess deps
+apt-get --purge autoremove -s
+apt-get check
+
echo 'blacklist done'
diff --git a/imager/build-hooks-neon-ko/093-preinstalled-pool.chroot b/imager/build-hooks-neon-ko/093-preinstalled-pool.chroot
index 09256a0..dca59a9 100644
--- a/imager/build-hooks-neon-ko/093-preinstalled-pool.chroot
+++ b/imager/build-hooks-neon-ko/093-preinstalled-pool.chroot
@@ -1,8 +1,9 @@
#!/bin/sh
-set -e
+set -ex
-echo 'running preinstalled pool hoook'
+echo "build-hooks-neon -- 093-preinstalled-pool.chroot"
+echo "running preinstalled pool hook"
mkdir -p /var/lib/preinstalled-pool/pool/
cd /var/lib/preinstalled-pool/pool/
@@ -31,23 +32,20 @@ apt-get \
grub-efi-amd64 \
grub-efi-amd64-bin \
grub-efi-amd64-signed \
- lupin-support \
mokutil \
- mouseemu \
patch \
setserial \
shim \
shim-signed \
user-setup \
- bcmwl-kernel-source \
- oem-config \
- oem-config-kde
+ bcmwl-kernel-source
apt-get \
-o Debug::NoLocking=true \
-o Dir::Cache::Archives=`pwd`/cache \
--download-only \
-y \
install \
- grub-pc
+ oem-config \
+ oem-config-kde
mv cache/*.deb .
rm -r cache
diff --git a/imager/build-hooks-neon-mobile/099-calamares-settings.chroot b/imager/build-hooks-neon-ko/099-calamares-settings.chroot
similarity index 73%
copy from imager/build-hooks-neon-mobile/099-calamares-settings.chroot
copy to imager/build-hooks-neon-ko/099-calamares-settings.chroot
index 2621cde..7b24ec0 100755
--- a/imager/build-hooks-neon-mobile/099-calamares-settings.chroot
+++ b/imager/build-hooks-neon-ko/099-calamares-settings.chroot
@@ -3,9 +3,10 @@
# SPDX-FileCopyrightText: 2020 Jonathan Riddell <jr at jriddell.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
-echo 'installing calamares-setings'
+echo "build-hooks-neon -- 099-calamres-settingss.chroot"
+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/imager/build-hooks-neon-ko/100-grubster.binary b/imager/build-hooks-neon-ko/100-grubster.binary
index ff444f8..5f801ca 100644
--- a/imager/build-hooks-neon-ko/100-grubster.binary
+++ b/imager/build-hooks-neon-ko/100-grubster.binary
@@ -2,8 +2,9 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
+echo "build-hooks-neon -- 100-grubster.binary"
echo "Finalizing Grub"
# This could kinda be done by live-build, but I don't trust ubuntu's ancient
diff --git a/imager/build-hooks-neon-ko/91-apt-update.chroot b/imager/build-hooks-neon-ko/91-apt-update.chroot
deleted file mode 100755
index 9d13124..0000000
--- a/imager/build-hooks-neon-ko/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/imager/build-hooks-neon-ko/92-apt-blacklist.chroot b/imager/build-hooks-neon-ko/92-apt-blacklist.chroot
deleted file mode 100644
index 87916ab..0000000
--- a/imager/build-hooks-neon-ko/92-apt-blacklist.chroot
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# Drop blacklisted nonesense pulled in via recommends or platform seed.
-apt-get purge -y unattended-upgrades || true
diff --git a/imager/build-hooks-neon-ko/999-md5sum.binary b/imager/build-hooks-neon-ko/999-md5sum.binary
index 523e979..9cee001 100644
--- a/imager/build-hooks-neon-ko/999-md5sum.binary
+++ b/imager/build-hooks-neon-ko/999-md5sum.binary
@@ -2,9 +2,11 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
+echo "build-hooks-neon -- 999-md5sum.binary"
echo "Generating md5sum.txt"
+
# is used on focal+ to verify ISO data integrity.
# we exlcude md5sum.txt for obvious reasons (still being written and changing)
diff --git a/imager/build-hooks-neon-mobile/009-neon-masks.chroot b/imager/build-hooks-neon-mobile/009-neon-masks.chroot
index 9d34450..2c22394 100644
--- a/imager/build-hooks-neon-mobile/009-neon-masks.chroot
+++ b/imager/build-hooks-neon-mobile/009-neon-masks.chroot
@@ -4,7 +4,8 @@
# Mask certain packages which aren't getting properly covered by dependencies.
-set -e
+set -ex
+echo "build-hooks-neon -- running 009-neon-masks-chroot"
. /etc/os-release
diff --git a/imager/build-hooks-neon-mobile/010-neon-forks.chroot b/imager/build-hooks-neon-mobile/010-neon-forks.chroot
index 81c9cec..4739c66 100755
--- a/imager/build-hooks-neon-mobile/010-neon-forks.chroot
+++ b/imager/build-hooks-neon-mobile/010-neon-forks.chroot
@@ -1,6 +1,7 @@
#!/bin/bash
set -ex
+echo "build-hooks-neon -- running 010-neon-forks.chroot"
UBIQUITY=`apt-cache policy ubiquity | grep http | head -n 1 | awk '{print $2}' | sed 's,[a-z]*$,,'`
LIVE_BUILD=`apt-cache policy live-build | grep http | head -n 1 | awk '{print $2}' | sed 's,[a-z]*$,,'`
diff --git a/imager/build-hooks-neon-mobile/011-fuse.chroot b/imager/build-hooks-neon-mobile/011-fuse.chroot
index 24d53e1..da9aa23 100644
--- a/imager/build-hooks-neon-mobile/011-fuse.chroot
+++ b/imager/build-hooks-neon-mobile/011-fuse.chroot
@@ -27,7 +27,8 @@
# only available on unstable and testing for now but enable universally when it has a real release
-set -e
+set -ex
+echo "build-hooks-neon -- running 011-fuse.chroot"
if grep -q Unstable /etc/os-release; then
apt-get install -y kio-fuse fuse3
diff --git a/imager/build-hooks-neon-mobile/011-fuse.chroot_early b/imager/build-hooks-neon-mobile/011-fuse.chroot_early
index f9a9158..856ed71 100644
--- a/imager/build-hooks-neon-mobile/011-fuse.chroot_early
+++ b/imager/build-hooks-neon-mobile/011-fuse.chroot_early
@@ -28,7 +28,7 @@
# only available on unstable and testing for now but enable universally when it has a real release
set -ex
-echo 011-fuse.chroot_early
+echo "build-hooks-neon -- 011-fuse.chroot_early"
if grep -q Unstable /etc/os-release; then
apt-get install -y neon-ubuntu-advantage-tools fuse3
diff --git a/imager/build-hooks-neon-mobile/012-firefox.chroot b/imager/build-hooks-neon-mobile/012-firefox.chroot
index a2adbf2..f5322e0 100644
--- a/imager/build-hooks-neon-mobile/012-firefox.chroot
+++ b/imager/build-hooks-neon-mobile/012-firefox.chroot
@@ -4,11 +4,14 @@
# Mask certain packages which aren't getting properly covered by dependencies.
-set -e
+set -ex
+
+echo "build-hooks-neon -- running 012-firefox.chroot"
+echo "Installing Firefox from PPA"
. /etc/os-release
-echo "Installing Firefox from PPA"
+if [ "$VERSION_CODENAME" = "jammy" ]; then
mv /etc/apt/apt.conf.d/00http-proxy /tmp/
sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
@@ -18,3 +21,17 @@ mv /tmp/00http-proxy /etc/apt/apt.conf.d/
sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-net-launchpad-ppa-mozillateam-pin
apt-get update
apt-cache policy firefox
+
+else
+
+# firefox has transitioned to the mozilla provided debs in noble
+mv /etc/apt/apt.conf.d/00http-proxy /tmp/
+sed -i s,550,1000, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-get -y --allow-downgrades install firefox
+mv /tmp/00http-proxy /etc/apt/apt.conf.d/
+sed -i s,1000,550, /etc/apt/preferences.d/org-kde-neon-packages-mozilla-org-pin
+apt-get update
+apt-cache policy firefox
+
+fi
diff --git a/imager/build-hooks-neon-arm64/013-fuse.chroot_early b/imager/build-hooks-neon-mobile/013-fuse.chroot_early
similarity index 96%
copy from imager/build-hooks-neon-arm64/013-fuse.chroot_early
copy to imager/build-hooks-neon-mobile/013-fuse.chroot_early
index 359a97f..5e393f6 100644
--- a/imager/build-hooks-neon-arm64/013-fuse.chroot_early
+++ b/imager/build-hooks-neon-mobile/013-fuse.chroot_early
@@ -28,7 +28,7 @@
# only available on unstable and testing for now but enable universally when it has a real release
set -ex
-echo "running 013-fuse.chroot_early"
+echo "build-hooks-neon -- running 013-fuse.chroot_early"
if grep -q Unstable /etc/os-release; then
apt-get install -y neon-settings-2
diff --git a/imager/build-hooks-neon-mobile/051-zfs.chroot b/imager/build-hooks-neon-mobile/051-zfs.chroot
index 750b796..d5085a1 100755
--- a/imager/build-hooks-neon-mobile/051-zfs.chroot
+++ b/imager/build-hooks-neon-mobile/051-zfs.chroot
@@ -1,8 +1,8 @@
#!/bin/sh
-set -e
+set -ex
+echo "build-hooks-neon -- 051-zfs.chroot"
# Illegal to distribute
-
rm -f /lib/modules/*/kernel/zfs/zfs/zfs.ko
rm -f /lib/modules/*/kernel/zfs/zfs/zfs.ko
diff --git a/imager/build-hooks-neon-mobile/091-apt-update.chroot b/imager/build-hooks-neon-mobile/091-apt-update.chroot
index 9d13124..7f26c1f 100755
--- a/imager/build-hooks-neon-mobile/091-apt-update.chroot
+++ b/imager/build-hooks-neon-mobile/091-apt-update.chroot
@@ -1,6 +1,7 @@
#!/bin/sh
-set -e
+set -ex
+echo "build-hooks-neon -- 091-apt-update.chroot"
#refresh apt cache including appstream cache
apt-get update
diff --git a/imager/build-hooks-neon-mobile/092-apt-blacklist.chroot b/imager/build-hooks-neon-mobile/092-apt-blacklist.chroot
index e49a588..c6a72ef 100644
--- a/imager/build-hooks-neon-mobile/092-apt-blacklist.chroot
+++ b/imager/build-hooks-neon-mobile/092-apt-blacklist.chroot
@@ -2,7 +2,8 @@
set -ex
-echo 'running blacklist hook'
+echo "build-hooks-neon -- 092-apt-blacklist.chroot"
+echo "running blacklist hook"
# Drop blacklisted nonesense pulled in via recommends or platform seed.
apt-get purge -y unattended-upgrades || true
diff --git a/imager/build-hooks-neon-mobile/092-apt-remove-unnecessary.chroot b/imager/build-hooks-neon-mobile/092-apt-remove-unnecessary.chroot
index 6038ccc..a939d5c 100644
--- a/imager/build-hooks-neon-mobile/092-apt-remove-unnecessary.chroot
+++ b/imager/build-hooks-neon-mobile/092-apt-remove-unnecessary.chroot
@@ -2,9 +2,17 @@
set -ex
+echo "build-hooks-neon -- 092-remove-unnecessary.chroot"
echo 'removing unnecessary packages'
+if [ "$VERSION_CODENAME" = "jammy" ]; then
+
apt-get remove linux-image-5.15.0-112-generic -y || true
apt-get remove linux-image-5.15.0-113-generic -y || true
+else
+
+
+fi
+
echo 'removing unnecessary packages done'
diff --git a/imager/build-hooks-neon-mobile/093-preinstalled-pool.chroot b/imager/build-hooks-neon-mobile/093-preinstalled-pool.chroot
index 9807dce..dca59a9 100644
--- a/imager/build-hooks-neon-mobile/093-preinstalled-pool.chroot
+++ b/imager/build-hooks-neon-mobile/093-preinstalled-pool.chroot
@@ -1,8 +1,9 @@
#!/bin/sh
-set -e
+set -ex
-echo 'running preinstalled pool hoook'
+echo "build-hooks-neon -- 093-preinstalled-pool.chroot"
+echo "running preinstalled pool hook"
mkdir -p /var/lib/preinstalled-pool/pool/
cd /var/lib/preinstalled-pool/pool/
@@ -37,15 +38,14 @@ apt-get \
shim \
shim-signed \
user-setup \
- bcmwl-kernel-source \
- oem-config \
- oem-config-kde
+ bcmwl-kernel-source
apt-get \
-o Debug::NoLocking=true \
-o Dir::Cache::Archives=`pwd`/cache \
--download-only \
-y \
install \
- grub-pc
+ oem-config \
+ oem-config-kde
mv cache/*.deb .
rm -r cache
diff --git a/imager/build-hooks-neon-mobile/099-calamares-settings.chroot b/imager/build-hooks-neon-mobile/099-calamares-settings.chroot
index 2621cde..7b24ec0 100755
--- a/imager/build-hooks-neon-mobile/099-calamares-settings.chroot
+++ b/imager/build-hooks-neon-mobile/099-calamares-settings.chroot
@@ -3,9 +3,10 @@
# SPDX-FileCopyrightText: 2020 Jonathan Riddell <jr at jriddell.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
-echo 'installing calamares-setings'
+echo "build-hooks-neon -- 099-calamres-settingss.chroot"
+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/imager/build-hooks-neon-mobile/100-grubster.binary b/imager/build-hooks-neon-mobile/100-grubster.binary
index ff444f8..5f801ca 100644
--- a/imager/build-hooks-neon-mobile/100-grubster.binary
+++ b/imager/build-hooks-neon-mobile/100-grubster.binary
@@ -2,8 +2,9 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
+echo "build-hooks-neon -- 100-grubster.binary"
echo "Finalizing Grub"
# This could kinda be done by live-build, but I don't trust ubuntu's ancient
diff --git a/imager/build-hooks-neon-mobile/999-md5sum.binary b/imager/build-hooks-neon-mobile/999-md5sum.binary
index 523e979..9cee001 100644
--- a/imager/build-hooks-neon-mobile/999-md5sum.binary
+++ b/imager/build-hooks-neon-mobile/999-md5sum.binary
@@ -2,9 +2,11 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-set -e
+set -ex
+echo "build-hooks-neon -- 999-md5sum.binary"
echo "Generating md5sum.txt"
+
# is used on focal+ to verify ISO data integrity.
# we exlcude md5sum.txt for obvious reasons (still being written and changing)
diff --git a/imager/config-hooks-neon-arm64/00-debconf-preseed.sh b/imager/config-hooks-neon-arm64/00-debconf-preseed.sh
index f5fc563..dc2bd46 100644
--- a/imager/config-hooks-neon-arm64/00-debconf-preseed.sh
+++ b/imager/config-hooks-neon-arm64/00-debconf-preseed.sh
@@ -1,8 +1,10 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-# preseed debconf selections
+set -ex
+echo "config-hooks-neon -- 00-debconf-preseed"
+# preseed debconf selections
# - disable man-db updates, they are super slow and who even uses man-db...
cat << EOF > config/preseed/000-neon.preseed
man-db man-db/auto-update boolean false
diff --git a/imager/config-hooks-neon-arm64/00-neon-forks.sh b/imager/config-hooks-neon-arm64/00-neon-forks.sh
index 6332827..4a8591e 100644
--- a/imager/config-hooks-neon-arm64/00-neon-forks.sh
+++ b/imager/config-hooks-neon-arm64/00-neon-forks.sh
@@ -13,6 +13,9 @@
# determine the origin of the package without having to meddle with dpkg-query
# format strings and the like or going through apt.
+set -ex
+echo "config-hooks-neon -- 00-neon-forks"
+
pkgs="livecd-rootfs"
for pkg in $pkgs; do
if dpkg-query -s $pkg | grep --fixed-strings --quiet '<neon at kde.org>'; then
diff --git a/imager/config-hooks-neon-arm64/20_package_list.sh b/imager/config-hooks-neon-arm64/20_package_list.sh
index 15adf89..d106371 100644
--- a/imager/config-hooks-neon-arm64/20_package_list.sh
+++ b/imager/config-hooks-neon-arm64/20_package_list.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 20-package-list"
+
# konsole needs installed first else xterm gets installed cos xorg deps on
# terminal | xterm and doesn't know terminal is installed later in the tree.
# Also explicitly install the efi image packages explicitly so live-build
diff --git a/imager/config-hooks-neon-arm64/99-grub-deps.sh b/imager/config-hooks-neon-arm64/99-grub-deps.sh
index a9e9a30..0682229 100644
--- a/imager/config-hooks-neon-arm64/99-grub-deps.sh
+++ b/imager/config-hooks-neon-arm64/99-grub-deps.sh
@@ -1,6 +1,9 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+set -ex
+echo "config-hooks-neon -- 99-grub-deps"
+
# Install grub shebang in container. lb's grub-efi is a bit conflicted on
# which files to get from the host and which to get from the chroot so best
# have it on both ends.
diff --git a/imager/config-hooks-neon-arm64/99-preinstalled-pool.sh b/imager/config-hooks-neon-arm64/99-preinstalled-pool.sh
index 7afda63..781ee1c 100644
--- a/imager/config-hooks-neon-arm64/99-preinstalled-pool.sh
+++ b/imager/config-hooks-neon-arm64/99-preinstalled-pool.sh
@@ -1,5 +1,12 @@
-mkdir -vp config/gnupg
-mkdir -vp config/indices
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 99-preinstalled-pool"
+
+mkdir -vp -m 0700 config/gnupg
+mkdir -vp -m 0700 config/indices
# Make sure we use a suitably strong digest algorithm. SHA1 is deprecated and
# makes apt angry.
@@ -9,9 +16,19 @@ cert-digest-algo SHA512
default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
EOF
+# confirm the conf file
+cat config/gnupg/gpg.conf
+# make sure we have a copy of the neon-archive-keyring.gpg
+# to be used as the preinstalled-pool's pubring.gpg
+#wget https://archive.neon.kde.org/public.key
+#gpg --home config/gnupg --import public.key
+#cp -v public.key config/gnupg/pubring.gpg
+#ls -lsh config/gnupg/
+#cat config/gnupg/pubring.gpg
+
for component in $COMPONENTS; do
(cd config/indices && \
- wget http://ports.ubuntu.com/indices/override.$SUITE.$component && \
- wget http://ports.ubuntu.com/indices/override.$SUITE.extra.$component \
+ wget http://archive.ubuntu.com/ubuntu/indices/override.$SUITE.$component && \
+ wget http://archive.ubuntu.com/ubuntu/indices/override.$SUITE.extra.$component \
)
done
diff --git a/imager/config-hooks-neon-arm64/apt.conf.sh b/imager/config-hooks-neon-arm64/apt.conf.sh
index 5221a44..392f6d1 100644
--- a/imager/config-hooks-neon-arm64/apt.conf.sh
+++ b/imager/config-hooks-neon-arm64/apt.conf.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-apt.conf"
+
rm config/chroot_apt/apt.conf || true
echo 'Debug::pkgProblemResolver "true";' >> config/chroot_apt/apt.conf
echo 'Acquire::Languages "none";' >> config/chroot_apt/apt.conf
diff --git a/imager/config-hooks-neon-arm64/repo.sh b/imager/config-hooks-neon-arm64/repo.sh
index 330ea8b..17ea4d0 100644
--- a/imager/config-hooks-neon-arm64/repo.sh
+++ b/imager/config-hooks-neon-arm64/repo.sh
@@ -1,16 +1,74 @@
-# Use gpg1, mostly because we are lazy and don't know how to best port this to v2
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-repo"
+
+if [ "$VERSION_CODENAME" = "jammy" ]; then
apt install -y dirmngr gnupg1
ARGS="--batch --verbose"
GPG="gpg1"
-apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
+apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
$ARGS \
--no-default-keyring \
--primary-keyring config/archives/ubuntu-defaults.key \
--import
-echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
-echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+
+else
+
+apt install -y curl
+
+ # use this hack until new neon-keyring is in the wild, then we can use cp down below
+ mkdir -p /etc/apt/keyring
+ chmod 700 ~/.gnupg
+ curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" | tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
+ gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt/keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
+ gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
+ gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
+
+ # use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
+ cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ # cp our non-armoured (binary) public key to where it needs to be
+ mkdir -p chroot/etc/apt/keyring/
+ cp /etc/apt/keyring/* chroot/etc/apt/keyring/
+
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.asc || true
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.gpg || true
+
+ # use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
+ cat <<EOF >config/archives/neon.list
+deb [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb-src [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+EOF
+
+ # add a nice depreciation message when we actually have depreciated the above hack
+ #echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
+
+ # add or spiffy new deb822 .sources config
+ cat > config/archives/neon.sources << EOF
+X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
+Types: deb deb-src
+URIs: http://archive.neon.kde.org/${NEONARCHIVE}
+Suites: $SUITE
+Components: main
+Architectures: $ARCH
+Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
+EOF
+
+ # check our stuffs are in the right place
+ ls -lshR config/archives/
+ cat config/archives/neon.list
+ cat config/archives/neon.sources
-# make sure _apt can read this file. it may get copied into the chroot
-chmod 644 config/archives/ubuntu-defaults.key || true
+fi
diff --git a/imager/config-hooks-neon-bigscreen/00-debconf-preseed.sh b/imager/config-hooks-neon-bigscreen/00-debconf-preseed.sh
index f5fc563..dc2bd46 100644
--- a/imager/config-hooks-neon-bigscreen/00-debconf-preseed.sh
+++ b/imager/config-hooks-neon-bigscreen/00-debconf-preseed.sh
@@ -1,8 +1,10 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-# preseed debconf selections
+set -ex
+echo "config-hooks-neon -- 00-debconf-preseed"
+# preseed debconf selections
# - disable man-db updates, they are super slow and who even uses man-db...
cat << EOF > config/preseed/000-neon.preseed
man-db man-db/auto-update boolean false
diff --git a/imager/config-hooks-neon-bigscreen/00-neon-forks.sh b/imager/config-hooks-neon-bigscreen/00-neon-forks.sh
index 6332827..4a8591e 100644
--- a/imager/config-hooks-neon-bigscreen/00-neon-forks.sh
+++ b/imager/config-hooks-neon-bigscreen/00-neon-forks.sh
@@ -13,6 +13,9 @@
# determine the origin of the package without having to meddle with dpkg-query
# format strings and the like or going through apt.
+set -ex
+echo "config-hooks-neon -- 00-neon-forks"
+
pkgs="livecd-rootfs"
for pkg in $pkgs; do
if dpkg-query -s $pkg | grep --fixed-strings --quiet '<neon at kde.org>'; then
diff --git a/imager/config-hooks-neon-bigscreen/20_package_list.sh b/imager/config-hooks-neon-bigscreen/20_package_list.sh
index ee2a2af..552e67c 100644
--- a/imager/config-hooks-neon-bigscreen/20_package_list.sh
+++ b/imager/config-hooks-neon-bigscreen/20_package_list.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 20-package-list"
+
# konsole needs installed first else xterm gets installed cos xorg deps on
# terminal | xterm and doesn't know terminal is installed later in the tree.
# Also explicitly install the efi image packages explicitly so live-build
@@ -7,7 +14,6 @@ shim-signed
grub-efi-amd64-signed
grub-efi-ia32-bin
konsole
-neon-repositories-launchpad-mozilla
+neon-desktop
plasma-bigscreen-meta
-neon-settings-2
EOF
diff --git a/imager/config-hooks-neon-bigscreen/20_package_list.sh~ b/imager/config-hooks-neon-bigscreen/20_package_list.sh~
deleted file mode 100644
index 79ffc23..0000000
--- a/imager/config-hooks-neon-bigscreen/20_package_list.sh~
+++ /dev/null
@@ -1,11 +0,0 @@
-# konsole needs installed first else xterm gets installed cos xorg deps on
-# terminal | xterm and doesn't know terminal is installed later in the tree.
-# Also explicitly install the efi image packages explicitly so live-build
-# can find them for extraction into the ISO.
-cat << EOF > config/package-lists/ubuntu-defaults.list.chroot_install
-shim-signed
-grub-efi-amd64-signed
-grub-efi-ia32-bin
-konsole
-neon-desktop
-EOF
diff --git a/imager/config-hooks-neon-bigscreen/99-grub-deps.sh b/imager/config-hooks-neon-bigscreen/99-grub-deps.sh
index 47dee67..4c1c414 100644
--- a/imager/config-hooks-neon-bigscreen/99-grub-deps.sh
+++ b/imager/config-hooks-neon-bigscreen/99-grub-deps.sh
@@ -1,6 +1,9 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+set -ex
+echo "config-hooks-neon -- 99-grub-deps"
+
# Install grub shebang in container. lb's grub-efi is a bit conflicted on
# which files to get from the host and which to get from the chroot so best
# have it on both ends.
diff --git a/imager/config-hooks-neon-bigscreen/99-preinstalled-pool.sh b/imager/config-hooks-neon-bigscreen/99-preinstalled-pool.sh
index 1277eb0..781ee1c 100644
--- a/imager/config-hooks-neon-bigscreen/99-preinstalled-pool.sh
+++ b/imager/config-hooks-neon-bigscreen/99-preinstalled-pool.sh
@@ -1,5 +1,12 @@
-mkdir -vp config/gnupg
-mkdir -vp config/indices
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 99-preinstalled-pool"
+
+mkdir -vp -m 0700 config/gnupg
+mkdir -vp -m 0700 config/indices
# Make sure we use a suitably strong digest algorithm. SHA1 is deprecated and
# makes apt angry.
@@ -9,6 +16,16 @@ cert-digest-algo SHA512
default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
EOF
+# confirm the conf file
+cat config/gnupg/gpg.conf
+# make sure we have a copy of the neon-archive-keyring.gpg
+# to be used as the preinstalled-pool's pubring.gpg
+#wget https://archive.neon.kde.org/public.key
+#gpg --home config/gnupg --import public.key
+#cp -v public.key config/gnupg/pubring.gpg
+#ls -lsh config/gnupg/
+#cat config/gnupg/pubring.gpg
+
for component in $COMPONENTS; do
(cd config/indices && \
wget http://archive.ubuntu.com/ubuntu/indices/override.$SUITE.$component && \
diff --git a/imager/config-hooks-neon-bigscreen/apt.conf.sh b/imager/config-hooks-neon-bigscreen/apt.conf.sh
index 5221a44..392f6d1 100644
--- a/imager/config-hooks-neon-bigscreen/apt.conf.sh
+++ b/imager/config-hooks-neon-bigscreen/apt.conf.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-apt.conf"
+
rm config/chroot_apt/apt.conf || true
echo 'Debug::pkgProblemResolver "true";' >> config/chroot_apt/apt.conf
echo 'Acquire::Languages "none";' >> config/chroot_apt/apt.conf
diff --git a/imager/config-hooks-neon-bigscreen/repo.sh b/imager/config-hooks-neon-bigscreen/repo.sh
index 330ea8b..17ea4d0 100644
--- a/imager/config-hooks-neon-bigscreen/repo.sh
+++ b/imager/config-hooks-neon-bigscreen/repo.sh
@@ -1,16 +1,74 @@
-# Use gpg1, mostly because we are lazy and don't know how to best port this to v2
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-repo"
+
+if [ "$VERSION_CODENAME" = "jammy" ]; then
apt install -y dirmngr gnupg1
ARGS="--batch --verbose"
GPG="gpg1"
-apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
+apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
$ARGS \
--no-default-keyring \
--primary-keyring config/archives/ubuntu-defaults.key \
--import
-echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
-echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+
+else
+
+apt install -y curl
+
+ # use this hack until new neon-keyring is in the wild, then we can use cp down below
+ mkdir -p /etc/apt/keyring
+ chmod 700 ~/.gnupg
+ curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" | tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
+ gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt/keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
+ gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
+ gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
+
+ # use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
+ cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ # cp our non-armoured (binary) public key to where it needs to be
+ mkdir -p chroot/etc/apt/keyring/
+ cp /etc/apt/keyring/* chroot/etc/apt/keyring/
+
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.asc || true
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.gpg || true
+
+ # use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
+ cat <<EOF >config/archives/neon.list
+deb [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb-src [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+EOF
+
+ # add a nice depreciation message when we actually have depreciated the above hack
+ #echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
+
+ # add or spiffy new deb822 .sources config
+ cat > config/archives/neon.sources << EOF
+X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
+Types: deb deb-src
+URIs: http://archive.neon.kde.org/${NEONARCHIVE}
+Suites: $SUITE
+Components: main
+Architectures: $ARCH
+Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
+EOF
+
+ # check our stuffs are in the right place
+ ls -lshR config/archives/
+ cat config/archives/neon.list
+ cat config/archives/neon.sources
-# make sure _apt can read this file. it may get copied into the chroot
-chmod 644 config/archives/ubuntu-defaults.key || true
+fi
diff --git a/imager/config-hooks-neon-developer/00-debconf-preseed.sh b/imager/config-hooks-neon-developer/00-debconf-preseed.sh
index f5fc563..dc2bd46 100644
--- a/imager/config-hooks-neon-developer/00-debconf-preseed.sh
+++ b/imager/config-hooks-neon-developer/00-debconf-preseed.sh
@@ -1,8 +1,10 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-# preseed debconf selections
+set -ex
+echo "config-hooks-neon -- 00-debconf-preseed"
+# preseed debconf selections
# - disable man-db updates, they are super slow and who even uses man-db...
cat << EOF > config/preseed/000-neon.preseed
man-db man-db/auto-update boolean false
diff --git a/imager/config-hooks-neon-developer/00-neon-forks.sh b/imager/config-hooks-neon-developer/00-neon-forks.sh
index 6332827..4a8591e 100644
--- a/imager/config-hooks-neon-developer/00-neon-forks.sh
+++ b/imager/config-hooks-neon-developer/00-neon-forks.sh
@@ -13,6 +13,9 @@
# determine the origin of the package without having to meddle with dpkg-query
# format strings and the like or going through apt.
+set -ex
+echo "config-hooks-neon -- 00-neon-forks"
+
pkgs="livecd-rootfs"
for pkg in $pkgs; do
if dpkg-query -s $pkg | grep --fixed-strings --quiet '<neon at kde.org>'; then
diff --git a/imager/config-hooks-neon-developer/20_package_list.sh b/imager/config-hooks-neon-developer/20_package_list.sh
index 8c8ff5e..baa5552 100644
--- a/imager/config-hooks-neon-developer/20_package_list.sh
+++ b/imager/config-hooks-neon-developer/20_package_list.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 20-package-list"
+
# konsole needs installed first else xterm gets installed cos xorg deps on
# terminal | xterm and doesn't know terminal is installed later in the tree.
# Also explicitly install the efi image packages explicitly so live-build
diff --git a/imager/config-hooks-neon-developer/99-grub-deps.sh b/imager/config-hooks-neon-developer/99-grub-deps.sh
index 47dee67..4c1c414 100644
--- a/imager/config-hooks-neon-developer/99-grub-deps.sh
+++ b/imager/config-hooks-neon-developer/99-grub-deps.sh
@@ -1,6 +1,9 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+set -ex
+echo "config-hooks-neon -- 99-grub-deps"
+
# Install grub shebang in container. lb's grub-efi is a bit conflicted on
# which files to get from the host and which to get from the chroot so best
# have it on both ends.
diff --git a/imager/config-hooks-neon-developer/99-no-gnome.sh b/imager/config-hooks-neon-developer/99-no-gnome.sh
deleted file mode 100644
index 75cea5c..0000000
--- a/imager/config-hooks-neon-developer/99-no-gnome.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-# SPDX-FileCopyrightText: 2020 Jonathan Riddell <jr at jriddell.org>
-# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-
-apt remove -y gnome-shell ubuntu-session
diff --git a/imager/config-hooks-neon-developer/99-preinstalled-pool.sh b/imager/config-hooks-neon-developer/99-preinstalled-pool.sh
index 1277eb0..781ee1c 100644
--- a/imager/config-hooks-neon-developer/99-preinstalled-pool.sh
+++ b/imager/config-hooks-neon-developer/99-preinstalled-pool.sh
@@ -1,5 +1,12 @@
-mkdir -vp config/gnupg
-mkdir -vp config/indices
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 99-preinstalled-pool"
+
+mkdir -vp -m 0700 config/gnupg
+mkdir -vp -m 0700 config/indices
# Make sure we use a suitably strong digest algorithm. SHA1 is deprecated and
# makes apt angry.
@@ -9,6 +16,16 @@ cert-digest-algo SHA512
default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
EOF
+# confirm the conf file
+cat config/gnupg/gpg.conf
+# make sure we have a copy of the neon-archive-keyring.gpg
+# to be used as the preinstalled-pool's pubring.gpg
+#wget https://archive.neon.kde.org/public.key
+#gpg --home config/gnupg --import public.key
+#cp -v public.key config/gnupg/pubring.gpg
+#ls -lsh config/gnupg/
+#cat config/gnupg/pubring.gpg
+
for component in $COMPONENTS; do
(cd config/indices && \
wget http://archive.ubuntu.com/ubuntu/indices/override.$SUITE.$component && \
diff --git a/imager/config-hooks-neon-developer/apt.conf.sh b/imager/config-hooks-neon-developer/apt.conf.sh
index 5221a44..392f6d1 100644
--- a/imager/config-hooks-neon-developer/apt.conf.sh
+++ b/imager/config-hooks-neon-developer/apt.conf.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-apt.conf"
+
rm config/chroot_apt/apt.conf || true
echo 'Debug::pkgProblemResolver "true";' >> config/chroot_apt/apt.conf
echo 'Acquire::Languages "none";' >> config/chroot_apt/apt.conf
diff --git a/imager/config-hooks-neon-developer/repo.sh b/imager/config-hooks-neon-developer/repo.sh
index 330ea8b..17ea4d0 100644
--- a/imager/config-hooks-neon-developer/repo.sh
+++ b/imager/config-hooks-neon-developer/repo.sh
@@ -1,16 +1,74 @@
-# Use gpg1, mostly because we are lazy and don't know how to best port this to v2
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-repo"
+
+if [ "$VERSION_CODENAME" = "jammy" ]; then
apt install -y dirmngr gnupg1
ARGS="--batch --verbose"
GPG="gpg1"
-apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
+apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
$ARGS \
--no-default-keyring \
--primary-keyring config/archives/ubuntu-defaults.key \
--import
-echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
-echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+
+else
+
+apt install -y curl
+
+ # use this hack until new neon-keyring is in the wild, then we can use cp down below
+ mkdir -p /etc/apt/keyring
+ chmod 700 ~/.gnupg
+ curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" | tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
+ gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt/keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
+ gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
+ gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
+
+ # use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
+ cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ # cp our non-armoured (binary) public key to where it needs to be
+ mkdir -p chroot/etc/apt/keyring/
+ cp /etc/apt/keyring/* chroot/etc/apt/keyring/
+
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.asc || true
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.gpg || true
+
+ # use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
+ cat <<EOF >config/archives/neon.list
+deb [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb-src [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+EOF
+
+ # add a nice depreciation message when we actually have depreciated the above hack
+ #echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
+
+ # add or spiffy new deb822 .sources config
+ cat > config/archives/neon.sources << EOF
+X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
+Types: deb deb-src
+URIs: http://archive.neon.kde.org/${NEONARCHIVE}
+Suites: $SUITE
+Components: main
+Architectures: $ARCH
+Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
+EOF
+
+ # check our stuffs are in the right place
+ ls -lshR config/archives/
+ cat config/archives/neon.list
+ cat config/archives/neon.sources
-# make sure _apt can read this file. it may get copied into the chroot
-chmod 644 config/archives/ubuntu-defaults.key || true
+fi
diff --git a/imager/config-hooks-neon-ko/00-debconf-preseed.sh b/imager/config-hooks-neon-ko/00-debconf-preseed.sh
index f5fc563..dc2bd46 100644
--- a/imager/config-hooks-neon-ko/00-debconf-preseed.sh
+++ b/imager/config-hooks-neon-ko/00-debconf-preseed.sh
@@ -1,8 +1,10 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-# preseed debconf selections
+set -ex
+echo "config-hooks-neon -- 00-debconf-preseed"
+# preseed debconf selections
# - disable man-db updates, they are super slow and who even uses man-db...
cat << EOF > config/preseed/000-neon.preseed
man-db man-db/auto-update boolean false
diff --git a/imager/config-hooks-neon-ko/00-neon-forks.sh b/imager/config-hooks-neon-ko/00-neon-forks.sh
index 6332827..4a8591e 100644
--- a/imager/config-hooks-neon-ko/00-neon-forks.sh
+++ b/imager/config-hooks-neon-ko/00-neon-forks.sh
@@ -13,6 +13,9 @@
# determine the origin of the package without having to meddle with dpkg-query
# format strings and the like or going through apt.
+set -ex
+echo "config-hooks-neon -- 00-neon-forks"
+
pkgs="livecd-rootfs"
for pkg in $pkgs; do
if dpkg-query -s $pkg | grep --fixed-strings --quiet '<neon at kde.org>'; then
diff --git a/imager/config-hooks-neon-ko/20_package_list.sh b/imager/config-hooks-neon-ko/20_package_list.sh
index d6e11c4..f87bc3e 100644
--- a/imager/config-hooks-neon-ko/20_package_list.sh
+++ b/imager/config-hooks-neon-ko/20_package_list.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 20-package-list"
+
# konsole needs installed first else xterm gets installed cos xorg deps on
# terminal | xterm and doesn't know terminal is installed later in the tree.
# Also explicitly install the efi image packages explicitly so live-build
diff --git a/imager/config-hooks-neon-ko/99-grub-deps.sh b/imager/config-hooks-neon-ko/99-grub-deps.sh
index 47dee67..4c1c414 100644
--- a/imager/config-hooks-neon-ko/99-grub-deps.sh
+++ b/imager/config-hooks-neon-ko/99-grub-deps.sh
@@ -1,6 +1,9 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+set -ex
+echo "config-hooks-neon -- 99-grub-deps"
+
# Install grub shebang in container. lb's grub-efi is a bit conflicted on
# which files to get from the host and which to get from the chroot so best
# have it on both ends.
diff --git a/imager/config-hooks-neon-ko/99-preinstalled-pool.sh b/imager/config-hooks-neon-ko/99-preinstalled-pool.sh
index b160970..781ee1c 100644
--- a/imager/config-hooks-neon-ko/99-preinstalled-pool.sh
+++ b/imager/config-hooks-neon-ko/99-preinstalled-pool.sh
@@ -1,13 +1,30 @@
-mkdir -vp config/gnupg
-mkdir -vp config/indices
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 99-preinstalled-pool"
+
+mkdir -vp -m 0700 config/gnupg
+mkdir -vp -m 0700 config/indices
# Make sure we use a suitably strong digest algorithm. SHA1 is deprecated and
# makes apt angry.
-#cat > config/gnupg/gpg.conf <<EOF
-#personal-digest-preferences SHA512
-#cert-digest-algo SHA512
-#default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
-#EOF
+cat > config/gnupg/gpg.conf <<EOF
+personal-digest-preferences SHA512
+cert-digest-algo SHA512
+default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
+EOF
+
+# confirm the conf file
+cat config/gnupg/gpg.conf
+# make sure we have a copy of the neon-archive-keyring.gpg
+# to be used as the preinstalled-pool's pubring.gpg
+#wget https://archive.neon.kde.org/public.key
+#gpg --home config/gnupg --import public.key
+#cp -v public.key config/gnupg/pubring.gpg
+#ls -lsh config/gnupg/
+#cat config/gnupg/pubring.gpg
for component in $COMPONENTS; do
(cd config/indices && \
diff --git a/imager/config-hooks-neon-ko/apt.conf.sh b/imager/config-hooks-neon-ko/apt.conf.sh
index 5221a44..392f6d1 100644
--- a/imager/config-hooks-neon-ko/apt.conf.sh
+++ b/imager/config-hooks-neon-ko/apt.conf.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-apt.conf"
+
rm config/chroot_apt/apt.conf || true
echo 'Debug::pkgProblemResolver "true";' >> config/chroot_apt/apt.conf
echo 'Acquire::Languages "none";' >> config/chroot_apt/apt.conf
diff --git a/imager/config-hooks-neon-ko/repo.sh b/imager/config-hooks-neon-ko/repo.sh
index 330ea8b..17ea4d0 100644
--- a/imager/config-hooks-neon-ko/repo.sh
+++ b/imager/config-hooks-neon-ko/repo.sh
@@ -1,16 +1,74 @@
-# Use gpg1, mostly because we are lazy and don't know how to best port this to v2
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-repo"
+
+if [ "$VERSION_CODENAME" = "jammy" ]; then
apt install -y dirmngr gnupg1
ARGS="--batch --verbose"
GPG="gpg1"
-apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
+apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
$ARGS \
--no-default-keyring \
--primary-keyring config/archives/ubuntu-defaults.key \
--import
-echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
-echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+
+else
+
+apt install -y curl
+
+ # use this hack until new neon-keyring is in the wild, then we can use cp down below
+ mkdir -p /etc/apt/keyring
+ chmod 700 ~/.gnupg
+ curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" | tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
+ gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt/keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
+ gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
+ gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
+
+ # use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
+ cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ # cp our non-armoured (binary) public key to where it needs to be
+ mkdir -p chroot/etc/apt/keyring/
+ cp /etc/apt/keyring/* chroot/etc/apt/keyring/
+
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.asc || true
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.gpg || true
+
+ # use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
+ cat <<EOF >config/archives/neon.list
+deb [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb-src [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+EOF
+
+ # add a nice depreciation message when we actually have depreciated the above hack
+ #echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
+
+ # add or spiffy new deb822 .sources config
+ cat > config/archives/neon.sources << EOF
+X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
+Types: deb deb-src
+URIs: http://archive.neon.kde.org/${NEONARCHIVE}
+Suites: $SUITE
+Components: main
+Architectures: $ARCH
+Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
+EOF
+
+ # check our stuffs are in the right place
+ ls -lshR config/archives/
+ cat config/archives/neon.list
+ cat config/archives/neon.sources
-# make sure _apt can read this file. it may get copied into the chroot
-chmod 644 config/archives/ubuntu-defaults.key || true
+fi
diff --git a/imager/config-hooks-neon-mobile/00-debconf-preseed.sh b/imager/config-hooks-neon-mobile/00-debconf-preseed.sh
index f5fc563..dc2bd46 100644
--- a/imager/config-hooks-neon-mobile/00-debconf-preseed.sh
+++ b/imager/config-hooks-neon-mobile/00-debconf-preseed.sh
@@ -1,8 +1,10 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
-# preseed debconf selections
+set -ex
+echo "config-hooks-neon -- 00-debconf-preseed"
+# preseed debconf selections
# - disable man-db updates, they are super slow and who even uses man-db...
cat << EOF > config/preseed/000-neon.preseed
man-db man-db/auto-update boolean false
diff --git a/imager/config-hooks-neon-mobile/00-neon-forks.sh b/imager/config-hooks-neon-mobile/00-neon-forks.sh
index 6332827..4a8591e 100644
--- a/imager/config-hooks-neon-mobile/00-neon-forks.sh
+++ b/imager/config-hooks-neon-mobile/00-neon-forks.sh
@@ -13,6 +13,9 @@
# determine the origin of the package without having to meddle with dpkg-query
# format strings and the like or going through apt.
+set -ex
+echo "config-hooks-neon -- 00-neon-forks"
+
pkgs="livecd-rootfs"
for pkg in $pkgs; do
if dpkg-query -s $pkg | grep --fixed-strings --quiet '<neon at kde.org>'; then
diff --git a/imager/config-hooks-neon-mobile/20_package_list.sh b/imager/config-hooks-neon-mobile/20_package_list.sh
index ae7a69e..aefbc21 100644
--- a/imager/config-hooks-neon-mobile/20_package_list.sh
+++ b/imager/config-hooks-neon-mobile/20_package_list.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 20-package-list"
+
# konsole needs installed first else xterm gets installed cos xorg deps on
# terminal | xterm and doesn't know terminal is installed later in the tree.
# Also explicitly install the efi image packages explicitly so live-build
@@ -6,6 +13,6 @@ cat << EOF > config/package-lists/ubuntu-defaults.list.chroot_install
shim-signed
grub-efi-amd64-signed
grub-efi-ia32-bin
+konsole
plasma-phone
-neon-settings-2
EOF
diff --git a/imager/config-hooks-neon-mobile/30_no_source.sh b/imager/config-hooks-neon-mobile/30_no_source.sh
index 612b555..1ee3807 100644
--- a/imager/config-hooks-neon-mobile/30_no_source.sh
+++ b/imager/config-hooks-neon-mobile/30_no_source.sh
@@ -1 +1,8 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 30-no-source"
+
echo 'LB_SOURCE=false' > config/source
diff --git a/imager/config-hooks-neon-mobile/99-grub-deps.sh b/imager/config-hooks-neon-mobile/99-grub-deps.sh
index 47dee67..4c1c414 100644
--- a/imager/config-hooks-neon-mobile/99-grub-deps.sh
+++ b/imager/config-hooks-neon-mobile/99-grub-deps.sh
@@ -1,6 +1,9 @@
# SPDX-FileCopyrightText: 2020 Harald Sitter <sitter at kde.org>
# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+set -ex
+echo "config-hooks-neon -- 99-grub-deps"
+
# Install grub shebang in container. lb's grub-efi is a bit conflicted on
# which files to get from the host and which to get from the chroot so best
# have it on both ends.
diff --git a/imager/config-hooks-neon-mobile/99-preinstalled-pool.sh b/imager/config-hooks-neon-mobile/99-preinstalled-pool.sh
index 1277eb0..781ee1c 100644
--- a/imager/config-hooks-neon-mobile/99-preinstalled-pool.sh
+++ b/imager/config-hooks-neon-mobile/99-preinstalled-pool.sh
@@ -1,5 +1,12 @@
-mkdir -vp config/gnupg
-mkdir -vp config/indices
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- 99-preinstalled-pool"
+
+mkdir -vp -m 0700 config/gnupg
+mkdir -vp -m 0700 config/indices
# Make sure we use a suitably strong digest algorithm. SHA1 is deprecated and
# makes apt angry.
@@ -9,6 +16,16 @@ cert-digest-algo SHA512
default-preference-list SHA512 SHA384 SHA256 SHA224 AES256 AES192 AES CAST5 ZLIB BZIP2 ZIP Uncompressed
EOF
+# confirm the conf file
+cat config/gnupg/gpg.conf
+# make sure we have a copy of the neon-archive-keyring.gpg
+# to be used as the preinstalled-pool's pubring.gpg
+#wget https://archive.neon.kde.org/public.key
+#gpg --home config/gnupg --import public.key
+#cp -v public.key config/gnupg/pubring.gpg
+#ls -lsh config/gnupg/
+#cat config/gnupg/pubring.gpg
+
for component in $COMPONENTS; do
(cd config/indices && \
wget http://archive.ubuntu.com/ubuntu/indices/override.$SUITE.$component && \
diff --git a/imager/config-hooks-neon-mobile/apt.conf.sh b/imager/config-hooks-neon-mobile/apt.conf.sh
index 5221a44..392f6d1 100644
--- a/imager/config-hooks-neon-mobile/apt.conf.sh
+++ b/imager/config-hooks-neon-mobile/apt.conf.sh
@@ -1,3 +1,10 @@
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-apt.conf"
+
rm config/chroot_apt/apt.conf || true
echo 'Debug::pkgProblemResolver "true";' >> config/chroot_apt/apt.conf
echo 'Acquire::Languages "none";' >> config/chroot_apt/apt.conf
diff --git a/imager/config-hooks-neon-mobile/repo.sh b/imager/config-hooks-neon-mobile/repo.sh
index 330ea8b..17ea4d0 100644
--- a/imager/config-hooks-neon-mobile/repo.sh
+++ b/imager/config-hooks-neon-mobile/repo.sh
@@ -1,16 +1,74 @@
-# Use gpg1, mostly because we are lazy and don't know how to best port this to v2
+#!/bin/sh
+# SPDX-FileCopyrightText: 2021 Harald Sitter <sitter at kde.org>
+# SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
+
+set -ex
+echo "config-hooks-neon -- **-repo"
+
+if [ "$VERSION_CODENAME" = "jammy" ]; then
apt install -y dirmngr gnupg1
ARGS="--batch --verbose"
GPG="gpg1"
-apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
+apt-key export '444D ABCF 3667 D028 3F89 4EDD E6D4 7362 5575 1E5D' | $GPG \
$ARGS \
--no-default-keyring \
--primary-keyring config/archives/ubuntu-defaults.key \
--import
-echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
-echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ echo "deb http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+ echo "deb-src http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main" >> config/archives/neon.list
+
+else
+
+apt install -y curl
+
+ # use this hack until new neon-keyring is in the wild, then we can use cp down below
+ mkdir -p /etc/apt/keyring
+ chmod 700 ~/.gnupg
+ curl -s --compressed "https://invent.kde.org/neon/neon/keyring/-/raw/work/overhaul/keyrings/neon-archive-keyring.gpg?ref_type=heads&inline=false" | tee /etc/apt/keyring/neon-archive-keyring-web.gpg >/dev/null
+ gpg --no-default-keyring --export-options export-minimal --keyring /etc/apt/keyring/neon-archive-keyring-web.gpg --output /etc/apt/keyring/neon-archive-keyring.gpg --export 444DABCF3667D0283F894EDDE6D4736255751E5D
+ gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
+ gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
+
+ # use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
+ cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
+ # cp our non-armoured (binary) public key to where it needs to be
+ mkdir -p chroot/etc/apt/keyring/
+ cp /etc/apt/keyring/* chroot/etc/apt/keyring/
+
+ # make sure _apt can read this file. it may get copied into the chroot
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.asc || true
+ chmod 644 chroot/etc/apt/keyring/neon-archive-keyring.gpg || true
+
+ # use a signed neon.list until we work out how to enable neon.sources in livecd-rootfs
+ cat <<EOF >config/archives/neon.list
+deb [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+deb-src [signed-by=/etc/apt/keyring/neon-archive-keyring.asc] http://archive.neon.kde.org/${NEONARCHIVE} $SUITE main
+EOF
+
+ # add a nice depreciation message when we actually have depreciated the above hack
+ #echo "# KDE neon sources have moved to /etc/apt/sources.list.d/neon.sources" >> config/archives/neon.list
+
+ # add or spiffy new deb822 .sources config
+ cat > config/archives/neon.sources << EOF
+X-Repolib-Name: KDE neon $SUITE ${NEONARCHIVE}
+Types: deb deb-src
+URIs: http://archive.neon.kde.org/${NEONARCHIVE}
+Suites: $SUITE
+Components: main
+Architectures: $ARCH
+Signed-By: /etc/apt/keyring/neon-archive-keyring-pubkey.asc
+EOF
+
+ # check our stuffs are in the right place
+ ls -lshR config/archives/
+ cat config/archives/neon.list
+ cat config/archives/neon.sources
-# make sure _apt can read this file. it may get copied into the chroot
-chmod 644 config/archives/ubuntu-defaults.key || true
+fi
diff --git a/imager/config-hooks-neon/repo.sh b/imager/config-hooks-neon/repo.sh
index cbe5eee..17ea4d0 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.sh
@@ -34,6 +34,10 @@ apt install -y curl
gpg --export --keyring /etc/apt/keyring/neon-archive-keyring.gpg --export-options export-minimal --armor > /etc/apt/keyring/neon-archive-keyring.asc
gpg --import /etc/apt/keyring/neon-archive-keyring.gpg
+ # use ubuntu-defaults.key for iso creation until we can use neon-keyring package for LB_BOOTSTRAP_KEYRING='neon-keyring'
+ cp /etc/apt/keyring/neon-archive-keyring.gpg config/archives/ubuntu-defaults.key
+ chmod 644 config/archives/ubuntu-defaults.key || true
+
# cp our non-armoured (binary) public key to where it needs to be
mkdir -p chroot/etc/apt/keyring/
cp /etc/apt/keyring/* chroot/etc/apt/keyring/
diff --git a/imager/config-settings-neon-arm64.sh b/imager/config-settings-neon-arm64.sh
index f065508..9d0df7c 100644
--- a/imager/config-settings-neon-arm64.sh
+++ b/imager/config-settings-neon-arm64.sh
@@ -1,5 +1,18 @@
+set -ex
+echo "neon -- config-settings-neon"
+
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
+export LB_APT_SOURCE_ARCHIVES="true"
export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} \$(date +%Y%m%d)"
export LB_ISO_APPLICATION="KDE neon arm64 Live"
-export LB_LINUX_FLAVOURS="generic-hwe-24.04"
export LB_LINUX_PACKAGES="linux"
+
+if [ "$VERSION_CODENAME" = "jammy" ]; then
+ export LB_LINUX_FLAVOURS="generic-hwe-22.04"
+else
+ export LB_LINUX_FLAVOURS="generic-hwe-24.04"
+fi
+
+export _COLOR="true"
+export _DEBUG="true"
+#export _VERBOSE="true"
diff --git a/imager/config-settings-neon-bigscreen.sh b/imager/config-settings-neon-bigscreen.sh
index 2909a0b..97f53ca 100644
--- a/imager/config-settings-neon-bigscreen.sh
+++ b/imager/config-settings-neon-bigscreen.sh
@@ -1,5 +1,18 @@
+set -ex
+echo "neon -- config-settings-neon"
+
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
+export LB_APT_SOURCE_ARCHIVES="true"
export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} \$(date +%Y%m%d-%H:%M)"
-export LB_ISO_APPLICATION="KDE neon Live"
-export LB_LINUX_FLAVOURS="generic-hwe-22.04"
+export LB_ISO_APPLICATION="KDE neon Plasma Big Screen Live"
export LB_LINUX_PACKAGES="linux"
+
+if [ "$VERSION_CODENAME" = "jammy" ]; then
+ export LB_LINUX_FLAVOURS="generic-hwe-22.04"
+else
+ export LB_LINUX_FLAVOURS="generic-hwe-24.04"
+fi
+
+export _COLOR="true"
+export _DEBUG="true"
+#export _VERBOSE="true"
diff --git a/imager/config-settings-neon-mobile.sh b/imager/config-settings-neon-mobile.sh
index 79068c4..74211ec 100644
--- a/imager/config-settings-neon-mobile.sh
+++ b/imager/config-settings-neon-mobile.sh
@@ -1,5 +1,18 @@
+set -ex
+echo "neon -- config-settings-neon"
+
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
-export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} Mobile \$(date +%Y%m%d)"
+export LB_APT_SOURCE_ARCHIVES="true"
+export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} Mobile \$(date +%Y%m%d-%H:%M)"
export LB_ISO_APPLICATION="KDE neon Plasma Mobile Live"
-export LB_LINUX_FLAVOURS="generic-hwe-22.04"
export LB_LINUX_PACKAGES="linux"
+
+if [ "$VERSION_CODENAME" = "jammy" ]; then
+ export LB_LINUX_FLAVOURS="generic-hwe-22.04"
+else
+ export LB_LINUX_FLAVOURS="generic-hwe-24.04"
+fi
+
+export _COLOR="true"
+export _DEBUG="true"
+#export _VERBOSE="true"
More information about the Neon-commits
mailing list