debian-installer: initial updated package for ecne
This commit is contained in:
Luis Guzmán
parent
4f380a8a26
commit
0c8c973c73
14 changed files with 272 additions and 181 deletions
|
|
@ -0,0 +1,25 @@
|
|||
diff --git a/build/Makefile b/build/Makefile
|
||||
index 0aeccf2a..17cf6a43 100644
|
||||
--- a/build/Makefile
|
||||
+++ b/build/Makefile
|
||||
@@ -673,7 +673,7 @@ sources.list.udeb:
|
||||
echo "deb $(MIRROR) unreleased $(UDEB_COMPONENTS)"; \
|
||||
fi \
|
||||
else \
|
||||
- gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) "$(UDEB_COMPONENTS)" $(USE_PROPOSED_UPDATES); \
|
||||
+ gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) "$(UDEB_COMPONENTS)"; \
|
||||
if [ "$(USE_UNRELEASED)" = 1 ]; then \
|
||||
gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" unreleased "$(UDEB_COMPONENTS)"; \
|
||||
fi \
|
||||
diff --git a/debian/rules b/debian/rules
|
||||
index 371e8b57..6caa6641 100755
|
||||
--- a/debian/rules
|
||||
+++ b/debian/rules
|
||||
@@ -13,7 +13,6 @@ TRANSSTATUS=
|
||||
BOOTMENU_BEEP=n
|
||||
else
|
||||
USE_UDEBS_FROM=trixie
|
||||
-USE_PROPOSED_UPDATES=0
|
||||
TRANSSTATUS=translation-status
|
||||
BOOTMENU_BEEP=y
|
||||
endif
|
||||
|
|
@ -1,17 +1,18 @@
|
|||
diff --git a/build/Makefile b/build/Makefile
|
||||
index c073a32..cace03d 100644
|
||||
index d45f982c..353e516e 100644
|
||||
--- a/build/Makefile
|
||||
+++ b/build/Makefile
|
||||
@@ -431,6 +431,12 @@ endif
|
||||
@@ -458,6 +458,13 @@ ifneq (,$(filter $(ARCH),amd64 arm64 i386))
|
||||
fi
|
||||
endif
|
||||
|
||||
ifeq ($(DEB_HOST_ARCH_OS),linux)
|
||||
ifdef KERNELVERSION
|
||||
+ifneq ($(DEB_HOST_ARCH),ppc64el)
|
||||
+ find $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ -name "ld-linux*" | xargs -r chmod 755
|
||||
+endif
|
||||
+ifeq ($(DEB_HOST_ARCH),ppc64el)
|
||||
+ chmod 755 $(TREE)/lib/$(DEB_HOST_MULTIARCH)/ld*.so*
|
||||
+endif
|
||||
+
|
||||
# Set up modules.dep, ensure there is at least one standard dir (kernel
|
||||
# in this case), so depmod will use its prune list for archs with no
|
||||
# modules.
|
||||
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/debian/control b/debian/control
|
||||
index c56adcf9..d45d50c4 100644
|
||||
--- a/debian/control
|
||||
+++ b/debian/control
|
||||
@@ -168,8 +168,8 @@ Build-Depends:
|
||||
# when creating ISO hybrid images on amd64 and i386 systems.
|
||||
fontconfig,
|
||||
# Used to generate a font cache through fc-cache, for gtk flavours
|
||||
- linux-image-@@DEBIAN_KERNEL@@-amd64 [amd64],
|
||||
- linux-image-@@DEBIAN_KERNEL@@-arm64 [arm64],
|
||||
+ linux-image-@@DEBIAN_KERNEL@@-generic [amd64],
|
||||
+ linux-image-@@DEBIAN_KERNEL@@-generic [arm64],
|
||||
# Ship some more drm modules, without waiting on fb-modules (#1036019)
|
||||
|
||||
Package: debian-installer
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/build/config/x86.cfg b/build/config/x86.cfg
|
||||
index 5ddc8cef..74ddad61 100644
|
||||
--- a/build/config/x86.cfg
|
||||
+++ b/build/config/x86.cfg
|
||||
@@ -443,8 +443,8 @@ arch_netboot_dir: x86_syslinux x86_grub_efi
|
||||
mkdir -p $(TEMP_DEPTHCHARGE)
|
||||
depthchargectl build -v \
|
||||
--board amd64-generic \
|
||||
- --kernel-release $(KERNELVERSION) \
|
||||
+ --kernel-release '' \
|
||||
--kernel $(TEMP_KERNEL) \
|
||||
--initramfs $(TEMP_INITRD) \
|
||||
--root none \
|
||||
|
||||
|
|
@ -0,0 +1,17 @@
|
|||
diff --git a/build/Makefile b/build/Makefile
|
||||
index 8a4717cb..c1c1c239 100644
|
||||
--- a/build/Makefile
|
||||
+++ b/build/Makefile
|
||||
@@ -428,8 +428,12 @@ ifeq ($(filter $(DEB_HOST_ARCH),mips64el hppa sh4),)
|
||||
# though (see KERNELNAME variable).
|
||||
VMLINUXZ=`find $(TREE)/boot/ -name 'vmlinu[xz]-*'`; \
|
||||
if [ `echo "$$VMLINUXZ" | wc -w` != 1 ]; then \
|
||||
+ if [ ! -e $(TREE)/boot/vmlinuz ] && [ ! -e $(TREE)/boot/vmlinux ]; then \
|
||||
echo "E: unexpected number of vmlinu[xz]-* in tree: $$VMLINUXZ (expected: 1)" >&2; \
|
||||
exit 1; \
|
||||
+ else \
|
||||
+ echo "W: skipping unversioning; vmlinuz/vmlinux already exists" >&2; \
|
||||
+ fi; \
|
||||
else \
|
||||
echo "I: unversioning vmlinu[xz]" >&2; \
|
||||
mv -v $$VMLINUXZ $(TREE)/boot/`basename $$VMLINUXZ|sed 's/-.*//'`; \
|
||||
|
|
@ -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);
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
=== modified file 'build/Makefile'
|
||||
--- build/Makefile 2010-11-05 16:34:29 +0000
|
||||
+++ build/Makefile 2011-03-01 11:42:39 +0000
|
||||
--- a/build/Makefile 2010-11-05 16:34:29 +0000
|
||||
+++ b/build/Makefile 2011-03-01 11:42:39 +0000
|
||||
@@ -294,6 +294,7 @@
|
||||
rm -rf $(TREE)
|
||||
# Set up the basic files [u]dpkg needs.
|
||||
|
|
@ -19,8 +19,8 @@
|
|||
ifdef EXTRADRIVERS
|
||||
|
||||
#=== modified file 'debian/changelog'
|
||||
#--- debian/changelog 2011-03-01 10:36:50 +0000
|
||||
#+++ debian/changelog 2011-03-01 11:42:39 +0000
|
||||
#--- a/debian/changelog 2011-03-01 10:36:50 +0000
|
||||
#+++ b/debian/changelog 2011-03-01 11:42:39 +0000
|
||||
#@@ -1,3 +1,10 @@
|
||||
#+debian-installer (20101020ubuntu21) UNRELEASED; urgency=low
|
||||
#+
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
=== modified file 'build/Makefile'
|
||||
#--- build/Makefile 2011-12-15 15:35:38 +0000
|
||||
#+++ build/Makefile 2012-04-18 05:24:59 +0000
|
||||
#--- a/build/Makefile 2011-12-15 15:35:38 +0000
|
||||
#+++ b/build/Makefile 2012-04-18 05:24:59 +0000
|
||||
#@@ -493,6 +493,12 @@
|
||||
# `find $(TEMP) -type f -a \( -perm +0111 -o -name '*.so' -o -name '*.so.*' \) | \
|
||||
# grep -v udeblibs | grep -v 'usr/lib/xorg/modules/.*\.so'`
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
# # have the ld.so symlink as the interpreter. Ideally mklibs should
|
||||
#
|
||||
=== modified file 'build/config/armhf.cfg'
|
||||
--- build/config/armhf.cfg 2012-04-11 08:52:18 +0000
|
||||
+++ build/config/armhf.cfg 2012-04-18 05:24:59 +0000
|
||||
--- a/build/config/armhf.cfg 2012-04-11 08:52:18 +0000
|
||||
+++ b/build/config/armhf.cfg 2012-04-18 05:24:59 +0000
|
||||
@@ -1,5 +1,7 @@
|
||||
SUBARCH_SUPPORTED = omap omap4 armadaxp
|
||||
|
||||
|
|
@ -28,8 +28,8 @@
|
|||
KERNEL_FLAVOUR = di
|
||||
|
||||
#=== modified file 'debian/changelog'
|
||||
#--- debian/changelog 2012-04-13 13:14:35 +0000
|
||||
#+++ debian/changelog 2012-04-18 05:24:59 +0000
|
||||
#--- a/debian/changelog 2012-04-13 13:14:35 +0000
|
||||
#+++ b/debian/changelog 2012-04-18 05:24:59 +0000
|
||||
#@@ -1,3 +1,12 @@
|
||||
#+debian-installer (20101020ubuntu134) precise; urgency=low
|
||||
#+
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
=== modified file 'build/Makefile'
|
||||
--- build/Makefile 2015-01-22 12:10:03 +0000
|
||||
+++ build/Makefile 2015-03-17 21:09:21 +0000
|
||||
--- a/build/Makefile 2015-01-22 12:10:03 +0000
|
||||
+++ b/build/Makefile 2015-03-17 21:09:21 +0000
|
||||
@@ -414,6 +414,14 @@
|
||||
|
||||
# These files are used to build special kernel images for some
|
||||
|
|
@ -46,8 +46,8 @@
|
|||
# install -m 644 -D $(TEMP_BOOT)$(GZIPPED) $@
|
||||
|
||||
#=== added file 'build/boot/README.device-tree'
|
||||
#--- build/boot/README.device-tree 1970-01-01 00:00:00 +0000
|
||||
#+++ build/boot/README.device-tree 2015-02-13 23:50:29 +0000
|
||||
#--- a/build/boot/README.device-tree 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/boot/README.device-tree 2015-02-13 23:50:29 +0000
|
||||
#@@ -0,0 +1,2 @@
|
||||
#+This directory contains all of the device-tree files shipped by the Ubuntu
|
||||
#+kernel package.
|
||||
|
|
@ -63,8 +63,8 @@
|
|||
#+
|
||||
|
||||
#=== modified file 'build/config/arm64.cfg'
|
||||
#--- build/config/arm64.cfg 2015-05-09 07:52:07 +0000
|
||||
#+++ build/config/arm64.cfg 2015-05-12 16:01:14 +0000
|
||||
#--- a/build/config/arm64.cfg 2015-05-09 07:52:07 +0000
|
||||
#+++ b/build/config/arm64.cfg 2015-05-12 16:01:14 +0000
|
||||
#@@ -1,14 +1,98 @@
|
||||
#-SUBARCH_SUPPORTED = generic
|
||||
#-
|
||||
|
|
@ -173,16 +173,16 @@
|
|||
|
||||
=== added directory 'build/config/arm64/cdrom'
|
||||
=== added file 'build/config/arm64/cdrom.cfg'
|
||||
#--- build/config/arm64/cdrom.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ build/config/arm64/cdrom.cfg 2015-02-24 05:14:26 +0000
|
||||
#--- a/build/config/arm64/cdrom.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/config/arm64/cdrom.cfg 2015-02-24 05:14:26 +0000
|
||||
#@@ -0,0 +1,3 @@
|
||||
#+FLAVOUR_SUPPORTED = grub
|
||||
#+
|
||||
#+MEDIA_TYPE = CD-ROM
|
||||
|
||||
=== added file 'build/config/arm64/cdrom/grub.cfg'
|
||||
#--- build/config/arm64/cdrom/grub.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ build/config/arm64/cdrom/grub.cfg 2015-02-24 05:14:26 +0000
|
||||
#--- a/build/config/arm64/cdrom/grub.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/config/arm64/cdrom/grub.cfg 2015-02-24 05:14:26 +0000
|
||||
#@@ -0,0 +1,8 @@
|
||||
#+MEDIA_TYPE = CD-ROM
|
||||
#+TARGET = $(INITRD) $(KERNEL) $(DEBIAN_CD_INFO)
|
||||
|
|
@ -194,8 +194,8 @@
|
|||
#+TYPE = cdrom/grub
|
||||
|
||||
#=== added file 'build/config/arm64/device-tree.cfg'
|
||||
#--- build/config/arm64/device-tree.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ build/config/arm64/device-tree.cfg 2015-02-13 23:51:06 +0000
|
||||
#--- a/build/config/arm64/device-tree.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/config/arm64/device-tree.cfg 2015-02-13 23:51:06 +0000
|
||||
#@@ -0,0 +1,4 @@
|
||||
#+MEDIA_TYPE = device-tree blobs
|
||||
#+
|
||||
|
|
@ -203,8 +203,8 @@
|
|||
#+EXTRANAME = $(MEDIUM)/
|
||||
|
||||
#=== removed file 'build/config/arm64/generic.cfg'
|
||||
#--- build/config/arm64/generic.cfg 2014-01-27 14:09:42 +0000
|
||||
#+++ build/config/arm64/generic.cfg 1970-01-01 00:00:00 +0000
|
||||
#--- a/build/config/arm64/generic.cfg 2014-01-27 14:09:42 +0000
|
||||
#+++ b/build/config/arm64/generic.cfg 1970-01-01 00:00:00 +0000
|
||||
#@@ -1,7 +0,0 @@
|
||||
#-MEDIUM_SUPPORTED = netboot
|
||||
#-
|
||||
|
|
@ -215,8 +215,8 @@
|
|||
#-VERSIONED_SYSTEM_MAP =
|
||||
|
||||
#=== removed file 'build/config/arm64/generic/netboot.cfg'
|
||||
#--- build/config/arm64/generic/netboot.cfg 2015-02-27 10:58:49 +0000
|
||||
#+++ build/config/arm64/generic/netboot.cfg 1970-01-01 00:00:00 +0000
|
||||
#--- a/build/config/arm64/generic/netboot.cfg 2015-02-27 10:58:49 +0000
|
||||
#+++ b/build/config/arm64/generic/netboot.cfg 1970-01-01 00:00:00 +0000
|
||||
#@@ -1,33 +0,0 @@
|
||||
#-MEDIA_TYPE = netboot image
|
||||
#-TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) all-generic
|
||||
|
|
@ -253,8 +253,8 @@
|
|||
#-all-generic: generic xgene
|
||||
|
||||
=== added file 'build/config/arm64/netboot.cfg'
|
||||
#--- build/config/arm64/netboot.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ build/config/arm64/netboot.cfg 2015-02-24 05:45:09 +0000
|
||||
#--- a/build/config/arm64/netboot.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/config/arm64/netboot.cfg 2015-02-24 05:45:09 +0000
|
||||
#@@ -0,0 +1,37 @@
|
||||
#+MEDIA_TYPE = netboot image
|
||||
#+
|
||||
|
|
@ -295,8 +295,8 @@
|
|||
#+ mkimage -A arm -O linux -T ramdisk -C none -a 0x0 -e 0x0 -n "debian-installer ramdisk" -d $(TEMP_INITRD) $(XU_INSTALL_PATH)/uInitrd
|
||||
|
||||
#=== modified file 'build/config/dir'
|
||||
#--- build/config/dir 2010-08-25 22:06:28 +0000
|
||||
#+++ build/config/dir 2015-02-13 23:50:29 +0000
|
||||
#--- a/build/config/dir 2010-08-25 22:06:28 +0000
|
||||
#+++ b/build/config/dir 2015-02-13 23:50:29 +0000
|
||||
#@@ -62,6 +62,7 @@
|
||||
# # The files we may want to have in dest/
|
||||
# INITRD = $(SOME_DEST)/$(EXTRANAME)initrd.gz
|
||||
|
|
@ -315,8 +315,8 @@
|
|||
# TEMP_MINIISO = $(TEMP)/mini.iso
|
||||
|
||||
#=== added file 'build/pkg-lists/cdrom/arm64.cfg'
|
||||
#--- build/pkg-lists/cdrom/arm64.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ build/pkg-lists/cdrom/arm64.cfg 2015-02-24 05:14:26 +0000
|
||||
#--- a/build/pkg-lists/cdrom/arm64.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/pkg-lists/cdrom/arm64.cfg 2015-02-24 05:14:26 +0000
|
||||
#@@ -0,0 +1,11 @@
|
||||
#+fat-modules-${kernel:Version}
|
||||
#+storage-core-modules-${kernel:Version}
|
||||
|
|
@ -332,15 +332,15 @@
|
|||
|
||||
#=== added directory 'build/pkg-lists/cdrom/grub'
|
||||
#=== added file 'build/pkg-lists/cdrom/grub/arm64.cfg'
|
||||
#--- build/pkg-lists/cdrom/grub/arm64.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ build/pkg-lists/cdrom/grub/arm64.cfg 2015-02-24 05:14:26 +0000
|
||||
#--- a/build/pkg-lists/cdrom/grub/arm64.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/pkg-lists/cdrom/grub/arm64.cfg 2015-02-24 05:14:26 +0000
|
||||
#@@ -0,0 +1,2 @@
|
||||
#+# This image is based on the regular cdrom image, and gets all the packages
|
||||
#+# from that one too.
|
||||
|
||||
#=== added file 'build/pkg-lists/cdrom/grub/common'
|
||||
#--- build/pkg-lists/cdrom/grub/common 1970-01-01 00:00:00 +0000
|
||||
#+++ build/pkg-lists/cdrom/grub/common 2015-03-17 21:09:21 +0000
|
||||
#--- a/build/pkg-lists/cdrom/grub/common 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/pkg-lists/cdrom/grub/common 2015-03-17 21:09:21 +0000
|
||||
#@@ -0,0 +1,3 @@
|
||||
#+# This image is based on the regular cdrom image, and gets all the packages
|
||||
#+# from that one too.
|
||||
|
|
@ -348,20 +348,20 @@
|
|||
|
||||
=== added directory 'build/pkg-lists/device-tree'
|
||||
#=== added file 'build/pkg-lists/device-tree/arm64.cfg'
|
||||
#--- build/pkg-lists/device-tree/arm64.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ build/pkg-lists/device-tree/arm64.cfg 2015-02-13 23:51:06 +0000
|
||||
#--- a/build/pkg-lists/device-tree/arm64.cfg 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/pkg-lists/device-tree/arm64.cfg 2015-02-13 23:51:06 +0000
|
||||
#@@ -0,0 +1,1 @@
|
||||
#+# Empty
|
||||
|
||||
=== added file 'build/pkg-lists/device-tree/common'
|
||||
#--- build/pkg-lists/device-tree/common 1970-01-01 00:00:00 +0000
|
||||
#+++ build/pkg-lists/device-tree/common 2015-02-13 23:50:29 +0000
|
||||
#--- a/build/pkg-lists/device-tree/common 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/pkg-lists/device-tree/common 2015-02-13 23:50:29 +0000
|
||||
#@@ -0,0 +1,1 @@
|
||||
#+#include "kernel"
|
||||
|
||||
#=== modified file 'build/util/efi-image'
|
||||
#--- build/util/efi-image 2012-10-15 20:03:40 +0000
|
||||
#+++ build/util/efi-image 2015-02-24 04:58:57 +0000
|
||||
#--- a/build/util/efi-image 2012-10-15 20:03:40 +0000
|
||||
#+++ b/build/util/efi-image 2015-02-24 04:58:57 +0000
|
||||
#@@ -22,13 +22,14 @@
|
||||
# # it exists.
|
||||
#
|
||||
|
|
@ -392,8 +392,8 @@
|
|||
# size=$(( $(stat -c %s "$workdir/boot$efi_name.efi") / 1024 ))
|
||||
|
||||
#=== added file 'build/util/grub-gencfg'
|
||||
#--- build/util/grub-gencfg 1970-01-01 00:00:00 +0000
|
||||
#+++ build/util/grub-gencfg 2015-03-23 23:27:39 +0000
|
||||
#--- a/build/util/grub-gencfg 1970-01-01 00:00:00 +0000
|
||||
#+++ b/build/util/grub-gencfg 2015-03-23 23:27:39 +0000
|
||||
#@@ -0,0 +1,210 @@
|
||||
#+#!/usr/bin/perl
|
||||
#+
|
||||
|
|
@ -607,8 +607,8 @@
|
|||
#+menuentry('Install with speech synthesis', Graphical => $graphical, Speach => 1);
|
||||
|
||||
#=== modified file 'debian/changelog'
|
||||
#--- debian/changelog 2015-05-09 07:52:07 +0000
|
||||
#+++ debian/changelog 2015-05-14 14:24:09 +0000
|
||||
#--- a/debian/changelog 2015-05-09 07:52:07 +0000
|
||||
#+++ b/debian/changelog 2015-05-14 14:24:09 +0000
|
||||
#@@ -1,3 +1,25 @@
|
||||
#+debian-installer (20101020ubuntu379) UNRELEASED; urgency=medium
|
||||
#+
|
||||
|
|
@ -637,8 +637,8 @@
|
|||
# * Move master kernels to 3.19.0-17.
|
||||
|
||||
#=== modified file 'debian/control'
|
||||
#--- debian/control 2014-10-30 08:19:25 +0000
|
||||
#+++ debian/control 2015-04-03 21:16:40 +0000
|
||||
#--- a/debian/control 2014-10-30 08:19:25 +0000
|
||||
#+++ b/debian/control 2015-04-03 21:16:40 +0000
|
||||
#@@ -9,7 +9,7 @@
|
||||
# Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu
|
||||
# Build-Conflicts: libnewt-pic [mipsel]
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
=== modified file 'build/Makefile'
|
||||
#--- build/Makefile 2015-12-09 17:32:28 +0000
|
||||
#+++ build/Makefile 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/Makefile 2015-12-09 17:32:28 +0000
|
||||
#+++ b/build/Makefile 2016-04-16 19:45:21 +0000
|
||||
#@@ -525,12 +525,6 @@
|
||||
# `find $(TEMP) -type f -a \( -perm /0111 -o -name '*.so' -o -name '*.so.*' \) | \
|
||||
# grep -v udeblibs | grep -v 'usr/lib/xorg/modules/.*\.so'`
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
# # have the ld.so symlink as the interpreter. Ideally mklibs should
|
||||
#
|
||||
#=== modified file 'build/config/amd64.cfg'
|
||||
#--- build/config/amd64.cfg 2016-04-08 14:58:47 +0000
|
||||
#+++ build/config/amd64.cfg 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/config/amd64.cfg 2016-04-08 14:58:47 +0000
|
||||
#+++ b/build/config/amd64.cfg 2016-04-16 19:45:21 +0000
|
||||
#@@ -1,8 +1,6 @@
|
||||
# MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-xen hd-media # netboot-gtk
|
||||
# MEDIUM_SUPPORTED_EXTRA = monolithic
|
||||
|
|
@ -29,8 +29,8 @@
|
|||
# KERNELVERSION = $(BASEVERSION)-generic
|
||||
|
||||
#=== modified file 'build/config/amd64/netboot.cfg'
|
||||
#--- build/config/amd64/netboot.cfg 2016-03-27 03:15:58 +0000
|
||||
#+++ build/config/amd64/netboot.cfg 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/config/amd64/netboot.cfg 2016-03-27 03:15:58 +0000
|
||||
#+++ b/build/config/amd64/netboot.cfg 2016-04-16 19:45:21 +0000
|
||||
#@@ -1,7 +1,7 @@
|
||||
# MEDIA_TYPE = netboot image
|
||||
#
|
||||
|
|
@ -42,8 +42,8 @@
|
|||
|
||||
|
||||
=== modified file 'build/config/armhf.cfg'
|
||||
--- build/config/armhf.cfg 2016-04-08 14:58:47 +0000
|
||||
+++ build/config/armhf.cfg 2016-04-16 19:45:21 +0000
|
||||
--- a/build/config/armhf.cfg 2016-04-08 14:58:47 +0000
|
||||
+++ b/build/config/armhf.cfg 2016-04-16 19:45:21 +0000
|
||||
@@ -1,6 +1,6 @@
|
||||
SUBARCH_SUPPORTED = generic-lpae generic
|
||||
|
||||
|
|
@ -54,8 +54,8 @@
|
|||
KERNELVERSION = 4.4.0-18
|
||||
|
||||
#=== modified file 'build/config/common'
|
||||
#--- build/config/common 2015-11-12 19:14:48 +0000
|
||||
#+++ build/config/common 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/config/common 2015-11-12 19:14:48 +0000
|
||||
#+++ b/build/config/common 2016-04-16 19:45:21 +0000
|
||||
#@@ -24,7 +24,7 @@
|
||||
#
|
||||
# # The library reducer to use. Set to mklibs (to build with library reduction)
|
||||
|
|
@ -67,8 +67,8 @@
|
|||
# # "normal" sources.list. However, you can specify a mirror here to override
|
||||
|
||||
#=== modified file 'build/config/i386/netboot.cfg'
|
||||
#--- build/config/i386/netboot.cfg 2016-03-22 04:37:29 +0000
|
||||
#+++ build/config/i386/netboot.cfg 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/config/i386/netboot.cfg 2016-03-22 04:37:29 +0000
|
||||
#+++ b/build/config/i386/netboot.cfg 2016-04-16 19:45:21 +0000
|
||||
#@@ -3,7 +3,7 @@
|
||||
# MEDIA_TYPE = netboot image
|
||||
#
|
||||
|
|
@ -80,8 +80,8 @@
|
|||
|
||||
|
||||
#=== modified file 'build/config/powerpc/powerpc/netboot.cfg'
|
||||
#--- build/config/powerpc/powerpc/netboot.cfg 2016-03-22 05:15:29 +0000
|
||||
#+++ build/config/powerpc/powerpc/netboot.cfg 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/config/powerpc/powerpc/netboot.cfg 2016-03-22 05:15:29 +0000
|
||||
#+++ b/build/config/powerpc/powerpc/netboot.cfg 2016-04-16 19:45:21 +0000
|
||||
#@@ -1,7 +1,7 @@
|
||||
# MEDIA_TYPE = netboot image
|
||||
#
|
||||
|
|
@ -93,8 +93,8 @@
|
|||
|
||||
|
||||
#=== modified file 'build/config/ppc64el.cfg'
|
||||
#--- build/config/ppc64el.cfg 2016-04-08 14:58:47 +0000
|
||||
#+++ build/config/ppc64el.cfg 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/config/ppc64el.cfg 2016-04-08 14:58:47 +0000
|
||||
#+++ b/build/config/ppc64el.cfg 2016-04-16 19:45:21 +0000
|
||||
#@@ -1,7 +1,5 @@
|
||||
# MEDIUM_SUPPORTED = netboot cdrom
|
||||
#
|
||||
|
|
@ -105,8 +105,8 @@
|
|||
# KERNELVERSION = $(BASEVERSION)-generic
|
||||
|
||||
#=== modified file 'build/pkg-lists/base'
|
||||
#--- build/pkg-lists/base 2015-09-22 18:31:39 +0000
|
||||
#+++ build/pkg-lists/base 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/pkg-lists/base 2015-09-22 18:31:39 +0000
|
||||
#+++ b/build/pkg-lists/base 2016-04-16 19:45:21 +0000
|
||||
#@@ -10,7 +10,6 @@
|
||||
# di-utils-shell
|
||||
# libdebconfclient0-udeb
|
||||
|
|
@ -117,8 +117,8 @@
|
|||
# main-menu
|
||||
|
||||
#=== modified file 'build/pkg-lists/exclude'
|
||||
#--- build/pkg-lists/exclude 2010-05-24 15:01:07 +0000
|
||||
#+++ build/pkg-lists/exclude 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/pkg-lists/exclude 2010-05-24 15:01:07 +0000
|
||||
#+++ b/build/pkg-lists/exclude 2016-04-16 19:45:21 +0000
|
||||
#@@ -2,15 +2,6 @@
|
||||
# # they are currently provided not in udeb form but by the library
|
||||
# # reduction step.
|
||||
|
|
@ -137,8 +137,8 @@
|
|||
# # and newt
|
||||
|
||||
#=== modified file 'build/pkg-lists/gtk-common'
|
||||
#--- build/pkg-lists/gtk-common 2015-05-14 17:55:41 +0000
|
||||
#+++ build/pkg-lists/gtk-common 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/pkg-lists/gtk-common 2015-05-14 17:55:41 +0000
|
||||
#+++ b/build/pkg-lists/gtk-common 2016-04-16 19:45:21 +0000
|
||||
#@@ -1,5 +1,4 @@
|
||||
# # udebs needed for graphical installer
|
||||
#-libnss-files-udeb
|
||||
|
|
@ -147,8 +147,8 @@
|
|||
# cdebconf-gtk-terminal
|
||||
|
||||
#=== modified file 'build/pkg-lists/network-console'
|
||||
#--- build/pkg-lists/network-console 2004-06-29 08:17:34 +0000
|
||||
#+++ build/pkg-lists/network-console 2016-04-16 19:45:21 +0000
|
||||
#--- a/build/pkg-lists/network-console 2004-06-29 08:17:34 +0000
|
||||
#+++ b/build/pkg-lists/network-console 2016-04-16 19:45:21 +0000
|
||||
#@@ -1,4 +1,3 @@
|
||||
# openssh-server-udeb
|
||||
#-libnss-files-udeb
|
||||
|
|
@ -156,8 +156,8 @@
|
|||
|
||||
|
||||
#=== modified file 'debian/changelog'
|
||||
#--- debian/changelog 2016-04-13 12:07:03 +0000
|
||||
#+++ debian/changelog 2016-04-16 19:45:21 +0000
|
||||
#--- a/debian/changelog 2016-04-13 12:07:03 +0000
|
||||
#+++ b/debian/changelog 2016-04-16 19:45:21 +0000
|
||||
#@@ -1,3 +1,16 @@
|
||||
#+debian-installer (20101020ubuntu448) xenial; urgency=medium
|
||||
#+
|
||||
|
|
@ -177,8 +177,8 @@
|
|||
# * Rebuild with updated udebs for s390x.
|
||||
|
||||
=== modified file 'debian/control'
|
||||
#--- debian/control 2016-02-19 17:00:28 +0000
|
||||
#+++ debian/control 2016-04-16 19:45:21 +0000
|
||||
#--- a/debian/control 2016-02-19 17:00:28 +0000
|
||||
#+++ b/debian/control 2016-04-16 19:45:21 +0000
|
||||
#@@ -9,7 +9,7 @@
|
||||
# Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/debian-installer/ubuntu
|
||||
# Build-Conflicts: libnewt-pic [mipsel]
|
||||
|
|
@ -207,8 +207,8 @@
|
|||
# # - genisoimage (>= 9:1.1.10-1ubuntu2) [!s390 !s390x]
|
||||
# # For making mini isos.
|
||||
##Ark74's fix
|
||||
--- debian/control 2023-05-10 08:36:56.311243556 -0600
|
||||
+++ debian/control 2023-05-10 12:00:07.617639516 -0600
|
||||
--- a/debian/control 2023-05-10 08:36:56.311243556 -0600
|
||||
+++ b/debian/control 2023-05-10 12:00:07.617639516 -0600
|
||||
@@ -45,6 +45,7 @@
|
||||
# them.
|
||||
# Lintian: Yes, we know it's essential. We prefer not to
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
=== modified file 'build/Makefile'
|
||||
--- build/Makefile 2018-02-15 11:44:41 +0000
|
||||
+++ build/Makefile 2018-07-22 10:55:51 +0000
|
||||
--- a/build/Makefile 2018-02-15 11:44:41 +0000
|
||||
+++ b/build/Makefile 2018-07-22 10:55:51 +0000
|
||||
@@ -782,6 +782,8 @@
|
||||
update-manifest $@ $(MANIFEST-BOOT) $(UDEB_LISTS)
|
||||
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
|
||||
#=== modified file 'debian/changelog'
|
||||
#--- debian/changelog 2018-06-14 10:36:23 +0000
|
||||
#+++ debian/changelog 2018-07-22 10:55:51 +0000
|
||||
#--- a/debian/changelog 2018-06-14 10:36:23 +0000
|
||||
#+++ b/debian/changelog 2018-07-22 10:55:51 +0000
|
||||
#@@ -1,3 +1,9 @@
|
||||
#+debian-installer (20101020ubuntu547) UNRELEASED; urgency=medium
|
||||
#+
|
||||
|
|
|
|||
|
|
@ -1,62 +0,0 @@
|
|||
diff -Nru source/build/Makefile source_no_proposed/build/Makefile
|
||||
--- source/build/Makefile 2022-10-20 08:22:18.334230755 -0500
|
||||
+++ source_no_proposed/build/Makefile 2022-10-20 08:25:19.346634640 -0500
|
||||
@@ -636,7 +636,7 @@
|
||||
echo "deb $(MIRROR) unreleased $(UDEB_COMPONENTS)"; \
|
||||
fi \
|
||||
else \
|
||||
- gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) $(UDEB_COMPONENTS) $(USE_PROPOSED_UPDATES); \
|
||||
+ gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" $(USE_UDEBS_FROM) $(UDEB_COMPONENTS); \
|
||||
if [ "$(USE_UNRELEASED)" = 1 ]; then \
|
||||
gen-sources.list.udeb "$(SYSTEM_SOURCES_LIST)" unreleased $(UDEB_COMPONENTS); \
|
||||
fi \
|
||||
@@ -648,10 +648,6 @@
|
||||
echo "Using generated $@:"; \
|
||||
sed -n "/^[^#]/ s/^/ /p" $@; \
|
||||
fi
|
||||
- @if [ "$(USE_PROPOSED_UPDATES)" = 1 ] && ! grep -q proposed-updates $@; then \
|
||||
- echo "ERROR: no valid source for $(USE_UDEBS_FROM)-proposed-updates"; \
|
||||
- exit 1; \
|
||||
- fi
|
||||
|
||||
# Font generation.
|
||||
#
|
||||
diff -Nru source/build/util/gen-sources.list.udeb source_no_proposed/build/util/gen-sources.list.udeb
|
||||
--- source/build/util/gen-sources.list.udeb 2022-09-06 15:55:12.000000000 -0500
|
||||
+++ source_no_proposed/build/util/gen-sources.list.udeb 2022-10-20 08:26:32.538801725 -0500
|
||||
@@ -8,7 +8,6 @@
|
||||
SOURCES_LIST=$1
|
||||
SUITE=$2
|
||||
UDEB_COMPONENTS=$3
|
||||
-USE_PROPOSED_UPDATES=$4 # optional
|
||||
|
||||
# Set to 1 or 2 to see increasing debug info about mirror tests
|
||||
# Use 0 for quiet (normal) operation
|
||||
@@ -84,16 +83,8 @@
|
||||
else
|
||||
echo "WARNING: mirror '$tmirror' appears to be invalid; skipping" >&2
|
||||
fi
|
||||
- if [ "$USE_PROPOSED_UPDATES" = 1 ] &&
|
||||
- test_url $tmirror/dists/$SUITE-proposed-updates/Release; then
|
||||
- echo "$mirror $SUITE-proposed-updates $UDEB_COMPONENTS"
|
||||
- echo "INFO: using '$tmirror' for $SUITE-proposed-updates" >&2
|
||||
- fi
|
||||
else
|
||||
echo "$mirror $SUITE $UDEB_COMPONENTS"
|
||||
- if [ "$USE_PROPOSED_UPDATES" = 1 ]; then
|
||||
- echo "$mirror $SUITE-proposed-updates $UDEB_COMPONENTS"
|
||||
- fi
|
||||
fi
|
||||
|
||||
done | perl -ne 'print unless $seen{$_}; $seen{$_}=1'
|
||||
diff -Nru source/debian/rules source_no_proposed/debian/rules
|
||||
--- source/debian/rules 2022-10-20 08:22:18.318230720 -0500
|
||||
+++ source_no_proposed/debian/rules 2022-10-20 08:26:53.702850378 -0500
|
||||
@@ -13,7 +13,6 @@
|
||||
BOOTMENU_BEEP=n
|
||||
else
|
||||
USE_UDEBS_FROM=aramo
|
||||
-USE_PROPOSED_UPDATES=1
|
||||
TRANSSTATUS=translation-status
|
||||
BOOTMENU_BEEP=y
|
||||
endif
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
#!/bin/sh
|
||||
#
|
||||
# Copyright (C) 2009-2020 Ruben Rodriguez <ruben@trisquel.info>
|
||||
# Copyright (C) 2023 Luis Guzman <ark@switnet.org>
|
||||
# Copyright (C) 2025 Luis Guzman <ark@switnet.org>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
|
|
@ -18,20 +18,28 @@
|
|||
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
#
|
||||
|
||||
VERSION=17
|
||||
EXTERNAL='deb-src http://ftp.debian.org/debian bullseye main'
|
||||
VERSION=18.9.testing
|
||||
EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
|
||||
REPOKEY=0E98404D386FA1D9
|
||||
NETINST=true
|
||||
|
||||
HWEKR=6.8
|
||||
HWE_ENABLED=0
|
||||
[ $HWE_ENABLED != 1 ] && \
|
||||
CONTROL_PACKAGE=linux
|
||||
[ $HWE_ENABLED = 1 ] && \
|
||||
CONTROL_PACKAGE=linux-hwe-$HWEKR
|
||||
|
||||
. ./config
|
||||
|
||||
# Set kernel from release/main packages.
|
||||
set_kernel_release() {
|
||||
KRNL_REL=6.5
|
||||
LASTKERNEL="$(apt-cache madison -c ${LOCAL_APT}/etc/apt_${CODENAME}.conf linux-hwe-$KRNL_REL-tools-common |\
|
||||
LASTKERNEL="$(apt-cache madison -c ${LOCAL_APT}/etc/apt_${CODENAME}.conf $CONTROL_PACKAGE-tools-common |\
|
||||
grep ${CODENAME}/main |\
|
||||
awk '{print$3}'|head -n1 |\
|
||||
cut -d. -f1,2,3)"
|
||||
}
|
||||
DEBIAN_KERNEL="$(awk '/^LINUX_KERNEL_ABI/{print$3}' build/config/common)"
|
||||
|
||||
cat << EOF > ${LOCAL_APT}/etc/apt_${CODENAME}.conf
|
||||
Dir::State "${LOCAL_APT}/var/lib/apt";
|
||||
|
|
@ -55,14 +63,36 @@ EOF
|
|||
find build/pkg-lists -type f | xargs -r sed -i /media-retriever/d
|
||||
apt-get update -c ${LOCAL_APT}/etc/apt_${CODENAME}.conf
|
||||
|
||||
# Disable proposed-updates patch
|
||||
patch_p1 $DATA/001_remove-proposed-updates.patch
|
||||
|
||||
# Ensure that ld-linux is executable
|
||||
patch_p1 $DATA/002_chmod_755_ld-linux2.patch
|
||||
|
||||
# HACK: include ditto for libassuan.so & libnpth.so from host into iso image, as runtime dependencies of gpgv
|
||||
sed '/$(DEB_HOST_MULTIARCH)\/libgcc_s.so/a\\tcp /usr/lib/$(DEB_HOST_MULTIARCH)/libnpth.so* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile
|
||||
sed '/$(DEB_HOST_MULTIARCH)\/libgcc_s.so/a\\tcp /usr/lib/$(DEB_HOST_MULTIARCH)/libassuan.so* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile
|
||||
sed '/$(DEB_HOST_MULTIARCH)\/libgcc_s.so/a\\t# HACK ALERT: ditto for libassuan.so & libnpth.so -- Trisquel' -i build/Makefile
|
||||
|
||||
# HACK: include ditto liblzma.so and liblz4.so from host into iso image, as runtime dependencies of zstd
|
||||
sed '/$(DEB_HOST_MULTIARCH)\/libgcc_s.so/a\\tcp /usr/lib/$(DEB_HOST_MULTIARCH)/liblzma.so.5* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile
|
||||
sed '/$(DEB_HOST_MULTIARCH)\/libgcc_s.so/a\\tcp /usr/lib/$(DEB_HOST_MULTIARCH)/liblz4.so* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile
|
||||
sed '/$(DEB_HOST_MULTIARCH)\/libgcc_s.so/a\\t# HACK ALERT: ditto for liblzma & liblz4 -- Trisquel' -i build/Makefile
|
||||
sed -i '/Build-Depends:/a\\tliblzma5, liblz4-1,' debian/control
|
||||
|
||||
# Fix mini.iso boot on EFI systems
|
||||
sed 's|/debian|/trisquel|' -i ./build/util/efi-image
|
||||
grep -lr 'EFI/debian' build/config | xargs -r sed -i 's|EFI/debian|EFI/trisquel|'
|
||||
|
||||
# Set kernel release for images
|
||||
set_kernel_release
|
||||
sed -i "s|LINUX_KERNEL_ABI ?= .*|LINUX_KERNEL_ABI ?= $LASTKERNEL|" build/config/common
|
||||
sed -i '/LINUX_KERNEL_ABI/d' build/config/ppc64el.cfg
|
||||
|
||||
# Patch MEDIUM_SUPPORTED
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/medium_supported.patch
|
||||
for i in amd64 arm64 armhf ppc64el
|
||||
patch_p1 $DATA/003_medium_supported.patch
|
||||
# Apply Debian kernel version replacement to Trisquel's
|
||||
for i in amd64 arm64 armhf ppc64el riscv64
|
||||
do
|
||||
sed -i "/^KERNELVERSION =/i BASEVERSION = $LASTKERNEL" build/config/$i.cfg
|
||||
sed -i 's/^KERNELVERSION = .*/KERNELVERSION = $(BASEVERSION)-generic/g' build/config/$i.cfg
|
||||
|
|
@ -70,6 +100,11 @@ do
|
|||
sed -i '/^KERNEL_FLAVOUR = di/a KERNELIMAGEVERSION = $(KERNELVERSION)' build/config/$i.cfg
|
||||
done
|
||||
|
||||
sed -i "/linux-image/s|$DEBIAN_KERNEL|@@DEBIAN_KERNEL@@|" debian/control
|
||||
patch_p1 $DATA/004_set-kernel-on-control-file.patch
|
||||
sed -i "/linux-image-/s|@@DEBIAN_KERNEL@@|$LASTKERNEL|" debian/control
|
||||
patch_p1 $DATA/006_prevent_error_unversioned_kernel_usage.patch
|
||||
|
||||
##TODO: fix the EFI bootloader image
|
||||
sed -i '/shim/s|signed|unsigned|g' debian/control
|
||||
sed -i 's|grub-efi-amd64-signed|grub-efi-amd64-bin|' debian/control
|
||||
|
|
@ -78,9 +113,13 @@ sed -i '/win32-loader/d' debian/control
|
|||
|
||||
# use unsigned shim
|
||||
grep -rl "efi\.signed" | xargs -r sed -i 's|efi\.signed|efi|g'
|
||||
#adjust path and name files from debian to trisquel | $arch-bin efi file (/usr/lib/grub/x86_64-efi/monolithic/grubx64.efi)
|
||||
# adjust path and name files from debian to trisquel
|
||||
# $arch-bin efi file (/usr/lib/grub/x86_64-efi/monolithic/grubx64.efi)
|
||||
sed -i 's|\$platform-signed/grub|\$platform/monolithic/grub|' build/util/efi-image
|
||||
sed -i 's|\$efi_name-installer.efi|\$efi_name.efi|' build/util/efi-image
|
||||
|
||||
# enable experimental ChromeOS devices support with depthcharge
|
||||
patch_p1 $DATA/005_customize-chromeos-devices-build.patch
|
||||
##EO-TODO
|
||||
|
||||
rm -r build/boot/artwork/11-homeworld
|
||||
|
|
@ -93,13 +132,13 @@ grep -rl 'rows 12' build/boot | xargs -r sed -i '/rows/s|12|10|g'
|
|||
cat << EOF > build/sources.list.udeb.local
|
||||
deb $LOCALMIRROR $CODENAME main/debian-installer
|
||||
deb $LOCALMIRROR $CODENAME-updates main/debian-installer
|
||||
#deb $LOCALMIRROR $CODENAME-security main/debian-installer
|
||||
deb $LOCALMIRROR $CODENAME-security main/debian-installer
|
||||
EOF
|
||||
|
||||
# firmware-linux-free-udeb is missing
|
||||
cat << EOF >> build/pkg-lists/netboot/common
|
||||
#open-ath9k-htc-firmware-udeb
|
||||
openfwwf-udeb
|
||||
#openfwwf-udeb
|
||||
EOF
|
||||
|
||||
rpl "2004-20.." "2004-20$(date +'%y')" . -R
|
||||
|
|
@ -120,10 +159,11 @@ rpl ubuntu-archive-keyring trisquel-archive-keyring . -R
|
|||
rpl Debian Trisquel . -R
|
||||
rpl DEBIAN TRISQUEL . -R
|
||||
rpl http://ftp.debian.org/debian http://archive.trisquel.org/trisquel . -R
|
||||
rpl http://www.debian.org/doc/ https://trisquel.info/wiki/documentation . -R
|
||||
rpl http://www.debian.org/ https://trisquel.info build/boot/ -R
|
||||
|
||||
# Replace the debian release for the trisquel one.
|
||||
rpl bullseye $CODENAME . -R
|
||||
rpl $RELNAME $CODENAME . -R
|
||||
rpl debian-archive-keyring trisquel-keyring debian/control
|
||||
rpl debian-ports-archive-keyring trisquel-keyring debian/control
|
||||
rpl debian-archive-keyring.gpg trisquel-archive-keyring.gpg . -R
|
||||
|
|
@ -134,30 +174,13 @@ rpl debian-ports-archive-keyring-udeb trisquel-keyring-udeb . -R
|
|||
# build/config/common
|
||||
grep -rl TRISQUEL_VERSION |xargs -r sed -i "s|TRISQUEL_VERSION =.*|TRISQUEL_VERSION = $REVISION ($CODENAME)|"
|
||||
|
||||
# Disable proposed-updates patch
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/remove-proposed-updates.patch
|
||||
|
||||
echo "# Remove gtk related packages, not looking for graphical installer"
|
||||
rm $(find build/pkg-lists -type f -path "*/gtk/*")
|
||||
echo "Remove unused modules from d-i pkg-list"
|
||||
grep -rl acpi-modules- build/pkg-lists/ |xargs -r sed -i '/acpi-modules-/d'
|
||||
grep -rl cdrom-core-modules- build/pkg-lists/ |xargs -r sed -i '/cdrom-core-modules-/d'
|
||||
grep -rl cdebconf-gtk-entropy build/config/ | xargs -r sed -i 's/cdebconf-gtk-entropy//'
|
||||
|
||||
# Ensure that ld-linux is executable
|
||||
patch --no-backup-if-mismatch -p1 < $DATA/chmod_755_ld-linux2.patch
|
||||
|
||||
# HACK: include liblzma.so and liblz4.so from host into iso image, as runtime dependencies of zstd
|
||||
sed '/not packaged as a udeb/a\\tcp /lib/$(DEB_HOST_MULTIARCH)/liblzma.so.5* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile
|
||||
sed '/not packaged as a udeb/a\\tcp /lib/$(DEB_HOST_MULTIARCH)/liblz4.so* $(TREE)/lib/$(DEB_HOST_MULTIARCH)' -i build/Makefile
|
||||
sed -i '/Build-Depends:/a\\tliblzma5, liblz4-1,' debian/control
|
||||
|
||||
# Fix mini.iso boot on EFI systems
|
||||
sed 's|/debian|/trisquel|' -i ./build/util/efi-image
|
||||
sed 's|EFI/debian|EFI/trisquel|' -i ./build/config/arm.cfg ./build/config/x86.cfg
|
||||
|
||||
#Fix u-boot naming debian>ubuntu
|
||||
sed -i 's|.imx|-dtb.imx|g' build/boot/arm/u-boot-image-config
|
||||
patch_p1 $DATA/007-remove_graphical_options_from_netinstall.patch
|
||||
|
||||
# replace references to the OS as 'Linux' with 'GNU/Linux'
|
||||
match_rxs=( # ASSERT: aligns with '$replace_rxs'
|
||||
|
|
@ -188,8 +211,7 @@ done
|
|||
## https://bazaar.launchpad.net/~xnox/debian-installer/di-focal/changes?filter_path=build/Makefile
|
||||
for patch in $(ls -v ${DATA}/di_focal/*.diff)
|
||||
do
|
||||
echo "Applying $patch"
|
||||
patch --no-backup-if-mismatch -Np0 < $patch
|
||||
patch_p1 $patch
|
||||
done
|
||||
|
||||
changelog "Rebranded and adapted for Trisquel"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue