Compare commits

...

15 Commits

Author SHA1 Message Date
Philip Roche
56ad09bf1a fix: Update d/ch for 23.10.60 as I am uploader sponsoring Ankush Pathak changes
I do not have keys to sign changes for Ankush Pathak
2024-05-22 11:57:03 +01:00
Philip Roche
3df29d28a0 fix: Update d/ch for 23.10.60 to include space after name
format must be space between name and email address.

`-- maintainer-name <email-address> date`

No space resulted in error during build

```
W: livecd-rootfs: syntax-error-in-debian-changelog "badly formatted trailer line" [usr/share/doc/livecd-rootfs/changelog.gz:5]
W: livecd-rootfs: syntax-error-in-debian-changelog "found start of entry where expected more change data or trailer" [usr/share/doc/livecd-rootfs/changelog.gz:7]
```
2024-05-22 11:40:16 +01:00
Philip Roche
a0b332f617 Merge ankushpathak-feat/add_apparmor_unconfined_restrictions_policy_6_5_kernel_mantic into ubuntu/mantic [a=ankushpathak] [r=kajiya,philroche]
Update d/ch for 23.10.60 release

feat(apparmor): Add policy:unconfined_restrictions feature to 6.5 kernel

MP: https://code.launchpad.net/~ankushpathak/livecd-rootfs/+git/livecd-rootfs/+merge/465109
2024-05-22 10:42:53 +01:00
Ankush Pathak
8c91f61564 Update d/ch for 23.10.60 release 2024-04-26 18:33:14 -05:00
Ankush Pathak
2995899af8 feat(apparmor): Add policy:unconfined_restrictions feature to 6.5 kernel
Failing CPC tests show that the preseeded apparmor features don't
include policy:unconfined_restrictions for the 6.5 kernel. This change
adds the feature preseed.
Fixes LP: #2062929
2024-04-26 12:37:08 -05:00
Philip Roche
36bc6e3722 add missing bug reference for 23.10.58 2024-04-12 14:39:10 +01:00
Philip Roche
7bc309bb1a releasing package livecd-rootfs version 23.10.59 2024-04-12 13:52:22 +01:00
Philip Roche
f0b44d7de9 Merge bugfix/lp-2061121-snap-preseed-latest into ubuntu/mantic [a=philroche] [r=jchittum,tomparrott,utkarsh]
fix: Use Ubuntu policy default channel "latest" for preseeded snaps (LP: #2061121)

Recent Mantic cloud image builds fail after default track for LXD change to "5.21" instead of "latest"

This changes preseed from "latest/" for all snaps and no longer assume that "latest/" is the default.

MP: https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/464199
2024-04-12 13:35:19 +01:00
Philip Roche
2a029bacf1 fix: Use Ubuntu policy default channel "latest" for preseeded snaps (LP: #2061121)
Recent Mantic cloud image builds fail after default track for LXD change to "5.21" instead of "latest"

This changes preseed from "latest/" for all snaps and no longer assume that "latest/" is the default.
2024-04-12 12:56:44 +01:00
Dimitri John Ledkov
eabde6cde5
releasing package livecd-rootfs version 23.10.58 2024-01-03 15:17:23 +00:00
Simon Poirier
0975e2a5dd
fix: add back systemd-resolved to buildd images.
systemd-resolved got moved out of the systemd package in kinetic and is
required for bootable buildd environement (as opposed to launchpad buildd)
(LP: #2007419)

(cherry picked from commit 3729e2ae948879a582f16ac5753646505ff6bc2d)
Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
2024-01-03 15:16:53 +00:00
Brian Murray
b96839c857 releasing package livecd-rootfs version 23.10.57 2023-12-06 11:30:43 -08:00
Brian Murray
48b5d89e15 arm: fix console parameter for ARM cloud-images (LP: #2036730) 2023-12-06 11:30:25 -08:00
Philip Roche
558d393333 Merge bugfix/ubuntu-cpc-LP-2038957-ppc64el-vmlinux-mantic into ubuntu/mantic [a=philroche] [r=andrew-cloke,vorlon]
fix: Enable snap preseeding with ppc64el images where /boot/vmlinux is used instead of /boot/vmlinuz. (LP: #2038957)

ppc64el still uses /boot/vmlinux so we need to determine the boot file name as non ppc64el use /boot/vmlinuz. This
is then used to determine the kernel major minor version installed so that the correct apparmor features can be used
during snap preseeding. This preseeding was failing for ppc64el for the mantic 6.5 kernel as the /boot/vmlinuz
being checked did not exist.

MP: https://code.launchpad.net/~philroche/livecd-rootfs/+git/livecd-rootfs/+merge/454045
2023-10-27 12:50:15 +01:00
Philip Roche
07f26cb78e fix: Enable snap preseeding with ppc64el images where /boot/vmlinux is used instead of /boot/vmlinuz. (LP: #2038957)
ppc64el still uses /boot/vmlinux so we need to determine the boot file name as non ppc64el use /boot/vmlinuz. This
is then used to determine the kernel major minor version installed so that the correct apparmor features can be used
during snap preseeding. This preseeding was failing for ppc64el for the mantic 6.5 kernel as the /boot/vmlinuz
being checked did not exist.
2023-10-11 11:45:36 +01:00
7 changed files with 60 additions and 3 deletions

35
debian/changelog vendored
View File

@ -1,3 +1,38 @@
livecd-rootfs (23.10.60) mantic; urgency=medium
[ Ankush Pathak ]
* Add policy:unconfined_restrictions feature to 6.5 kernel (LP: #2062929)
-- Philip Roche <phil.roche@canonical.com> Wed, 22 May 2024 11:55:15 +0100
livecd-rootfs (23.10.59) mantic; urgency=medium
* Use Ubuntu policy default channel "latest" for preseeded snaps
(LP: #2061121)
-- Philip Roche <phil.roche@canonical.com> Fri, 12 Apr 2024 12:37:29 +0100
livecd-rootfs (23.10.58) mantic; urgency=medium
[ Simon Poirier ]
* fix: add back systemd-resolved to buildd images (LP: #2007419)
-- Dimitri John Ledkov <dimitri.ledkov@canonical.com> Wed, 03 Jan 2024 15:17:17 +0000
livecd-rootfs (23.10.57) mantic; urgency=medium
[ Heinrich Schuchardt ]
* arm: fix console parameter for ARM cloud-images (LP: #2036730)
-- Brian Murray <brian@ubuntu.com> Wed, 06 Dec 2023 11:30:35 -0800
livecd-rootfs (23.10.56) mantic; urgency=medium
* Enable snap preseeding with ppc64el images where /boot/vmlinux is used
instead of /boot/vmlinuz. (LP: #2038957)
-- Philip Roche <phil.roche@canonical.com> Wed, 11 Oct 2023 11:41:00 +0100
livecd-rootfs (23.10.55) mantic; urgency=medium livecd-rootfs (23.10.55) mantic; urgency=medium
* fix: add 6.5 kernel appamor features to livecd-rootfs based on * fix: add 6.5 kernel appamor features to livecd-rootfs based on

View File

@ -1123,6 +1123,9 @@ case $SUBPROJECT in
add_package install build-essential add_package install build-essential
# Needed for LXD-based builds. # Needed for LXD-based builds.
add_package install init add_package install init
# Needed for bootable buildd systems which don't get injected
# nameserver configuration. (LP: 2007419)
add_package install systemd-resolved
# Not strictly build-essential, but traditionally present # Not strictly build-essential, but traditionally present
# and a variety of things fail without it. # and a variety of things fail without it.
add_package install tzdata add_package install tzdata

View File

@ -730,7 +730,7 @@ snap_preseed() {
CHANNEL=${2#*=} CHANNEL=${2#*=}
;; ;;
*) *)
CHANNEL="stable/ubuntu-$(release_ver)" CHANNEL="latest/stable/ubuntu-$(release_ver)"
;; ;;
esac esac
fi fi
@ -768,9 +768,18 @@ snap_preseed() {
snap_validate_seed() { snap_validate_seed() {
local CHROOT_ROOT=$1 local CHROOT_ROOT=$1
local kern_major_min=undefined local kern_major_min=undefined
local boot_filename=undefined
# ppc64el still uses /boot/vmlinux so we need to determine the boot file name as non ppc64el use /boot/vmlinuz
# We don't need to query the arch as we can use existence of the file to determine the boot file name. Both
# will never be present at the same time.
if [ -e ${CHROOT_ROOT}/boot/vmlinuz ]; then if [ -e ${CHROOT_ROOT}/boot/vmlinuz ]; then
kern_major_min=$(readlink --canonicalize --no-newline ${CHROOT_ROOT}/boot/vmlinuz | grep --extended-regexp --only-matching --max-count 1 '[0-9]+\.[0-9]+') boot_filename=vmlinuz
elif [ -e ${CHROOT_ROOT}/boot/vmlinux ]; then
boot_filename=vmlinux
fi
if [ ${boot_filename} != undefined ]; then # we have a known boot file so we can proceed with checking for features to mount
kern_major_min=$(readlink --canonicalize --no-newline ${CHROOT_ROOT}/boot/${boot_filename} | grep --extended-regexp --only-matching --max-count 1 '[0-9]+\.[0-9]+')
if [ -d /usr/share/livecd-rootfs/live-build/apparmor/${kern_major_min} ]; then if [ -d /usr/share/livecd-rootfs/live-build/apparmor/${kern_major_min} ]; then
# if an Ubuntu version has different kernel apparmor features between LTS and HWE kernels # if an Ubuntu version has different kernel apparmor features between LTS and HWE kernels
# a snap pre-seeding issue can occur, where the incorrect apparmor features are reported # a snap pre-seeding issue can occur, where the incorrect apparmor features are reported

View File

@ -170,6 +170,16 @@ fi
psuedo_grub_probe > "${gprobe}" psuedo_grub_probe > "${gprobe}"
chmod 755 "${gprobe}" chmod 755 "${gprobe}"
case $arch in
armhf|arm64)
# QEMU virt machine provides AMBA PrimeCell UART
serial_console='ttyAMA0'
;;
*)
serial_console='ttyS0'
;;
esac
# for Quantal and later, use /etc/default/grub.d functionality # for Quantal and later, use /etc/default/grub.d functionality
# rather than modifying the grub configuration itself. # rather than modifying the grub configuration itself.
# This avoids the mess of having to do dpkg stuff # This avoids the mess of having to do dpkg stuff
@ -186,7 +196,7 @@ GRUB_RECORDFAIL_TIMEOUT=0
GRUB_TIMEOUT=0 GRUB_TIMEOUT=0
# Set the default commandline # Set the default commandline
GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=ttyS0" GRUB_CMDLINE_LINUX_DEFAULT="console=tty1 console=${serial_console}"
# Set the grub console type # Set the grub console type
GRUB_TERMINAL=console GRUB_TERMINAL=console