mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-21 13:44:08 +00:00
Compare commits
7 Commits
ubuntu/mas
...
2.578.3
| Author | SHA1 | Date | |
|---|---|---|---|
|
24e39d6844 | ||
|
2fecd44890 | ||
|
|
00b995c7e2 | ||
|
|
f493132f90 | ||
|
51bd9d5b4a | ||
|
|
523a964b64 | ||
|
a3dac25d86 |
19
debian/changelog
vendored
19
debian/changelog
vendored
@ -1,8 +1,23 @@
|
||||
livecd-rootfs (2.579) UNRELEASED; urgency=medium
|
||||
livecd-rootfs (2.578.3) disco; urgency=medium
|
||||
|
||||
[ Robert C Jennings ]
|
||||
* ubuntu-cpc: Ensure base disk image is the same between all build targets
|
||||
(LP: #1827426)
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Tue, 21 May 2019 15:19:34 -0700
|
||||
|
||||
livecd-rootfs (2.578.2) disco; urgency=medium
|
||||
|
||||
* Remove device nodes later for ubuntu-base:minimized (i.e. docker) builds.
|
||||
(LP: #1828118)
|
||||
|
||||
-- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 08 May 2019 09:59:35 +1200
|
||||
|
||||
livecd-rootfs (2.578.1) disco; urgency=medium
|
||||
|
||||
* Run clean_debian_chroot after minimize_manual (LP: #1826377)
|
||||
|
||||
-- Julian Andres Klode <juliank@ubuntu.com> Thu, 25 Apr 2019 11:43:11 +0200
|
||||
-- Julian Andres Klode <juliank@ubuntu.com> Fri, 26 Apr 2019 10:34:05 +0200
|
||||
|
||||
livecd-rootfs (2.578) disco; urgency=medium
|
||||
|
||||
|
||||
@ -308,17 +308,6 @@ EOF
|
||||
apt-get -y --purge autoremove"
|
||||
fi
|
||||
|
||||
if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then
|
||||
# Save even more size by removing apt lists (that are currently removed
|
||||
# downstream anyway)
|
||||
rm -rf chroot/var/lib/apt/lists/*
|
||||
# Having device notes in the docker image can cause problems
|
||||
# (https://github.com/tianon/docker-brew-ubuntu-core/issues/62)
|
||||
# so remove them. We only do this for docker out of an
|
||||
# abundance of caution.
|
||||
rm -rf chroot/dev/*
|
||||
fi
|
||||
|
||||
configure_universe
|
||||
|
||||
if [ -d chroot/var/lib/preinstalled-pool ]; then
|
||||
|
||||
@ -717,7 +717,18 @@ subtract_package_lists() {
|
||||
clean_debian_chroot() {
|
||||
# remove crufty files that shouldn't be left in an image
|
||||
rm -f chroot/var/cache/debconf/*-old chroot/var/lib/dpkg/*-old
|
||||
Chroot chroot apt clean
|
||||
Chroot chroot apt clean
|
||||
# For the docker images we remove even more stuff.
|
||||
if [ "${PROJECT}:${SUBPROJECT:-}" = "ubuntu-base:minimized" ]; then
|
||||
# Remove apt lists (that are currently removed downstream
|
||||
# anyway)
|
||||
rm -rf chroot/var/lib/apt/lists/*
|
||||
# Having device nodes in the docker image can cause problems
|
||||
# (https://github.com/tianon/docker-brew-ubuntu-core/issues/62)
|
||||
# so remove them. We only do this for docker out of an
|
||||
# abundance of caution.
|
||||
rm -rf chroot/dev/*
|
||||
fi
|
||||
}
|
||||
|
||||
configure_universe() {
|
||||
|
||||
@ -65,8 +65,8 @@ install_grub() {
|
||||
chroot mountpoint mkdir -p "${efi_boot_dir}"
|
||||
|
||||
if [ -n "$partuuid" ]; then
|
||||
# FIXME: code duplicated between 032-disk-image.binary
|
||||
# and 033-disk-image-uefi.binary. We want to fix this to not
|
||||
# FIXME: code duplicated between disk-image.binary
|
||||
# and disk-image-uefi.binary. We want to fix this to not
|
||||
# have initramfs-tools installed at all on these images.
|
||||
echo "partuuid found for root device; omitting initrd"
|
||||
echo "GRUB_FORCE_PARTUUID=$partuuid" >> mountpoint/etc/default/grub.d/40-force-partuuid.cfg
|
||||
|
||||
@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# This is the directory created by 031-0-create-root-dir.binary
|
||||
# This is the directory created by create-root-dir.binary
|
||||
rootfs_dir=rootfs.dir
|
||||
|
||||
squashfs_f="$PWD/livecd.ubuntu-cpc.squashfs"
|
||||
|
||||
@ -8,7 +8,7 @@ if [ -n "$SUBARCH" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# This is the directory created by 031-0-create-root-dir.binary
|
||||
# This is the directory created by create-root-dir.binary
|
||||
rootfs_dir=rootfs.dir
|
||||
|
||||
cp $rootfs_dir.manifest livecd.ubuntu-cpc.rootfs.manifest
|
||||
|
||||
@ -1 +1,3 @@
|
||||
# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent
|
||||
depends disk-image
|
||||
base/create-root-dir.binary
|
||||
|
||||
@ -1,2 +1,4 @@
|
||||
# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent
|
||||
depends disk-image
|
||||
depends root-dir
|
||||
base/root-squashfs.binary
|
||||
|
||||
@ -1,2 +1,4 @@
|
||||
# Include disk-image to ensure livecd.ubuntu-cpc.ext4 is consistent
|
||||
depends disk-image
|
||||
depends root-dir
|
||||
base/root-xz.binary
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
# and checksums. This step produces an OVA that is suitable for use with
|
||||
# Cloud's that support the OVF specification.
|
||||
#
|
||||
# For this step, we re-use the VMDK's made in 040-vmdk-image.binary
|
||||
# For this step, we re-use the VMDK's made in vmdk-image.binary
|
||||
|
||||
case ${SUBPROJECT:-} in
|
||||
minimized)
|
||||
|
||||
@ -161,7 +161,7 @@ class MakeHooks:
|
||||
with open(series_file, "r", encoding="utf-8") as fp:
|
||||
for line in fp:
|
||||
line = line.strip()
|
||||
if not line:
|
||||
if not line or line.startswith("#"):
|
||||
continue
|
||||
m = re.match(r"^\s*depends\s+(\S+.*)$", line)
|
||||
if m:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user