[neon/infrastructure/pangea-data] imager: sync bigscreen to neon
Carlos De Maine
null at kde.org
Tue Nov 5 22:01:04 GMT 2024
Git commit 7a9542f18edeb8f191eb13562a59dfe88375ec16 by Carlos De Maine.
Committed on 05/11/2024 at 21:59.
Pushed by carlosdem into branch 'master'.
sync bigscreen to neon
M +2 -1 imager/build-hooks-neon-bigscreen/009-neon-masks.chroot
M +1 -0 imager/build-hooks-neon-bigscreen/010-neon-forks.chroot
M +2 -1 imager/build-hooks-neon-bigscreen/011-fuse.chroot
M +1 -1 imager/build-hooks-neon-bigscreen/011-fuse.chroot_early
M +19 -2 imager/build-hooks-neon-bigscreen/012-firefox.chroot
C +3 -8 imager/build-hooks-neon-bigscreen/013-fuse.chroot_early [from: imager/build-hooks-neon-bigscreen/011-fuse.chroot - 087% similarity]
M +2 -2 imager/build-hooks-neon-bigscreen/051-zfs.chroot
M +2 -1 imager/build-hooks-neon-bigscreen/091-apt-update.chroot
M +2 -1 imager/build-hooks-neon-bigscreen/092-apt-blacklist.chroot
M +6 -6 imager/build-hooks-neon-bigscreen/093-preinstalled-pool.chroot
M +3 -2 imager/build-hooks-neon-bigscreen/099-calamares-settings.chroot
M +2 -1 imager/build-hooks-neon-bigscreen/100-grubster.binary
M +3 -1 imager/build-hooks-neon-bigscreen/999-md5sum.binary
M +1 -1 imager/build.sh
D +0 -38 imager/config-hooks-neon/polkit.hack.sh
https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/7a9542f18edeb8f191eb13562a59dfe88375ec16
diff --git a/imager/build-hooks-neon-bigscreen/009-neon-masks.chroot b/imager/build-hooks-neon-bigscreen/009-neon-masks.chroot
index 9d34450..2c22394 100644
--- a/imager/build-hooks-neon-bigscreen/009-neon-masks.chroot
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/010-neon-forks.chroot b/imager/build-hooks-neon-bigscreen/010-neon-forks.chroot
index 81c9cec..4739c66 100755
--- a/imager/build-hooks-neon-bigscreen/010-neon-forks.chroot
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/011-fuse.chroot b/imager/build-hooks-neon-bigscreen/011-fuse.chroot
index 24d53e1..da9aa23 100644
--- a/imager/build-hooks-neon-bigscreen/011-fuse.chroot
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/011-fuse.chroot_early b/imager/build-hooks-neon-bigscreen/011-fuse.chroot_early
index f9a9158..856ed71 100644
--- a/imager/build-hooks-neon-bigscreen/011-fuse.chroot_early
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/012-firefox.chroot b/imager/build-hooks-neon-bigscreen/012-firefox.chroot
index a2adbf2..f5322e0 100644
--- a/imager/build-hooks-neon-bigscreen/012-firefox.chroot
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/011-fuse.chroot b/imager/build-hooks-neon-bigscreen/013-fuse.chroot_early
similarity index 87%
copy from imager/build-hooks-neon-bigscreen/011-fuse.chroot
copy to imager/build-hooks-neon-bigscreen/013-fuse.chroot_early
index 24d53e1..5e393f6 100644
--- a/imager/build-hooks-neon-bigscreen/011-fuse.chroot
+++ b/imager/build-hooks-neon-bigscreen/013-fuse.chroot_early
@@ -27,14 +27,9 @@
# 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 013-fuse.chroot_early"
if grep -q Unstable /etc/os-release; then
- apt-get install -y kio-fuse fuse3
-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
+ apt-get install -y neon-settings-2
fi
diff --git a/imager/build-hooks-neon-bigscreen/051-zfs.chroot b/imager/build-hooks-neon-bigscreen/051-zfs.chroot
index 750b796..d5085a1 100755
--- a/imager/build-hooks-neon-bigscreen/051-zfs.chroot
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/091-apt-update.chroot b/imager/build-hooks-neon-bigscreen/091-apt-update.chroot
index 9d13124..7f26c1f 100755
--- a/imager/build-hooks-neon-bigscreen/091-apt-update.chroot
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/092-apt-blacklist.chroot b/imager/build-hooks-neon-bigscreen/092-apt-blacklist.chroot
index e49a588..c6a72ef 100644
--- a/imager/build-hooks-neon-bigscreen/092-apt-blacklist.chroot
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/093-preinstalled-pool.chroot b/imager/build-hooks-neon-bigscreen/093-preinstalled-pool.chroot
index 9807dce..8a223f1 100644
--- a/imager/build-hooks-neon-bigscreen/093-preinstalled-pool.chroot
+++ b/imager/build-hooks-neon-bigscreen/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
+ broadcom-sta-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-bigscreen/099-calamares-settings.chroot b/imager/build-hooks-neon-bigscreen/099-calamares-settings.chroot
index 2621cde..7b24ec0 100755
--- a/imager/build-hooks-neon-bigscreen/099-calamares-settings.chroot
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/100-grubster.binary b/imager/build-hooks-neon-bigscreen/100-grubster.binary
index ff444f8..5f801ca 100644
--- a/imager/build-hooks-neon-bigscreen/100-grubster.binary
+++ b/imager/build-hooks-neon-bigscreen/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-bigscreen/999-md5sum.binary b/imager/build-hooks-neon-bigscreen/999-md5sum.binary
index 523e979..9cee001 100644
--- a/imager/build-hooks-neon-bigscreen/999-md5sum.binary
+++ b/imager/build-hooks-neon-bigscreen/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 fc88c84..04547de 100755
--- a/imager/build.sh
+++ b/imager/build.sh
@@ -166,7 +166,7 @@ cd ../result/
# All *release* iso's and also during LTS update all FUTURE_SERIES iso are published to a different location
-# and namingaltered to include $DIST to be able to differentiate iso's e.g.-> neon-noble-release-#######.iso
+# and naming altered to include $DIST to be able to differentiate iso's e.g.-> neon-noble-release-#######.iso
# we also override TYPE with the 'new_type' variable to alter naming for non-desktop editions
new_type="${NEONARCHIVE}-${TYPE}"
diff --git a/imager/config-hooks-neon/polkit.hack.sh b/imager/config-hooks-neon/polkit.hack.sh
deleted file mode 100644
index a7d325b..0000000
--- a/imager/config-hooks-neon/polkit.hack.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/sh
-
-set -ex
-echo "config-hooks-neon -- **-polkit.hack..."
-
-PREREQ=""
-DESCRIPTION="Grant administrative PolicyKit privileges to default user..."
-
-prereqs()
-{
- echo "$PREREQ"
-}
-
-case $1 in
-# get pre-requisites
-prereqs)
- prereqs
- exit 0
- ;;
-esac
-
-#. /scripts/casper-functions
-
-echo "$DESCRIPTION"
-
-# configure PolicyKit in live session
-mkdir -p /chroot/var/lib/polkit-1/localauthority/10-vendor.d
-cat << EOF > /chroot/var/lib/polkit-1/localauthority/10-vendor.d/10-live-cd.pkla
-# Policy to allow the livecd user to bypass policykit
-[Live CD user permissions]
-Identity=unix-user:$USERNAME;unix-user:sddm
-Action=*
-ResultAny=no
-ResultInactive=yes
-ResultActive=yes
-EOF
-
-#log_end_msg
More information about the Neon-commits
mailing list