mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-02-23 19:31:31 +00:00
Merge branch 'dead-wubi' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
This commit is contained in:
commit
1a3eaf75c8
6
debian/changelog
vendored
6
debian/changelog
vendored
@ -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.
|
||||
|
1
debian/tests/default-bootstraps
vendored
1
debian/tests/default-bootstraps
vendored
@ -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::"
|
||||
|
@ -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" \
|
||||
|
Loading…
x
Reference in New Issue
Block a user