Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-04-28 19:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drop support for building i386 images aside from the launchpad builder images.

Browse Source
This commit is contained in:
Steve Langasek 2022-07-25 12:50:56 -07:00
parent 6b217c3242
commit abcfabdbc0
3 changed files with 11 additions and 26 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 (2.771) UNRELEASED; urgency=medium
* Drop support for building i386 images aside from the launchpad builder
images.
-- Steve Langasek <steve.langasek@ubuntu.com> Mon, 25 Jul 2022 12:49:28 -0700
livecd-rootfs (2.770) kinetic; urgency=medium livecd-rootfs (2.770) kinetic; urgency=medium
[ Alexandre Ghiti ] [ Alexandre Ghiti ]

20
live-build/auto/build
View File

@ -641,26 +641,6 @@ case $SUBARCH in
;; ;;
esac esac
# LTSP chroot building (only in 32bit and for Edubuntu (DVD))
case $PROJECT in
edubuntu-dvd)
if [ "$ARCH" = i386 ]; then
echo "Building LTSP chroot"
ltsp-build-client --base $(pwd) --mirror $LB_PARENT_MIRROR_BOOTSTRAP --arch $ARCH --dist $LB_PARENT_DISTRIBUTION --chroot ltsp-live --late-packages ldm-edubuntu-theme,plymouth-theme-edubuntu --purge-chroot --skipimage
mkdir -p images
mksquashfs ltsp-live images/ltsp-live.img -e cdrom
rm -Rf ltsp-live
if [ -f images/ltsp-live.img ]; then
mv images/ltsp-live.img livecd.$PROJECT-ltsp.squashfs
chmod 0644 livecd.$PROJECT-ltsp.squashfs
rmdir --ignore-fail-on-non-empty images
else
echo "LTSP: Unable to build the chroot, see above for details."
fi
fi
;;
esac
if [ -f "config/magic-proxy.pid" ]; then if [ -f "config/magic-proxy.pid" ]; then
kill -TERM $(cat config/magic-proxy.pid) kill -TERM $(cat config/magic-proxy.pid)
rm -f config/magic-proxy.pid rm -f config/magic-proxy.pid

10
live-build/auto/config
View File

@ -391,8 +391,6 @@ case $IMAGEFORMAT in
MODEL=intel-iot ;; MODEL=intel-iot ;;
amd64+*) amd64+*)
MODEL=pc-amd64 ;; MODEL=pc-amd64 ;;
i386+*)
MODEL=pc-i386 ;;
arm64+snapdragon) arm64+snapdragon)
MODEL=dragonboard ;; MODEL=dragonboard ;;
armhf+raspi) armhf+raspi)
@ -425,7 +423,7 @@ case $IMAGEFORMAT in
CHANNEL="${CHANNEL:-edge}" CHANNEL="${CHANNEL:-edge}"
case $MODEL in case $MODEL in
pc-amd64|pc-i386) pc-amd64)
if [ -z "${SUBARCH:-}" ]; then if [ -z "${SUBARCH:-}" ]; then
# This is to make sure there's enough writable space # This is to make sure there's enough writable space
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
@ -776,7 +774,7 @@ case $PROJECT in
LIVE_TASK='xubuntu-live' LIVE_TASK='xubuntu-live'
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;; amd64) KERNEL_FLAVOURS=generic ;;
esac esac
;; ;;
@ -796,7 +794,7 @@ case $PROJECT in
LIVE_TASK='lubuntu-live' LIVE_TASK='lubuntu-live'
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS=generic ;; amd64) KERNEL_FLAVOURS=generic ;;
esac esac
;; ;;
@ -822,7 +820,7 @@ case $PROJECT in
add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography
COMPONENTS='main restricted universe multiverse' COMPONENTS='main restricted universe multiverse'
case $ARCH in case $ARCH in
amd64|i386) KERNEL_FLAVOURS=lowlatency ;; amd64) KERNEL_FLAVOURS=lowlatency ;;
esac esac
;; ;;