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

Imported 23.10.37 from mantic-release pocket.

Browse Source 
No reason for CPC update specified.
This commit is contained in:
CloudBuilder 2023-09-16 15:51:08 +00:00
parent b1a110175f
commit 8c127ebec1
5 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
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
livecd-rootfs (23.10.36) mantic; urgency=medium livecd-rootfs (23.10.36) mantic; urgency=medium
* Since we restored the minimal layer, we also need to adjust all hook * Since we restored the minimal layer, we also need to adjust all hook

6
live-build/auto/build
View File

@ -618,11 +618,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
fi fi
case $FLAVOUR in case $FLAVOUR in
allwinner|virtual|generic-hwe-*) allwinner|virtual|generic-hwe-*)
if [ "$ARCH" = "armhf" ]; then FLAVOUR="generic"
FLAVOUR="generic-lpae"
else
FLAVOUR="generic"
fi
;; ;;
oem-*) oem-*)
FLAVOUR="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 base/disk-image-ppc64el.binary
provides livecd.ubuntu-cpc.ext4 provides livecd.ubuntu-cpc.ext4
provides livecd.ubuntu-cpc.initrd-generic 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
provides livecd.ubuntu-cpc.kernel-generic-lpae
provides livecd.ubuntu-cpc.manifest provides livecd.ubuntu-cpc.manifest
provides livecd.ubuntu-cpc.filelist 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 base/disk-image-uefi.binary
provides livecd.ubuntu-cpc.ext4 provides livecd.ubuntu-cpc.ext4
provides livecd.ubuntu-cpc.initrd-generic 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
provides livecd.ubuntu-cpc.kernel-generic-lpae
provides livecd.ubuntu-cpc.manifest provides livecd.ubuntu-cpc.manifest
provides livecd.ubuntu-cpc.filelist provides livecd.ubuntu-cpc.filelist

8
minimize-manual
View File

@ -7,10 +7,10 @@
set -e set -e
chroot=$1 chroot_directory=$1
auto_packages=$(/usr/share/livecd-rootfs/auto-markable-pkgs $chroot) auto_packages=$(/usr/share/livecd-rootfs/auto-markable-pkgs $chroot_directory)
if [ -n "$auto_packages" ]; then if [ -n "$auto_packages" ]; then
chroot chroot apt-mark auto $auto_packages chroot $chroot_directory apt-mark auto $auto_packages
fi fi
[ -z "$(/usr/share/livecd-rootfs/auto-markable-pkgs $chroot 2> /dev/null)" ] [ -z "$(/usr/share/livecd-rootfs/auto-markable-pkgs $chroot_directory 2> /dev/null)" ]