From 4c4560c1f1ac3eb74737d14a1195b9c7e69e49df Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Sun, 8 Sep 2019 22:08:03 -0500 Subject: [PATCH 1/4] Fix repokey for make-firmware-free --- helpers/make-firmware-free | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/helpers/make-firmware-free b/helpers/make-firmware-free index 4f2d92f..720f02b 100644 --- a/helpers/make-firmware-free +++ b/helpers/make-firmware-free @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2017 Ruben Rodriguez +# Copyright (C) 2019 David Trudgian # # 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 @@ -17,9 +18,9 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2 +VERSION=3 EXTERNAL='deb-src http://ftp.us.debian.org/debian testing main' -REPOKEY=7638D0442B90D010 +REPOKEY=04EE7237B7D453EC . ./config From 32f34ad8971c602da6ca431c027a132bdc2deb96 Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Sun, 8 Sep 2019 22:09:02 -0500 Subject: [PATCH 2/4] Remove non-free nvidia-dkms stuff in make-linux --- helpers/make-linux | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/helpers/make-linux b/helpers/make-linux index bac9e30..ae3f620 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -1,6 +1,7 @@ #!/bin/sh # # Copyright (C) 2008-2018 Ruben Rodriguez +# Copyright (C) 2019 David Trudgian # # 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 @@ -17,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=3 +VERSION=4 . ./config @@ -38,6 +39,10 @@ sh $DATA/deblob-4.15 --force echo "Reverting deblobbing for files patched by silent-accept-firmware" cp /tmp/preserve/* . -av +# Wipe dkms-versions +# lists zfs / nvidia versions +echo > debian/dkms-versions + # Remove ZFS rm zfs spl debian/scripts/misc/update-zfs.sh -rf /bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control debian.master/control.d/vars.generic debian.master/control.d/vars.* @@ -50,6 +55,13 @@ rm ubuntu/vbox* -rf sed /vbox/d -i debian.master/control.d/generic.inclusion-list ubuntu/Makefile sed '/vbox/d' -i debian.master/reconstruct +# Remove nvidia +rm -rf debian/scripts/debian/scripts/dkms-build--nvidia-N +/bin/sed '/ifeq ($(do_dkms_nvidia),true)/,/endif/d' -i debian/rules.d/2-binary-arch.mk +/bin/sed '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.* +/bin/sed '/nvidiafb/d' -i debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.* + + # Compile with less modules and avoid abi check echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk echo 'skipabi = true' >> debian.master/rules.d/0-common-vars.mk From 3b479fc66982f5fd9a7732c2631b3c618ec98fea Mon Sep 17 00:00:00 2001 From: David Trudgian Date: Mon, 9 Sep 2019 08:54:27 -0500 Subject: [PATCH 3/4] make-linux: disable retpoline check vs last release --- helpers/make-linux | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/helpers/make-linux b/helpers/make-linux index ae3f620..c22bf3b 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -68,6 +68,11 @@ echo 'skipabi = true' >> debian.master/rules.d/0-common-vars.mk echo 'skipmodule = true' >> debian/rules.d/0-common-vars.mk echo 'skipabi = true' >> debian/rules.d/0-common-vars.mk +# Skip the retpoline check as there is no last release to chaeck against +echo 'skipretpoline = true' >> debian.master/rules.d/0-common-vars.mk +echo 'skipretpoline = true' >> debian/rules.d/0-common-vars.mk + + # Do not label packages as unsigned sed '/bin_pkg_name_unsigned/s/linux-image-unsigned/linux-image/' -i debian/rules.d/0-common-vars.mk sed 's/.unsigned//' -i debian/scripts/control-create From e84f03ce0344e0d9342301ccb4bfff6e0b6c4e5a Mon Sep 17 00:00:00 2001 From: Ruben Rodriguez Date: Fri, 13 Sep 2019 21:29:06 +0000 Subject: [PATCH 4/4] nvidiafb is free, no need to remove it. --- helpers/make-linux | 2 -- 1 file changed, 2 deletions(-) diff --git a/helpers/make-linux b/helpers/make-linux index c22bf3b..8812209 100644 --- a/helpers/make-linux +++ b/helpers/make-linux @@ -59,8 +59,6 @@ sed '/vbox/d' -i debian.master/reconstruct rm -rf debian/scripts/debian/scripts/dkms-build--nvidia-N /bin/sed '/ifeq ($(do_dkms_nvidia),true)/,/endif/d' -i debian/rules.d/2-binary-arch.mk /bin/sed '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.* -/bin/sed '/nvidiafb/d' -i debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.* - # Compile with less modules and avoid abi check echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk