Ubuntu Developer Tools

Merge lp:~ryanakca/ubuntu-dev-tools/ubuntu-dev-tools into lp:~ubuntu-dev/ubuntu-dev-tools/trunk

  1. ubuntu-dev-tools
  2. Merge into trunk
Proposed by Ryan Kavanagh
Status: Merged
Merged at revision: 349
Proposed branch: lp:~ryanakca/ubuntu-dev-tools/ubuntu-dev-tools
Merge into: lp:~ubuntu-dev/ubuntu-dev-tools/trunk
Diff against target: None lines
To merge this branch: bzr merge lp:~ryanakca/ubuntu-dev-tools/ubuntu-dev-tools
Reviewer Review Type Date Requested Status
Ubuntu Development Team Pending
Review via email: mp+4492@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2009-03-14 12:16:32 +0000
3+++ debian/changelog 2009-03-14 21:03:09 +0000
4@@ -1,10 +1,15 @@
5 ubuntu-dev-tools (0.67) UNRELEASED; urgency=low
6
7+ [ Jonathan Davies ]
8 * mk-sbuild-lv: Changed default behaviour so that the initial build and log
9 directories are not created on first run; instead read settings file and
10 check if they exist (LP: #342154).
11 * requestsync: Reverted old madison.php workaround (LP: #183346).
12
13+ [ Ryan Kavanagh ]
14+ * mk-sbuild-lv: Added support for Debian chroots. Updated manpage.
15+ (LP: #342158)
16+
17 -- Jonathan Davies <jpds@ubuntu.com> Mon, 09 Mar 2009 16:03:09 +0000
18
19 ubuntu-dev-tools (0.66) jaunty; urgency=low
20
21=== modified file 'doc/mk-sbuild-lv.1'
22--- doc/mk-sbuild-lv.1 2009-01-19 13:10:41 +0000
23+++ doc/mk-sbuild-lv.1 2009-03-14 21:03:09 +0000
24@@ -35,6 +35,9 @@
25 .B \-\-debootstrap\-mirror=URL
26 Use URL as the debootstrap source (defaults to http://ports.ubuntu.com for lpia,
27 official Ubuntu repositories for the supported architectures).
28+.TP
29+.B \-\-debian
30+Make a Debian schroot environment.
31
32 .SH ENVIRONMENT VARIABLES
33 .TP
34
35=== modified file 'mk-sbuild-lv'
36--- mk-sbuild-lv 2009-03-13 09:25:03 +0000
37+++ mk-sbuild-lv 2009-03-14 21:03:09 +0000
38@@ -2,6 +2,7 @@
39 #
40 # Copyright 2006-2007 (C) Canonical Ltd.
41 # Created by Kees Cook <kees@ubuntu.com>
42+# Copyright 2009 (C) Ryan Kavanagh <ryanakca@kubuntu.org>
43 #
44 # ##################################################################
45 #
46@@ -108,6 +109,7 @@
47 echo " --skip-updates Do not include -updates pocket in sources.list"
48 echo " --source-template=FILE Use FILE as the sources.list template"
49 echo " --debootstrap-mirror=URL Use URL as the debootstrap source"
50+ echo " --debian Make a Debian schroot environment"
51 echo ""
52 echo "Configuration (via ~/.mk-sbuild-lv.rc)"
53 echo " LV_SIZE Size of source LVs (default ${LV_SIZE})"
54@@ -121,7 +123,7 @@
55 if [ -z "$1" ]; then
56 usage
57 fi
58-OPTS=`getopt -o '' --long "help,debug,skip-updates,arch:,name:,source-template:,debootstrap-mirror:,personality:" -- "$@"`
59+OPTS=`getopt -o '' --long "help,debug,skip-updates,arch:,name:,source-template:,debootstrap-mirror:,personality:,debian" -- "$@"`
60 eval set -- "$OPTS"
61
62 name=""
63@@ -165,6 +167,10 @@
64 DEBOOTSTRAP_MIRROR="$2"
65 shift 2
66 ;;
67+ --debian)
68+ DEBIAN=True
69+ shift
70+ ;;
71 --)
72 shift
73 break
74@@ -199,6 +205,11 @@
75 fi
76
77 # Settings check.
78+if [ $DEBIAN ] && [ ! -x /usr/bin/cdebootstrap ]; then
79+ echo "Please install the cdebootstrap package to create a Debian schroot."
80+ exit 1
81+fi
82+
83 if [ ! -d $build_dir ]; then
84 echo "Build directory $build_dir does not exist."
85 echo "Please create it or change the setting in ~/.sbuildrc ."
86@@ -225,7 +236,7 @@
87 fi
88
89 # are we doing an lpia build?
90-if [ -z "$DEBOOTSTRAP_MIRROR" ] && [ "$arch_opt" = "--arch lpia" ]; then
91+if [ -z "$DEBOOTSTRAP_MIRROR" ] && [ "$arch_opt" = "--arch lpia" ] && [ ! $DEBIAN ]; then
92 DEBOOTSTRAP_MIRROR="http://ports.ubuntu.com/"
93 fi
94
95@@ -236,7 +247,11 @@
96 # Mount and debootstrap the chroot
97 MNT=`mktemp -d -t schroot-XXXXXX`
98 sudo mount "$CHROOT_PATH" "$MNT"
99-sudo debootstrap $arch_opt $variant_opt "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}"
100+if [ $DEBIAN ]; then
101+ sudo cdebootstrap -f build $arch_opt $variant_opt "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://ftp.debian.org/debian}"
102+else
103+ sudo debootstrap $arch_opt $variant_opt "$RELEASE" "$MNT" "${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu}"
104+fi
105 # Update the package sources
106 TEMP_SOURCES=`mktemp -t sources-XXXXXX`
107 if [ -z "$TEMPLATE_SOURCES" ]; then
108@@ -245,20 +260,37 @@
109 if [ -r "$TEMPLATE_SOURCES" ]; then
110 cat "$TEMPLATE_SOURCES" > "$TEMP_SOURCES"
111 else
112- cat > "$TEMP_SOURCES" <<EOM
113+ # Start DEBIAN
114+ if [ $DEBIAN ]; then
115+ cat > "$TEMP_SOURCES" << EOM
116+deb ${DEBOOTSTRAP_MIRRORS:-http://ftp.debian.org/debian} RELEASE main non-free contrib
117+deb-src ${DEBOOTSTRAP_MIRRORS:-http://ftp.debian.org/debian} RELEASE main non-free contrib
118+EOM
119+ if [ "$RELEASE" != "sid" ]; then
120+ cat >> "$TEMP_SOURCES" << EOM
121+deb http://security.debian.org/ ${RELEASE}/updates main
122+deb-src http://security.debian.org/ ${RELEASE}/updates main
123+EOM
124+ fi
125+ # End Debian
126+ else
127+ # Start Ubuntu
128+ cat > "$TEMP_SOURCES" <<EOM
129 deb ${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu} RELEASE main restricted universe multiverse
130 deb-src ${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu} RELEASE main restricted universe multiverse
131 EOM
132- if [ -z "$SKIP_UPDATES" ]; then
133- cat >> "$TEMP_SOURCES" <<EOM
134+ if [ -z "$SKIP_UPDATES" ]; then
135+ cat >> "$TEMP_SOURCES" <<EOM
136 deb ${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu} RELEASE-updates main restricted universe multiverse
137 deb-src ${DEBOOTSTRAP_MIRROR:-http://archive.ubuntu.com/ubuntu} RELEASE-updates main restricted universe multiverse
138 EOM
139- fi
140- cat >> "$TEMP_SOURCES" <<EOM
141+ fi
142+ cat >> "$TEMP_SOURCES" <<EOM
143 deb http://security.ubuntu.com/ubuntu RELEASE-security main restricted universe multiverse
144 deb-src http://security.ubuntu.com/ubuntu RELEASE-security main restricted universe multiverse
145 EOM
146+ # End Ubuntu
147+ fi
148 fi
149 cat "$TEMP_SOURCES" | sed -e "s|RELEASE|$RELEASE|g" | \
150 sudo bash -c "cat > $MNT/etc/apt/sources.list"
151@@ -307,7 +339,11 @@
152 if [ "$RELEASE" != "breezy" ] && [ "$RELEASE" != "dapper" ]; then
153 # Disable recommends for a smaller chroot (gutsy and later only)
154 # Add buildd tools
155- BUILD_PKGS="--no-install-recommends $BUILD_PKGS pkg-create-dbgsym pkgbinarymangler"
156+ # No need to do this for debian, --flavour=build in cdebootstrap
157+ # takes care of it.
158+ if [ ! $DEBIAN ]; then
159+ BUILD_PKGS="--no-install-recommends $BUILD_PKGS"
160+ fi
161 fi
162 sudo bash -c "cat >> $MNT/finish.sh" <<EOM
163 #!/bin/bash
164@@ -316,7 +352,11 @@
165 # Reload package lists
166 apt-get update || true
167 # Pull down signature requirements
168-apt-get -y --force-yes install gnupg ubuntu-keyring
169+if [ ! DEBIAN_BOOL ]; then
170+ # This will only be run in Ubuntu chroots. Not required with debian because
171+ # cdebootstrap pulls gnupg and debian-archive-keyring.
172+ apt-get -y --force-yes install gnupg ubuntu-keyring
173+fi
174 # Reload package lists
175 apt-get update || true
176 # Disable debconf questions so that automated builds won't prompt
177@@ -332,6 +372,9 @@
178 apt-get clean
179 rm /finish.sh
180 EOM
181+sudo cat "$MNT"/finish.sh | sed \
182+ -e "s|DEBIAN_BOOL|$DEBIAN|g" | \
183+ sudo bash -c "cat > ${MNT}/finish.sh"
184 sudo chmod +x "$MNT"/finish.sh
185 sudo umount "$MNT"
186 rmdir "$MNT"

Subscribers

People subscribed via source and target branches

to status/vote changes: