Merge branch 'dead-wubi' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master

This commit is contained in:
Dimitri John Ledkov 2019-06-04 23:37:47 +01:00
commit 1a3eaf75c8
3 changed files with 6 additions and 11 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
livecd-rootfs (2.590) UNRELEASED; urgency=medium
* Drop dead wubi subproject.
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 30 May 2019 11:04:02 +0100
livecd-rootfs (2.589) eoan; urgency=medium
* Add support for the 'kassel' subflavor of UC18 images.

View File

@ -45,7 +45,6 @@ ALL_TRIPLETS="
ubuntu-server::
ubuntu-server:ubuntu-rtm:
ubuntu-server:ubuntu-rtm/foo:
ubuntu-server:wubi:
ubuntu-touch-custom::ubuntu-touch-custom
ubuntu-touch::ubuntu-touch
xubuntu::"

View File

@ -303,10 +303,6 @@ case $IMAGEFORMAT in
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
PREINSTALLED=true
case ${SUBPROJECT:-} in
wubi)
add_package install lupin-support
COMPONENTS='main restricted universe multiverse'
;;
*)
case $PROJECT in
ubuntu-cpc)
@ -1030,12 +1026,6 @@ case $PROJECT in
;;
esac
case ${SUBPROJECT:-} in
wubi)
add_binary_hook build-wubildr
;;
esac
lb config noauto \
--mode ubuntu \
--distribution "$SUITE" \