CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

debian-installer: temporary re-enable overwrite 'til riscv overhaul

Browse source
This commit is contained in:
Luis Guzmán 2025-07-07 23:52:22 -06:00
parent f0c7717cd6
commit 120d3ba1bf
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

59
helpers/DATA/debian-installer/patch_changes/007-remove_graphical_options_from_netinstall.patch Normal file
View file

@ -0,0 +1,59 @@
diff --git a/build/util/grub-gencfg b/build/util/grub-gencfg
index 6b38cd88..f5df37a5 100755
--- a/build/util/grub-gencfg
+++ b/build/util/grub-gencfg
@@ -208,54 +208,18 @@ menuentry("Install");
menuentry("Graphical install", Graphical => 1);
start_submenu("Advanced options ...", Hotkey => 'a'); {
- menuentry("... Graphical expert install", Graphical => 1, Expert => 1);
- menuentry("... Graphical rescue mode", Graphical => 1, Rescue => 1);
- menuentry("... Graphical automated install", Graphical => 1, Auto => 1);
menuentry("... Expert install", Expert => 1);
menuentry("... Rescue mode", Rescue => 1);
menuentry("... Automated install", Auto => 1);
menuentry("... Expert install with speech synthesis", Expert => 1, Speech => 1, Hotkey => 'x');
menuentry("... Rescue mode with speech synthesis", Rescue => 1, Speech => 1, Hotkey => 'r');
menuentry("... Automated install with speech synthesis", Auto => 1, Speech => 1, Hotkey => 'a');
-
- start_submenu("... Desktop environment menu ..."); {
-
- foreach ( ["GNOME", "gnome"], ["KDE Plasma", "kde"], ["LXDE", "lxde"] ) {
- my ($desktop,$opt) = @{$_};
-
- my $one = sub { my ($title, %xargs) = @_;
- $xargs{Desktop} = $opt;
- menuentry($title, %xargs);
- };
- start_submenu("... $desktop desktop boot menu ..."); {
- $one->("... Install");
- $one->("... Graphical install", Graphical => 1);
-
- start_submenu("... $desktop advanced options ..."); {
- $one->("... Graphical expert install", Graphical => 1, Expert => 1);
- $one->("... Graphical automated install", Graphical => 1, Auto => 1);
- $one->("... Expert install", Expert => 1);
- $one->("... Automated install", Auto => 1);
- $one->("... Expert install with speech synthesis", Expert => 1, Speech => 1, Hotkey => 'x');
- $one->("... Automated install with speech synthesis", Auto => 1, Speech => 1, Hotkey => 'a');
- } end_submenu(); # $desktop advanced
-
- $one->("... Install with speech synthesis", Graphical => 1, Speech => 1, Hotkey => 's');
- $one->("... 32 bit speech install", ThirtyTwo => 1, Graphical => 1, Speech => 1)
- if $thirtytwo;
- } end_submenu(); # $desktop submenu
- } # Desktop loop
- } end_submenu(); # Desktop submenu
} end_submenu(); # Advanced
start_submenu("Accessible dark contrast installer menu ...", Hotkey => 'd', Dark => 1); {
menuentry("... Install", Dark => 1);
- menuentry("... Graphical install", Graphical => 1, Dark => 1);
start_submenu("... Advanced options ...", Hotkey => 'a', Dark => 1); {
- menuentry("... Graphical expert install", Graphical => 1, Expert => 1, Dark => 1);
- menuentry("... Graphical rescue mode", Graphical => 1, Rescue => 1, Dark => 1);
- menuentry("... Graphical automated install", Graphical => 1, Auto => 1, Dark => 1);
menuentry("... Expert install", Expert => 1, Dark => 1);
menuentry("... Rescue mode", Rescue => 1, Dark => 1);
menuentry("... Automated install", Auto => 1, Dark => 1);

16
helpers/DATA/debian-installer/patch_changes/008-re-enable_dpkg_force-overwrite.patch Normal file
View file

@ -0,0 +1,16 @@
We'll remove the force-overwrite flag once we conclude the riscv rework on the kernel and new arch implementation.
-- ark74 - Mon, 07 Jul 2025 23:27:26 -0600
diff --git a/build/config/common b/build/config/common
index 6e58ca8f..5953b26f 100644
--- a/build/config/common
+++ b/build/config/common
@@ -41,7 +41,7 @@ PRESEED =
# Options to pass to dpkg when it is unpacking the udebs to create the
# image. None should be needed, but --force-overwrite might need to be
# enabled from time to time if udebs have conflicting files.
-DPKG_UNPACK_OPTIONS =
+DPKG_UNPACK_OPTIONS = --force-overwrite
# The codename of the Trisquel release that should be installed by default.
TRISQUEL_RELEASE = ecne