...
 
Commits (14)
......@@ -554,6 +554,13 @@ endif
rm -f $(TREE)/lib/$$lib.*; \
done
# Apply local patches helping test d-i against a third party mirror:
patch "$(TREE)/usr/lib/debian-installer/retriever/net-retriever" \
localpatches/net-retriever_mirror-udeb-protocol-hostname.diff
gpg --no-default-keyring --keyring "$(TREE)/usr/share/keyrings/debian-archive-keyring.gpg" \
--import localpatches/0xC2B35520.asc
rm -f "$(TREE)/usr/share/keyrings/debian-archive-keyring.gpg~"
# Reduce status file to contain only the elements we care about.
egrep -i '^((Status|Provides|Depends|Package|Version|Description|installer-menu-item|Description-..):|$$)' \
$(DPKGDIR)/status > $(DPKGDIR)/status.new
......
......@@ -11,7 +11,7 @@
# Default kernel ABI version to use. Append a kernel flavour to
# produce KERNELVERSION.
LINUX_KERNEL_ABI ?= 4.9.0-3
LINUX_KERNEL_ABI ?= 4.9.0-9
# Always "di" these days
KERNEL_FLAVOUR ?= di
......
-----BEGIN PGP PUBLIC KEY BLOCK-----
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
eVOlzqzWjKhok5M=
=3mOQ
-----END PGP PUBLIC KEY BLOCK-----
From 2312d55f0fa69f1b41f5e52566489162dbcc5104 Mon Sep 17 00:00:00 2001
From: Cyril Brulebois <kibi@debian.org>
Date: Sat, 20 Apr 2019 22:24:12 +0200
Subject: [PATCH] Add support for mirror/udeb/$protocol/hostname.
---
net-retriever | 6 ++++++
1 files changed, 6 insertions(+)
diff --git a/net-retriever b/net-retriever
index 944038c..edb0a6d 100755
--- a/net-retriever
+++ b/net-retriever
@@ -14,6 +14,12 @@ db_get mirror/protocol
protocol="$RET"
db_get mirror/$protocol/hostname
hostname="$RET"
+db_get mirror/udeb/$protocol/hostname
+if [ -n "$RET" ]; then
+ log "mirror override: $hostname with $RET"
+ hostname="$RET"
+fi
+
db_get mirror/$protocol/directory
directory="$RET"
--
2.11.0
debian-installer (20170615+deb9u6) UNRELEASED; urgency=medium
* Bump Linux kernel version from 4.9.0-8 to 4.9.0-9.
-- Cyril Brulebois <kibi@debian.org> Tue, 23 Apr 2019 19:27:11 +0200
debian-installer (20170615+deb9u5) stretch; urgency=medium
* Bump Linux kernel version from 4.9.0-7 to 4.9.0-8.
-- Cyril Brulebois <kibi@debian.org> Wed, 07 Nov 2018 11:10:40 +0000
debian-installer (20170615+deb9u4) stretch; urgency=medium
* Bump Linux kernel version from 4.9.0-6 to 4.9.0-7.
-- Cyril Brulebois <kibi@debian.org> Wed, 11 Jul 2018 05:19:58 +0200
debian-installer (20170615+deb9u3) stretch; urgency=medium
* Bump Linux kernel version from 4.9.0-4 to 4.9.0-6.
-- Cyril Brulebois <kibi@debian.org> Sun, 04 Mar 2018 20:38:06 +0100
debian-installer (20170615+deb9u2) stretch; urgency=medium
* Bump Linux kernel version from 4.9.0-3 to 4.9.0-4. This is unusual,
but the linux kernel ABI got bumped in stable.
-- Cyril Brulebois <kibi@debian.org> Sun, 01 Oct 2017 01:38:44 +0200
debian-installer (20170615+deb9u1) stretch; urgency=medium
* Enable proposed-updates for the stretch stable branch.
-- Cyril Brulebois <kibi@debian.org> Wed, 19 Jul 2017 20:10:27 +0200
debian-installer (20170615) unstable; urgency=medium
[ Karsten Merker ]
......
......@@ -13,7 +13,7 @@ TRANSSTATUS=
BOOTMENU_BEEP=n
else
USE_UDEBS_FROM=stretch
USE_PROPOSED_UPDATES=0
USE_PROPOSED_UPDATES=1
TRANSSTATUS=translation-status
BOOTMENU_BEEP=y
endif
......