From 7784027184c88dd8bb2ad0e8e67312224df2279e Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Mon, 30 Aug 2021 03:33:21 -0400 Subject: [PATCH] GNU Linux-libre 4.4.282-gnu1a erratum notes (no logs) --- ERRATUM.txt | 13 +++++ scripts-4.4.282-gnu1-4.4.282-gnu1a.patch | 16 ++++++ scripts-4.4.282-gnu1-4.4.282-gnu1a.patch.sign | 6 +++ sources-4.4.282-gnu1-4.4.282-gnu1a.patch | 51 +++++++++++++++++++ sources-4.4.282-gnu1-4.4.282-gnu1a.patch.sign | 6 +++ 5 files changed, 92 insertions(+) create mode 100644 ERRATUM.txt create mode 100644 scripts-4.4.282-gnu1-4.4.282-gnu1a.patch create mode 100644 scripts-4.4.282-gnu1-4.4.282-gnu1a.patch.sign create mode 100644 sources-4.4.282-gnu1-4.4.282-gnu1a.patch create mode 100644 sources-4.4.282-gnu1-4.4.282-gnu1a.patch.sign diff --git a/ERRATUM.txt b/ERRATUM.txt new file mode 100644 index 00000000000..e0a87673fd7 --- /dev/null +++ b/ERRATUM.txt @@ -0,0 +1,13 @@ +This is an erratum, not a release proper, so the usual logs and +signatures are not here. + +Unlike releases, this hasn't gone through the release process, it's +just a record of the fix for an error introduced by a cleaning up bug. + +The scripts-* patch file holds the change to the cleaning-up scripts. +Applying it to the scripts used to create the release should get you +the corrected scripts, that have been tagged with the erratum identifier. + +The sources-* patch file holds the changes the scripts bring about to +the sources. Applying it to the sources of the release should get you +corrected sources, that have been tagged with the erratum identifier. diff --git a/scripts-4.4.282-gnu1-4.4.282-gnu1a.patch b/scripts-4.4.282-gnu1-4.4.282-gnu1a.patch new file mode 100644 index 00000000000..3c86169018b --- /dev/null +++ b/scripts-4.4.282-gnu1-4.4.282-gnu1a.patch @@ -0,0 +1,16 @@ +diff --git scripts/linux-libre-4.4.282-gnu1/deblob-4.4 scripts/linux-libre-4.4.282-gnu1/deblob-4.4 +index 431d13026832..7fe38ad5097f 100755 +--- scripts/linux-libre-4.4.282-gnu1/deblob-4.4 ++++ scripts/linux-libre-4.4.282-gnu1/deblob-4.4 +@@ -1761,7 +1761,10 @@ clean_mk CONFIG_B43 drivers/net/wireless/b43/Makefile + + announce B43LEGACY - "Broadcom 43xx-legacy wireless support (mac80211 stack)" + reject_firmware drivers/net/wireless/b43legacy/main.c +-# Major portions of firwmare filenames not deblobbed. ++clean_sed ' ++{ ++ s,^\([\t]*filename = "\)\(ucode\|pcm\|[^ "]*initvals\)[0-9][^ ."]*";,\1/*(DEBLOBBED)*/";,g ++}' drivers/net/wireless/b43legacy/main.c 'cleaned up blob basenames' + clean_blob drivers/net/wireless/b43legacy/main.c + clean_kconfig drivers/net/wireless/b43legacy/Kconfig B43LEGACY + clean_mk CONFIG_B43LEGACY drivers/net/wireless/b43legacy/Makefile diff --git a/scripts-4.4.282-gnu1-4.4.282-gnu1a.patch.sign b/scripts-4.4.282-gnu1-4.4.282-gnu1a.patch.sign new file mode 100644 index 00000000000..9ab78461916 --- /dev/null +++ b/scripts-4.4.282-gnu1-4.4.282-gnu1a.patch.sign @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCYS74RwAKCRC8t8+Hfn1H +pyb6AJ985pqgdZRVEAsf9e+L8Vt4Nr6UoACgk4ujahoGcKaGI5RSqt9X7ks6YvA= +=0RmV +-----END PGP SIGNATURE----- diff --git a/sources-4.4.282-gnu1-4.4.282-gnu1a.patch b/sources-4.4.282-gnu1-4.4.282-gnu1a.patch new file mode 100644 index 00000000000..86d1635c097 --- /dev/null +++ b/sources-4.4.282-gnu1-4.4.282-gnu1a.patch @@ -0,0 +1,51 @@ +diff --git linux-libre-4.4.282-gnu1/drivers/net/wireless/b43legacy/main.c linux-libre-4.4.282-gnu1/drivers/net/wireless/b43legacy/main.c +index ffd46af0fba4..a18a1580ac91 100644 +--- linux-libre-4.4.282-gnu1/drivers/net/wireless/b43legacy/main.c ++++ linux-libre-4.4.282-gnu1/drivers/net/wireless/b43legacy/main.c +@@ -1598,20 +1598,20 @@ static void b43legacy_request_firmware(struct work_struct *work) + + if (!fw->ucode) { + if (rev == 2) +- filename = /*(DEBLOBBED)*/; ++ filename = "/*(DEBLOBBED)*/"; + else if (rev == 4) +- filename = /*(DEBLOBBED)*/; ++ filename = "/*(DEBLOBBED)*/"; + else +- filename = "ucode5"; ++ filename = "/*(DEBLOBBED)*/"; + err = do_request_fw(dev, filename, &fw->ucode, true); + if (err) + goto err_load; + } + if (!fw->pcm) { + if (rev < 5) +- filename = /*(DEBLOBBED)*/; ++ filename = "/*(DEBLOBBED)*/"; + else +- filename = /*(DEBLOBBED)*/; ++ filename = "/*(DEBLOBBED)*/"; + err = do_request_fw(dev, filename, &fw->pcm, false); + if (err) + goto err_load; +@@ -1621,9 +1621,9 @@ static void b43legacy_request_firmware(struct work_struct *work) + case B43legacy_PHYTYPE_B: + case B43legacy_PHYTYPE_G: + if ((rev >= 5) && (rev <= 10)) +- filename = "b0g0initvals5"; ++ filename = "/*(DEBLOBBED)*/"; + else if (rev == 2 || rev == 4) +- filename = /*(DEBLOBBED)*/; ++ filename = "/*(DEBLOBBED)*/"; + else + goto err_no_initvals; + break; +@@ -1639,7 +1639,7 @@ static void b43legacy_request_firmware(struct work_struct *work) + case B43legacy_PHYTYPE_B: + case B43legacy_PHYTYPE_G: + if ((rev >= 5) && (rev <= 10)) +- filename = "b0g0bsinitvals5"; ++ filename = "/*(DEBLOBBED)*/"; + else if (rev >= 11) + filename = NULL; + else if (rev == 2 || rev == 4) diff --git a/sources-4.4.282-gnu1-4.4.282-gnu1a.patch.sign b/sources-4.4.282-gnu1-4.4.282-gnu1a.patch.sign new file mode 100644 index 00000000000..9143cd81831 --- /dev/null +++ b/sources-4.4.282-gnu1-4.4.282-gnu1a.patch.sign @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCYS74RwAKCRC8t8+Hfn1H +p6w6AKCcCV6mqeA+Y3797tH0wXcYnpHKPwCghZfVmnBzxhSGanxWzmrUVoyoObs= +=2bfl +-----END PGP SIGNATURE----- -- 2.31.1