[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#964248: marked as done (base-installer: Pass "--extra-suites=unreleased" to debootstrap on ports arches)

Your message dated Sun, 12 Jul 2020 11:48:37 +0000
with message-id <E1juaTF-000Dw5-MK@fasolo.debian.org>
and subject line Bug#964248: fixed in base-installer 1.195
has caused the Debian Bug report #964248,
regarding base-installer: Pass "--extra-suites=unreleased" to debootstrap on ports arches
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
964248: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=964248
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Package: base-installer
Severity: normal
Version: 1.194

Hi!

I've posted these patches to debian-boot@ last month,
but thought I'd try again.

Confer commit messages for detailed references, but the short of it is:
  the base-installer patch pulls in ports arch detexion logic from
  apt-setup and adds the unreleased suite in debootstrap, fixing Hurd
  installs from, i.a., mini ISOs, which require it for a working system,
and
  the apt-setup patch switches to the detection logic
  moved to base-installer.

Thread on debian-hurd@:
<https://lists.debian.org/debian-hurd/2020/06/msg00015.html>

These patches apply cleanly on top of the Salsa HEADs as of today
(e70510edbb6772e0eb98537c3a7175b977ce0423 for base-installer and
 30f36f7e8617f52cbc7fc9942cfbf326d2b773c2 for apt-setup).

Best,
наб
--- Begin Message --- 
This fixes, e.g., hurd installs from mini ISOs,
which require libp11-kit0 from unreleased for a functioning apt.

is_ports_architecture() extracted from apt-setup's 50mirror:
https://salsa.debian.org/installer-team/apt-setup/-/blob/584e84b5a1d6e71ecb94e503a1a8e546048d215b/generators/50mirror#L28-45
which already included unreleased for new installs on ports arches.

Ref: thread of https://lists.debian.org/debian-hurd/2020/06/msg00015.html
---
 debian/bootstrap-base.postinst |  4 ++++
 debian/changelog               |  8 ++++++++
 library.sh                     | 11 +++++++++++
 3 files changed, 23 insertions(+)

diff --git a/debian/bootstrap-base.postinst b/debian/bootstrap-base.postinst
index f25fd167..7e872197 100755
--- a/debian/bootstrap-base.postinst
+++ b/debian/bootstrap-base.postinst
@@ -96,6 +96,9 @@ install_base_system () {
 	if [ "${EXCLUDES}" ]; then
 		exclude="--exclude=${EXCLUDES}"
 	fi
+	if is_ports_architecture "${ARCH}"; then
+		extra_suites="--extra-suites=unreleased"
+	fi
 	sigcheck="--no-check-gpg"
 	if [ "$PROTOCOL" = http ] || [ "$PROTOCOL" = ftp ]; then
 		if type gpgv >/dev/null; then
@@ -149,6 +152,7 @@ install_base_system () {
 			--debian-installer \
 			--resolve-deps \
 			${include} ${exclude} \
+			${extra_suites} \
 			${sigcheck} \
 			${DEBOOTSTRAP_VARIANT} \
 			${DISTRIBUTION} /target \
diff --git a/debian/changelog b/debian/changelog
index 43ce8dbb..38501c62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+base-installer (1.195) UNRELEASED; urgency=medium
+
+  [ наб ]
+  * Pass "--extra-suites=unreleased" to debootstrap for ports architectures,
+    fixing, e.g., hurd installs from mini ISOs.
+
+ -- Holger Wansing <hwansing@mailbox.org>  Mon, 15 Jun 2020 22:17:27 +0200
+
 base-installer (1.194) unstable; urgency=medium
 
   * Team upload
diff --git a/library.sh b/library.sh
index d7f05024..e7fb8f60 100644
--- a/library.sh
+++ b/library.sh
@@ -887,3 +887,14 @@ EOT
 cleanup () {
 	rm -f "$KERNEL_LIST" "$KERNEL_LIST.unfiltered"
 }
+
+is_ports_architecture() {
+	case "$1" in
+		alpha|hppa|hurd-i386|ia64|kfreebsd-amd64|kfreebsd-i386|m68k|powerpc|ppc64|riscv64|sh4|sparc64|x32)
+			return 0
+			;;
+		*)
+			return 1
+			;;
+	esac
+}
-- 
2.20.1

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
The hard versioned dependency is required since that function will have
just moved in in 1.195 and we didn't depend on base-installer before

This shouldn't affect users, since apt-mirror-setup is likely pulled in
by apt-setup-udeb, which depends on installed-base,
provided by bootstrap-base and live-installer,
both of which depend on base-installer

Ref: https://lists.debian.org/msgid-search/3ff43fa102094f36688749bb866ad72d9580d47a.1592257217.git.nabijaczleweli@gmail.com
---
 debian/changelog    |  8 ++++++++
 debian/control      |  2 +-
 generators/50mirror | 16 +++-------------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b434904..61ad8de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt-setup (1:0.158) unstable; urgency=medium
+
+  [ наб ]
+  * apt-mirror-setup: Depend on base-installer (>= 1.195)
+  * generators/50mirror: Use is_ports_architecture from base-installer
+
+ -- Holger Wansing <hwansing@mailbox.org>  Mon, 15 Jun 2020 23:42:43 +0200
+
 apt-setup (1:0.157) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 1707e06..4e46e44 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,7 @@ Description: Configure apt
 Package: apt-mirror-setup
 Package-Type: udeb
 Architecture: all
-Depends: choose-mirror-bin, ${misc:Depends}
+Depends: choose-mirror-bin, base-installer (>= 1.195), ${misc:Depends}
 Description: set up a mirror in sources.list
 
 Package: apt-cdrom-setup
diff --git a/generators/50mirror b/generators/50mirror
index 42e62ac..e8c60a1 100755
--- a/generators/50mirror
+++ b/generators/50mirror
@@ -2,6 +2,7 @@
 set -e
 
 . /usr/share/debconf/confmodule
+. /usr/lib/base-installer/library.sh
 
 file="$1"
 
@@ -25,22 +26,11 @@ ask_no_mirror() {
 	fi
 }
 
-is_ports_architecture() {
-	case "$(chroot /target /usr/bin/dpkg --print-architecture)" in
-		alpha|hppa|hurd-i386|ia64|kfreebsd-amd64|kfreebsd-i386|m68k|powerpc|ppc64|riscv64|sh4|sparc64|x32)
-			log "Debian-Ports architecture detected"
-			return 0
-			;;
-		*)
-			return 1
-			;;
-	esac
-}
-
 # For architectures in the Debian-Ports archive, sources.list has to include
 # an additional entry for the "unreleased" suite.
 unset use_unreleased
-if is_ports_architecture; then
+if is_ports_architecture "$(chroot /target /usr/bin/dpkg --print-architecture)"; then
+	log "Debian-Ports architecture detected"
 	use_unreleased=yes
 fi
 
-- 
2.20.1

Attachment: signature.asc
Description: PGP signature


--- End Message ---

Attachment: signature.asc
Description: PGP signature


--- End Message ---
--- Begin Message --- 
Source: base-installer
Source-Version: 1.195
Done: Holger Wansing <hwansing@mailbox.org>

We believe that the bug you reported is fixed in the latest version of
base-installer, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 964248@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Holger Wansing <hwansing@mailbox.org> (supplier of updated base-installer package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sun, 12 Jul 2020 13:30:23 +0200
Source: base-installer
Architecture: source
Version: 1.195
Distribution: unstable
Urgency: medium
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Changed-By: Holger Wansing <hwansing@mailbox.org>
Closes: 964248
Changes:
 base-installer (1.195) unstable; urgency=medium
 .
   * Team upload
 .
   [ наб ]
   * Pass "--extra-suites=unreleased" to debootstrap for ports architectures,
     fixing, e.g., hurd installs from mini ISOs (Closes: Bug#964248).
 .
   [ Updated translations ]
   * Icelandic (is.po) by Sveinn í Felli
   * Norwegian Bokmal (nb.po) by Allan Nordhøy
Checksums-Sha1:
 5ac36e1e5c5ab3e09babe37e322c432748e993c3 1942 base-installer_1.195.dsc
 8f29ca4407be8e8ea69e1f03bd3e97267507d11a 256916 base-installer_1.195.tar.xz
 1d600980ab9b04bc19c04fea29f487c1513d5f35 5958 base-installer_1.195_amd64.buildinfo
Checksums-Sha256:
 8484ac868579280007ba7cb1051bfd7ebb4f1bf2db09afc5a9b1e2dfe32d3147 1942 base-installer_1.195.dsc
 e2fe77a4e38bb1a4d5bd490053b89f5917f5f5b6f44029ddce3a7177ce586d13 256916 base-installer_1.195.tar.xz
 2350d0653724a3483244bf75e77bff18f4f67ce4cd08fe5898cf3438938acd4e 5958 base-installer_1.195_amd64.buildinfo
Files:
 2bca61a4adc0872cb9c1ccdd22af7e51 1942 debian-installer required base-installer_1.195.dsc
 6f19aea29486c8f9ef5a06a0caf6b46f 256916 debian-installer required base-installer_1.195.tar.xz
 58f6d31fde09f66a7ff1f285f365d96c 5958 debian-installer required base-installer_1.195_amd64.buildinfo

-----BEGIN PGP SIGNATURE-----

iQJJBAEBCgAzFiEESWrG6BRCSzSFCDUpWfGHyhVusHYFAl8K9fQVHGh3YW5zaW5n
QG1haWxib3gub3JnAAoJEFnxh8oVbrB2orcP/0A5vXk6C3xGV4vbL4oBiCNH9LvQ
jJOKTHty8ZbKC8S62te24fI7+oOFM3k7RaPE5Ltp1HMEReaQlrFbbiDTpGpblVKS
J2ugbrb9/oUaNMIf7XRTzHxJVFQthqRHX8mFCs/ggxVu1bOQkJOAoVksXAthOFKY
HYycDPsKpabI8nTwUosIpynq2UDHbjdKMcc1mLTpgD41gZOdg7ZI3psopXjsFE85
lWMRcZ0kw2uPJGLgFOpKHTYmAA0Ra/5H2W/OqrTvF7O1Cv9LClUJXS3Pbf7PcalP
Yja88XCG36dOyXGRp0/4gj8psjVzr9Cc2K7tW/4kYutGWOHFrOO6Br/hLeks7XQQ
m6vhOqTKEIBqkibNk+BMgOb5yEEy+CXvySnR2OWzjhHVYXrrIWSWS8daOvz6inca
l71ReSdCLyVNP+D+9dHeLHqX431deBr1MVAD4jSlMjUSiJOk8jkXEp3+N6vGZYxT
zWXXCHPxi4iTMWzEbTcVJyRcGVePdkVUZxMfyLE7QlypaueXLKjvUrRPqcNTTOst
7YCVKed0dAoa1IOe/mIqdxell9R9xvVfL6eLcQewOSwCtfJsHPQ+dvGTrfDpRO+b
TiHUikZ/3V/Vyg9vxZm0o40ZyWT61Uc9xSCryrnP9rYRY7VfSqR0ihvfEB1wRxeZ
+9vkUzsLV960MLKN
=ylrg
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: