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

live-build/auto/config: Handle applying priorities to EXTRA_PPAS

Browse Source 
via the extra_ppa="user/ppaname:priority" syntax (LP: #1450257)
This commit is contained in:
Adam Conrad 2015-04-29 18:29:40 -06:00
parent c10fd7dd72
commit e79e2e6493
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -1,11 +1,16 @@
livecd-rootfs (2.301) UNRELEASED; urgency=low livecd-rootfs (2.301) UNRELEASED; urgency=low
[ Michael Vogt ]
* create /boot/uboot on armhf to ensure that its in the system * create /boot/uboot on armhf to ensure that its in the system
tarball and still on the system if ubuntu-core-upgrader tarball and still on the system if ubuntu-core-upgrader
performs a "format" (LP: #1447652) performs a "format" (LP: #1447652)
* live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary: * live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary:
- fix typo in hardware.yaml - fix typo in hardware.yaml
[ Adam Conrad ]
* live-build/auto/config: Handle applying priorities to EXTRA_PPAS
via the extra_ppa="user/ppaname:priority" syntax (LP: #1450257)
-- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Apr 2015 08:27:44 +0200 -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Apr 2015 08:27:44 +0200
livecd-rootfs (2.300) vivid; urgency=medium livecd-rootfs (2.300) vivid; urgency=medium

18
live-build/auto/config
View File

@ -659,6 +659,7 @@ esac
if [ "$EXTRA_PPAS" ]; then if [ "$EXTRA_PPAS" ]; then
rm -f config/archives/extra-ppas.list.chroot \ rm -f config/archives/extra-ppas.list.chroot \
config/archives/extra-ppas.pref.chroot \
config/archives/extra-ppas.key.chroot config/archives/extra-ppas.key.chroot
gpg_tmpdir="$(mktemp -d)" gpg_tmpdir="$(mktemp -d)"
run_gpg () { run_gpg () {
@ -668,8 +669,23 @@ if [ "$EXTRA_PPAS" ]; then
"$@" "$@"
} }
for extra_ppa in $EXTRA_PPAS; do for extra_ppa in $EXTRA_PPAS; do
extra_ppa_pin=''
extra_ppa_origin=''
case $extra_ppa in
*:*)
extra_ppa_pin=${extra_ppa#*:}
extra_ppa=${extra_ppa%:*}
;;
esac
extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")" extra_ppa_fingerprint="$(/usr/share/livecd-rootfs/get-ppa-fingerprint "$extra_ppa")"
echo "deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main" >> config/archives/extra-ppas.list.chroot echo "deb http://ppa.launchpad.net/$extra_ppa/ubuntu @DISTRIBUTION@ main" >> config/archives/extra-ppas.list.chroot
if [ -n "$extra_ppa_pin" ]; then
extra_ppa_origin="LP-PPA-$(echo $extra_ppa | sed -e 's,/ppa$,,' -e 's,/,-,')"
echo "Package: *" >> config/archives/extra-ppas.pref.chroot
echo "Pin: release o=$extra_ppa_origin" >> config/archives/extra-ppas.pref.chroot
echo "Pin-Priority: $extra_ppa_pin" >> config/archives/extra-ppas.pref.chroot
echo "" >> config/archives/extra-ppas.pref.chroot
fi
run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \ run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \
--recv "$extra_ppa_fingerprint" --recv "$extra_ppa_fingerprint"
run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \ run_gpg --keyring "$gpg_tmpdir/pubring.gpg" \
@ -692,6 +708,8 @@ if [ "$EXTRA_PPAS" ]; then
rm -rf "$gpg_tmpdir" rm -rf "$gpg_tmpdir"
cp -a config/archives/extra-ppas.list.chroot \ cp -a config/archives/extra-ppas.list.chroot \
config/archives/extra-ppas.list.binary config/archives/extra-ppas.list.binary
cp -a config/archives/extra-ppas.pref.chroot \
config/archives/extra-ppas.pref.binary
cp -a config/archives/extra-ppas.key.chroot \ cp -a config/archives/extra-ppas.key.chroot \
config/archives/extra-ppas.key.binary config/archives/extra-ppas.key.binary
fi fi