ubiquity

Merge ~xnox/ubiquity:submodules into ubiquity:master

  1. Git
  2. lp:~xnox/ubiquity
  3. submodules
  4. Merge into master
Proposed by Dimitri John Ledkov
Status: Rejected
Rejected by: Dimitri John Ledkov
Proposed branch: ~xnox/ubiquity:submodules
Merge into: ubiquity:master
Diff against target: 535 lines (+164/-108)
39 files modified
.gitmodules (+96/-0)
d-i/Makefile (+2/-4)
d-i/get-sources (+1/-101)
d-i/source/README (+25/-0)
d-i/source/apt-setup (+1/-0)
d-i/source/base-installer (+1/-0)
d-i/source/bterm-unifont (+1/-0)
d-i/source/choose-mirror (+1/-0)
d-i/source/clock-setup (+1/-0)
d-i/source/console-setup (+1/-0)
d-i/source/debian-installer-utils (+1/-0)
d-i/source/grub-installer (+1/-0)
d-i/source/hw-detect (+1/-0)
d-i/source/localechooser (+1/-0)
d-i/source/netcfg (+1/-0)
d-i/source/partconf (+1/-0)
d-i/source/partman-auto (+1/-0)
d-i/source/partman-auto-crypto (+1/-0)
d-i/source/partman-auto-loop (+1/-0)
d-i/source/partman-auto-lvm (+1/-0)
d-i/source/partman-base (+1/-0)
d-i/source/partman-basicfilesystems (+1/-0)
d-i/source/partman-basicmethods (+1/-0)
d-i/source/partman-btrfs (+1/-0)
d-i/source/partman-crypto (+1/-0)
d-i/source/partman-efi (+1/-0)
d-i/source/partman-ext3 (+1/-0)
d-i/source/partman-jfs (+1/-0)
d-i/source/partman-lvm (+1/-0)
d-i/source/partman-partitioning (+1/-0)
d-i/source/partman-swapfile (+1/-0)
d-i/source/partman-target (+1/-0)
d-i/source/partman-xfs (+1/-0)
d-i/source/preseed (+1/-0)
d-i/source/tzsetup (+1/-0)
d-i/source/user-setup (+1/-0)
debian/clean (+1/-0)
debian/source/options (+7/-0)
dev/null (+0/-3)
Reviewer Review Type Date Requested Status
Dimitri John Ledkov Disapprove
Canonical Foundations Team Pending
Ubuntu Desktop Pending
Review via email: mp+385566@code.launchpad.net

Commit message

d-i: vendorize d-i components with git submodule.

This changes the development process. A fresh recursive clone of the repository is advised. This should clone ubiquity history, as well as all the submodules, and alone building ubiquity without access to mirrors, or apt-getting source packages.

To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Debdiff between pre-submodules and with-submodules looks sane, hence the source package is still the same.

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

You can use submodules commands to operate on the repositories, or pass the option to clone to fetch all the submodules straight away.

$ git clone lp:~xnox/ubiquity -b submodules --recurse-submodules

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

I feel like we dislike this option, as it requires managing many repos.

review: Disapprove

Unmerged commits

72f4eb5... by Dimitri John Ledkov

d-i: vendorize d-i components with git submodule.

This changes the development process. A fresh recursive clone of the
repository is advised. This should clone ubiquity history, as well as
all the submodules, and alone building ubiquity without access to
mirrors, or apt-getting source packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/.gitmodules b/.gitmodules
0new file mode 1006440new file mode 100644
index 0000000..63b68af
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,96 @@
1[submodule "d-i/source/apt-setup"]
2 path = d-i/source/apt-setup
3 url = https://git.launchpad.net/~ubuntu-installer/apt-setup
4[submodule "d-i/source/base-installer"]
5 path = d-i/source/base-installer
6 url = https://git.launchpad.net/~ubuntu-installer/base-installer
7[submodule "d-i/source/bterm-unifont"]
8 path = d-i/source/bterm-unifont
9 url = https://git.launchpad.net/bterm-unifont
10[submodule "d-i/source/choose-mirror"]
11 path = d-i/source/choose-mirror
12 url = https://git.launchpad.net/~ubuntu-installer/choose-mirror
13[submodule "d-i/source/clock-setup"]
14 path = d-i/source/clock-setup
15 url = https://git.launchpad.net/~ubuntu-installer/clock-setup
16[submodule "d-i/source/console-setup"]
17 path = d-i/source/console-setup
18 url = https://git.launchpad.net/ubuntu/+source/console-setup
19[submodule "d-i/source/debian-installer-utils"]
20 path = d-i/source/debian-installer-utils
21 url = https://git.launchpad.net/~ubuntu-installer/debian-installer-utils
22[submodule "d-i/source/grub-installer"]
23 path = d-i/source/grub-installer
24 url = https://git.launchpad.net/~ubuntu-installer/grub-installer
25[submodule "d-i/source/hw-detect"]
26 path = d-i/source/hw-detect
27 url = https://git.launchpad.net/~ubuntu-installer/hw-detect
28[submodule "d-i/source/localechooser"]
29 path = d-i/source/localechooser
30 url = https://git.launchpad.net/ubuntu/+source/localechooser
31[submodule "d-i/source/netcfg"]
32 path = d-i/source/netcfg
33 url = https://git.launchpad.net/~ubuntu-installer/netcfg
34[submodule "d-i/source/partconf"]
35 path = d-i/source/partconf
36 url = https://git.launchpad.net/~ubuntu-installer/partconf
37[submodule "d-i/source/partman-auto"]
38 path = d-i/source/partman-auto
39 url = https://git.launchpad.net/~ubuntu-installer/partman-auto
40[submodule "d-i/source/partman-auto-crypto"]
41 path = d-i/source/partman-auto-crypto
42 url = https://git.launchpad.net/~ubuntu-installer/partman-auto-crypto
43[submodule "d-i/source/partman-auto-loop"]
44 path = d-i/source/partman-auto-loop
45 url = https://git.launchpad.net/~ubuntu-installer/partman-auto-loop
46[submodule "d-i/source/partman-auto-lvm"]
47 path = d-i/source/partman-auto-lvm
48 url = https://git.launchpad.net/~ubuntu-installer/partman-auto-lvm
49[submodule "d-i/source/partman-base"]
50 path = d-i/source/partman-base
51 url = https://git.launchpad.net/~ubuntu-installer/partman-base
52[submodule "d-i/source/partman-basicfilesystems"]
53 path = d-i/source/partman-basicfilesystems
54 url = https://git.launchpad.net/~ubuntu-installer/partman-basicfilesystems
55[submodule "d-i/source/partman-btrfs"]
56 path = d-i/source/partman-btrfs
57 url = https://git.launchpad.net/~ubuntu-installer/partman-btrfs
58[submodule "d-i/source/partman-crypto"]
59 path = d-i/source/partman-crypto
60 url = https://git.launchpad.net/~ubuntu-installer/partman-crypto
61[submodule "d-i/source/partman-efi"]
62 path = d-i/source/partman-efi
63 url = https://git.launchpad.net/~ubuntu-installer/partman-efi
64[submodule "d-i/source/partman-ext3"]
65 path = d-i/source/partman-ext3
66 url = https://git.launchpad.net/~ubuntu-installer/partman-ext3
67[submodule "d-i/source/partman-jfs"]
68 path = d-i/source/partman-jfs
69 url = https://git.launchpad.net/~ubuntu-installer/partman-jfs
70[submodule "d-i/source/partman-lvm"]
71 path = d-i/source/partman-lvm
72 url = https://git.launchpad.net/partman-lvm
73[submodule "d-i/source/partman-partitioning"]
74 path = d-i/source/partman-partitioning
75 url = https://git.launchpad.net/~ubuntu-installer/partman-partitioning
76[submodule "d-i/source/partman-swapfile"]
77 path = d-i/source/partman-swapfile
78 url = https://git.launchpad.net/partman-swapfile
79[submodule "d-i/source/partman-target"]
80 path = d-i/source/partman-target
81 url = https://git.launchpad.net/~ubuntu-installer/partman-target
82[submodule "d-i/source/partman-xfs"]
83 path = d-i/source/partman-xfs
84 url = https://git.launchpad.net/~ubuntu-installer/partman-xfs
85[submodule "d-i/source/preseed"]
86 path = d-i/source/preseed
87 url = https://git.launchpad.net/~ubuntu-installer/preseed
88[submodule "d-i/source/tzsetup"]
89 path = d-i/source/tzsetup
90 url = https://git.launchpad.net/~ubuntu-installer/tzsetup
91[submodule "d-i/source/user-setup"]
92 path = d-i/source/user-setup
93 url = https://git.launchpad.net/ubuntu/+source/user-setup
94[submodule "d-i/source/partman-basicmethods"]
95 path = d-i/source/partman-basicmethods
96 url = https://git.launchpad.net/~ubuntu-installer/partman-basicmethods
diff --git a/d-i/Makefile b/d-i/Makefile
index 7b3b478..aad9f2b 100644
--- a/d-i/Makefile
+++ b/d-i/Makefile
@@ -32,9 +32,6 @@ endif
32check:32check:
33 ./check-manifest33 ./check-manifest
3434
35maintainer-clean:
36 rm -rf $(SOURCEDIR)
37
38build:35build:
39 set -e; for package in $(PACKAGES); do \36 set -e; for package in $(PACKAGES); do \
40 if [ -d "$(SOURCEDIR)/$$package" ]; then \37 if [ -d "$(SOURCEDIR)/$$package" ]; then \
@@ -51,7 +48,8 @@ clean:
51 fi; \48 fi; \
52 done49 done
53 $(MAKE) -C $(SOURCEDIR)/console-setup/Keyboard clean50 $(MAKE) -C $(SOURCEDIR)/console-setup/Keyboard clean
54 rm -f $(SOURCEDIR)/*.deb $(SOURCEDIR)/*.udeb51 git -C $(SOURCEDIR)/console-setup reset --hard || :
52 rm -f $(SOURCEDIR)/*.deb $(SOURCEDIR)/*.udeb $(SOURCEDIR)/*.ddeb
55 rm -f manifest.old53 rm -f manifest.old
56 rm -rf udeb-control templates54 rm -rf udeb-control templates
5755
diff --git a/d-i/get-sources b/d-i/get-sources
index 48c7fcb..6d19eee 100755
--- a/d-i/get-sources
+++ b/d-i/get-sources
@@ -1,82 +1,12 @@
1#!/bin/sh1#!/bin/sh
2#2#
3# get-sources <package> | <update> ...3# get-sources <package>
4#4#
5# Download source packages with the help of apt-get
6#
7# Files:
8# sources.list / sources.list.local
9#
10# Environment:
11# APTDIR - basename for the apt directory (default: apt.$TYPE)
12# ONLINE - update Packages files (default: y)
13#
14# This is loosely based on get-packages in debian-installer, copyright (C)
15# 2001-2005 by Joey Hess <joeyh@debian.org> and the d-i team, and licensed
16# under the terms of the GNU General Public License.
175
18set -e6set -e
197
20PACKAGES=$*8PACKAGES=$*
219
22# Setup environment
23if [ ! $APTDIR ]; then
24 APTDIR="apt"
25fi
26if [ ! $SOURCEDIR ]; then
27 SOURCEDIR="source"
28fi
29if [ ! $ONLINE ]; then
30 ONLINE="y"
31fi
32
33# Set sources.list file
34if [ -f sources.list.local ]; then
35 LIST=sources.list.local
36else
37 LIST=sources.list
38fi
39
40# All these options make apt read the right sources list, and use APTDIR for
41# everything so it need not run as root.
42APT_GET="apt-get --assume-yes \
43 -o Dir::Etc::sourcelist=`pwd`/$LIST \
44 -o Dir::Etc::sourceparts=#clear \
45 -o Dir::State=`pwd`/$APTDIR/state \
46 -o Dir::State::status=`pwd`/$APTDIR/state/status \
47 -o Debug::NoLocking=true \
48 -o Dir::Cache=`pwd`/$APTDIR/cache \
49 -o Acquire::Retries=3"
50
51# Prepare APTDIR
52mkdir -p $APTDIR/state/lists/partial
53mkdir -p $APTDIR/cache/archives/partial
54echo -n > $APTDIR/state/status
55
56# Update package lists and autoclean cache.
57if [ "$ONLINE" = "y" ]; then
58 $APT_GET update || {
59 echo "Failed to update the Packages file. This usually means either of:"
60 echo
61 echo "A) $LIST does not contain a valid repository."
62 echo " You can override the generated sources.list.$TYPE"
63 echo " with sources.list.$TYPE.local if you haven't done so yet."
64 echo
65 echo "B) The repository in $LIST is not reachable."
66 echo " If you are not working online, use 'export ONLINE=n' to skip updating"
67 echo " the Packages files. Beware that this can result in images with"
68 echo " out-of-date packages and should be used for private development only."
69 exit 1
70 }
71 $APT_GET autoclean
72else
73 # A Release.gpg may not be cached, allow continuing w/o it in
74 # offline mode.
75 APT_GET="$APT_GET --allow-unauthenticated"
76
77 $APT_GET --no-list-cleanup update || echo "Ignoring update failure in offline mode"
78fi
79
80if [ "$PACKAGES" = update ]; then10if [ "$PACKAGES" = update ]; then
81 exit 011 exit 0
82fi12fi
@@ -87,33 +17,3 @@ elif ! [ -f manifest.old ]; then
87 echo "Building manifest ..."17 echo "Building manifest ..."
88 ./build-manifest > manifest.old18 ./build-manifest > manifest.old
89fi19fi
90
91rm -rf $SOURCEDIR
92mkdir -p $SOURCEDIR
93
94# Get source packages.
95echo Need to download: $PACKAGES
96if [ -n "$PACKAGES" ]; then (
97 set -e
98 cd $SOURCEDIR
99 $APT_GET source $PACKAGES
100 rm -f *.dsc *.tar.gz *.tar.xz
101 rename 's/-[0-9].*//' *-[0-9]*
102) fi
103
104# We don't build console-setup, as it takes too long, so these aren't
105# needed; we just need a couple of scripts from it.
106for subdir in .svn Fonts Keyboard/acm Keyboard/ckb Keyboard/locale; do
107 rm -rf "$SOURCEDIR/console-setup/$subdir"
108done
109
110# Add a warning to budding hackers.
111cat > "$SOURCEDIR/README" <<EOF
112The files in this directory are updated automatically from the distribution
113archive. Any changes you make under this directory will be lost!
114
115New ubiquity-specific scripts should be added to scripts/ instead; you can
116make local modifications here if you need to, but for inclusion in official
117builds the changes need to be applied to the corresponding source packages
118and uploaded.
119EOF
diff --git a/d-i/source/README b/d-i/source/README
120new file mode 10064420new file mode 100644
index 0000000..36d9c6b
--- /dev/null
+++ b/d-i/source/README
@@ -0,0 +1,25 @@
1The files in this directory are managed with git submodules.
2
3Different URLs are used for them
4
5* lp:$project
6
7Direct vcs import from salsa.debian.org/installer-team/$proejct
8
9Or Ubuntu-only brand new d-i component that has not yet been
10upstreamed to Debian.
11
12* lp:~ubuntu-installer/$project
13
14Single ubuntu delta import, on top of the d-i upstream history
15(lp:~ubuntu-installer/$project). Or for example, fixing the master
16branch onto the tagged release, instead of unreleased commits.
17
18* lp:ubuntu/+source/$project
19
20UDD import of the source package from the Ubuntu Archive, because the
21package produces .deb in addition to vendored .udeb, and thus still
22must be uploaded into the archive as per usual development processes.
23
24Otherwise, these submodules are usual packages, and one can
25merge/rebase, change urls of them as needed.
diff --git a/d-i/source/apt-setup b/d-i/source/apt-setup
0new file mode 16000026new file mode 160000
index 0000000..4bda5bb
--- /dev/null
+++ b/d-i/source/apt-setup
@@ -0,0 +1 @@
1Subproject commit 4bda5bb46817c4fd46569167f17a4f1b35ec6fcc
diff --git a/d-i/source/base-installer b/d-i/source/base-installer
0new file mode 1600002new file mode 160000
index 0000000..1fe8a86
--- /dev/null
+++ b/d-i/source/base-installer
@@ -0,0 +1 @@
1Subproject commit 1fe8a86d0c4da730e2b7b0bf9606c4c48a50131b
diff --git a/d-i/source/bterm-unifont b/d-i/source/bterm-unifont
0new file mode 1600002new file mode 160000
index 0000000..8785661
--- /dev/null
+++ b/d-i/source/bterm-unifont
@@ -0,0 +1 @@
1Subproject commit 878566183dba7099a867a5d20f06cddbdeeb8005
diff --git a/d-i/source/choose-mirror b/d-i/source/choose-mirror
0new file mode 1600002new file mode 160000
index 0000000..7c8c331
--- /dev/null
+++ b/d-i/source/choose-mirror
@@ -0,0 +1 @@
1Subproject commit 7c8c3313e9b6edbb8f6de0e5481d012374f382d3
diff --git a/d-i/source/clock-setup b/d-i/source/clock-setup
0new file mode 1600002new file mode 160000
index 0000000..debd1a4
--- /dev/null
+++ b/d-i/source/clock-setup
@@ -0,0 +1 @@
1Subproject commit debd1a4689d11f535fa90062cf437c583e7120f3
diff --git a/d-i/source/console-setup b/d-i/source/console-setup
0new file mode 1600002new file mode 160000
index 0000000..3260578
--- /dev/null
+++ b/d-i/source/console-setup
@@ -0,0 +1 @@
1Subproject commit 32605782603ed12bfe32e4cde3bb3d897850af34
diff --git a/d-i/source/debian-installer-utils b/d-i/source/debian-installer-utils
0new file mode 1600002new file mode 160000
index 0000000..6d83a67
--- /dev/null
+++ b/d-i/source/debian-installer-utils
@@ -0,0 +1 @@
1Subproject commit 6d83a67a3361a161971586e792e61d43d114b78f
diff --git a/d-i/source/grub-installer b/d-i/source/grub-installer
0new file mode 1600002new file mode 160000
index 0000000..a0c511c
--- /dev/null
+++ b/d-i/source/grub-installer
@@ -0,0 +1 @@
1Subproject commit a0c511cd84fbb6469abb86d64f9c89ca5fa56aac
diff --git a/d-i/source/hw-detect b/d-i/source/hw-detect
0new file mode 1600002new file mode 160000
index 0000000..8b40b21
--- /dev/null
+++ b/d-i/source/hw-detect
@@ -0,0 +1 @@
1Subproject commit 8b40b219df6cd630d7d78f96eea870b60aeb5b7f
diff --git a/d-i/source/localechooser b/d-i/source/localechooser
0new file mode 1600002new file mode 160000
index 0000000..b55adde
--- /dev/null
+++ b/d-i/source/localechooser
@@ -0,0 +1 @@
1Subproject commit b55addec1d387a88a781c40cb94997ec164007af
diff --git a/d-i/source/netcfg b/d-i/source/netcfg
0new file mode 1600002new file mode 160000
index 0000000..9dccb15
--- /dev/null
+++ b/d-i/source/netcfg
@@ -0,0 +1 @@
1Subproject commit 9dccb1547a87e0bb5a4f9640db60a7d04fee9093
diff --git a/d-i/source/partconf b/d-i/source/partconf
0new file mode 1600002new file mode 160000
index 0000000..aa6db51
--- /dev/null
+++ b/d-i/source/partconf
@@ -0,0 +1 @@
1Subproject commit aa6db5109188188aaf5e01f4cc27e4ecf8a1a26a
diff --git a/d-i/source/partman-auto b/d-i/source/partman-auto
0new file mode 1600002new file mode 160000
index 0000000..751f910
--- /dev/null
+++ b/d-i/source/partman-auto
@@ -0,0 +1 @@
1Subproject commit 751f91047ed7bae2b69dcb3c445a8bfeb449dd72
diff --git a/d-i/source/partman-auto-crypto b/d-i/source/partman-auto-crypto
0new file mode 1600002new file mode 160000
index 0000000..49bb374
--- /dev/null
+++ b/d-i/source/partman-auto-crypto
@@ -0,0 +1 @@
1Subproject commit 49bb374f36ac10538afd7e70ba4ec91a2d2ccde5
diff --git a/d-i/source/partman-auto-loop b/d-i/source/partman-auto-loop
0new file mode 1600002new file mode 160000
index 0000000..7d0cc12
--- /dev/null
+++ b/d-i/source/partman-auto-loop
@@ -0,0 +1 @@
1Subproject commit 7d0cc126788ee8a47662461148b6fc63eefcd289
diff --git a/d-i/source/partman-auto-lvm b/d-i/source/partman-auto-lvm
0new file mode 1600002new file mode 160000
index 0000000..8a0d589
--- /dev/null
+++ b/d-i/source/partman-auto-lvm
@@ -0,0 +1 @@
1Subproject commit 8a0d589a2e6beabe575a712e1a18961e2eeb7864
diff --git a/d-i/source/partman-base b/d-i/source/partman-base
0new file mode 1600002new file mode 160000
index 0000000..b77ff65
--- /dev/null
+++ b/d-i/source/partman-base
@@ -0,0 +1 @@
1Subproject commit b77ff65633926f6437dc0d1f6d93484629fca516
diff --git a/d-i/source/partman-basicfilesystems b/d-i/source/partman-basicfilesystems
0new file mode 1600002new file mode 160000
index 0000000..7ff160f
--- /dev/null
+++ b/d-i/source/partman-basicfilesystems
@@ -0,0 +1 @@
1Subproject commit 7ff160f1cdaf18fb078b683a208f302d9818b94b
diff --git a/d-i/source/partman-basicmethods b/d-i/source/partman-basicmethods
0new file mode 1600002new file mode 160000
index 0000000..4786368
--- /dev/null
+++ b/d-i/source/partman-basicmethods
@@ -0,0 +1 @@
1Subproject commit 478636889573e9fef309a7db624b95fba0df19ae
diff --git a/d-i/source/partman-btrfs b/d-i/source/partman-btrfs
0new file mode 1600002new file mode 160000
index 0000000..1725671
--- /dev/null
+++ b/d-i/source/partman-btrfs
@@ -0,0 +1 @@
1Subproject commit 17256715c6add3b023e70895d2cc7f1afe19c54f
diff --git a/d-i/source/partman-crypto b/d-i/source/partman-crypto
0new file mode 1600002new file mode 160000
index 0000000..06f4803
--- /dev/null
+++ b/d-i/source/partman-crypto
@@ -0,0 +1 @@
1Subproject commit 06f480323fd25ac19562997c15de9cfb53223d76
diff --git a/d-i/source/partman-efi b/d-i/source/partman-efi
0new file mode 1600002new file mode 160000
index 0000000..7099358
--- /dev/null
+++ b/d-i/source/partman-efi
@@ -0,0 +1 @@
1Subproject commit 7099358fef64d325890a0927c17ac3780c183cee
diff --git a/d-i/source/partman-ext3 b/d-i/source/partman-ext3
0new file mode 1600002new file mode 160000
index 0000000..e6fc953
--- /dev/null
+++ b/d-i/source/partman-ext3
@@ -0,0 +1 @@
1Subproject commit e6fc9534431c5237502065ad5c78226ac46a6483
diff --git a/d-i/source/partman-jfs b/d-i/source/partman-jfs
0new file mode 1600002new file mode 160000
index 0000000..4c0db16
--- /dev/null
+++ b/d-i/source/partman-jfs
@@ -0,0 +1 @@
1Subproject commit 4c0db16539691504cd457d73def962490b97c88c
diff --git a/d-i/source/partman-lvm b/d-i/source/partman-lvm
0new file mode 1600002new file mode 160000
index 0000000..49d2061
--- /dev/null
+++ b/d-i/source/partman-lvm
@@ -0,0 +1 @@
1Subproject commit 49d20617371d92f767c20ac541dae82ad8bbf9e0
diff --git a/d-i/source/partman-partitioning b/d-i/source/partman-partitioning
0new file mode 1600002new file mode 160000
index 0000000..de32179
--- /dev/null
+++ b/d-i/source/partman-partitioning
@@ -0,0 +1 @@
1Subproject commit de321797da9f4c9a3d9a1c93012b47e5d56cccf7
diff --git a/d-i/source/partman-swapfile b/d-i/source/partman-swapfile
0new file mode 1600002new file mode 160000
index 0000000..2734457
--- /dev/null
+++ b/d-i/source/partman-swapfile
@@ -0,0 +1 @@
1Subproject commit 27344576d9d66e9027389ff97c81851c4e8adacb
diff --git a/d-i/source/partman-target b/d-i/source/partman-target
0new file mode 1600002new file mode 160000
index 0000000..537aa91
--- /dev/null
+++ b/d-i/source/partman-target
@@ -0,0 +1 @@
1Subproject commit 537aa91937eed47ad7f3a53daa050f2f24b03bd2
diff --git a/d-i/source/partman-xfs b/d-i/source/partman-xfs
0new file mode 1600002new file mode 160000
index 0000000..ea9ae0b
--- /dev/null
+++ b/d-i/source/partman-xfs
@@ -0,0 +1 @@
1Subproject commit ea9ae0b41262656889b193de9316acd65a2ad893
diff --git a/d-i/source/preseed b/d-i/source/preseed
0new file mode 1600002new file mode 160000
index 0000000..b934de2
--- /dev/null
+++ b/d-i/source/preseed
@@ -0,0 +1 @@
1Subproject commit b934de244443ce687a1024cb641136a205494849
diff --git a/d-i/source/tzsetup b/d-i/source/tzsetup
0new file mode 1600002new file mode 160000
index 0000000..20a1aa7
--- /dev/null
+++ b/d-i/source/tzsetup
@@ -0,0 +1 @@
1Subproject commit 20a1aa76594c4d9fef9d0c8b853ab38f74cf842b
diff --git a/d-i/source/user-setup b/d-i/source/user-setup
0new file mode 1600002new file mode 160000
index 0000000..e24f6c0
--- /dev/null
+++ b/d-i/source/user-setup
@@ -0,0 +1 @@
1Subproject commit e24f6c0d1c32f141b236662017df43031119c125
diff --git a/d-i/sources.list b/d-i/sources.list
0deleted file mode 1006442deleted file mode 100644
index 39446b6..0000000
--- a/d-i/sources.list
+++ /dev/null
@@ -1,3 +0,0 @@
1deb-src http://archive.ubuntu.com/ubuntu groovy main
2deb-src http://archive.ubuntu.com/ubuntu groovy-updates main
3deb-src http://archive.ubuntu.com/ubuntu groovy-proposed main
diff --git a/debian/clean b/debian/clean
index a12f26d..e02ec7e 100644
--- a/debian/clean
+++ b/debian/clean
@@ -11,3 +11,4 @@ tests/debconfdb
11tests/templates.dat*11tests/templates.dat*
12ubiquity/frontend/liveinstaller.py12ubiquity/frontend/liveinstaller.py
13ubiquity/frontend/crashdialog.py13ubiquity/frontend/crashdialog.py
14data/com.ubuntu.ubiquity.policy
diff --git a/debian/source/options b/debian/source/options
index e3af1ec..9373476 100644
--- a/debian/source/options
+++ b/debian/source/options
@@ -1,2 +1,9 @@
1compression = "xz"1compression = "xz"
2tar-ignore = ".git"2tar-ignore = ".git"
3tar-ignore = ".gitignore"
4tar-ignore = ".gitmodules"
5tar-ignore = "d-i/source/console-setup/Fonts"
6tar-ignore = "d-i/source/console-setup/Keyboard/acm"
7tar-ignore = "d-i/source/console-setup/Keyboard/ckb"
8tar-ignore = "d-i/source/console-setup/Keyboard/locale"
9tar-ignore = "d-i/source/console-setup/Keyboard/*.tree"

Subscribers

People subscribed via source and target branches