mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-14 18:24:15 +00:00
Imported 24.04.4 from noble-release pocket.
No reason for CPC update specified.
This commit is contained in:
CloudBuilder
parent
7fded2fbe1
commit
34cda945a8
@ -1,40 +0,0 @@
|
||||
diff --git a/live-build/auto/config b/live-build/auto/config
|
||||
index 20d28139..8f188b5d 100755
|
||||
--- a/live-build/auto/config
|
||||
+++ b/live-build/auto/config
|
||||
@@ -1048,12 +1048,13 @@ case $PROJECT in
|
||||
add_task install ubuntu-server-raspi
|
||||
;;
|
||||
armhf*)
|
||||
- add_package install flash-kernel
|
||||
+ if [ "${SUBPROJECT:-}" != minimized ]; then
|
||||
+ add_package install flash-kernel
|
||||
+ fi
|
||||
;;
|
||||
arm64*)
|
||||
- add_package install flash-kernel
|
||||
- if [ "${SUBARCH:-}" = "generic" ]; then
|
||||
- KERNEL_FLAVOURS=generic
|
||||
+ if [ "${SUBPROJECT:-}" != minimized ]; then
|
||||
+ add_package install flash-kernel
|
||||
fi
|
||||
;;
|
||||
amd64*)
|
||||
diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
|
||||
index 3685e464..4602267c 100755
|
||||
--- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
|
||||
+++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary
|
||||
@@ -112,11 +112,11 @@ install_grub() {
|
||||
# please file a bug against grub2 to include the affected module.
|
||||
case $ARCH in
|
||||
arm64)
|
||||
- chroot mountpoint apt-get -qqy install --no-install-recommends shim-signed grub-efi-arm64-signed
|
||||
+ chroot mountpoint apt-get install -qqy shim-signed
|
||||
efi_target=arm64-efi
|
||||
;;
|
||||
armhf)
|
||||
- chroot mountpoint apt-get -qqy install --no-install-recommends grub-efi-arm grub-efi-arm-bin
|
||||
+ chroot mountpoint apt-get -qqy install grub-efi-arm grub-efi-arm-bin
|
||||
efi_target=arm-efi
|
||||
;;
|
||||
amd64)
|
||||
15
debian/changelog
vendored
15
debian/changelog
vendored
@ -1,3 +1,18 @@
|
||||
livecd-rootfs (24.04.4) noble; urgency=medium
|
||||
|
||||
* Drop a few remaining 'legacy' references.
|
||||
* Drop cargo-culted code for "preinstalled" images.
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Sun, 05 Nov 2023 16:42:19 +0200
|
||||
|
||||
livecd-rootfs (24.04.3) noble; urgency=medium
|
||||
|
||||
* Drop the legacy images for both Ubuntu and Ubuntu Budgie.
|
||||
* We no longer need to remove ubiquity from the Ubuntu live layer and
|
||||
install ubuntu-desktop-installer, this is now handled via the seeds.
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Sat, 04 Nov 2023 22:06:57 +0200
|
||||
|
||||
livecd-rootfs (24.04.2) noble; urgency=medium
|
||||
|
||||
* Enable snap preseeding with ppc64el images where /boot/vmlinux is used
|
||||
|
||||
1
debian/tests/default-bootstraps
vendored
1
debian/tests/default-bootstraps
vendored
@ -18,7 +18,6 @@ ALL_TRIPLETS="
|
||||
lubuntu::
|
||||
ubuntu-unity::
|
||||
ubuntu::
|
||||
ubuntu:legacy:
|
||||
ubuntu-base::
|
||||
ubuntu-base:buildd:
|
||||
ubuntu-budgie::
|
||||
|
||||
@ -582,15 +582,13 @@ for OUTPUT in ext2 ext3 ext4 manifest manifest-remove size squashfs; do
|
||||
done
|
||||
|
||||
# we don't need a manifest-remove for a layered-aware installer
|
||||
if [ "$SUBPROJECT" != "legacy" ]; then
|
||||
# here we have a list of all new-installer flavors
|
||||
case $PROJECT in
|
||||
# here we have a list of all new-installer flavors
|
||||
case $PROJECT in
|
||||
ubuntu|ubuntu-budgie)
|
||||
rm -f livecd.${PROJECT}-manifest-remove
|
||||
rm -f config/manifest-minimal-remove
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
esac
|
||||
|
||||
if [ -e config/manifest-minimal-remove ]; then
|
||||
cp config/manifest-minimal-remove "$PREFIX.manifest-minimal-remove"
|
||||
|
||||
@ -537,12 +537,8 @@ case $IMAGEFORMAT in
|
||||
;;
|
||||
*)
|
||||
case $PROJECT in
|
||||
ubuntu-server|ubuntu-wsl|ubuntu-oem)
|
||||
;;
|
||||
ubuntu|ubuntu-budgie)
|
||||
if [ "$SUBPROJECT" = "legacy" ]; then
|
||||
add_package live casper
|
||||
fi
|
||||
ubuntu-server|ubuntu-wsl|ubuntu-oem|ubuntu|\
|
||||
ubuntu-budgie)
|
||||
;;
|
||||
*)
|
||||
add_package live casper
|
||||
@ -551,50 +547,6 @@ case $IMAGEFORMAT in
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ "$PREINSTALLED" = "true" ]; then
|
||||
# Touch a random file that we can refer back to during build,
|
||||
# cause that's wildly hackish
|
||||
touch config/universe-enabled
|
||||
case $PROJECT in
|
||||
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-unity)
|
||||
add_package live oem-config-gtk ubiquity-frontend-gtk
|
||||
add_package live ubiquity-slideshow-ubuntu
|
||||
;;
|
||||
ubuntu-server)
|
||||
add_package live oem-config-debconf ubiquity-frontend-debconf
|
||||
;;
|
||||
ubuntu-base|ubuntu-oci|ubuntu-cpc|ubuntu-wsl|ubuntu-mini-iso)
|
||||
;;
|
||||
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
|
||||
iso*|usb*)
|
||||
BINARY_IMAGES="$BINARYFORMAT"
|
||||
@ -675,17 +627,7 @@ fi
|
||||
|
||||
case $PROJECT in
|
||||
ubuntu)
|
||||
|
||||
case ${SUBPROJECT:-} in
|
||||
legacy)
|
||||
LIVE_TASK='ubuntu-live'
|
||||
add_task install minimal standard ubuntu-desktop
|
||||
add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
|
||||
KERNEL_FLAVOURS='generic-hwe-22.04'
|
||||
if [ "$SUBARCH" = "intel-iot" ]; then
|
||||
KERNEL_FLAVOURS='intel-iotg'
|
||||
fi
|
||||
;;
|
||||
desktop-preinstalled)
|
||||
add_task install minimal standard ubuntu-desktop
|
||||
case $SUBARCH in
|
||||
@ -727,8 +669,6 @@ case $PROJECT in
|
||||
add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages
|
||||
# the live layer, contains all packages for the live session installer
|
||||
add_task minimal.standard.live ubuntu-live
|
||||
remove_package minimal.standard.live ubiquity-frontend-gtk
|
||||
add_snap minimal.standard.live ubuntu-desktop-installer/classic
|
||||
add_package minimal.standard.live linux-$KERNEL_FLAVOURS casper
|
||||
# language support
|
||||
seeded_langs="$(get_seeded_languages desktop)"
|
||||
@ -857,13 +797,6 @@ case $PROJECT in
|
||||
;;
|
||||
|
||||
ubuntu-budgie)
|
||||
case ${SUBPROJECT:-} in
|
||||
legacy)
|
||||
add_task install minimal standard ubuntu-budgie-desktop
|
||||
LIVE_TASK='ubuntu-budgie-live'
|
||||
;;
|
||||
|
||||
*)
|
||||
# By default Ubuntu Budgie now ships the new installer.
|
||||
touch config/universe-enabled
|
||||
PASSES_TO_LAYERS="true"
|
||||
@ -875,7 +808,6 @@ case $PROJECT in
|
||||
remove_package minimal.standard.live ubiquity-frontend-gtk
|
||||
add_snap minimal.standard.live ubuntu-budgie-installer/classic
|
||||
add_package minimal.standard.live linux-$KERNEL_FLAVOURS casper
|
||||
|
||||
seeded_langs="$(get_seeded_languages budgie-desktop-minimal budgie-desktop)"
|
||||
echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
|
||||
derive_language_layers minimal budgie-desktop-minimal budgie-desktop-minimal-default-languages "$seeded_langs"
|
||||
@ -902,8 +834,6 @@ case $PROJECT in
|
||||
/usr/share/livecd-rootfs/checkout-translations-branch \
|
||||
https://git.launchpad.net/subiquity po config/catalog-translations
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
ubuntu-mate)
|
||||
add_task install minimal standard ubuntu-mate-core ubuntu-mate-desktop
|
||||
|
||||
@ -99,7 +99,7 @@ fi
|
||||
|
||||
|
||||
case $arch in
|
||||
# ARM, ppc, riscv64 and s390x images are special
|
||||
# ppc, riscv64 and s390x images are special
|
||||
powerpc|ppc64el|s390x|riscv64)
|
||||
exit 0
|
||||
;;
|
||||
|
||||
@ -1 +0,0 @@
|
||||
/home/philroche/Working/livecd-rootfs
|
||||
Loading…
x
Reference in New Issue
Block a user