mirror of
https://git.launchpad.net/livecd-rootfs
synced 2025-05-28 11:11:31 +00:00
Merge branch 'dead-jasper' of git+ssh://git.launchpad.net/~xnox/livecd-rootfs into ubuntu/master
This commit is contained in:
commit
b0312baeb7
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -1,6 +1,7 @@
|
|||||||
livecd-rootfs (2.590) UNRELEASED; urgency=medium
|
livecd-rootfs (2.590) UNRELEASED; urgency=medium
|
||||||
|
|
||||||
* Drop dead wubi subproject.
|
* Drop dead wubi subproject.
|
||||||
|
* Drop dead jasper subproject.
|
||||||
|
|
||||||
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 30 May 2019 11:04:02 +0100
|
-- Dimitri John Ledkov <xnox@ubuntu.com> Thu, 30 May 2019 11:04:02 +0100
|
||||||
|
|
||||||
|
@ -302,19 +302,6 @@ case $IMAGEFORMAT in
|
|||||||
ext2|ext3|ext4)
|
ext2|ext3|ext4)
|
||||||
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
|
OPTS="${OPTS:+$OPTS }--initramfs none --chroot-filesystem $IMAGEFORMAT"
|
||||||
PREINSTALLED=true
|
PREINSTALLED=true
|
||||||
case ${SUBPROJECT:-} in
|
|
||||||
*)
|
|
||||||
case $PROJECT in
|
|
||||||
ubuntu-cpc)
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
add_package live jasper
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
;;
|
|
||||||
|
|
||||||
plain)
|
plain)
|
||||||
case $PROJECT:${SUBPROJECT:-} in
|
case $PROJECT:${SUBPROJECT:-} in
|
||||||
ubuntu-server:live)
|
ubuntu-server:live)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user