upgpkg: libre/linux-libre-firmware 1:1.2.1-1

Signed-off-by: David P <megver83@parabola.nu>

3 files changed, 50 insertions, 150 deletions

diff --git a/libre/linux-libre-firmware/0002-carl9170fw-gcc-8-fix.patch b/libre/linux-libre-firmware/0002-carl9170fw-gcc-8-fix.patch
deleted file mode 100644
index c6ba04bb7..000000000
--- a/libre/linux-libre-firmware/0002-carl9170fw-gcc-8-fix.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 81a2b8b073461b04616a739d6bc4ba77f02dfc1f Mon Sep 17 00:00:00 2001
-From: David P <megver83@parabola.nu>
-Date: Fri, 4 May 2018 09:32:41 -0300
-Subject: [PATCH 2/2] carl9170fw gcc 8+ fix
-
-Mark certain structs/union aligned(4) to fix -Wpacked-not-aligned warnings on gcc 8+.
-
-Based on: https://github.com/chunkeey/carl9170fw/commit/b94cc57fa4ee29cb70415b699a1efc5f66eb41c7
-
-Signed-off-by: David P <megver83@parabola.nu>
----
- src/carl9170fw/carlfw/include/dma.h   |  4 ++--
- src/carl9170fw/include/shared/fwcmd.h |  2 +-
- src/carl9170fw/include/shared/wlan.h  | 12 ++++++------
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/src/carl9170fw/carlfw/include/dma.h b/src/carl9170fw/carlfw/include/dma.h
-index 477c2a2..8141b1c 100644
---- a/src/carl9170fw/carlfw/include/dma.h
-+++ b/src/carl9170fw/carlfw/include/dma.h
-@@ -73,12 +73,12 @@ struct carl9170_tx_ba_superframe {
- struct ar9170_tx_null_frame {
- 	struct ar9170_tx_hwdesc hdr;
- 	struct ieee80211_hdr null;
--} __packed;
-+} __packed __aligned(4);
- 
- struct carl9170_tx_null_superframe {
- 	struct carl9170_tx_superdesc s;
- 	struct ar9170_tx_null_frame f;
--} __packed;
-+} __packed __aligned(4);
- 
- #define CARL9170_BA_BUFFER_LEN	(__roundup(sizeof(struct carl9170_tx_ba_superframe), 16))
- #define CARL9170_RSP_BUFFER_LEN	AR9170_BLOCK_SIZE
-diff --git a/src/carl9170fw/include/shared/fwcmd.h b/src/carl9170fw/include/shared/fwcmd.h
-index ea1d80f..2a58dd8 100644
---- a/src/carl9170fw/include/shared/fwcmd.h
-+++ b/src/carl9170fw/include/shared/fwcmd.h
-@@ -240,7 +240,7 @@ struct carl9170_cmd {
- 		struct carl9170_bcn_ctrl_cmd	bcn_ctrl;
- 		struct carl9170_rx_filter_cmd	rx_filter;
- 		u8 data[CARL9170_MAX_CMD_PAYLOAD_LEN];
--	} __packed;
-+	} __packed __aligned(4);
- } __packed __aligned(4);
- 
- #define	CARL9170_TX_STATUS_QUEUE	3
-diff --git a/src/carl9170fw/include/shared/wlan.h b/src/carl9170fw/include/shared/wlan.h
-index ea17995..9c6b7ff 100644
---- a/src/carl9170fw/include/shared/wlan.h
-+++ b/src/carl9170fw/include/shared/wlan.h
-@@ -370,24 +370,24 @@ struct ar9170_rx_frame_single {
- 	struct ieee80211_hdr i3e;
- 	struct ar9170_rx_phystatus phy_tail;
- 	struct ar9170_rx_macstatus macstatus;
--} __packed;
-+} __packed __aligned(4);
- 
- struct ar9170_rx_frame_head {
- 	struct ar9170_rx_head phy_head;
- 	struct ieee80211_hdr i3e;
- 	struct ar9170_rx_macstatus macstatus;
--} __packed;
-+} __packed __aligned(4);
- 
- struct ar9170_rx_frame_middle {
- 	struct ieee80211_hdr i3e;
- 	struct ar9170_rx_macstatus macstatus;
--} __packed;
-+} __packed __aligned(4);
- 
- struct ar9170_rx_frame_tail {
- 	struct ieee80211_hdr i3e;
- 	struct ar9170_rx_phystatus phy_tail;
- 	struct ar9170_rx_macstatus macstatus;
--} __packed;
-+} __packed __aligned(4);
- 
- struct ar9170_rx_frame {
- 	union {
-@@ -395,8 +395,8 @@ struct ar9170_rx_frame {
- 		struct ar9170_rx_frame_head head;
- 		struct ar9170_rx_frame_middle middle;
- 		struct ar9170_rx_frame_tail tail;
--	} __packed;
--} __packed;
-+	} __packed __aligned(4);
-+} __packed __aligned(4);
- 
- static inline u8 ar9170_get_decrypt_type(struct ar9170_rx_macstatus *t)
- {
--- 
-2.17.0
-
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD
index e0ec3fb91..fbd16f431 100644
--- a/libre/linux-libre-firmware/PKGBUILD
+++ b/libre/linux-libre-firmware/PKGBUILD
@@ -4,8 +4,8 @@
 # Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
 
 pkgname=linux-libre-firmware
-pkgver=1.2
-pkgrel=2
+pkgver=1.2.1
+pkgrel=1
 epoch=1
 pkgdesc='Firmware files for Linux-libre'
 arch=('any')
@@ -31,31 +31,26 @@ conflicts=('linux-firmware'
            'ath9k-htc-firmware')
 replaces=(${conflicts[@]})
 options=(!strip)
-source=("${url}/${pkgname}-${pkgver}.tar.lz"{,.asc} '0001-remove-external-toolchains.patch' '0002-carl9170fw-gcc-8-fix.patch')
-sha512sums=('2f70207ae7a98a71b74950a909e899c58617e46693a4b069cd16de1b2f0bb31c6abb07c0f4db88b5cecc3f3c50da56265da0b771c58b164981d628231f130387'
+source=("$url/$pkgname-$pkgver.tar.lz"{,.asc} 'remove-external-toolchains.patch')
+sha512sums=('dc4f2e931b4dde217f2e3430e7a0c1a5f42f0844087bf9a771c7e40dbdd8050205d7a80495bd130f87a02a823db7514241d68bfded19548132b3620d4c7e630a'
             'SKIP'
-            'cc3417dcf165442260b509facc391fcce9125befea26c22b0748715484ab2373c56e5fa6e306ff74c1f39baccf8f5a0aee067d444d5980796e9d2c6fa6179fe5'
-            'f1326f1af1586b39ca738ff9c263c5ac1388996914cbab9898adac3430dba2b28fecc5495ab624b098c853cc9795b646d0ca631b696413db14d7f4a47b4a2374')
+            '19732ee8e8320a143fee462ae79ca4551672bebc425e71dffd0a8d01fb7a7a02c822966c57072becfff5da11e2a6abe4a0f6de93e9c218bba0b594421a541150')
 validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self
 
 prepare() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-$pkgver/src
 
   # do not download toolchains so we can build offline
-  patch -p1 -i ../0001-remove-external-toolchains.patch
-
-  # fix building with GCC 8+
-  patch -p1 -i ../0002-carl9170fw-gcc-8-fix.patch
-
+  patch -p1 -i $srcdir/remove-external-toolchains.patch
 }  
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
+  cd $srcdir/$pkgname-$pkgver/src
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/src"
+  cd $srcdir/$pkgname-$pkgver/src
 
   install -dm755 $pkgdir/usr/lib/firmware
   make prefix=$pkgdir/usr/lib/firmware install
diff --git a/libre/linux-libre-firmware/0001-remove-external-toolchains.patch b/libre/linux-libre-firmware/remove-external-toolchains.patch
index 13ec21f50..a216c65bb 100644
--- a/libre/linux-libre-firmware/0001-remove-external-toolchains.patch
+++ b/libre/linux-libre-firmware/remove-external-toolchains.patch
@@ -1,12 +1,12 @@
-From aeedcc04bd0a6aad5f025f8860a29516de159932 Mon Sep 17 00:00:00 2001
+From 9b5cc4a22720dd6f7486da3fa1f64e7ecf6f72a7 Mon Sep 17 00:00:00 2001
 From: David P <megver83@parabola.nu>
 Date: Sun, 29 Apr 2018 13:54:13 -0300
-Subject: [PATCH 1/2] remove external toolchains
+Subject: [PATCH] remove external toolchains
 
 Make ath9k_htc and carl9170fw build without depending on downloading compilers, and
 remove related files, so it can be built offline using the system ones.
 
-Changes to src/:
+Changes to src:
 
  - ath9k_htc:
    * target_firmware/configure: use the system's xtensa-elf cross-compiler
@@ -44,10 +44,10 @@ Signed-off-by: David P <megver83@parabola.nu>
  src/carl9170fw/toolchain/SHA256SUMS                   |    14 -
  15 files changed, 31 insertions(+), 29439 deletions(-)
 
-diff --git a/src/INSTALL b/src/INSTALL
+diff --git src/INSTALL src/INSTALL
 index dfabf2a..be6c905 100644
---- a/src/INSTALL
-+++ b/src/INSTALL
+--- src/INSTALL
++++ src/INSTALL
 @@ -20,11 +20,19 @@ system:
  	* GNU Flex
  	* GNU Gperf
@@ -69,10 +69,10 @@ index dfabf2a..be6c905 100644
  
  CARL9170 Firmware Configuration
  When building the carl9170 firmware you will be prompted with
-diff --git a/src/Makefile b/src/Makefile
+diff --git src/Makefile src/Makefile
 index 122f659..c2b8451 100644
---- a/src/Makefile
-+++ b/src/Makefile
+--- src/Makefile
++++ src/Makefile
 @@ -17,7 +17,7 @@ shell=/bin/sh
  prefix=/lib/firmware
  install_program=install
@@ -122,10 +122,10 @@ index 122f659..c2b8451 100644
  	if [ -a carl9170fw/Makefile ]; then cd carl9170fw && $(MAKE) clean; fi;
  	cd dsp56k && $(MAKE) clean
  	cd ihex2fw && $(MAKE) clean
-diff --git a/src/ath9k_htc/.travis.yml b/src/ath9k_htc/.travis.yml
+diff --git src/ath9k_htc/.travis.yml src/ath9k_htc/.travis.yml
 index cfb0ee1..5a8db8f 100644
---- a/src/ath9k_htc/.travis.yml
-+++ b/src/ath9k_htc/.travis.yml
+--- src/ath9k_htc/.travis.yml
++++ src/ath9k_htc/.travis.yml
 @@ -19,6 +19,5 @@ addons:
        - cmake
  
@@ -133,10 +133,10 @@ index cfb0ee1..5a8db8f 100644
 -  - make toolchain
    - make -C target_firmware
    - make -C target_firmware clean
-diff --git a/src/ath9k_htc/Makefile b/src/ath9k_htc/Makefile
+diff --git src/ath9k_htc/Makefile src/ath9k_htc/Makefile
 index ee5e61b..3f9c66d 100644
---- a/src/ath9k_htc/Makefile
-+++ b/src/ath9k_htc/Makefile
+--- src/ath9k_htc/Makefile
++++ src/ath9k_htc/Makefile
 @@ -1,149 +1,11 @@
 -GMP_VER=6.1.1
 -GMP_URL=https://ftp.gnu.org/gnu/gmp/gmp-$(GMP_VER).tar.bz2
@@ -293,10 +293,10 @@ index ee5e61b..3f9c66d 100644
 -$(eval $(call Build,GCC,MPC MPFR))
 +	
 +.PHONY: all clean firmware
-diff --git a/src/ath9k_htc/README b/src/ath9k_htc/README
+diff --git src/ath9k_htc/README src/ath9k_htc/README
 index 93823e4..bd14e8f 100644
---- a/src/ath9k_htc/README
-+++ b/src/ath9k_htc/README
+--- src/ath9k_htc/README
++++ src/ath9k_htc/README
 @@ -48,19 +48,7 @@ You're in for a treat.
  * Install the cmake build tool (http://www.cmake.org/).
    Major distributions have packages for this.
@@ -318,10 +318,10 @@ index 93823e4..bd14e8f 100644
  
  * Next, build the firmware.
  
-diff --git a/src/ath9k_htc/local/patches/binutils-2.27_fixup.patch b/src/ath9k_htc/local/patches/binutils-2.27_fixup.patch
+diff --git src/ath9k_htc/local/patches/binutils-2.27_fixup.patch src/ath9k_htc/local/patches/binutils-2.27_fixup.patch
 deleted file mode 100644
 index fb61345..0000000
---- a/src/ath9k_htc/local/patches/binutils-2.27_fixup.patch
+--- src/ath9k_htc/local/patches/binutils-2.27_fixup.patch
 +++ /dev/null
 @@ -1,13 +0,0 @@
 -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
@@ -337,10 +337,10 @@ index fb61345..0000000
 - 
 -   free (cnt_arg);
 -   *cnt_argp = new_arg;
-diff --git a/src/ath9k_htc/local/patches/binutils.patch b/src/ath9k_htc/local/patches/binutils.patch
+diff --git src/ath9k_htc/local/patches/binutils.patch src/ath9k_htc/local/patches/binutils.patch
 deleted file mode 100644
 index 8246771..0000000
---- a/src/ath9k_htc/local/patches/binutils.patch
+--- src/ath9k_htc/local/patches/binutils.patch
 +++ /dev/null
 @@ -1,28962 +0,0 @@
 -From dbca73446265ce01b8e11462c3346b25953e3399 Mon Sep 17 00:00:00 2001
@@ -29305,10 +29305,10 @@ index 8246771..0000000
 --- 
 -1.8.1
 -
-diff --git a/src/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch b/src/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch
+diff --git src/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch src/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch
 deleted file mode 100644
 index 681c0ee..0000000
---- a/src/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch
+--- src/ath9k_htc/local/patches/gcc-6.3.0_fixup.patch
 +++ /dev/null
 @@ -1,49 +0,0 @@
 -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
@@ -29360,10 +29360,10 @@ index 681c0ee..0000000
 -       else
 - 	output_addr_const (file, x);
 -     }
-diff --git a/src/ath9k_htc/local/patches/gcc.patch b/src/ath9k_htc/local/patches/gcc.patch
+diff --git src/ath9k_htc/local/patches/gcc.patch src/ath9k_htc/local/patches/gcc.patch
 deleted file mode 100644
 index b26cc56..0000000
---- a/src/ath9k_htc/local/patches/gcc.patch
+--- src/ath9k_htc/local/patches/gcc.patch
 +++ /dev/null
 @@ -1,92 +0,0 @@
 -diff --git a/include/xtensa-config.h b/include/xtensa-config.h
@@ -29458,10 +29458,10 @@ index b26cc56..0000000
 - 
 - #undef XCHAL_MAX_INSTRUCTION_SIZE
 - #define XCHAL_MAX_INSTRUCTION_SIZE	3
-diff --git a/src/ath9k_htc/local/patches/gcc.patch2 b/src/ath9k_htc/local/patches/gcc.patch2
+diff --git src/ath9k_htc/local/patches/gcc.patch2 src/ath9k_htc/local/patches/gcc.patch2
 deleted file mode 100644
 index 4d82574..0000000
---- a/src/ath9k_htc/local/patches/gcc.patch2
+--- src/ath9k_htc/local/patches/gcc.patch2
 +++ /dev/null
 @@ -1,13 +0,0 @@
 -diff --git a/gcc/ubsan.c b/gcc/ubsan.c
@@ -29477,10 +29477,10 @@ index 4d82574..0000000
 -       || xloc.file[1] == '\xff')
 -     return false;
 - 
-diff --git a/src/ath9k_htc/target_firmware/configure b/src/ath9k_htc/target_firmware/configure
+diff --git src/ath9k_htc/target_firmware/configure src/ath9k_htc/target_firmware/configure
 index e2d4639..6e49093 100755
---- a/src/ath9k_htc/target_firmware/configure
-+++ b/src/ath9k_htc/target_firmware/configure
+--- src/ath9k_htc/target_firmware/configure
++++ src/ath9k_htc/target_firmware/configure
 @@ -38,7 +38,7 @@
  TARGET=xtensa-elf
  
@@ -29490,10 +29490,10 @@ index e2d4639..6e49093 100755
  
  TOOLCHAIN_FILE="$PWD/build/toolchain.cmake"
  
-diff --git a/src/carl9170fw/README.md b/src/carl9170fw/README.md
+diff --git src/carl9170fw/README.md src/carl9170fw/README.md
 index 65a3aa7..440ea20 100644
---- a/src/carl9170fw/README.md
-+++ b/src/carl9170fw/README.md
+--- src/carl9170fw/README.md
++++ src/carl9170fw/README.md
 @@ -8,17 +8,6 @@ driver or the tools supplied in the repository.
  
  ## Build
@@ -29512,10 +29512,10 @@ index 65a3aa7..440ea20 100644
  ### Build Firmware Image
  
  The firmware configuration and build process requires the following
-diff --git a/src/carl9170fw/extra/sh-elf-linux.cmake b/src/carl9170fw/extra/sh-elf-linux.cmake
+diff --git src/carl9170fw/extra/sh-elf-linux.cmake src/carl9170fw/extra/sh-elf-linux.cmake
 index 3fdf98c..c0b1e84 100644
---- a/src/carl9170fw/extra/sh-elf-linux.cmake
-+++ b/src/carl9170fw/extra/sh-elf-linux.cmake
+--- src/carl9170fw/extra/sh-elf-linux.cmake
++++ src/carl9170fw/extra/sh-elf-linux.cmake
 @@ -3,19 +3,19 @@ set(CMAKE_SYSTEM_PROCESSOR "sh2")
  
  set_property(DIRECTORY PROPERTY TARGET_SUPPORTS_SHARED_LIBS FALSE)
@@ -29544,10 +29544,10 @@ index 3fdf98c..c0b1e84 100644
  
  set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
  set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-diff --git a/src/carl9170fw/toolchain/Makefile b/src/carl9170fw/toolchain/Makefile
+diff --git src/carl9170fw/toolchain/Makefile src/carl9170fw/toolchain/Makefile
 deleted file mode 100644
 index 3ee93a9..0000000
---- a/src/carl9170fw/toolchain/Makefile
+--- src/carl9170fw/toolchain/Makefile
 +++ /dev/null
 @@ -1,104 +0,0 @@
 -BINUTILS_VER=2.30
@@ -29654,10 +29654,10 @@ index 3ee93a9..0000000
 -
 -distclean: clean
 -	rm -rf "$(BASEDIR)/src"
-diff --git a/src/carl9170fw/toolchain/SHA256SUMS b/src/carl9170fw/toolchain/SHA256SUMS
+diff --git src/carl9170fw/toolchain/SHA256SUMS src/carl9170fw/toolchain/SHA256SUMS
 deleted file mode 100644
 index 99505e4..0000000
---- a/src/carl9170fw/toolchain/SHA256SUMS
+--- src/carl9170fw/toolchain/SHA256SUMS
 +++ /dev/null
 @@ -1,14 +0,0 @@
 -1cf7adf8ff4b5aa49041c8734bbcf1ad18cc4c94d0029aae0f4e48841088479a  src/gcc-7.2.0.tar.xz