Commit 77e8d6d6 authored by Cyril Brulebois's avatar Cyril Brulebois

Add support for a new USE_BACKPORTS_FROM variable.

It can be used to set an extra entry in sources.list

Status: for master.
Signed-off-by: default avatarCyril Brulebois <cyril@debamax.com>
parent 261b78eb
......@@ -116,6 +116,7 @@ export KEYRING
export KERNELVERSION
export LOCALUDEBDIR
export SOURCE_DATE_EPOCH
export USE_BACKPORTS_FROM
ifneq ($(shell id -u),0)
ROOTCMD ?= fakeroot
......@@ -656,7 +657,7 @@ sources.list.udeb:
echo "deb $(MIRROR) unreleased $(UDEB_COMPONENTS)"; \
fi \
else \
gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) $(UDEB_COMPONENTS) $(USE_PROPOSED_UPDATES); \
gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) $(UDEB_COMPONENTS) $(USE_PROPOSED_UPDATES) $(USE_BACKPORTS_FROM); \
if [ "$(USE_UNRELEASED)" = 1 ]; then \
gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" unreleased $(UDEB_COMPONENTS); \
fi \
......@@ -672,6 +673,10 @@ sources.list.udeb:
echo "ERROR: no valid source for $(USE_UDEBS_FROM)-proposed-updates"; \
exit 1; \
fi
@if [ -n "$(USE_BACKPORTS_FROM)" ] && ! grep -q "$(USE_BACKPORTS_FROM)" $@; then \
echo "ERROR: no valid source for backports ($(USE_BACKPORTS_FROM))"; \
exit 1; \
fi
# Font generation.
#
......
......@@ -363,6 +363,13 @@ USE_PROPOSED_UPDATES
make USE_PROPOSED_UPDATES=1 all_build
If no valid source for proposed updates is found, the build will fail.
USE_BACKPORTS_FROM
Set to <suite>-backports if it shall be used as an overlay suite when
building an image. The resulting image should be able to install some
components from backports (e.g. a newer kernel). Defaults to an empty string
meaning no backports support.
Included in /etc/udebs-backports-source in most initrds.
OMIT_RELEASE_INFO
Can be used to suppress the inclusion of the files /etc/default-release and
/etc/udebs-source in some targets (like boot floppies).
......
......@@ -57,6 +57,9 @@ DEBIAN_VERSION ?= buster
# daily images. For official builds this is overruled in debian/rules.
USE_UDEBS_FROM ?= unstable
# Define which backports suite to use, if any:
USE_BACKPORTS_FROM ?=
# Archive components from which to fetch debian-installer modules.
UDEB_COMPONENTS ?= main/debian-installer
......
......@@ -9,6 +9,7 @@ SOURCES_LIST=$1
SUITE=$2
UDEB_COMPONENTS=$3
USE_PROPOSED_UPDATES=$4
USE_BACKPORTS_FROM=$5 # optional
# Set to 1 or 2 to see increasing debug info about mirror tests
# Use 0 for quiet (normal) operation
......@@ -89,6 +90,12 @@ for mirror in $MIRRORS; do
echo "$mirror $SUITE-proposed-updates $UDEB_COMPONENTS"
echo "INFO: using '$tmirror' for $SUITE-proposed-updates" >&2
fi
if [ -n "$USE_BACKPORTS_FROM" ] &&
test_url $tmirror/dists/$USE_BACKPORTS_FROM/Release; then
echo "$mirror $USE_BACKPORTS_FROM $UDEB_COMPONENTS"
echo "INFO: using '$tmirror' for backports ($USE_BACKPORTS_FROM)" >&2
fi
else
echo "$mirror $SUITE $UDEB_COMPONENTS"
if [ "$USE_PROPOSED_UPDATES" = 1 ]; then
......
......@@ -13,6 +13,8 @@ debian-installer (2018XXXX) UNRELEASED; urgency=medium
* config/common: Add USE_PROPOSED_UPDATES ?= 0. Having an explicit
default setting makes it possible to pass extra parameters to the
gen-sources.list.udeb script.
* Add support for a new USE_BACKPORTS_FROM variable, which can be used
to set an extra entry in sources.list
-- Cyril Brulebois <kibi@debian.org> Tue, 26 Dec 2017 15:10:47 +0100
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment