Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-12 22:07:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'philroche/bugfix/ubuntu-cpc-LP-2036192-armhf' into ubuntu/master

Browse Source
This commit is contained in:
Steve Langasek 2023-09-15 14:44:00 -07:00
commit 0542e9d218
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/changelog vendored
View File

@ -1,6 +1,7 @@
livecd-rootfs (23.10.37) mantic; urgency=medium
* fix: ensure minimize-manual script uses passed in argument for all commands (LP: #2036198)
* fix: armhf flavour for 6.5+ kernel is now generic (LP: #2036192)
-- Philip Roche <phil.roche@ubuntu.com> Fri, 15 Sep 2023 11:58:23 +0100

6
live-build/auto/build
View File

@ -618,11 +618,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
fi
case $FLAVOUR in
allwinner|virtual|generic-hwe-*)
if [ "$ARCH" = "armhf" ]; then
FLAVOUR="generic-lpae"
else
FLAVOUR="generic"
fi
FLAVOUR="generic"
;;
oem-*)
FLAVOUR="oem"

2
live-build/ubuntu-cpc/hooks.d/base/series/disk-image
View File

@ -3,8 +3,6 @@ base/disk-image.binary
base/disk-image-ppc64el.binary
provides livecd.ubuntu-cpc.ext4
provides livecd.ubuntu-cpc.initrd-generic
provides livecd.ubuntu-cpc.initrd-generic-lpae
provides livecd.ubuntu-cpc.kernel-generic
provides livecd.ubuntu-cpc.kernel-generic-lpae
provides livecd.ubuntu-cpc.manifest
provides livecd.ubuntu-cpc.filelist

2
live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi
View File

@ -1,8 +1,6 @@
base/disk-image-uefi.binary
provides livecd.ubuntu-cpc.ext4
provides livecd.ubuntu-cpc.initrd-generic
provides livecd.ubuntu-cpc.initrd-generic-lpae
provides livecd.ubuntu-cpc.kernel-generic
provides livecd.ubuntu-cpc.kernel-generic-lpae
provides livecd.ubuntu-cpc.manifest
provides livecd.ubuntu-cpc.filelist