linux: base helper for aramo

helpers/DATA/linux-hwe-5.8/check.sh

-#!/bin/bash
-
-WD=$(dirname $0)
-
-files=`find -type f`
-while read -r line
-do
-    sh $WD/deblob-check  $line
-done <<< "$files"

helpers/DATA/linux/revert_iwlwifi_clear_firmware1.patch

+reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/
+
+--- b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
++++ a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+@@ -1597,8 +1597,15 @@
+ 	 * else from proceeding if the module fails to load
+ 	 * or hangs loading.
+ 	 */
++	if (load_module) {
+-	if (load_module)
+ 		request_module("%s", op->name);
++#ifdef CONFIG_IWLWIFI_OPMODE_MODULAR
++		if (err)
++			IWL_ERR(drv,
++				"failed to load module %s (error %d), is dynamic loading enabled?\n",
++				op->name, err);
++#endif
++	}
+ 	failure = false;
+ 	goto free;
+ 

helpers/DATA/linux/revert_iwlwifi_clear_firmware2.patch

+reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/
+
+--- b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
++++ a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+@@ -130,9 +130,6 @@
+ 
+ 	for (i = 0; i < IWL_UCODE_TYPE_MAX; i++)
+ 		iwl_free_fw_img(drv, drv->fw.img + i);
+-
+-	/* clear the data for the aborted load case */
+-	memset(&drv->fw, 0, sizeof(drv->fw));
+ }
+ 
+ static int iwl_alloc_fw_desc(struct iwl_drv *drv, struct fw_desc *desc,
+@@ -1429,7 +1426,6 @@
+ 	int i;
+ 	bool load_module = false;
+ 	bool usniffer_images = false;
+-	bool failure = true;
+ 
+ 	fw->ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH;
+ 	fw->ucode_capa.standard_phy_calibration_size =
+@@ -1699,7 +1695,6 @@
+ 				op->name, err);
+ #endif
+ 	}
+-	failure = false;
+ 	goto free;
+ 
+  try_again:
+@@ -1715,9 +1710,6 @@
+ 	complete(&drv->request_firmware_complete);
+ 	device_release_driver(drv->trans->dev);
+  free:
+-	if (failure)
+-		iwl_dealloc_ucode(drv);
+-
+ 	if (pieces) {
+ 		for (i = 0; i < ARRAY_SIZE(pieces->img); i++)
+ 			kfree(pieces->img[i].sec);

helpers/DATA/linux/revert_iwlwifi_clear_firmware3.patch

+reverts https://lore.kernel.org/all/iwlwifi.20211210110539.1f742f0eb58a.I1315f22f6aa632d94ae2069f85e1bca5e734dce0@changeid/
+
+diff -ru source.orig/drivers/net/wireless/intel/iwlwifi/iwl-drv.c source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+--- source.orig/drivers/net/wireless/intel/iwlwifi/iwl-drv.c	2022-05-13 16:10:11.883295769 -0400
++++ source/drivers/net/wireless/intel/iwlwifi/iwl-drv.c	2022-05-13 20:13:06.568151229 -0400
+@@ -1605,7 +1605,6 @@
+ 	complete(&drv->request_firmware_complete);
+ 	device_release_driver(drv->trans->dev);
+ 	/* drv has just been freed by the release */
+-	failure = false;
+  free:
+ 	if (pieces) {
+ 		for (i = 0; i < ARRAY_SIZE(pieces->img); i++)

helpers/make-linux

 #!/bin/sh
 #
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
-#    Copyright (C) 2008-2020  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C) 2022 Luis Guzman <ark@switnet.org>
+#    Copyright (C) 2008-2022  Ruben Rodriguez <ruben@trisquel.info>
 #    Copyright (C) 2019 David Trudgian <dave@trudgian.net>
 #
 #    This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=10
+VERSION=10.5
 
 . ./config
 
@@ -30,6 +30,7 @@ done
 
 PRESERVEDIRS='
 drivers/gpu/drm/amd/amdgpu
+drivers/gpu/drm/amd/pm/powerplay
 drivers/gpu/drm/r128
 drivers/gpu/drm/radeon
 drivers/net/wireless/intel/ipw2x00
@@ -60,35 +61,52 @@ done
 # Enable blobless activation - https://libreplanet.org/wiki/Group:Hardware/research/gpu/radeon
 rm $TMPDIR/drivers/gpu/drm/radeon/ni.c
 
-sh $DATA/deblob-5.4
+sh $DATA/deblob-5.15
 
 echo "Reverting deblobbing for files patched by silent-accept-firmware"
 cp $TMPDIR/* . -av
 rm -rf $TMPDIR
 
 # Wipe dkms-versions
-# lists zfs / nvidia versions
+# lists zfs / v4l2loopback 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.*
-/bin/sed '/^define build_zfs/,/^endef/d; /^define install_zfs/,/^endef/d; /zfs/d' -i debian/rules.d/2-binary-arch.mk
-/bin/sed '/ifeq ($(do_zfs),false)/,/endif/d' -i debian/rules
-/bin/sed  '/zfs/d' -i debian.master/rules.d/* debian.master/d-i/modules/fs-core-modules debian.master/control.d/generic.inclusion-list debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
+/bin/sed 's/spl-dkms, zfs-dkms//' -i debian/control \
+                                     debian.master/control.d/vars.generic \
+                                     debian.master/control.d/vars.*
+
+/bin/sed -i '/ifeq ($(do_zfs),false)/,/endif$/d' debian/rules
+/bin/sed  -i '/zfs/d' debian.master/abi/*/*.modules \
+                      debian/rules.d/2-binary-arch.mk \
+                      debian.master/rules.d/* \
+                      debian/rules
+#                      debian.master/d-i/modules/fs-core-modules \
+#                      debian.master/control.d/generic.inclusion-list \
+#                      debian.master/control.d/vars.*
 
 # Remove VBox
-sed -i '/vbox/s|true|false|' debian.master/rules.d/amd64.mk
+#sed -i '/vbox/s|true|false|' debian.master/rules.d/amd64.mk
+
+# Remove v4l2loopback
+/bin/sed -i '/ifeq ($(do_v4l2loopback),false)/,/endif$/d' debian/rules
+/bin/sed -i '/v4l2loopback/d' debian/rules.d/2-binary-arch.mk \
+                              debian/rules
+/bin/sed -i '/do_v4l2loopback/d' debian.master/rules.d/*
 
 # Remove nvidia
-rm -rf debian/scripts/debian/scripts/dkms-build--nvidia-N
-/bin/sed  '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
-sed '/do_dkms_nvidia/,/endif/d' -i debian/rules.d/2-binary-arch.mk
-/bin/sed '/do_dkms_nvidia/d' -i debian.master/rules.d/*
+rm -rf debian/scripts/dkms-build--nvidia-N
+sed -i '/dkms-build--nvidia-N/d' debian.master/reconstruct
+
+#/bin/sed  '/do_dkms_nvidia = true/d' -i debian.master/abi/*/*/*.modules \
+#                                        debian/rules \
+#                                        debian.master/control.d/vars.*
 
 # Remove wireguard
-sed '/do_dkms_wireguard/d' -i debian/rules.d/2-binary-arch.mk
-/bin/sed '/do_dkms_wireguard/d' -i debian.master/rules.d/*
+/bin/sed '/ifeq ($(do_dkms_wireguard),false)/,/endif$/d' -i debian/rules
+#sed '/do_dkms_wireguard/d' -i debian/rules.d/2-binary-arch.mk
+#/bin/sed '/do_dkms_wireguard/d' -i debian.master/rules.d/*
 
 # Compile with less modules and avoid abi check
 echo 'skipmodule = true' >> debian.master/rules.d/0-common-vars.mk
@@ -100,7 +118,6 @@ echo 'skipabi = true' >> debian/rules.d/0-common-vars.mk
 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
@@ -108,6 +125,10 @@ sed 's/.unsigned//' -i debian/scripts/control-create
 line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1)
 sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i
 sed s/family=ubuntu/family=trisquel/ -i debian/rules.d/0-common-vars.mk
+cat << EOF > debian.master/etc/kernelconfig
+archs="amd64 i386 armhf arm64 ppc64el"
+family='trisquel'
+EOF
 
 rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
 
@@ -116,19 +137,21 @@ find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linu
 # Descriptions should not change based on the build arch
 sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i
 
-sed '/^firmware/d' ./debian*/abi/*/fwinfo -i
-echo > ./debian.master/d-i/firmware/nic-modules
-echo > ./debian.master/d-i/firmware/scsi-modules
+sed '/^firmware/d' ./debian*/abi/fwinfo -i
+#echo > ./debian.master/d-i/firmware/nic-modules
+#echo > ./debian.master/d-i/firmware/scsi-modules
 
 # Disable using udev as a fallback for firmware loading
 replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" debian.master/config
 
-# Fix armhf port build
+# Fix arm port build
 sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'armhf': 'y',|'armhf': 'n',|g" debian.master/config/annotations
+sed -i "/CONFIG_FW_LOADER_USER_HELPER/s|'arm64': 'y',|'arm64': 'n',|g" debian.master/config/annotations
 sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'armhf': 'n',|'armhf': '-',|g" debian.master/config/annotations
+sed -i "/CONFIG_FW_LOADER_USER_HELPER_FALLBACK/s|'arm64': 'n',|'arm64': '-',|g" debian.master/config/annotations
 
-# Disable ahc1ec0.
-sed -i "/AHC1EC0/d" debian.master/config/annotations
+# Disable aaeon.
+sed -i "/AAEON/d" debian.master/config/annotations #10.2
 
 cp debian.master/config debian.hwe -a
 

helpers/make-linux-hwe-5.8

-#!/bin/sh
-#
-#    Copyright (C) 2008-2020  Ruben Rodriguez <ruben@trisquel.info>
-#    Copyright (C) 2021 Luis Guzman <ark@switnet.org>
-#    Copyright (C) 2021 Pablo Correa Gómez <ablocorrea@hotmail.com>
-#    Copyright (C) 2019 David Trudgian <dave@trudgian.net>
-#
-#    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
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-#
-
-VERSION=5
-
-. ./config
-
-for PATCH in $DATA/*.patch ; do
-  echo $PATCH
-  patch --no-backup-if-mismatch -p1 < $PATCH
-done
-
-PRESERVEDIRS='
-drivers/gpu/drm/amd/amdgpu
-drivers/gpu/drm/r128
-drivers/gpu/drm/radeon
-drivers/net/wireless/intel/ipw2x00
-drivers/net/wireless/intel/iwlegacy
-drivers/net/wireless/intel/iwlwifi
-drivers/net/wireless/realtek/rtl8xxxu
-drivers/net/wireless/realtek/rtlwifi
-drivers/net/wireless/realtek/rtlwifi/rtl8188ee
-drivers/net/wireless/realtek/rtlwifi/rtl8192ce
-drivers/net/wireless/realtek/rtlwifi/rtl8192cu
-drivers/net/wireless/realtek/rtlwifi/rtl8192de
-drivers/net/wireless/realtek/rtlwifi/rtl8192ee
-drivers/net/wireless/realtek/rtlwifi/rtl8192se
-drivers/net/wireless/realtek/rtlwifi/rtl8723ae
-drivers/net/wireless/realtek/rtlwifi/rtl8723be
-drivers/net/wireless/realtek/rtlwifi/rtl8821ae
-'
-TMPDIR=$(mktemp -d preserve-XXXX)
-PRESERVE=$(grep '^+++' $DATA/silent-accept-firmware.patch | /bin/sed 's/+++ //; s/\t.*//;' | cut -d/ -f2- | sort -u )
-for FILE in $PRESERVE; do
-  cp $FILE $TMPDIR --parents -a
-done
-for DIR in $PRESERVEDIRS; do
-  cp $DIR $TMPDIR --parents -a
-done
-
-# Enable blobless activation - https://libreplanet.org/wiki/Group:Hardware/research/gpu/radeon
-rm $TMPDIR/drivers/gpu/drm/radeon/ni.c
-
-sh $DATA/deblob-5.8
-
-echo "Reverting deblobbing for files patched by silent-accept-firmware"
-cp $TMPDIR/* . -av
-rm -rf $TMPDIR
-
-# 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.*
-/bin/sed '/^define build_zfs/,/^endef/d; /^define install_zfs/,/^endef/d; /zfs/d' -i debian/rules.d/2-binary-arch.mk
-/bin/sed '/ifeq ($(do_zfs),false)/,/endif/d' -i debian/rules
-/bin/sed  '/zfs/d' -i debian.master/rules.d/* debian.master/d-i/modules/fs-core-modules debian.master/control.d/generic.inclusion-list debian.master/abi/*/*/*.modules debian/rules debian.master/control.d/vars.*
-
-# Remove nvidia
-rm -rf debian/scripts/debian/scripts/dkms-build--nvidia-N
-sed -i '/dkms-build--nvidia-N/d' debian.master/reconstruct
-/bin/sed  '/do_dkms_nvidia = true/d' -i debian/rules
-/bin/sed '/do_dkms_nvidia/,/endif/d' -i debian/rules.d/2-binary-arch.mk
-
-# Remove VBox
-/bin/sed '/do_dkms_vbox/d' -i debian.*/rules.d/* debian.hwe-*/scripts/helpers/local-mangle
-
-# Remove wireguard
-#sed '/do_dkms_wireguard/d' -i debian/rules.d/2-binary-arch.mk
-/bin/sed '/do_dkms_wireguard/d' -i debian.master/rules.d/*
-
-# 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
-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
-
-line=$(grep -n ')-Ubuntu' debian/rules.d/0-common-vars.mk|cut -d: -f1)
-sed $(expr $line - 1 ),$(expr $line + 1 )d debian/rules.d/0-common-vars.mk -i
-sed 's/family=ubuntu/family=trisquel/' -i debian/rules.d/0-common-vars.mk
-sed 's/ubuntu/trisquel/1' -i debian.*/etc/kernelconfig
-
-rename s/ubuntu/trisquel/ debian.*/config/config.common.ubuntu
-
-find debian* -type f -name *control* -exec sed 's/ with Ubuntu patches//; s/Linux/Linux-libre/g' -i {} \;
-
-# Descriptions should not change based on the build arch
-sed 's/on DESC//; s/PKGVER on/PKGVER/; /^ DESC.$/d;' debian*/control.d/flavour-control.stub -i
-
-sed '/^firmware/d' ./debian*/abi/*/fwinfo -i
-echo > ./debian.master/d-i/firmware/nic-modules
-echo > ./debian.master/d-i/firmware/scsi-modules
-
-# Disable using udev as a fallback for firmware loading
-replace "CONFIG_FW_LOADER_USER_HELPER=y" "CONFIG_FW_LOADER_USER_HELPER=n" debian.master/config
-
-cp debian.master/config debian.hwe -a
-
-changelog "Removed non-free bits"
-
-cp debian/changelog debian.master/changelog
-cp debian/changelog debian.hwe/changelog
-cp debian/changelog debian.hwe-5.8/changelog
-
-compile