2066 Commits

Author SHA1 Message Date
Sebastien Bacher
ac41893c14 Fix the minimal option for the oem mode config 2023-09-12 12:34:31 +02:00
Sebastien Bacher
faf88cbbe7 Restore a desktop minimal layer and use if by default 2023-09-12 11:11:22 +02:00
Utkarsh Gupta
940df6e060 Install linux-virtual to restore the stripped headers
In a minimized image, the linux headers are stripped, so when
unminimizing it, we should restore those stripped headers
by installing the linux-virtual package.
2023-09-12 12:29:25 +05:30
Utkarsh Gupta
4400dd37c6 Enhance unminimize to transform into a base image for ubuntu-cpc
The unminimize script previously just restored the system documentation
and translations, man pages, and installed ubuntu-minimal and ubuntu-standard
packages to provide the familiar Ubuntu minimal system. But such an image
never became an equivalent of base image.

Upon investigation and looking at how the base image is constructed -
https://git.launchpad.net/livecd-rootfs/tree/live-build/auto/config#n1108 -
we use the following things:
 - minimal task
 - standard task
 - cloud-image task (which involves ubuntu-server)
 - ubuntu-minimal package
 - server task if arch != amd64

OTOH, in the unminimize script, we use the following:
(https://git.launchpad.net/livecd-rootfs/tree/live-build/auto/build#n286)
 - ubuntu-minimal package
 - ubuntu-standard package

So upon running some tests, it was found that if we install ubuntu-server
(with --fix-policy flag), we get the resulting image equivalent to that
of a base image.

cf: https://warthogs.atlassian.net/browse/CPC-3033
2023-09-12 12:29:17 +05:30
Dan Bungert
4c6bb3c386 Merge remote-tracking branch 'dbungert/lp-2026225-surely' into ubuntu/master 2023-09-07 21:31:20 -06:00
Dan Bungert
c00bbf3fb3 desktop: place kernel in the live layer
Placing the kernel in the live layer allows for selecting at install
time which kernel to install.
2023-09-07 16:52:53 -06:00
Dave Jones
7fbe0825b7 Remove spam from boot mountpoint
The pi images contain redundant copies of cmdline.txt and config.txt in
the boot partition mount-point (which get hidden by the *actual* boot
partition). This commit removes those and simplifies the subarch check
(again, +raspi is the only subarch in use at this point on the Raspberry
Pi images)
2023-09-07 10:58:18 +01:00
Steve Langasek
61c1b9bacb Merge remote-tracking branch 'mwhudson/use-server-live-task' into ubuntu/master 2023-09-06 20:04:03 -07:00
Michael Hudson-Doyle
2e1b092a0e auto/config: use the new server-live task to reduce the use of explicit calls to add_package and add_snap a bit. 2023-09-07 12:55:53 +12:00
Steve Langasek
6be1e868f0 Drop live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal/etc/hosts
/etc/hosts in an installed system comes from one of several places:
- the netbase package which ships a sane default
- scripts/casper-bottom/18hostname, which is mostly identical to the netbase
  one but sets a hostname to the flavor name
- the installer which writes one to the target fs
- chroot includes in livecd-rootfs

A chroot include is only needed for images that don't include netbase (so
don't inherit from the minimal seed), don't boot casper, and don't run an
installer.

NONE of these conditions are true for the ubuntu-server live image.  And in
addition, the /etc/hosts here differs from the others.

So, remove it.
2023-09-06 17:55:43 -07:00
Steve Langasek
5a456417d2 Drop code only used for d-i based ubuntu-server images, no longer supported. 2023-09-06 15:40:55 -07:00
Steve Langasek
6d834be1bf More consolidation of duplicate configs 2023-09-06 15:39:55 -07:00
Steve Langasek
86917060b8 Remove dead code: is never 'amd64' 2023-09-06 15:35:40 -07:00
Steve Langasek
65157e0c13 Duplicate if condition 2023-09-06 15:16:01 -07:00
Steve Langasek
cd9c0e4bd7 More consolidation of duplicate configs 2023-09-06 15:13:01 -07:00
Steve Langasek
e501d7ab4c More consolidation of duplicate configs 2023-09-06 14:56:54 -07:00
Steve Langasek
76d133becf Remove unnecessary arch guarding of the UbuntuStudio kernel selection: we only build this image on amd64 (the arch checking is from i386 days), and the lowlatency kernel also exists on arm64. 2023-09-06 14:47:11 -07:00
Steve Langasek
d169cb531c ubuntukylin-default-settings is part of the task, don't hard-code the package. 2023-09-06 14:36:29 -07:00
Steve Langasek
a53fe72235 Drop references to kubuntu-dvd, obsoleted in 2012. 2023-09-06 14:34:36 -07:00
Steve Langasek
7c4ad85509 Merge some more live image definitions 2023-09-06 12:59:40 -07:00
Steve Langasek
214fee87ee generic is the default kernel flavor in live-build on Ubuntu; remove hard-coded cargo-culting of this setting. 2023-09-06 12:56:27 -07:00
Steve Langasek
5776828153 Parameterize and consolidate live image definitions for flavors using a common pattern 2023-09-06 12:04:45 -07:00
Steve Langasek
458f58bb7a Drop references to mythbuntu, obsolete after xenial. 2023-09-06 11:59:32 -07:00
Steve Langasek
f763efa40e Drop references to ubuntu-dvd, obsolete since precise. 2023-09-06 11:53:23 -07:00
Steve Langasek
d7e77d7acf Alphabetize for clarity 2023-09-06 11:49:28 -07:00
Steve Langasek
f2360a58c8 remove redundancy from case statement 2023-09-06 11:48:22 -07:00
Steve Langasek
f44c2aac8c merge redundant cases for seed/mirror handling 2023-09-06 11:43:11 -07:00
Steve Langasek
caace43cb9 ubuntu-unity-live task exists, use it also instead of hard-coded list of packages. 2023-09-06 11:36:18 -07:00
Steve Langasek
fc49fb286c Drop references to ubuntu-netbook, obsolete since Ubuntu 11.04. 2023-09-06 11:32:43 -07:00
Steve Langasek
e8a08ad084 Don't hard-code addition of xterm package on xubuntu, it's in the task already. 2023-09-06 11:28:50 -07:00
Steve Langasek
7c51e152f1 ubuntucinnamon-live task has existed for a while now, use it instead of hard-coded list of packages. 2023-09-06 11:26:58 -07:00
Steve Langasek
abc60bc135 Drop references to kubuntu-plasma5, obsolete since wily 2023-09-06 11:24:06 -07:00
Łukasz 'sil2100' Zemczak
e38264ca7a Merge branch 'canary-as-default' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master 2023-09-06 18:23:07 +02:00
Steve Langasek
34e850d4a5 blkid is unreliable in mount_image(), but this blkid call is only here for debugging, so ignore any failures (even if we don't understand them). LP: #2034299. 2023-09-05 12:30:15 -07:00
Łukasz 'sil2100' Zemczak
9b33f085c1 Merge branch 'ubuntu/master' of git+ssh://git.launchpad.net/livecd-rootfs into canary-as-default 2023-09-05 19:00:32 +02:00
Simon Poirier
3729e2ae94 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)
2023-09-01 17:29:15 -04:00
Utkarsh Gupta
78a98c6835 Fix unminimize to correctly list packages (LP: #1996489)
Prior to dpkg/1.21.0, there was a bug where dpkg -V/--verify
couldn't list all the correct packages correctly but with
that being fix and in archive since Jammy, this works perfectly
but the syntax to report the missing files have changed. It
just prints 'missing' now. With that new format, we can now
fix the regex to simply list the packages.

With this patch, the unminimize script works flawlessly
on a minimized image.
2023-09-02 00:39:41 +05:30
Philip Roche
57153243a6 fix: disk-image-non-cloud ubuntu-cpc build target now provides manifest and filelist (LP: #2033751)
These were being created so now they can be downloaded post launchpad image build
2023-09-01 12:21:39 +01:00
Philip Roche
7dd9b1bd84 fix: Create .filelist in ubuntu-cpc project binary hooks that do not use create_manifest shared function (LP: #2033751)
ubuntu-cpc project binary hooks were not all producing .filelist files as they were not using
the create_manifest shared function.

This commit ensures the disk-image-uefi, disk-image-ppc64el and disk-image-uefi-non-cloud hooks create
a filelist during build.
2023-09-01 12:21:34 +01:00
Philip Roche
c72d1a7f2b fix: Ensure any created .filelist is symlinked with expected prefix and correct permissions (LP: #2033751)
If a .filelist is present, use it as the filelist for the image by
symlinking with expected name and updating permissions
2023-09-01 12:21:12 +01:00
Philip Roche
f8bd628c83 fix: Sort filelists creating when building ubuntu-cpc images (LP: #2033677)
The image filelists created during ubuntu-cpc project image builds were not sorted.

Soring the filelists makes it easier to compare the filelists without needing to sort first.
2023-08-31 20:36:00 +01:00
Łukasz 'sil2100' Zemczak
3a715d2fff Don't reset KERNEL_FLAVOURS for canary. 2023-08-30 16:47:21 +02:00
Łukasz 'sil2100' Zemczak
47a88df62f I suppose w don't need the 020-canary-live.binary hook anymore. 2023-08-30 14:25:26 +02:00
Łukasz 'sil2100' Zemczak
0c6e4314e5 canary: switch to use the live task, try to use KERNEL_FLAVOURS instead of a manual kernel add_package. 2023-08-30 11:57:04 +02:00
Steve Langasek
b30e7e4146 lb_chroot_layered: if the unmount of the chroot mountpoint fails, dump mount information for debugging. 2023-08-29 10:39:21 -07:00
Łukasz 'sil2100' Zemczak
353d222c94 Merge branch 'seed.yaml-live' of git+ssh://git.launchpad.net/~mwhudson/livecd-rootfs/+git/livecd-rootfs into ubuntu/master 2023-08-28 15:48:00 +02:00
Łukasz 'sil2100' Zemczak
4a2e30a3b3 Update enhanced-sb layer model assertion. 2023-08-28 12:23:30 +02:00
Michael Hudson-Doyle
6ab6066c05 Use a traditional seed.yaml style seed for the canary installer's live session. 2023-08-28 21:29:24 +12:00
Michael Hudson-Doyle
b91452e7fe snap-seed-parse.py: fix builds with no snaps. 2023-08-28 14:02:51 +12:00
Michael Hudson-Doyle
db6f685b84 snap-seed-parse.py: Update to allow parsing uc20-style seeds. (LP: #2028984) 2023-08-28 11:30:11 +12:00