[neon/infrastructure/pangea-data] imager: add debug to try and work out what the heck is going on at what time
Carlos De Maine
null at kde.org
Tue Aug 6 23:24:10 BST 2024
Git commit 7de1212692c3b2407ce7ba871aa1aa53769facb1 by Carlos De Maine.
Committed on 06/08/2024 at 22:24.
Pushed by carlosdem into branch 'master'.
add debug to try and work out what the heck is going on at what time
M +2 -2 imager/0090-sddm
M +2 -2 imager/0170-systemd
M +2 -1 imager/build-hooks-neon/009-neon-masks.chroot
M +1 -0 imager/build-hooks-neon/010-neon-forks.chroot
M +2 -1 imager/build-hooks-neon/011-fuse.chroot
M +1 -1 imager/build-hooks-neon/011-fuse.chroot_early
M +1 -0 imager/build-hooks-neon/012-firefox.chroot
M +1 -1 imager/build-hooks-neon/013-fuse.chroot_early
M +2 -2 imager/build-hooks-neon/051-zfs.chroot
M +2 -1 imager/build-hooks-neon/091-apt-update.chroot
M +2 -1 imager/build-hooks-neon/092-apt-blacklist.chroot
M +3 -2 imager/build-hooks-neon/093-preinstalled-pool.chroot
M +3 -2 imager/build-hooks-neon/099-calamares-settings.chroot
M +2 -1 imager/build-hooks-neon/100-grubster.binary
M +3 -1 imager/build-hooks-neon/999-md5sum.binary
M +1 -0 imager/build.sh
M +3 -1 imager/config-hooks-neon/00-debconf-preseed.sh
M +3 -0 imager/config-hooks-neon/00-neon-forks.sh
M +7 -0 imager/config-hooks-neon/20_package_list.sh
M +3 -0 imager/config-hooks-neon/99-grub-deps.sh
M +7 -0 imager/config-hooks-neon/99-preinstalled-pool.sh
M +7 -0 imager/config-hooks-neon/apt.conf.sh
M +7 -0 imager/config-hooks-neon/repo.sh
M +3 -0 imager/config-settings-neon.sh
M +2 -0 imager/ubuntu-defaults-image
https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/7de1212692c3b2407ce7ba871aa1aa53769facb1
diff --git a/imager/0090-sddm b/imager/0090-sddm
index 03b07a4..67f8552 100755
--- a/imager/0090-sddm
+++ b/imager/0090-sddm
@@ -7,8 +7,8 @@
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
-
-set -e
+set -ex
+echo "neon -- 0090-sddm"
Cmdline ()
{
diff --git a/imager/0170-systemd b/imager/0170-systemd
index a67c752..ad1b3ad 100755
--- a/imager/0170-systemd
+++ b/imager/0170-systemd
@@ -7,8 +7,8 @@
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
-
-#set -e
+set -ex
+echo "neon -- 0170-systemd"
Cmdline ()
{
diff --git a/imager/build-hooks-neon/009-neon-masks.chroot b/imager/build-hooks-neon/009-neon-masks.chroot
index 9d34450..2c22394 100644
--- a/imager/build-hooks-neon/009-neon-masks.chroot
+++ b/imager/build-hooks-neon/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/010-neon-forks.chroot b/imager/build-hooks-neon/010-neon-forks.chroot
index 81c9cec..4739c66 100755
--- a/imager/build-hooks-neon/010-neon-forks.chroot
+++ b/imager/build-hooks-neon/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/011-fuse.chroot b/imager/build-hooks-neon/011-fuse.chroot
index 24d53e1..da9aa23 100644
--- a/imager/build-hooks-neon/011-fuse.chroot
+++ b/imager/build-hooks-neon/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/011-fuse.chroot_early b/imager/build-hooks-neon/011-fuse.chroot_early
index f9a9158..856ed71 100644
--- a/imager/build-hooks-neon/011-fuse.chroot_early
+++ b/imager/build-hooks-neon/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/012-firefox.chroot b/imager/build-hooks-neon/012-firefox.chroot
index a2adbf2..f126b3d 100644
--- a/imager/build-hooks-neon/012-firefox.chroot
+++ b/imager/build-hooks-neon/012-firefox.chroot
@@ -8,6 +8,7 @@ set -e
. /etc/os-release
+echo "build-hooks-neon -- running 012-firefox.chroot"
echo "Installing Firefox from PPA"
mv /etc/apt/apt.conf.d/00http-proxy /tmp/
diff --git a/imager/build-hooks-neon/013-fuse.chroot_early b/imager/build-hooks-neon/013-fuse.chroot_early
index 359a97f..5e393f6 100644
--- a/imager/build-hooks-neon/013-fuse.chroot_early
+++ b/imager/build-hooks-neon/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/051-zfs.chroot b/imager/build-hooks-neon/051-zfs.chroot
index 750b796..d5085a1 100755
--- a/imager/build-hooks-neon/051-zfs.chroot
+++ b/imager/build-hooks-neon/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/091-apt-update.chroot b/imager/build-hooks-neon/091-apt-update.chroot
index 9d13124..7f26c1f 100755
--- a/imager/build-hooks-neon/091-apt-update.chroot
+++ b/imager/build-hooks-neon/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/092-apt-blacklist.chroot b/imager/build-hooks-neon/092-apt-blacklist.chroot
index e49a588..c6a72ef 100644
--- a/imager/build-hooks-neon/092-apt-blacklist.chroot
+++ b/imager/build-hooks-neon/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/093-preinstalled-pool.chroot b/imager/build-hooks-neon/093-preinstalled-pool.chroot
index 15030dd..dca59a9 100644
--- a/imager/build-hooks-neon/093-preinstalled-pool.chroot
+++ b/imager/build-hooks-neon/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/
diff --git a/imager/build-hooks-neon/099-calamares-settings.chroot b/imager/build-hooks-neon/099-calamares-settings.chroot
index 2621cde..7b24ec0 100755
--- a/imager/build-hooks-neon/099-calamares-settings.chroot
+++ b/imager/build-hooks-neon/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/100-grubster.binary b/imager/build-hooks-neon/100-grubster.binary
index ff444f8..5f801ca 100644
--- a/imager/build-hooks-neon/100-grubster.binary
+++ b/imager/build-hooks-neon/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/999-md5sum.binary b/imager/build-hooks-neon/999-md5sum.binary
index 523e979..9cee001 100644
--- a/imager/build-hooks-neon/999-md5sum.binary
+++ b/imager/build-hooks-neon/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.sh b/imager/build.sh
index e3e8100..562b784 100755
--- a/imager/build.sh
+++ b/imager/build.sh
@@ -1,6 +1,7 @@
#!/bin/sh
set -ex
+echo "neon -- build.sh"
cleanup() {
if [ ! -d build ]; then
diff --git a/imager/config-hooks-neon/00-debconf-preseed.sh b/imager/config-hooks-neon/00-debconf-preseed.sh
index f5fc563..dc2bd46 100644
--- a/imager/config-hooks-neon/00-debconf-preseed.sh
+++ b/imager/config-hooks-neon/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/00-neon-forks.sh b/imager/config-hooks-neon/00-neon-forks.sh
index 6332827..4a8591e 100644
--- a/imager/config-hooks-neon/00-neon-forks.sh
+++ b/imager/config-hooks-neon/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/20_package_list.sh b/imager/config-hooks-neon/20_package_list.sh
index 79ffc23..d3d55a6 100644
--- a/imager/config-hooks-neon/20_package_list.sh
+++ b/imager/config-hooks-neon/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/99-grub-deps.sh b/imager/config-hooks-neon/99-grub-deps.sh
index 47dee67..4c1c414 100644
--- a/imager/config-hooks-neon/99-grub-deps.sh
+++ b/imager/config-hooks-neon/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/99-preinstalled-pool.sh b/imager/config-hooks-neon/99-preinstalled-pool.sh
index 5ad1c33..781ee1c 100644
--- a/imager/config-hooks-neon/99-preinstalled-pool.sh
+++ b/imager/config-hooks-neon/99-preinstalled-pool.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 -- 99-preinstalled-pool"
+
mkdir -vp -m 0700 config/gnupg
mkdir -vp -m 0700 config/indices
diff --git a/imager/config-hooks-neon/apt.conf.sh b/imager/config-hooks-neon/apt.conf.sh
index 5221a44..392f6d1 100644
--- a/imager/config-hooks-neon/apt.conf.sh
+++ b/imager/config-hooks-neon/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/repo.sh b/imager/config-hooks-neon/repo.sh
index d3a0bd3..3098ef2 100644
--- a/imager/config-hooks-neon/repo.sh
+++ b/imager/config-hooks-neon/repo.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 -- **-repo"
+
if [ "$VERSION_CODENAME" = "jammy" ]; then
apt install -y dirmngr gnupg1
ARGS="--batch --verbose"
diff --git a/imager/config-settings-neon.sh b/imager/config-settings-neon.sh
index 942ccc4..c12b0eb 100644
--- a/imager/config-settings-neon.sh
+++ b/imager/config-settings-neon.sh
@@ -1,3 +1,6 @@
+set -ex
+echo "neon -- config-settings-neon"
+
EDITION=$(echo $NEONARCHIVE | sed 's,/, ,')
export LB_ISO_VOLUME="${IMAGENAME} ${EDITION} \$(date +%Y%m%d-%H:%M)"
export LB_ISO_APPLICATION="KDE neon Live"
diff --git a/imager/ubuntu-defaults-image b/imager/ubuntu-defaults-image
index ce21a54..82004c5 100755
--- a/imager/ubuntu-defaults-image
+++ b/imager/ubuntu-defaults-image
@@ -21,6 +21,8 @@
set -e
set -x
+echo "neon -- ubuntu-defaults-image"
+
LOCALE=
PACKAGE=
ARCH=
More information about the Neon-commits
mailing list