[neon/neon/livecd-rootfs/Neon/unstable] live-build/auto: manually sync to noble cleaning up mistakes in rebases
Carlos De Maine
null at kde.org
Wed Aug 28 00:28:05 BST 2024
Git commit b8b9e1ed360b216de19450d029432a132600a40a by Carlos De Maine.
Committed on 27/08/2024 at 23:27.
Pushed by carlosdem into branch 'Neon/unstable'.
manually sync to noble cleaning up mistakes in rebases
M +0 -25 live-build/auto/build
M +11 -151 live-build/auto/config
https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/b8b9e1ed360b216de19450d029432a132600a40a
diff --git a/live-build/auto/build b/live-build/auto/build
index 4e22d58d..70547538 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -342,34 +342,9 @@ Signed-By: /etc/apt/keyrings/preinstalled-pool.gpg
chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release
mv -v config/gnupg/Release.asc \
chroot/var/lib/preinstalled-pool/dists/$R_CODENAME/Release.gpg
- # export pubring.gpg as modern gnupg stores everything in pubring.kbx by default
- ls -lshR config/gnupg/
- #gpg --verbose --home config/gnupg --export-options export-minimal \
- # --keyring config/gnupg/pubring.kbx --output config/gnupg/pubring.gpg --export
# move pubring.gpg to where the .sources expects it
mv -v config/gnupg/pubring.kbx chroot/etc/apt/keyrings/preinstalled-pool.gpg
- ls -lsh config/gnupg/
- echo "finding packages in pool"
find chroot/var/lib/preinstalled-pool/ -name Packages | xargs rm
-
- ## Mangle binary ISO maindir to contain cdrom repo.
- ## But only if the installer is Ubiquity, Calamares has special code
- ## to clean up the preinstalled repo after installation.
- #if [ -e chroot/usr/bin/ubiquity ]; then
- # mkdir -p binary/.disk/ || true
- # echo full_cd/single > binary/.disk/cd_type
- #
- # rm -rf binary/dists/
- # mv chroot/var/lib/preinstalled-pool/dists binary/
- # rm -rf binary/pool/
- # mv chroot/var/lib/preinstalled-pool/pool binary/
- #
- # rm chroot/etc/apt/sources.list.d/preinstalled-pool.list
- # rm -r chroot/var/lib/preinstalled-pool/
- #fi
- ## End of mangle
-
- Chroot chroot "apt-get update"
# We only want to have a cache for the pre-installed pool at this point
Chroot chroot "apt-get update -o Dir::Etc::SourceParts=/dev/null -oDir::Etc::SourceList=etc/apt/sources.list.d/preinstalled-pool.sources"
echo "finished preinstalled-pool!!"
diff --git a/live-build/auto/config b/live-build/auto/config
index f17cc478..a34c567b 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -449,8 +449,6 @@ case $IMAGEFORMAT in
MODEL=pi-arm64 ;;
arm64+raspi3)
MODEL=pi3-arm64 ;;
- armhf+cm3)
- MODEL=cm3 ;;
arm64+tegra)
MODEL=tegra ;;
arm64+tegra-igx)
@@ -508,47 +506,6 @@ case $IMAGEFORMAT in
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
;;
*)
- if [ "$SUITE" = "focal" ]; then
- CORE_MAJOR=20
- else
- CORE_MAJOR=22
- fi
- if [ "${MODEL}" = "pi" ]; then
- MODEL=pi-armhf
- fi
- # Ubuntu Core 2x
- # Currently uc2x assertions do not support global
- # channel overrides, instead we have per-channel models
- case $CHANNEL in
- stable)
- MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}"
- ;;
- candidate|beta|edge|dangerous)
- MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-${CHANNEL}"
- ;;
- dangerous-*)
- # That being said, the dangerous grade *does*
- # support channel overrides, so we can use the
- # dangerous model assertion and override the channel
- # freely.
- MODEL="ubuntu-core-${CORE_MAJOR}-${MODEL#pc-}-dangerous"
- CHANNEL=${CHANNEL#dangerous-}
- UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
- ;;
- dangerous-*)
- # That being said, the dangerous grade *does*
- # support channel overrides, so we can use the
- # dangerous model assertion and override the channel
- # freely.
- MODEL="ubuntu-core-20-${MODEL#pc-}-dangerous"
- CHANNEL=${CHANNEL#dangerous-}
- UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS -c $CHANNEL"
- ;;
- *)
- echo "Unknown CHANNEL ${CHANNEL} specification for ${SUITE}"
- exit 1
- ;;
- esac
echo "Unknown CHANNEL ${CHANNEL} specification for ${SUITE}"
exit 1
;;
@@ -576,38 +533,6 @@ case $IMAGEFORMAT in
else
# classic images
- # Certain models have different names but are built from the same source gadget tree
- BRANCH="classic"
- case $MODEL in
- pi|pi-arm64|pi3-arm64)
- MODEL=pi
- BRANCH="classic-22.04"
- ;;
- intel-iot)
- MODEL=pc
- ;;
- esac
-
- GADGET_TARGET="server"
- if [ "$SUBPROJECT" = "desktop-preinstalled" ]; then
- GADGET_TARGET="desktop"
- fi
-
- UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${SUBPROJECT:+ --subproject \"$SUBPROJECT\"}"
- UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}"
- UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}"
-
- # We need to look in two places for the gadget tree:
- # - Launchpad hosted gadgets will be in the snap-gadget repo
- # - Github hosted gadgets are mirrored into a github-mirror repo
- git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/snap-$MODEL -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror-$ARCH -b $BRANCH config/$PREFIX-gadget
-
- echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
- echo "SUITE=$SUITE" >> config/common
- echo "GADGET_TARGET=$GADGET_TARGET" >> config/common
- echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
-
- echo "Configured ubuntu-image for the following gadget model: $MODEL"
# Sometimes per-project quirks are necessary
IMAGE_PROJECT=$PROJECT
case "$IMAGE_PROJECT" in
@@ -643,7 +568,7 @@ case $IMAGEFORMAT in
;;
*)
case $PROJECT in
- kubuntu|lubuntu|ubuntu-unity)
+ kubuntu|lubuntu|neon|ubuntu-unity)
add_package live casper
;;
esac
@@ -653,43 +578,6 @@ esac
if [ "$PREINSTALLED" = "true" ]; then
# LP Bug: 2044154 Enable universe on pre-installed images
touch config/universe-enabled
- case $PROJECT in
- neon*)
- add_package live oem-config-kde ubiquity-frontend-kde
- ;;
- kubuntu*)
- add_package live oem-config-kde ubiquity-frontend-kde
- add_package live ubiquity-slideshow-kubuntu
- ;;
- lubuntu*)
- add_package live oem-config-gtk ubiquity-frontend-gtk
- add_package live ubiquity-slideshow-lubuntu
- ;;
- xubuntu*)
- add_package live oem-config-gtk ubiquity-frontend-gtk
- add_package live ubiquity-slideshow-xubuntu
- ;;
- ubuntu-mate)
- add_package live oem-config-gtk ubiquity-frontend-gtk
- add_package live ubiquity-slideshow-ubuntu-mate
- ;;
- ubuntu-server)
- add_package live oem-config-debconf ubiquity-frontend-debconf
- ;;
- ubuntu-base|ubuntu-oci|ubuntu-cpc|ubuntu-wsl)
- ;;
- ubuntu)
- add_package live oem-config-gtk ubiquity-frontend-gtk
- add_package live ubiquity-slideshow-ubuntu
- if [ "$SUBPROJECT" = "desktop-preinstalled" ]; then
- add_package live language-pack-en-base oem-config-slideshow-ubuntu
- fi
- ;;
- *)
- add_package live oem-config-gtk ubiquity-frontend-gtk
- add_package live ubiquity-slideshow-ubuntu
- ;;
- esac
fi
case $BINARYFORMAT in
@@ -706,7 +594,8 @@ if [ "${SUBPROJECT:-}" = minimized ]; then
fi
mkdir -p config/germinate-output
-case $PROJECT in
+ case $PROJECT in
+
edubuntu*)
FLAVOUR=edubuntu
;;
@@ -915,22 +804,6 @@ case $PROJECT in
;;
esac
;;
-
- desktop-preinstalled)
- add_task install minimal standard ubuntu-desktop
- if [ "$SUBARCH" = "intel-iot" ]; then
- # Since for non-pi we don't have any seeds yet but we want to be able to
- # grow the rootfs, manually install cloud-initramfs-growroot during build
- add_package install cloud-initramfs-growroot
- KERNEL_FLAVOURS='image-intel'
- COMPONENTS='main restricted'
- OPTS="${OPTS:+$OPTS }--initramfs=none"
- OPTS="${OPTS:+$OPTS }--system=normal"
- OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
- OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
- OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
- fi
- ;;
*)
HAS_MINIMAL=yes
MINIMAL_DESC="A minimal but usable Ubuntu Desktop."
@@ -973,14 +846,6 @@ case $PROJECT in
esac
;;
- neon)
- HWE=""
- KERNEL_FLAVOURS="generic${HWE:+-$HWE_SUFFIX}"
- add_task install minimal standard
- add_package live linux-$KERNEL_FLAVOURS neon-live
- add_package neon-desktop neon-live
- ;;
-
ubuntu-core-desktop)
touch config/universe-enabled
KERNEL_FLAVOURS='generic-hwe-22.04'
@@ -1019,7 +884,14 @@ case $PROJECT in
add_task install kubuntu-desktop
LIVE_TASK='kubuntu-live'
add_chroot_hook remove-gnome-icon-cache
- KERNEL_FLAVOURS='generic-hwe-22.04'
+ ;;
+
+ neon)
+ HWE=""
+ KERNEL_FLAVOURS="generic${HWE:+-$HWE_SUFFIX}"
+ add_task install minimal standard
+ add_package live linux-$KERNEL_FLAVOURS neon-live
+ add_package neon-desktop neon-live
;;
edubuntu)
@@ -1551,18 +1423,6 @@ exit 0
EOF
fi
-if [ "$PROJECT" = "ubuntustudio-dvd" ]; then
- cat > config/hooks/100-ubuntustudio-dkms.chroot <<EOF
-#!/bin/bash
-set -e
-
-env DEBIAN_FRONTEND=noninteractive \
- apt-get -y autoremove --purge v4l2loopback-dkms v4l2loopback-utils
-
-EOF
- chmod +x config/hooks/100-ubuntustudio-dkms.chroot
-fi
-
if $BINARY_REMOVE_LINUX; then
cat > config/binary_rootfs/excludes << EOF
boot/vmlinu?-*
More information about the Neon-commits
mailing list