mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-08-16 03:04:07 +00:00
Imported 2.408.41
No reason for CPC update specified.
This commit is contained in:
CloudBuilder
parent
752e87d549
commit
821402c31e
25
debian/changelog
vendored
25
debian/changelog
vendored
@ -1,3 +1,28 @@
|
||||
livecd-rootfs (2.408.41) xenial; urgency=medium
|
||||
|
||||
* Disable checksum generation (LP: #1799773)
|
||||
|
||||
-- Robert C Jennings <robert.jennings@canonical.com> Fri, 16 Nov 2018 08:37:57 -0800
|
||||
|
||||
livecd-rootfs (2.408.40) xenial; urgency=medium
|
||||
|
||||
[ Cody Shepherd ]
|
||||
* Increasing modularity in relocation of /etc/resolv.conf to enable users
|
||||
of live-build/functions to manipulate /etc/resolv.conf in a more
|
||||
granular and future-proof way. LP: #1801134.
|
||||
|
||||
-- Steve Langasek <steve.langasek@ubuntu.com> Thu, 01 Nov 2018 13:46:47 -0700
|
||||
|
||||
livecd-rootfs (2.408.39) xenial; urgency=medium
|
||||
|
||||
* Backport support for building ubuntu-core images with ubuntu-image (using
|
||||
IMAGEFORMAT=ubuntu-image).
|
||||
* Decide what model assertion series to fetch depending on the suite. Use 16
|
||||
for xenial and 18 for other series (bionic+). This enables core18 image
|
||||
builds (LP: #1799736).
|
||||
|
||||
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Thu, 04 Oct 2018 19:30:17 +0200
|
||||
|
||||
livecd-rootfs (2.408.38) xenial; urgency=medium
|
||||
|
||||
* ubuntu-cpc: Handle a pre-existing /lib/modules in 030-root-tarball.hook
|
||||
|
||||
2
debian/control
vendored
2
debian/control
vendored
@ -30,7 +30,9 @@ Depends: ${misc:Depends},
|
||||
python3-software-properties,
|
||||
qemu-utils,
|
||||
rsync,
|
||||
snapd,
|
||||
squashfs-tools (>= 1:3.3-1),
|
||||
ubuntu-image,
|
||||
vmdk-stream-converter [amd64 i386],
|
||||
xz-utils,
|
||||
zerofree
|
||||
|
||||
@ -10,6 +10,28 @@ Arguments "${@}"
|
||||
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
|
||||
Set_defaults
|
||||
|
||||
if [ -z "${PROJECT:-}" ]; then
|
||||
echo "PROJECT environment variable has to be set" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
. config/functions
|
||||
|
||||
# Link output files somewhere BuildLiveCD will be able to find them.
|
||||
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
|
||||
|
||||
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
|
||||
# Use ubuntu-image instead of live-build
|
||||
|
||||
CHANNEL="${CHANNEL:-edge}"
|
||||
env SNAPPY_STORE_NO_CDN=1 \
|
||||
ubuntu-image -c "$CHANNEL" $UBUNTU_IMAGE_ARGS \
|
||||
-o "$PREFIX".img "$PREFIX".model-assertion
|
||||
xz -0 -T4 "$PREFIX".img
|
||||
mv seed.manifest "$PREFIX".manifest
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# Setup cleanup function
|
||||
Setup_cleanup
|
||||
|
||||
@ -350,9 +372,6 @@ else
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Link output files somewhere BuildLiveCD will be able to find them.
|
||||
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
|
||||
|
||||
case $LB_INITRAMFS in
|
||||
casper)
|
||||
INITFS="casper"
|
||||
|
||||
@ -96,6 +96,7 @@ LIVE_TASK=
|
||||
PREINSTALLED=false
|
||||
PREINSTALL_POOL=
|
||||
PREINSTALL_POOL_SEEDS=
|
||||
PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
|
||||
|
||||
CHROOT_HOOKS=
|
||||
BINARY_HOOKS=
|
||||
@ -144,6 +145,53 @@ case $IMAGEFORMAT in
|
||||
PREINSTALLED=true
|
||||
;;
|
||||
|
||||
ubuntu-image)
|
||||
case "$ARCH+${SUBARCH:-}" in
|
||||
amd64+*)
|
||||
MODEL=pc-amd64 ;;
|
||||
i386+*)
|
||||
MODEL=pc-i386 ;;
|
||||
arm64+snapdragon)
|
||||
MODEL=dragonboard ;;
|
||||
armhf+raspi2)
|
||||
MODEL=pi2 ;;
|
||||
armhf+raspi3)
|
||||
MODEL=pi3 ;;
|
||||
armhf+cm3)
|
||||
MODEL=cm3 ;;
|
||||
*)
|
||||
echo "Model $ARCH+${SUBARCH:-} unknown to livecd-rootfs" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
case $MODEL in
|
||||
pc-amd64|pc-i386)
|
||||
UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
|
||||
*)
|
||||
UBUNTU_IMAGE_ARGS="" ;;
|
||||
esac
|
||||
case $SUITE in
|
||||
xenial)
|
||||
# Ubuntu Core 16
|
||||
;;
|
||||
*)
|
||||
# Ubuntu Core 18
|
||||
MODEL="ubuntu-core-18-${MODEL#pc-}" ;;
|
||||
esac
|
||||
|
||||
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
|
||||
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
|
||||
# Store model assertion in top dir to get it picked up later as a build artifact
|
||||
env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
|
||||
echo "Configured ubuntu-image for the following model assertion:"
|
||||
cat "$PREFIX".model-assertion
|
||||
echo "----------------------------------------------------------"
|
||||
# Fake finished configuration for lb build
|
||||
mkdir -p .build
|
||||
touch .build/config
|
||||
exit 0
|
||||
;;
|
||||
|
||||
none)
|
||||
OPTS="${OPTS:+$OPTS }--chroot-filesystem $IMAGEFORMAT"
|
||||
;;
|
||||
@ -682,6 +730,7 @@ lb config noauto \
|
||||
--initsystem none \
|
||||
--bootloader "$BOOTLOADER" \
|
||||
--initramfs-compression lzma \
|
||||
--checksums none \
|
||||
--cache false \
|
||||
${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
|
||||
$OPTS \
|
||||
|
||||
@ -77,6 +77,17 @@ mount_image() {
|
||||
return 0
|
||||
}
|
||||
|
||||
setup_resolvconf() {
|
||||
local mountpoint=${1}
|
||||
mv "${mountpoint}/etc/resolv.conf" resolv.conf.tmp
|
||||
cp /etc/resolv.conf "${mountpoint}/etc/resolv.conf"
|
||||
}
|
||||
|
||||
recover_resolvconf() {
|
||||
local mountpoint=${1}
|
||||
mv resolv.conf.tmp "${mountpoint}/etc/resolv.conf"
|
||||
}
|
||||
|
||||
setup_mountpoint() {
|
||||
local mountpoint="$1"
|
||||
|
||||
@ -86,8 +97,7 @@ setup_mountpoint() {
|
||||
mount -t tmpfs none "$mountpoint/tmp"
|
||||
mount -t tmpfs none "$mountpoint/var/lib/apt"
|
||||
mount -t tmpfs none "$mountpoint/var/cache/apt"
|
||||
mv "$mountpoint/etc/resolv.conf" resolv.conf.tmp
|
||||
cp /etc/resolv.conf "$mountpoint/etc/resolv.conf"
|
||||
setup_resolvconf "${mountpoint}"
|
||||
chroot "$mountpoint" apt-get update
|
||||
|
||||
}
|
||||
@ -103,7 +113,7 @@ teardown_mountpoint() {
|
||||
{ print \$2 }" | LC_ALL=C sort -r); do
|
||||
umount $submount
|
||||
done
|
||||
mv resolv.conf.tmp "$mountpoint/etc/resolv.conf"
|
||||
recover_resolvconf "${mountpoint}"
|
||||
}
|
||||
|
||||
mount_partition() {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user