From 9aa0a91c07aa325a01be71a35f2b10b546e951ac Mon Sep 17 00:00:00 2001
From: Ark74 <ark@switnet.org>
Date: Fri, 18 Apr 2025 00:58:02 -0600
Subject: [PATCH] apt-setup: move base release to trixie for d-i/udeb build.

---
 ...n-free_firmware_contrib_mirror_setup.patch | 50 +++++++++++++++++++
 helpers/make-apt-setup                        | 17 ++-----
 2 files changed, 54 insertions(+), 13 deletions(-)
 create mode 100644 helpers/DATA/apt-setup/patch_changes/001-remove_non-free_firmware_contrib_mirror_setup.patch

diff --git a/helpers/DATA/apt-setup/patch_changes/001-remove_non-free_firmware_contrib_mirror_setup.patch b/helpers/DATA/apt-setup/patch_changes/001-remove_non-free_firmware_contrib_mirror_setup.patch
new file mode 100644
index 0000000..7278679
--- /dev/null
+++ b/helpers/DATA/apt-setup/patch_changes/001-remove_non-free_firmware_contrib_mirror_setup.patch
@@ -0,0 +1,50 @@
+diff --git a/debian/apt-mirror-setup.templates b/debian/apt-mirror-setup.templates
+index 85baf176..6b330b32 100644
+--- a/debian/apt-mirror-setup.templates
++++ b/debian/apt-mirror-setup.templates
+@@ -3,45 +3,7 @@ Type: text
+ # :sl1:
+ _Description: Scanning the mirror...
+ 
+-Template: apt-setup/non-free-firmware
+-Type: boolean
+-Default: false
+-# :sl5:
+-_Description: Use non-free firmware?
+- Firmware is a kind of software providing low-level control of certain
+- hardware components (such as Wi-Fi cards or audio chipsets), which may not
+- function fully or at all without it.
+- .
+- Although not at all part of Debian, some non-free firmware has been made to
+- work with Debian. This firmware has varying licenses which restrict your
+- freedoms to use, modify, or share the software, and generally does not have
+- source forms that you may study.
+- .
+- Please choose whether you want to have it available anyway.
+ 
+-Template: apt-setup/non-free
+-Type: boolean
+-Default: false
+-# :sl1:
+-_Description: Use non-free software?
+- Some non-free software has been made to work with Debian. Though this
+- software is not at all a part of Debian, standard Debian tools can be used
+- to install it. This software has varying licenses which may prevent you
+- from using, modifying, or sharing it.
+- .
+- Please choose whether you want to have it available anyway.
+-
+-Template: apt-setup/contrib
+-Type: boolean
+-Default: false
+-# :sl1:
+-_Description: Use contrib software?
+- Some additional software has been made to work with Debian. Though this
+- software is free, it depends on non-free software for its operation. This
+- software is not a part of Debian, but standard Debian tools can be
+- used to install it.
+- .
+- Please choose whether you want this software to be made available to you.
+ 
+ Template: apt-setup/mirror/error
+ Type: select
diff --git a/helpers/make-apt-setup b/helpers/make-apt-setup
index 33b4c15..53185f2 100644
--- a/helpers/make-apt-setup
+++ b/helpers/make-apt-setup
@@ -19,7 +19,7 @@
 #
 
 VERSION=3
-EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
+EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
 REPOKEY=0E98404D386FA1D9
 NETINST=true
 . ./config
@@ -33,19 +33,10 @@ EOF
 rm debian/apt-mirror-setup.templates-ubuntu
 
 # Remove multiarch support
-sed '/chroot/,$d' generators/01setup -i
+#sed '/chroot/,$d' generators/01setup -i
 
-# getline "seed" file
-getline(){
-grep -n "$1" "$2" |cut -d: -f1
-}
-
-START=$(getline apt-setup/non-free debian/apt-mirror-setup.templates)
-END=$(getline "Please choose whether you want to have it available anyway." debian/apt-mirror-setup.templates)
-sed ${START},${END}d debian/apt-mirror-setup.templates -i
-START=$(getline apt-setup/contrib debian/apt-mirror-setup.templates)
-END=$(getline "Please choose whether you want this software to be made available to you." debian/apt-mirror-setup.templates)
-sed ${START},${END}d debian/apt-mirror-setup.templates -i
+# use patch to remove non-free-firmware, non-free, contrib
+apply_patch_changes
 
 #Ubuntu legacy (udeb)
 /bin/sed '/canonical/d;