Adam D. Barratt <adam@adam-barratt.org.uk> (2015-09-01): > On 2015-08-31 0:13, Cyril Brulebois wrote: > >d-i/wheezy can binNMU'd as far as I can tell. > > Unfortunately not, due to what looks very much like #775136 (thanks to > Julien for pointed that bug out to me). I've just cherry-picked both fixes needed for that (initially apt-config dump commit, and follow-up fix-up to make sure not to lose the '*' bit for sources.list.d/); since "make clean" errored out on jessie, I took the liberty to also backport a "make" fixup which is only about moving some lines around, which is the first part of the source debdiff you'll find attached. I've just uploaded the 20130613+deb7u3 source package. Mraw, KiBi.
diff -Nru debian-installer-20130613+deb7u2/build/Makefile debian-installer-20130613+deb7u3/build/Makefile
--- debian-installer-20130613+deb7u2/build/Makefile 2014-04-20 11:11:12.000000000 +0200
+++ debian-installer-20130613+deb7u3/build/Makefile 2015-09-01 15:10:32.000000000 +0200
@@ -66,6 +66,15 @@
export DEB_HOST_ARCH DEB_HOST_ARCH_OS DEB_HOST_GNU_CPU DEB_HOST_GNU_SYSTEM DEB_HOST_MULTIARCH
endif
+define drop_lang
+ @echo "Dropping languages: $(1)"
+ @set -e; \
+ for FILE in $$(find $(TREE)/var/lib/dpkg -name "*.templates"); do \
+ perl -e 'my $$status=0; my $$drop=shift; while (<>) { if (/^[A-Z]/ || /^$$/) { if (/^(Choices|Description|Indices|Default)-($$drop)/ && ! /^Choices-C:/) { $$status = 0 } else { $$status = 1 } } print if ($$status); }' $(1) < $$FILE > temp; \
+ mv temp $$FILE; \
+ done
+endef
+
# We loop over all needed combinations of ARCH, SUBARCH, MEDIUM, FLAVOUR
# via recursive make calls. ARCH is constant, we don't support
# crosscompiling.
@@ -546,15 +555,6 @@
rm -rf $(DPKGDIR)
endif
-define drop_lang
- @echo "Dropping languages: $(1)"
- @set -e; \
- for FILE in $$(find $(TREE)/var/lib/dpkg -name "*.templates"); do \
- perl -e 'my $$status=0; my $$drop=shift; while (<>) { if (/^[A-Z]/ || /^$$/) { if (/^(Choices|Description|Indices|Default)-($$drop)/ && ! /^Choices-C:/) { $$status = 0 } else { $$status = 1 } } print if ($$status); }' $(1) < $$FILE > temp; \
- mv temp $$FILE; \
- done
-endef
-
ifndef KEEP_GI_LANGS
# It makes no sense to include languages only supported by the
# graphical installer in regular images. This will also ensure
diff -Nru debian-installer-20130613+deb7u2/build/util/gen-sources.list.udeb debian-installer-20130613+deb7u3/build/util/gen-sources.list.udeb
--- debian-installer-20130613+deb7u2/build/util/gen-sources.list.udeb 2013-12-04 00:49:41.000000000 +0100
+++ debian-installer-20130613+deb7u3/build/util/gen-sources.list.udeb 2015-09-01 15:07:04.000000000 +0200
@@ -45,8 +45,20 @@
done
}
+# Cache the apt configuration dump, with only the needed namespace
+APT_CONFIG=$(apt-config dump | grep '^Dir::Etc')
+
+# Get the system apt directory
+APT_DIR_ETC=$(echo "$APT_CONFIG" | sed -n -e 's/^Dir::Etc *\"\(.*\)\";$/\1/p')
+
+# Fetch APT's sources.list
+APT_SOURCELIST=$(echo "$APT_CONFIG" | sed -n -e 's/^Dir::Etc::sourcelist *\"\(.*\)\";$/\1/p')
+
+# Fetch APT' sources.list.d
+APT_SOURCEPARTS=$(echo "$APT_CONFIG" | sed -n -e 's/^Dir::Etc::sourceparts *\"\(.*\)\";$/\1/p')
+
# Also use mirrors defined in files in $SOURCES_LIST.d/
-MIRRORS="$(get_mirrors $SOURCES_LIST $SOURCES_LIST.d/*)"
+MIRRORS="$(get_mirrors $SOURCES_LIST /$APT_DIR_ETC/$APT_SOURCELIST /$APT_DIR_ETC/$APT_SOURCEPARTS/*)"
if ! which 'wget' >/dev/null; then
echo "ERROR: the command wget is not available; please install it" >&2
diff -Nru debian-installer-20130613+deb7u2/debian/changelog debian-installer-20130613+deb7u3/debian/changelog
--- debian-installer-20130613+deb7u2/debian/changelog 2014-04-20 11:13:39.000000000 +0200
+++ debian-installer-20130613+deb7u3/debian/changelog 2015-09-01 15:11:43.000000000 +0200
@@ -1,3 +1,16 @@
+debian-installer (20130613+deb7u3) wheezy; urgency=medium
+
+ [ Didier Raboud ]
+ * Use APT `apt-config dump`s result to determine where to find the
+ system's sources.list (Closes: #775136)
+
+ [ Cyril Brulebois ]
+ * build/Makefile: Move the drop_lang definition to the top of the file to
+ deal with incompatible changes in make 3.82 leading to the following
+ error: “recipe commences before first target” (Closes: #720719).
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 01 Sep 2015 15:11:42 +0200
+
debian-installer (20130613+deb7u2) wheezy; urgency=low
[ Martin Michlmayr ]
Attachment:
signature.asc
Description: Digital signature