diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/ath9k-htc-firmware-git/LICENSE | 33 | ||||
| -rw-r--r-- | libre/ath9k-htc-firmware-git/PKGBUILD | 81 | ||||
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch | 67 | ||||
| -rw-r--r-- | libre/parabola-keyring/PKGBUILD | 9 |
5 files changed, 6 insertions, 192 deletions
diff --git a/libre/ath9k-htc-firmware-git/LICENSE b/libre/ath9k-htc-firmware-git/LICENSE deleted file mode 100644 index 7668bcb97..000000000 --- a/libre/ath9k-htc-firmware-git/LICENSE +++ /dev/null @@ -1,33 +0,0 @@ -Copyright (c) 2013 Qualcomm Atheros, Inc. - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted (subject to the limitations in the -disclaimer below) provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the - distribution. - - * Neither the name of Qualcomm Atheros nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE -GRANTED BY THIS LICENSE. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT -HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED -WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR -BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE -OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN -IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/libre/ath9k-htc-firmware-git/PKGBUILD b/libre/ath9k-htc-firmware-git/PKGBUILD deleted file mode 100644 index d04643491..000000000 --- a/libre/ath9k-htc-firmware-git/PKGBUILD +++ /dev/null @@ -1,81 +0,0 @@ -# Maintainer: André Silva <emulatorman@lavabit.com> -# Maintainer: Márcio Silva <coadde@lavabit.com> - -pkgname=ath9k-htc-firmware-git -pkgver=$(LC_ALL=C date -u +%Y%m%d) -pkgrel=1 -pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs' -arch=('any') -url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc') -license=('BSD') -makedepends=('git' 'cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc') -conflicts=('ath9k-htc-firmware') -provides=('ath9k-htc-firmware') -source=("git://github.com/olerem/open-ath9k-htc-firmware" - #"git://github.com/qca/open-ath9k-htc-firmware" - 'LICENSE') -md5sums=('SKIP' - '5163b2711bc481c77045850610b7dd31') - -prepare() { - - cd $srcdir/open-ath9k-htc-firmware/target_firmware - mkdir -p build/{k2,magpie} - -} - -build() { - - cd $srcdir/open-ath9k-htc-firmware - - # use suspend_fix branch to fix "ath9k_htc: Target is unresponsive" - git checkout suspend_fix - - export CTARGET="xtensa-unknown-elf" - export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4" - export CXXFLAGS="${CFLAGS}" - - cat > target_firmware/build/toolchain.cmake <<EOF -INCLUDE(CMakeForceCompiler) - -SET(CMAKE_SYSTEM_PROCESSOR xtensa) -SET(COMPILER_PREFIX "xtensa-unknown-elf") -SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf) - -CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU) -EOF - - cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/k2 - - cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../.. - cd - - - cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/magpie - - cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../.. - cd - - - cd $srcdir/open-ath9k-htc-firmware/target_firmware - - make -C build/k2 - make -C build/magpie - -} - -package() { - - # create firmware folder to put the free firmware files there - install -d -m755 $pkgdir/usr/lib/firmware - - cd $srcdir/open-ath9k-htc-firmware/target_firmware - - # move firmware files to firmware folder - cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware - - # create license folder to put the license file there - install -d -m755 $pkgdir/usr/share/licenses/$pkgname - - # put LICENSE to license folder - install -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname - -} diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 8e96118c3..78293fad3 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -12,7 +12,7 @@ pkgbase=linux-libre # Build stock -LIBRE kernel _basekernel=3.9 _sublevel=9 pkgver=${_basekernel}.${_sublevel} -pkgrel=1.1 +pkgrel=1 _lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -29,7 +29,6 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'Kbuild.platforms' 'boot-logo.patch' 'change-default-console-loglevel.patch' - 'ath9k_htc-fix-target-is-unresponsive.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('120df29f88622dabf7015a22c7cc8e25' 'e143fc381f4d2fdfc18686b867a5e6a5' @@ -40,7 +39,6 @@ md5sums=('120df29f88622dabf7015a22c7cc8e25' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - '63b1d84fd82e5ea1c1e08a24d9d707b0' '30092ce96affb12f89a9eddfad966741') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -66,10 +64,6 @@ prepare() { # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227) patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch" - # fix "ath9k_htc: Target is unresponsive" - # https://github.com/qca/open-ath9k-htc-firmware/issues/1 - patch -Np1 -i "${srcdir}/ath9k_htc-fix-target-is-unresponsive.patch" - if [ "$CARCH" == "mips64el" ]; then sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre|" Makefile sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \ diff --git a/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch b/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch deleted file mode 100644 index 3ba839940..000000000 --- a/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c -index f5dda84..7730a5c 100644 ---- a/drivers/net/wireless/ath/ath9k/hif_usb.c -+++ b/drivers/net/wireless/ath/ath9k/hif_usb.c -@@ -1124,7 +1124,7 @@ static void ath9k_hif_usb_firmware_cb(const struct firmware *fw, void *context) - } - - release_firmware(fw); -- hif_dev->flags |= HIF_USB_READY; -+ hif_dev->flags |= HIF_USB_FW_LOADED; - complete(&hif_dev->fw_done); - - return; -@@ -1281,7 +1281,7 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface) - - wait_for_completion(&hif_dev->fw_done); - -- if (hif_dev->flags & HIF_USB_READY) { -+ if (hif_dev->flags & HIF_USB_FW_LOADED) { - ath9k_htc_hw_deinit(hif_dev->htc_handle, unplugged); - ath9k_htc_hw_free(hif_dev->htc_handle); - ath9k_hif_usb_dev_deinit(hif_dev); -@@ -1289,7 +1289,9 @@ static void ath9k_hif_usb_disconnect(struct usb_interface *interface) - - usb_set_intfdata(interface, NULL); - -- if (!unplugged && (hif_dev->flags & HIF_USB_START)) -+ /* If firmware was loaded we should drop it -+ * go back to first stage bootloader. */ -+ if (!unplugged && (hif_dev->flags & HIF_USB_FW_LOADED)) - ath9k_hif_usb_reboot(udev); - - kfree(hif_dev); -@@ -1326,7 +1328,7 @@ static int ath9k_hif_usb_resume(struct usb_interface *interface) - if (ret) - return ret; - -- if (hif_dev->flags & HIF_USB_READY) { -+ if (hif_dev->flags & HIF_USB_FW_LOADED) { - /* request cached firmware during suspend/resume cycle */ - ret = request_firmware(&fw, hif_dev->fw_name, - &hif_dev->udev->dev); -diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h b/drivers/net/wireless/ath/ath9k/hif_usb.h -index 51496e7..d74697d 100644 ---- a/drivers/net/wireless/ath/ath9k/hif_usb.h -+++ b/drivers/net/wireless/ath/ath9k/hif_usb.h -@@ -85,7 +85,7 @@ struct cmd_buf { - }; - - #define HIF_USB_START BIT(0) --#define HIF_USB_READY BIT(1) -+#define HIF_USB_FW_LOADED BIT(1) - - struct hif_device_usb { - struct usb_device *udev; -diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c -index a47f5e0..3b202ff 100644 ---- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c -+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c -@@ -846,6 +846,7 @@ static int ath9k_init_device(struct ath9k_htc_priv *priv, - if (error != 0) - goto err_rx; - -+ ath9k_hw_disable(priv->ah); - #ifdef CONFIG_MAC80211_LEDS - /* must be initialized before ieee80211_register_hw */ - priv->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(priv->hw, diff --git a/libre/parabola-keyring/PKGBUILD b/libre/parabola-keyring/PKGBUILD index af130b5c0..212c3beb0 100644 --- a/libre/parabola-keyring/PKGBUILD +++ b/libre/parabola-keyring/PKGBUILD @@ -1,18 +1,19 @@ # Maintainer: André Silva <emulatorman@lavabit.com> pkgname=parabola-keyring -pkgver=$(LC_ALL=C date -u +%Y%m%d).1 +pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 pkgdesc='Parabola GNU/Linux-libre PGP keyring' arch=('any') url='https://projects.parabolagnulinux.org/hackers.git/' license=('GPL') install="${pkgname}.install" -source=(http://repo.parabolagnulinux.org/other/parabola-keyring-20130221.tar.gz{,.sig}) +source=("http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz" + "http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz.sig") package() { - cd "${srcdir}/${pkgname}-"* + cd "${srcdir}/${pkgname}-${pkgver}" make PREFIX=/usr DESTDIR=${pkgdir} install } -md5sums=('007c35459478f86484f66323bf90b1e0' +md5sums=('d876a03f772de98905fd7eadf0ad5e1c' 'SKIP') |