Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-23 08:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import patches-unapplied version 2.226 to ubuntu/utopic-proposed

Browse Source 
Imported using git-ubuntu import.

Changelog parent: 92db4fa1efb3c12b4954b3a3e100b4896c0c3a1d

New changelog entries:
  * Disable apt authentication checks when building ubuntu-rtm images
    against dogfood (that test archive is signed, but not with a very useful
    key).
  * Apply a grievous hack to get debootstrap working against ubuntu-rtm
    series.
This commit is contained in:
Colin Watson 2014-07-23 01:50:21 +01:00 committed by usd-importer
parent 92db4fa1ef
commit 23bffaae7f
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
livecd-rootfs (2.226) utopic; urgency=medium
* Disable apt authentication checks when building ubuntu-rtm images
against dogfood (that test archive is signed, but not with a very useful
key).
* Apply a grievous hack to get debootstrap working against ubuntu-rtm
series.
-- Colin Watson <cjwatson@ubuntu.com> Wed, 23 Jul 2014 01:50:21 +0100
livecd-rootfs (2.225) utopic; urgency=medium livecd-rootfs (2.225) utopic; urgency=medium
* Use the soon-to-exist ubuntu-rtm archive for ubuntu-touch builds if * Use the soon-to-exist ubuntu-rtm archive for ubuntu-touch builds if

17
live-build/auto/config
View File

@ -344,6 +344,7 @@ case $PROJECT in
case $SUBPROJECT in case $SUBPROJECT in
ubuntu-rtm/dogfood) ubuntu-rtm/dogfood)
MIRROR=http://derived-archive.dogfood.content.paddev.net/ubuntu-rtm/ MIRROR=http://derived-archive.dogfood.content.paddev.net/ubuntu-rtm/
OPTS="${OPTS:+$OPTS }--apt-secure false"
;; ;;
ubuntu-rtm) ubuntu-rtm)
MIRROR=http://derived.archive.canonical.com/ubuntu-rtm/ MIRROR=http://derived.archive.canonical.com/ubuntu-rtm/
@ -572,6 +573,22 @@ if [ "$EXTRA_PPAS" ]; then
config/archives/extra-ppas.key.binary config/archives/extra-ppas.key.binary
fi fi
case $SUBPROJECT in
ubuntu-rtm|ubuntu-rtm/*)
# debootstrap doesn't know about ubuntu-rtm series directly. Rather
# than having to teach it, we employ a few hacks to make it use the
# Ubuntu script instead.
mkdir -p config/fake_debootstrap_dir/scripts
ln -s /usr/share/debootstrap/devices.tar.gz \
config/fake_debootstrap_dir/
ln -s /usr/share/debootstrap/functions config/fake_debootstrap_dir/
ln -s /usr/share/debootstrap/scripts/gutsy \
"config/fake_debootstrap_dir/scripts/$SUITE"
echo 'export DEBOOTSTRAP_DIR="$PWD/config/fake_debootstrap_dir"' \
>> config/bootstrap
;;
esac
# cribbed from cdimage, perhaps this should be a small helper script in germinate? # cribbed from cdimage, perhaps this should be a small helper script in germinate?
add_inheritance () { add_inheritance () {
case " $inherit " in case " $inherit " in