diff options
| -rw-r--r-- | libre/linux-libre-firmware/PKGBUILD | 15 | ||||
| -rw-r--r-- | libre/linux-libre-firmware/config | 52 |
2 files changed, 8 insertions, 59 deletions
diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index 26c128d1b..5a281751e 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -5,7 +5,7 @@ pkgname=linux-libre-firmware pkgver=1.1 -pkgrel=3 +pkgrel=4 epoch=1 pkgdesc='Firmware files for Linux-libre' arch=('any') @@ -33,12 +33,10 @@ replaces=(${conflicts[@]}) options=(!strip) source=("${url}/${pkgname}-${pkgver}.tar.lz"{,.asc} 'remove-wget.patch' # remove the download of external toolchains - 'config' # carl9170fw configuration ) sha512sums=('4ef111f86e8a87bab31e02be171e09f47d71884f1737f5329e9dd07e9f799436d8ff2de5aa0b2cfb4bc921ed02bb2b59b9a1ea69176dcef5f902364d8725e75a' 'SKIP' - '60b58bed66e737148a5954c18efb1113518f14cf43ee2b6e7e8cdabe253a6db1c0d696f01eb25ecda7a8d3300afcf0169fa35f5eb123211554f08710f2c26ea2' - '4e596db89f88ed24db3eaff8ed2853d2a07128ba430a26bc63e08f29e4cd4c7093d358df35f580ede563103f0cf720f0f81f517108c79e80d8cf2aee786023f4') + '60b58bed66e737148a5954c18efb1113518f14cf43ee2b6e7e8cdabe253a6db1c0d696f01eb25ecda7a8d3300afcf0169fa35f5eb123211554f08710f2c26ea2') validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self prepare() { @@ -48,8 +46,7 @@ prepare() { patch -p1 -i ../remove-wget.patch # CARL9170 configuration - cp -Tf ../config src/carl9170fw/.config - sed -e '13s|config/conf|config/conf --config|' \ + sed -e '13s|config/conf|config/conf --alldefconfig|' \ -i src/carl9170fw/autogen.sh } @@ -71,6 +68,10 @@ package() { install -dm755 $pkgdir/usr/lib/firmware make prefix=$pkgdir/usr/lib/firmware install - + + # ath9k_htc works only if it's located at /usr/lib/firmware + mv $pkgdir/usr/lib/firmware/ath9k_htc/* $pkgdir/usr/lib/firmware + rm -r $pkgdir/usr/lib/firmware/ath9k_htc + install -Dm644 WHENCE $pkgdir/usr/share/licenses/$pkgname/WHENCE } diff --git a/libre/linux-libre-firmware/config b/libre/linux-libre-firmware/config deleted file mode 100644 index 3b53f7989..000000000 --- a/libre/linux-libre-firmware/config +++ /dev/null @@ -1,52 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# CARL9170 Firmware Configuration -# - -# -# General -# -CONFIG_CARL9170FW_RELEASE_VERSION=1 - -# -# Selectable Hardware Options -# -# CONFIG_CARL9170FW_RX_FRAME_LEN_4096 is not set -CONFIG_CARL9170FW_RX_FRAME_LEN_8192=y -# CONFIG_CARL9170FW_RX_FRAME_LEN_16384 is not set -# CONFIG_CARL9170FW_RX_FRAME_LEN_32768 is not set -CONFIG_CARL9170FW_RX_FRAME_LEN=8192 -CONFIG_CARL9170FW_GPIO_INTERRUPT=y -CONFIG_CARL9170FW_SECURITY_ENGINE=y -CONFIG_CARL9170FW_RADIO_FUNCTIONS=y - -# -# USB Firmware Configuration Settings -# -CONFIG_CARL9170FW_USB_STANDARD_CMDS=y -CONFIG_CARL9170FW_USB_UP_STREAM=y -# CONFIG_CARL9170FW_USB_DN_STREAM is not set -CONFIG_CARL9170FW_DEBUG_USB=y - -# -# Experimental, Unstable & Testing Extensions -# -CONFIG_CARL9170FW_PRINTF=y -CONFIG_CARL9170FW_EXPERIMENTAL=y -# CONFIG_CARL9170FW_WOL_OPTION is not set -CONFIG_CARL9170FW_VIFS_NUM=1 -CONFIG_CARL9170FW_FW_MAC_RESET=y -# CONFIG_CARL9170FW_NOISY_MAC_RESET is not set -# CONFIG_CARL9170FW_80MHZ_CLOCK is not set -# CONFIG_CARL9170FW_BROKEN_FEATURES is not set - -# -# Build Options -# -CONFIG_CARL9170FW_AGGRESSIVE_CFLAGS=y -CONFIG_CARL9170FW_BUILD_MINIBOOT=y - -# -# Firmware Tools -# -# CONFIG_CARL9170FW_BUILD_TOOLS is not set |