Merge ~xnox/ubiquity:submodules into ubiquity:master

[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.

[Dimitri John Ledkov (xnox)]

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

[Dimitri John Ledkov (xnox)]

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

[Dimitri John Ledkov (xnox)]

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

review: Disapprove

Unmerged commits

72f4eb5... by Dimitri John Ledkov on 2020-06-11

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.

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..63b68af
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,96 @@
+[submodule "d-i/source/apt-setup"]
+	path = d-i/source/apt-setup
+	url = https://git.launchpad.net/~ubuntu-installer/apt-setup
+[submodule "d-i/source/base-installer"]
+	path = d-i/source/base-installer
+	url = https://git.launchpad.net/~ubuntu-installer/base-installer
+[submodule "d-i/source/bterm-unifont"]
+	path = d-i/source/bterm-unifont
+	url = https://git.launchpad.net/bterm-unifont
+[submodule "d-i/source/choose-mirror"]
+	path = d-i/source/choose-mirror
+	url = https://git.launchpad.net/~ubuntu-installer/choose-mirror
+[submodule "d-i/source/clock-setup"]
+	path = d-i/source/clock-setup
+	url = https://git.launchpad.net/~ubuntu-installer/clock-setup
+[submodule "d-i/source/console-setup"]
+	path = d-i/source/console-setup
+	url = https://git.launchpad.net/ubuntu/+source/console-setup
+[submodule "d-i/source/debian-installer-utils"]
+	path = d-i/source/debian-installer-utils
+	url = https://git.launchpad.net/~ubuntu-installer/debian-installer-utils
+[submodule "d-i/source/grub-installer"]
+	path = d-i/source/grub-installer
+	url = https://git.launchpad.net/~ubuntu-installer/grub-installer
+[submodule "d-i/source/hw-detect"]
+	path = d-i/source/hw-detect
+	url = https://git.launchpad.net/~ubuntu-installer/hw-detect
+[submodule "d-i/source/localechooser"]
+	path = d-i/source/localechooser
+	url = https://git.launchpad.net/ubuntu/+source/localechooser
+[submodule "d-i/source/netcfg"]
+	path = d-i/source/netcfg
+	url = https://git.launchpad.net/~ubuntu-installer/netcfg
+[submodule "d-i/source/partconf"]
+	path = d-i/source/partconf
+	url = https://git.launchpad.net/~ubuntu-installer/partconf
+[submodule "d-i/source/partman-auto"]
+	path = d-i/source/partman-auto
+	url = https://git.launchpad.net/~ubuntu-installer/partman-auto
+[submodule "d-i/source/partman-auto-crypto"]
+	path = d-i/source/partman-auto-crypto
+	url = https://git.launchpad.net/~ubuntu-installer/partman-auto-crypto
+[submodule "d-i/source/partman-auto-loop"]
+	path = d-i/source/partman-auto-loop
+	url = https://git.launchpad.net/~ubuntu-installer/partman-auto-loop
+[submodule "d-i/source/partman-auto-lvm"]
+	path = d-i/source/partman-auto-lvm
+	url = https://git.launchpad.net/~ubuntu-installer/partman-auto-lvm
+[submodule "d-i/source/partman-base"]
+	path = d-i/source/partman-base
+	url = https://git.launchpad.net/~ubuntu-installer/partman-base
+[submodule "d-i/source/partman-basicfilesystems"]
+	path = d-i/source/partman-basicfilesystems
+	url = https://git.launchpad.net/~ubuntu-installer/partman-basicfilesystems
+[submodule "d-i/source/partman-btrfs"]
+	path = d-i/source/partman-btrfs
+	url = https://git.launchpad.net/~ubuntu-installer/partman-btrfs
+[submodule "d-i/source/partman-crypto"]
+	path = d-i/source/partman-crypto
+	url = https://git.launchpad.net/~ubuntu-installer/partman-crypto
+[submodule "d-i/source/partman-efi"]
+	path = d-i/source/partman-efi
+	url = https://git.launchpad.net/~ubuntu-installer/partman-efi
+[submodule "d-i/source/partman-ext3"]
+	path = d-i/source/partman-ext3
+	url = https://git.launchpad.net/~ubuntu-installer/partman-ext3
+[submodule "d-i/source/partman-jfs"]
+	path = d-i/source/partman-jfs
+	url = https://git.launchpad.net/~ubuntu-installer/partman-jfs
+[submodule "d-i/source/partman-lvm"]
+	path = d-i/source/partman-lvm
+	url = https://git.launchpad.net/partman-lvm
+[submodule "d-i/source/partman-partitioning"]
+	path = d-i/source/partman-partitioning
+	url = https://git.launchpad.net/~ubuntu-installer/partman-partitioning
+[submodule "d-i/source/partman-swapfile"]
+	path = d-i/source/partman-swapfile
+	url = https://git.launchpad.net/partman-swapfile
+[submodule "d-i/source/partman-target"]
+	path = d-i/source/partman-target
+	url = https://git.launchpad.net/~ubuntu-installer/partman-target
+[submodule "d-i/source/partman-xfs"]
+	path = d-i/source/partman-xfs
+	url = https://git.launchpad.net/~ubuntu-installer/partman-xfs
+[submodule "d-i/source/preseed"]
+	path = d-i/source/preseed
+	url = https://git.launchpad.net/~ubuntu-installer/preseed
+[submodule "d-i/source/tzsetup"]
+	path = d-i/source/tzsetup
+	url = https://git.launchpad.net/~ubuntu-installer/tzsetup
+[submodule "d-i/source/user-setup"]
+	path = d-i/source/user-setup
+	url = https://git.launchpad.net/ubuntu/+source/user-setup
+[submodule "d-i/source/partman-basicmethods"]
+	path = d-i/source/partman-basicmethods
+	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
 check:
 	./check-manifest
 
-maintainer-clean:
-	rm -rf $(SOURCEDIR)
-
 build:
 	set -e; for package in $(PACKAGES); do \
 		if [ -d "$(SOURCEDIR)/$$package" ]; then \
@@ -51,7 +48,8 @@ clean:
 		fi; \
 	done
 	$(MAKE) -C $(SOURCEDIR)/console-setup/Keyboard clean
-	rm -f $(SOURCEDIR)/*.deb $(SOURCEDIR)/*.udeb
+	git -C $(SOURCEDIR)/console-setup reset --hard || :
+	rm -f $(SOURCEDIR)/*.deb $(SOURCEDIR)/*.udeb $(SOURCEDIR)/*.ddeb
 	rm -f manifest.old
 	rm -rf udeb-control templates
 
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 @@
 #!/bin/sh
 #
-# get-sources <package> | <update> ...
+# get-sources <package>
 #
-# Download source packages with the help of apt-get
-#
-# Files:
-#   sources.list / sources.list.local
-#
-# Environment:
-#   APTDIR       - basename for the apt directory (default: apt.$TYPE)
-#   ONLINE       - update Packages files (default: y)
-#
-# This is loosely based on get-packages in debian-installer, copyright (C)
-# 2001-2005 by Joey Hess <[e-mail]> and the d-i team, and licensed
-# under the terms of the GNU General Public License.
 
 set -e
 
 PACKAGES=$*
 
-# Setup environment
-if [ ! $APTDIR ]; then
-	APTDIR="apt"
-fi
-if [ ! $SOURCEDIR ]; then
-	SOURCEDIR="source"
-fi
-if [ ! $ONLINE ]; then
-	ONLINE="y"
-fi
-
-# Set sources.list file
-if [ -f sources.list.local ]; then
-	LIST=sources.list.local
-else
-	LIST=sources.list
-fi
-
-# All these options make apt read the right sources list, and use APTDIR for
-# everything so it need not run as root.
-APT_GET="apt-get --assume-yes \
-	-o Dir::Etc::sourcelist=`pwd`/$LIST \
-	-o Dir::Etc::sourceparts=#clear \
-	-o Dir::State=`pwd`/$APTDIR/state \
-	-o Dir::State::status=`pwd`/$APTDIR/state/status \
-	-o Debug::NoLocking=true \
-	-o Dir::Cache=`pwd`/$APTDIR/cache \
-	-o Acquire::Retries=3"
-
-# Prepare APTDIR
-mkdir -p $APTDIR/state/lists/partial
-mkdir -p $APTDIR/cache/archives/partial
-echo -n > $APTDIR/state/status
-
-# Update package lists and autoclean cache.
-if [ "$ONLINE" = "y" ]; then
-	$APT_GET update || {
-		echo "Failed to update the Packages file. This usually means either of:"
-		echo
-		echo "A) $LIST does not contain a valid repository."
-		echo "   You can override the generated sources.list.$TYPE"
-		echo "   with sources.list.$TYPE.local if you haven't done so yet."
-		echo
-		echo "B) The repository in $LIST is not reachable."
-		echo "   If you are not working online, use 'export ONLINE=n' to skip updating"
-		echo "   the Packages files. Beware that this can result in images with"
-		echo "   out-of-date packages and should be used for private development only."
-		exit 1
-	}
-	$APT_GET autoclean
-else
-	# A Release.gpg may not be cached, allow continuing w/o it in
-	# offline mode.
-	APT_GET="$APT_GET --allow-unauthenticated"
-	
-	$APT_GET --no-list-cleanup update || echo "Ignoring update failure in offline mode"
-fi
-
 if [ "$PACKAGES" = update ]; then
 	exit 0
 fi
@@ -87,33 +17,3 @@ elif ! [ -f manifest.old ]; then
 	echo "Building manifest ..."
 	./build-manifest > manifest.old
 fi
-
-rm -rf $SOURCEDIR
-mkdir -p $SOURCEDIR
-
-# Get source packages.
-echo Need to download: $PACKAGES
-if [ -n "$PACKAGES" ]; then (
-	set -e
-	cd $SOURCEDIR
-	$APT_GET source $PACKAGES
-	rm -f *.dsc *.tar.gz *.tar.xz
-	rename 's/-[0-9].*//' *-[0-9]*
-) fi
-
-# We don't build console-setup, as it takes too long, so these aren't
-# needed; we just need a couple of scripts from it.
-for subdir in .svn Fonts Keyboard/acm Keyboard/ckb Keyboard/locale; do
-	rm -rf "$SOURCEDIR/console-setup/$subdir"
-done
-
-# Add a warning to budding hackers.
-cat > "$SOURCEDIR/README" <<EOF
-The files in this directory are updated automatically from the distribution
-archive. Any changes you make under this directory will be lost!
-
-New ubiquity-specific scripts should be added to scripts/ instead; you can
-make local modifications here if you need to, but for inclusion in official
-builds the changes need to be applied to the corresponding source packages
-and uploaded.
-EOF
diff --git a/d-i/source/README b/d-i/source/README
new file mode 100644
index 0000000..36d9c6b
--- /dev/null
+++ b/d-i/source/README
@@ -0,0 +1,25 @@
+The files in this directory are managed with git submodules.
+
+Different URLs are used for them
+
+* lp:$project
+
+Direct vcs import from salsa.debian.org/installer-team/$proejct
+
+Or Ubuntu-only brand new d-i component that has not yet been
+upstreamed to Debian.
+
+* lp:~ubuntu-installer/$project
+
+Single ubuntu delta import, on top of the d-i upstream history
+(lp:~ubuntu-installer/$project). Or for example, fixing the master
+branch onto the tagged release, instead of unreleased commits.
+
+* lp:ubuntu/+source/$project
+
+UDD import of the source package from the Ubuntu Archive, because the
+package produces .deb in addition to vendored .udeb, and thus still
+must be uploaded into the archive as per usual development processes.
+
+Otherwise, these submodules are usual packages, and one can
+merge/rebase, change urls of them as needed.
diff --git a/d-i/source/apt-setup b/d-i/source/apt-setup
new file mode 160000
index 0000000..4bda5bb
--- /dev/null
+++ b/d-i/source/apt-setup
@@ -0,0 +1 @@
+Subproject commit 4bda5bb46817c4fd46569167f17a4f1b35ec6fcc
diff --git a/d-i/source/base-installer b/d-i/source/base-installer
new file mode 160000
index 0000000..1fe8a86
--- /dev/null
+++ b/d-i/source/base-installer
@@ -0,0 +1 @@
+Subproject commit 1fe8a86d0c4da730e2b7b0bf9606c4c48a50131b
diff --git a/d-i/source/bterm-unifont b/d-i/source/bterm-unifont
new file mode 160000
index 0000000..8785661
--- /dev/null
+++ b/d-i/source/bterm-unifont
@@ -0,0 +1 @@
+Subproject commit 878566183dba7099a867a5d20f06cddbdeeb8005
diff --git a/d-i/source/choose-mirror b/d-i/source/choose-mirror
new file mode 160000
index 0000000..7c8c331
--- /dev/null
+++ b/d-i/source/choose-mirror
@@ -0,0 +1 @@
+Subproject commit 7c8c3313e9b6edbb8f6de0e5481d012374f382d3
diff --git a/d-i/source/clock-setup b/d-i/source/clock-setup
new file mode 160000
index 0000000..debd1a4
--- /dev/null
+++ b/d-i/source/clock-setup
@@ -0,0 +1 @@
+Subproject commit debd1a4689d11f535fa90062cf437c583e7120f3
diff --git a/d-i/source/console-setup b/d-i/source/console-setup
new file mode 160000
index 0000000..3260578
--- /dev/null
+++ b/d-i/source/console-setup
@@ -0,0 +1 @@
+Subproject commit 32605782603ed12bfe32e4cde3bb3d897850af34
diff --git a/d-i/source/debian-installer-utils b/d-i/source/debian-installer-utils
new file mode 160000
index 0000000..6d83a67
--- /dev/null
+++ b/d-i/source/debian-installer-utils
@@ -0,0 +1 @@
+Subproject commit 6d83a67a3361a161971586e792e61d43d114b78f
diff --git a/d-i/source/grub-installer b/d-i/source/grub-installer
new file mode 160000
index 0000000..a0c511c
--- /dev/null
+++ b/d-i/source/grub-installer
@@ -0,0 +1 @@
+Subproject commit a0c511cd84fbb6469abb86d64f9c89ca5fa56aac
diff --git a/d-i/source/hw-detect b/d-i/source/hw-detect
new file mode 160000
index 0000000..8b40b21
--- /dev/null
+++ b/d-i/source/hw-detect
@@ -0,0 +1 @@
+Subproject commit 8b40b219df6cd630d7d78f96eea870b60aeb5b7f
diff --git a/d-i/source/localechooser b/d-i/source/localechooser
new file mode 160000
index 0000000..b55adde
--- /dev/null
+++ b/d-i/source/localechooser
@@ -0,0 +1 @@
+Subproject commit b55addec1d387a88a781c40cb94997ec164007af
diff --git a/d-i/source/netcfg b/d-i/source/netcfg
new file mode 160000
index 0000000..9dccb15
--- /dev/null
+++ b/d-i/source/netcfg
@@ -0,0 +1 @@
+Subproject commit 9dccb1547a87e0bb5a4f9640db60a7d04fee9093
diff --git a/d-i/source/partconf b/d-i/source/partconf
new file mode 160000
index 0000000..aa6db51
--- /dev/null
+++ b/d-i/source/partconf
@@ -0,0 +1 @@
+Subproject commit aa6db5109188188aaf5e01f4cc27e4ecf8a1a26a
diff --git a/d-i/source/partman-auto b/d-i/source/partman-auto
new file mode 160000
index 0000000..751f910
--- /dev/null
+++ b/d-i/source/partman-auto
@@ -0,0 +1 @@
+Subproject commit 751f91047ed7bae2b69dcb3c445a8bfeb449dd72
diff --git a/d-i/source/partman-auto-crypto b/d-i/source/partman-auto-crypto
new file mode 160000
index 0000000..49bb374
--- /dev/null
+++ b/d-i/source/partman-auto-crypto
@@ -0,0 +1 @@
+Subproject commit 49bb374f36ac10538afd7e70ba4ec91a2d2ccde5
diff --git a/d-i/source/partman-auto-loop b/d-i/source/partman-auto-loop
new file mode 160000
index 0000000..7d0cc12
--- /dev/null
+++ b/d-i/source/partman-auto-loop
@@ -0,0 +1 @@
+Subproject commit 7d0cc126788ee8a47662461148b6fc63eefcd289
diff --git a/d-i/source/partman-auto-lvm b/d-i/source/partman-auto-lvm
new file mode 160000
index 0000000..8a0d589
--- /dev/null
+++ b/d-i/source/partman-auto-lvm
@@ -0,0 +1 @@
+Subproject commit 8a0d589a2e6beabe575a712e1a18961e2eeb7864
diff --git a/d-i/source/partman-base b/d-i/source/partman-base
new file mode 160000
index 0000000..b77ff65
--- /dev/null
+++ b/d-i/source/partman-base
@@ -0,0 +1 @@
+Subproject commit b77ff65633926f6437dc0d1f6d93484629fca516
diff --git a/d-i/source/partman-basicfilesystems b/d-i/source/partman-basicfilesystems
new file mode 160000
index 0000000..7ff160f
--- /dev/null
+++ b/d-i/source/partman-basicfilesystems
@@ -0,0 +1 @@
+Subproject commit 7ff160f1cdaf18fb078b683a208f302d9818b94b
diff --git a/d-i/source/partman-basicmethods b/d-i/source/partman-basicmethods
new file mode 160000
index 0000000..4786368
--- /dev/null
+++ b/d-i/source/partman-basicmethods
@@ -0,0 +1 @@
+Subproject commit 478636889573e9fef309a7db624b95fba0df19ae
diff --git a/d-i/source/partman-btrfs b/d-i/source/partman-btrfs
new file mode 160000
index 0000000..1725671
--- /dev/null
+++ b/d-i/source/partman-btrfs
@@ -0,0 +1 @@
+Subproject commit 17256715c6add3b023e70895d2cc7f1afe19c54f
diff --git a/d-i/source/partman-crypto b/d-i/source/partman-crypto
new file mode 160000
index 0000000..06f4803
--- /dev/null
+++ b/d-i/source/partman-crypto
@@ -0,0 +1 @@
+Subproject commit 06f480323fd25ac19562997c15de9cfb53223d76
diff --git a/d-i/source/partman-efi b/d-i/source/partman-efi
new file mode 160000
index 0000000..7099358
--- /dev/null
+++ b/d-i/source/partman-efi
@@ -0,0 +1 @@
+Subproject commit 7099358fef64d325890a0927c17ac3780c183cee
diff --git a/d-i/source/partman-ext3 b/d-i/source/partman-ext3
new file mode 160000
index 0000000..e6fc953
--- /dev/null
+++ b/d-i/source/partman-ext3
@@ -0,0 +1 @@
+Subproject commit e6fc9534431c5237502065ad5c78226ac46a6483
diff --git a/d-i/source/partman-jfs b/d-i/source/partman-jfs
new file mode 160000
index 0000000..4c0db16
--- /dev/null
+++ b/d-i/source/partman-jfs
@@ -0,0 +1 @@
+Subproject commit 4c0db16539691504cd457d73def962490b97c88c
diff --git a/d-i/source/partman-lvm b/d-i/source/partman-lvm
new file mode 160000
index 0000000..49d2061
--- /dev/null
+++ b/d-i/source/partman-lvm
@@ -0,0 +1 @@
+Subproject commit 49d20617371d92f767c20ac541dae82ad8bbf9e0
diff --git a/d-i/source/partman-partitioning b/d-i/source/partman-partitioning
new file mode 160000
index 0000000..de32179
--- /dev/null
+++ b/d-i/source/partman-partitioning
@@ -0,0 +1 @@
+Subproject commit de321797da9f4c9a3d9a1c93012b47e5d56cccf7
diff --git a/d-i/source/partman-swapfile b/d-i/source/partman-swapfile
new file mode 160000
index 0000000..2734457
--- /dev/null
+++ b/d-i/source/partman-swapfile
@@ -0,0 +1 @@
+Subproject commit 27344576d9d66e9027389ff97c81851c4e8adacb
diff --git a/d-i/source/partman-target b/d-i/source/partman-target
new file mode 160000
index 0000000..537aa91
--- /dev/null
+++ b/d-i/source/partman-target
@@ -0,0 +1 @@
+Subproject commit 537aa91937eed47ad7f3a53daa050f2f24b03bd2
diff --git a/d-i/source/partman-xfs b/d-i/source/partman-xfs
new file mode 160000
index 0000000..ea9ae0b
--- /dev/null
+++ b/d-i/source/partman-xfs
@@ -0,0 +1 @@
+Subproject commit ea9ae0b41262656889b193de9316acd65a2ad893
diff --git a/d-i/source/preseed b/d-i/source/preseed
new file mode 160000
index 0000000..b934de2
--- /dev/null
+++ b/d-i/source/preseed
@@ -0,0 +1 @@
+Subproject commit b934de244443ce687a1024cb641136a205494849
diff --git a/d-i/source/tzsetup b/d-i/source/tzsetup
new file mode 160000
index 0000000..20a1aa7
--- /dev/null
+++ b/d-i/source/tzsetup
@@ -0,0 +1 @@
+Subproject commit 20a1aa76594c4d9fef9d0c8b853ab38f74cf842b
diff --git a/d-i/source/user-setup b/d-i/source/user-setup
new file mode 160000
index 0000000..e24f6c0
--- /dev/null
+++ b/d-i/source/user-setup
@@ -0,0 +1 @@
+Subproject commit e24f6c0d1c32f141b236662017df43031119c125
diff --git a/d-i/sources.list b/d-i/sources.list
deleted file mode 100644
index 39446b6..0000000
--- a/d-i/sources.list
+++ /dev/null
@@ -1,3 +0,0 @@
-deb-src http://archive.ubuntu.com/ubuntu groovy main
-deb-src http://archive.ubuntu.com/ubuntu groovy-updates main
-deb-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
 tests/templates.dat*
 ubiquity/frontend/liveinstaller.py
 ubiquity/frontend/crashdialog.py
+data/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 @@
 compression = "xz"
 tar-ignore = ".git"
+tar-ignore = ".gitignore"
+tar-ignore = ".gitmodules"
+tar-ignore = "d-i/source/console-setup/Fonts"
+tar-ignore = "d-i/source/console-setup/Keyboard/acm"
+tar-ignore = "d-i/source/console-setup/Keyboard/ckb"
+tar-ignore = "d-i/source/console-setup/Keyboard/locale"
+tar-ignore = "d-i/source/console-setup/Keyboard/*.tree"