GNU Linux-libre 4.4-gnu1a erratum notes (no logs)

diff --git a/ERRATUM.txt b/ERRATUM.txt
new file mode 100644 (file)
index 0000000..e0a8767
--- /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-gnu1-4.4-gnu1a.patch b/scripts-4.4-gnu1-4.4-gnu1a.patch
new file mode 100644 (file)
index 0000000..84525db
--- /dev/null
+++ b/scripts-4.4-gnu1-4.4-gnu1a.patch
@@ -0,0 +1,16 @@
+diff --git scripts/linux-libre-4.4-gnu1/deblob-4.4 scripts/linux-libre-4.4-gnu1/deblob-4.4
+index 084e6eec5f2c..431d13026832 100755
+--- scripts/linux-libre-4.4-gnu1/deblob-4.4
++++ scripts/linux-libre-4.4-gnu1/deblob-4.4
+@@ -1751,7 +1751,10 @@ clean_sed '
+               goto error;\
+       }
+ }' drivers/net/wireless/b43/main.c 'double-check and reject non-Free firmware'
+-# Major portions of firmware filenames not deblobbed.
++clean_sed '
++/^[\t]*filename = "\(ucode\|b0g0\(bs\)\?initvals\)5";$/! {
++      s,^\([\t]*filename = "\)\(ucode\|pcm\|[^ "]*initvals\)[0-9][^ ."]*";,\1/*(DEBLOBBED)*/";,g
++}' drivers/net/wireless/b43/main.c 'cleaned up blob basenames'
+ clean_blob drivers/net/wireless/b43/main.c
+ clean_kconfig drivers/net/wireless/b43/Kconfig B43
+ clean_mk CONFIG_B43 drivers/net/wireless/b43/Makefile

diff --git a/scripts-4.4-gnu1-4.4-gnu1a.patch.sign b/scripts-4.4-gnu1-4.4-gnu1a.patch.sign
new file mode 100644 (file)
index 0000000..5e09cfa
--- /dev/null
+++ b/scripts-4.4-gnu1-4.4-gnu1a.patch.sign
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCYS2SiAAKCRC8t8+Hfn1H
+pz/mAKCi3Q6Nl512oiHfTkzTR9ooZ/b4TQCfb/QZOeTCgjpa1wsSJ57dTPgezIk=
+=VwEL
+-----END PGP SIGNATURE-----

diff --git a/sources-4.4-gnu1-4.4-gnu1a.patch b/sources-4.4-gnu1-4.4-gnu1a.patch
new file mode 100644 (file)
index 0000000..081d5b0
--- /dev/null
+++ b/sources-4.4-gnu1-4.4-gnu1a.patch
@@ -0,0 +1,232 @@
+diff --git linux-libre-4.4-gnu1/drivers/net/wireless/b43/main.c linux-libre-4.4-gnu1/drivers/net/wireless/b43/main.c
+index c430c8d60f02..2400bbdcac28 100644
+--- linux-libre-4.4-gnu1/drivers/net/wireless/b43/main.c
++++ linux-libre-4.4-gnu1/drivers/net/wireless/b43/main.c
+@@ -2306,60 +2306,60 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
+       switch (rev) {
+       case 42:
+               if (phy->type == B43_PHYTYPE_AC)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 40:
+               if (phy->type == B43_PHYTYPE_AC)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 33:
+               if (phy->type == B43_PHYTYPE_LCN40)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 30:
+               if (phy->type == B43_PHYTYPE_N)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 29:
+               if (phy->type == B43_PHYTYPE_HT)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 26:
+               if (phy->type == B43_PHYTYPE_HT)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 28:
+       case 25:
+               if (phy->type == B43_PHYTYPE_N)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (phy->type == B43_PHYTYPE_LCN)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 24:
+               if (phy->type == B43_PHYTYPE_LCN)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 23:
+               if (phy->type == B43_PHYTYPE_N)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 16 ... 19:
+               if (phy->type == B43_PHYTYPE_N)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (phy->type == B43_PHYTYPE_LP)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case 15:
+-              filename = /*(DEBLOBBED)*/;
++              filename = "/*(DEBLOBBED)*/";
+               break;
+       case 14:
+-              filename = /*(DEBLOBBED)*/;
++              filename = "/*(DEBLOBBED)*/";
+               break;
+       case 13:
+-              filename = /*(DEBLOBBED)*/;
++              filename = "/*(DEBLOBBED)*/";
+               break;
+       case 11 ... 12:
+-              filename = /*(DEBLOBBED)*/;
++              filename = "/*(DEBLOBBED)*/";
+               break;
+       case 5 ... 10:
+               filename = "ucode5";
+@@ -2373,7 +2373,7 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
+ 
+       /* Get PCM code */
+       if ((rev >= 5) && (rev <= 10))
+-              filename = /*(DEBLOBBED)*/;
++              filename = "/*(DEBLOBBED)*/";
+       else if (rev >= 11)
+               filename = NULL;
+       else
+@@ -2392,53 +2392,53 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
+       switch (dev->phy.type) {
+       case B43_PHYTYPE_G:
+               if (rev == 13)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev >= 5 && rev <= 10)
+                       filename = "b0g0initvals5";
+               break;
+       case B43_PHYTYPE_N:
+               if (rev == 30)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 28 || rev == 25)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 24)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 23)
+-                      filename = /*(DEBLOBBED)*/; /*(DEBLOBBED)*/
++                      filename = "/*(DEBLOBBED)*/"; /*(DEBLOBBED)*/
+               else if (rev >= 16 && rev <= 18)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev >= 11 && rev <= 12)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_LP:
+               if (rev >= 16 && rev <= 18)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 15)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 14)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 13)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_HT:
+               if (rev == 29)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 26)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_LCN:
+               if (rev == 24)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_LCN40:
+               if (rev == 33)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_AC:
+               if (rev == 42)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 40)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       }
+       if (!filename)
+@@ -2452,53 +2452,53 @@ static int b43_try_request_fw(struct b43_request_fw_context *ctx)
+       switch (dev->phy.type) {
+       case B43_PHYTYPE_G:
+               if (rev == 13)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev >= 5 && rev <= 10)
+                       filename = "b0g0bsinitvals5";
+               break;
+       case B43_PHYTYPE_N:
+               if (rev == 30)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 28 || rev == 25)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 24)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 23)
+-                      filename = /*(DEBLOBBED)*/; /*(DEBLOBBED)*/
++                      filename = "/*(DEBLOBBED)*/"; /*(DEBLOBBED)*/
+               else if (rev >= 16 && rev <= 18)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev >= 11 && rev <= 12)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_LP:
+               if (rev >= 16 && rev <= 18)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 15)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 14)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 13)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_HT:
+               if (rev == 29)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 26)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_LCN:
+               if (rev == 24)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_LCN40:
+               if (rev == 33)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       case B43_PHYTYPE_AC:
+               if (rev == 42)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               else if (rev == 40)
+-                      filename = /*(DEBLOBBED)*/;
++                      filename = "/*(DEBLOBBED)*/";
+               break;
+       }
+       if (!filename)

diff --git a/sources-4.4-gnu1-4.4-gnu1a.patch.sign b/sources-4.4-gnu1-4.4-gnu1a.patch.sign
new file mode 100644 (file)
index 0000000..b0b6b0d
--- /dev/null
+++ b/sources-4.4-gnu1-4.4-gnu1a.patch.sign
@@ -0,0 +1,6 @@
+-----BEGIN PGP SIGNATURE-----
+
+iF0EABECAB0WIQRHRALIxYLa++OJxCe8t8+Hfn1HpwUCYS2SiAAKCRC8t8+Hfn1H
+p+1hAJ9jDbuEj9xGUI+M8Pn/+w671MLcXwCeIhw/WQsbkAcJXmdq50/yH5ODjgM=
+=TRjC
+-----END PGP SIGNATURE-----