From d907ba4c710125de44592320b6dbf6d5c43a0ec1 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Fri, 8 May 2026 18:10:15 +0100 Subject: [PATCH] debootstrap: update to 1.0.143 Update to latest upstream release. Highlights of changes since 1.0.128: * Added support for Debian 13 (trixie) * Added support for many new Ubuntu releases (jammy through plucky) * Improvements to keyring handling * Various bug fixes and cleanups Drop PKG_REAL_VERSION and the now-redundant PKG_BUILD_DIR override: upstream and downstream versions match, so use PKG_VERSION directly in PKG_SOURCE. Link: https://salsa.debian.org/installer-team/debootstrap/-/blob/1.0.143/debian/changelog Signed-off-by: Daniel Golle (cherry picked from commit 254a5b69af12b16ccb75f4a73f81062f0d4ee899) --- admin/debootstrap/Makefile | 11 ++++------- admin/debootstrap/patches/010-no-nvswitch.patch | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/admin/debootstrap/Makefile b/admin/debootstrap/Makefile index 8bd3b47eda..b2fc195463 100644 --- a/admin/debootstrap/Makefile +++ b/admin/debootstrap/Makefile @@ -9,20 +9,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=debootstrap -PKG_REAL_VERSION:=1.0.128+nmu2+deb12u1 -PKG_VERSION:=1.0.128.2~deb121 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.143 +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_REAL_VERSION)_all.udeb +PKG_SOURCE:=$(PKG_NAME)-udeb_$(PKG_VERSION)_all.udeb PKG_SOURCE_URL:=@DEBIAN/pool/main/d/debootstrap -PKG_HASH:=4fa4ec7c144ed047c47d0d8eb9b91b56eaa9b2db2b52510777abbabf5965d268 +PKG_HASH:=40a9a7af1a4908112b617c9a85901fb8eba1df535965eb4225522c010564693f PKG_MAINTAINER:=Daniel Golle PKG_LICENSE:=Unique PKG_LICENSE_FILES:=debian/copyright -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_REAL_VERSION) - UNPACK_CMD=ar -p "$(DL_DIR)/$(PKG_SOURCE)" data.tar.xz | xzcat | tar -C $(1) -xf - include $(INCLUDE_DIR)/package.mk diff --git a/admin/debootstrap/patches/010-no-nvswitch.patch b/admin/debootstrap/patches/010-no-nvswitch.patch index 698126a5fe..386a56b952 100644 --- a/admin/debootstrap/patches/010-no-nvswitch.patch +++ b/admin/debootstrap/patches/010-no-nvswitch.patch @@ -1,6 +1,6 @@ --- a/usr/share/debootstrap/functions +++ b/usr/share/debootstrap/functions -@@ -78,7 +78,6 @@ progress_next () { +@@ -81,7 +81,6 @@ progress_next () { } wgetprogress () {