diff options
| author | David P <megver83@parabola.nu> | 2018-08-20 17:45:00 -0300 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2018-08-20 17:46:25 -0300 |
| commit | ab617981fcc370140f6a0bb3e05a801b760fc5df (patch) | |
| tree | b4764b2af91cffe74d9cdfb50c7747db3fd61050 | |
| parent | 2601f8d3f61e0f4f2eea446566daa70772293ede (diff) | |
fix: libre/linux-libre-firmware 1:1.3-2
Signed-off-by: David P <megver83@parabola.nu>
| -rw-r--r-- | libre/linux-libre-firmware/PKGBUILD | 4 | ||||
| -rw-r--r-- | libre/linux-libre-firmware/remove-external-toolchains.patch | 20 |
2 files changed, 11 insertions, 13 deletions
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 3534a93ea..0d237e228 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -5,7 +5,7 @@ pkgname=linux-libre-firmware pkgver=1.3 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Firmware files for Linux-libre' arch=('any') @@ -34,7 +34,7 @@ options=(!buildflags !makeflags) source=("$url/$pkgname-$pkgver.tar.lz"{,.asc} 'remove-external-toolchains.patch') sha512sums=('d3ead6924e686d0212c5993386fdf7ed1d2f68cb899517510ef488b2006a7bb9c1a8e511d23622e0342bdc70410c90291aad60adb2ac5db20c00b40a11508700' 'SKIP' - '2d45a7afd7e22bf558a24fa7777976ee6bbe5aa7c73b6fcccab32c28c52bb76de2647e5b8c1560bb6f9dd0e2e5c36befb1a776257c5f412437cdaa8f96290864') + '028f18ab966bd6294034573fce4a8bb9be502ee31f28578803948847a824f5c477d59f21e3a99a8491df7ee24895631f110fd895125e319a875145eec55514fd') validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self prepare() { diff --git a/libre/linux-libre-firmware/remove-external-toolchains.patch b/libre/linux-libre-firmware/remove-external-toolchains.patch index a84b5cf95..41e300bee 100644 --- a/libre/linux-libre-firmware/remove-external-toolchains.patch +++ b/libre/linux-libre-firmware/remove-external-toolchains.patch @@ -1,4 +1,4 @@ -From 9c3baae5a5a78fddc3e8d9e66b73cf08863c2daf Mon Sep 17 00:00:00 2001 +From 661510f54eee57b5427fb576221e92e6027d07f7 Mon Sep 17 00:00:00 2001 From: David P <megver83@parabola.nu> Date: Mon, 20 Aug 2018 16:31:34 -0300 Subject: [PATCH] remove external toolchains @@ -22,12 +22,13 @@ Changes to src: * add sh-elf and xtensa-elf toolchains to the list of dependencies - Makefile: * remove ath9k_htc_toolchain, carl9170fw-toolchain and related commands + * refer to ath9k_htc instead of ath9k_htc_firmware in .PHONY * build carl9170fw with `./autogen.sh --alldefconfig' Signed-off-by: David P <megver83@parabola.nu> --- src/INSTALL | 14 +- - src/Makefile | 19 +- + src/Makefile | 16 +- src/ath9k_htc/.travis.yml | 1 - src/ath9k_htc/Makefile | 147 +- src/ath9k_htc/README | 14 +- @@ -38,7 +39,7 @@ Signed-off-by: David P <megver83@parabola.nu> src/carl9170fw/extra/sh-elf-linux.cmake | 16 +- src/carl9170fw/toolchain/Makefile | 104 - src/carl9170fw/toolchain/SHA256SUMS | 16 - - 12 files changed, 30 insertions(+), 29368 deletions(-) + 12 files changed, 28 insertions(+), 29367 deletions(-) delete mode 100644 src/ath9k_htc/local/patches/binutils.patch delete mode 100644 src/ath9k_htc/local/patches/gcc.patch delete mode 100644 src/carl9170fw/toolchain/Makefile @@ -86,7 +87,7 @@ index 74c5cfd..83fd648 100644 \ No newline at end of file +later version. diff --git src/Makefile src/Makefile -index 1a9ceb6..9980d19 100644 +index 1a9ceb6..bf41485 100644 --- src/Makefile +++ src/Makefile @@ -17,7 +17,7 @@ shell=/bin/sh @@ -94,11 +95,11 @@ index 1a9ceb6..9980d19 100644 install_program=install -.PHONY: all test clean install a56 as31 aica ath9k_htc_toolchain ath9k_htc_firmware av7110 b43-tools carl9170fw-toolchain carl9170fw cis-tools cis dsp56k ihex2fw isci keyspan_pda openfwwf usbdux -+.PHONY: all test clean install a56 as31 aica ath9k_htc_firmware av7110 b43-tools carl9170fw cis-tools cis dsp56k ihex2fw isci keyspan_pda openfwwf usbdux ++.PHONY: all test clean install a56 as31 aica ath9k_htc av7110 b43-tools carl9170fw cis-tools cis dsp56k ihex2fw isci keyspan_pda openfwwf usbdux all: aica ath9k_htc av7110 carl9170fw cis dsp56k isci keyspan_pda openfwwf usbdux -@@ -30,11 +30,8 @@ as31: +@@ -30,10 +30,7 @@ as31: aica: cd aica/arm && $(MAKE) @@ -106,12 +107,10 @@ index 1a9ceb6..9980d19 100644 - cd ath9k_htc && $(MAKE) toolchain - -ath9k_htc: ath9k_htc_toolchain -- cd ath9k_htc && $(MAKE) -C target_firmware +ath9k_htc: -+ cd ath9k_htc && $(MAKE) firmware + cd ath9k_htc && $(MAKE) -C target_firmware av7110: - cd av7110 && $(MAKE) @@ -42,11 +39,8 @@ av7110: b43-tools: cd b43-tools/assembler && $(MAKE) @@ -126,12 +125,11 @@ index 1a9ceb6..9980d19 100644 cis: cis-tools cd cis && $(MAKE) -@@ -79,10 +73,9 @@ clean: +@@ -79,10 +73,8 @@ clean: cd aica/arm && $(MAKE) clean cd a56 && $(MAKE) clean if [ -a as31/Makefile ]; then cd as31 && $(MAKE) clean; fi; - cd ath9k_htc && $(MAKE) toolchain-clean -+ cd ath9k_htc cd ath9k_htc && $(MAKE) -C target_firmware clean cd av7110 && $(MAKE) clean - cd carl9170fw/toolchain && $(MAKE) clean |