From 89994dc7b07a34a801890d310592cf323c5c16f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20Guzm=C3=A1n?= <ark@switnet.org> Date: Fri, 10 Feb 2023 21:18:28 +0000 Subject: [PATCH] linux: d-i.patch maintenance for linux --- helpers/DATA/linux/d-i.patch | 18 +++++++++--------- helpers/make-linux | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/helpers/DATA/linux/d-i.patch b/helpers/DATA/linux/d-i.patch index 69f38ee79..2c6d6bd1c 100644 --- a/helpers/DATA/linux/d-i.patch +++ b/helpers/DATA/linux/d-i.patch @@ -1,6 +1,6 @@ ---- a/debian/rules 2022-10-22 11:16:58.933510340 -0400 -+++ b/debian/rules 2022-10-18 15:38:19.000000000 -0400 -@@ -125,12 +135,19 @@ +--- a/debian/rules 2023-02-10 11:40:38.000000000 -0600 ++++ b/debian/rules 2023-02-10 11:53:56.313708852 -0600 +@@ -128,12 +128,19 @@ dh_testroot dh_clean @@ -20,15 +20,15 @@ cp $(DEBIAN)/changelog debian/changelog # Install the copyright information. -@@ -180,7 +197,6 @@ - $(DEBIAN)/control.stub: \ +@@ -184,7 +191,6 @@ $(DROOT)/scripts/control-create \ $(control_files) \ + debian/canonical-revoked-certs.pem \ - $(DROOT)/control.d/flavour-module.stub \ $(DEBIAN)/changelog \ $(wildcard $(DEBIAN)/control.d/* $(DEBIAN)/sub-flavours/*.vars) for i in $(control_files); do \ -@@ -205,7 +221,13 @@ +@@ -210,7 +216,13 @@ .PHONY: debian/control debian/control: $(DEBIAN)/control.stub @@ -42,9 +42,9 @@ debian/canonical-certs.pem: $(wildcard $(DROOT)/certs/*-all.pem) $(wildcard $(DROOT)/certs/*-$(arch).pem) $(wildcard $(DEBIAN)/certs/*-all.pem) $(wildcard $(DEBIAN)/certs/*-$(arch).pem) for cert in $(sort $(notdir $^)); \ ---- a/debian/rules.d/2-binary-arch.mk 2022-10-22 11:16:58.937510259 -0400 -+++ b/debian/rules.d/2-binary-arch.mk 2022-10-18 15:38:19.000000000 -0400 -@@ -178,12 +176,14 @@ +--- a/debian/rules.d/2-binary-arch.mk 2023-02-10 11:40:38.000000000 -0600 ++++ b/debian/rules.d/2-binary-arch.mk 2023-02-10 11:57:00.107737218 -0600 +@@ -178,12 +178,14 @@ $(pkgdir)/boot/config-$(abi_release)-$* install -m600 $(builddir)/build-$*/System.map \ $(pkgdir)/boot/System.map-$(abi_release)-$* diff --git a/helpers/make-linux b/helpers/make-linux index fbb40cdee..941a4cad5 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (C) 2022 Luis Guzman <ark@switnet.org> +# Copyright (C) 2023 Luis Guzman <ark@switnet.org> # Copyright (C) 2008-2022 Ruben Rodriguez <ruben@trisquel.info> # Copyright (C) 2019 David Trudgian <dave@trudgian.net> # @@ -19,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=13 +VERSION=14 . ./config for PATCH in $DATA/*.patch ; do -- GitLab