Merge lp:~pjdc/launchpad-buildd/chroot-scripts into lp:~lamont/launchpad-buildd/chroot-scripts

Proposed by Paul Collins on 2014-11-07
Status: Merged
Merged at revision: 55
Proposed branch: lp:~pjdc/launchpad-buildd/chroot-scripts
Merge into: lp:~lamont/launchpad-buildd/chroot-scripts
Diff against target: 33 lines (+9/-0)
1 file modified
make-chroot.sh (+9/-0)
To merge this branch: bzr merge lp:~pjdc/launchpad-buildd/chroot-scripts
Reviewer Review Type Date Requested Status
LaMont Jones 2014-11-07 Pending
Review via email: mp+241026@code.launchpad.net

This proposal supersedes a proposal from 2014-11-07.

Description of the change

Add --ubuntu-porter to replace IS use of "--dchroot --rapt", and also enable -proposed for Ubuntu porter chroots (cf. RT#76483).

{Resubmit: rebase and, importantly, fix the indentation of the here document.]

To post a comment you must log in.
55. By LaMont Jones on 2014-11-19

merging add --ubuntu-porter to replace IS use of --dchroot --rapt, and also enable -proposed when --ubuntu-porter is specified, also adding --proposed for completness.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'make-chroot.sh'
2--- make-chroot.sh 2013-06-20 16:11:43 +0000
3+++ make-chroot.sh 2014-11-07 00:35:50 +0000
4@@ -104,6 +104,7 @@
5 schroot=yes
6 schroot_used=""
7 home=""
8+proposed=""
9
10 while [ $# -gt 0 ]
11 do
12@@ -127,6 +128,7 @@
13 --nomangle) pkgmangle=""; shift;;
14 --debian) debian=yes; shift;; # building a debian chroot
15 --xdebian) debian=yes; xdebian=yes; shift;; # cross-built debian
16+ --ubuntu-porter) dchroot=yes; home=yes; proposed=yes; rapt=yes; shift;;
17 --user) buildduser=$2; shift; shift;;
18 --noarchuser) noarchuser=yes; shift;;
19 --group) builddgroup=$2; shift; shift;;
20@@ -393,6 +395,13 @@
21 deb-src $srcurl $distro-updates main restricted universe multiverse
22 deb-src $srcurl $distro-security main restricted universe multiverse
23 EOF
24+ if test -n "$proposed"; then
25+ cat <<- EOF >&6
26+
27+ deb $deburl $distro-proposed main restricted universe multiverse
28+ deb-src $srcurl $distro-proposed main restricted universe multiverse
29+ EOF
30+ fi
31 else
32 cat <<- EOF >&6
33 deb $deburl $distro main

Subscribers

People subscribed via source and target branches

to all changes: