From 0ada332cea6aa787be4c2716ca94dc7b373b22b0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 6 Jul 2013 18:20:40 -0600 Subject: update libre/dpkg --- libre/dpkg/PKGBUILD | 23 +++++++++++++---------- libre/dpkg/dpkg-gpg2.patch | 11 ----------- 2 files changed, 13 insertions(+), 21 deletions(-) delete mode 100644 libre/dpkg/dpkg-gpg2.patch (limited to 'libre') diff --git a/libre/dpkg/PKGBUILD b/libre/dpkg/PKGBUILD index 5d7534534..806194577 100644 --- a/libre/dpkg/PKGBUILD +++ b/libre/dpkg/PKGBUILD @@ -12,28 +12,30 @@ pkgname=(dpkg-devtools perl-dpkg) pkgdesc="Debian Package manager and utilities" license=('GPL2') -pkgver=1.16.9 +pkgver=1.16.10 url="http://packages.debian.org/source/sid/dpkg" -_debrepo=http://ftp.debian.org/debian/pool/main # Debian Sid +_debrepo=http://ftp.debian.org/debian/pool/main + +pkgrel=1.3 -pkgrel=1.2 -debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } arch=('i686' 'x86_64' 'mips64el') depends=('bzip2' 'xz' 'zlib' 'ncurses') checkdepends=('perl-test-pod') makedepends=('perl-io-string' 'perl-timedate') -source=("$(debfile ${pkgbase} ${pkgver}).tar.xz" - dpkg-gzip-rsyncable.patch dpkg-gpg2.patch) + +_debfile() { echo "${_debrepo}/${1:0:1}/${1}/${1}_${2}"; } +source=("$(_debfile ${pkgbase} ${pkgver}).tar.xz" + dpkg-gzip-rsyncable.patch) ###################################################################### # This is really gross. # It uses the debian control files to help us split the package. # Shame on the dpkg developers for not putting that logic into the build system. -_destdir="$srcdir/$pkgbase-$pkgver/debian/pkg-makepkg" +_destdir="$pkgbase-$pkgver/debian/pkg-makepkg" _debhelper_install() { local debname=$1 - cd "$_destdir" + cd "$srcdir/$_destdir" # main files sed -e '/^\s*$/d' -e 's|usr/share/perl5/|&vendor_perl/|g' ../$debname.install \ @@ -80,11 +82,10 @@ build() { cd "${srcdir}/${pkgbase}-${pkgver}" patch -Np0 -i "${srcdir}/dpkg-gzip-rsyncable.patch" - patch -Np1 -i "${srcdir}/dpkg-gpg2.patch" ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-zlib --with-bz2 --with-liblzma make - make DESTDIR="$_destdir" install + make DESTDIR="$srcdir/$_destdir" install } check() { @@ -125,3 +126,5 @@ package_perl-dpkg() { md5sums=('4df9319b2d17e19cdb6fe94dacee44da' '5ab63758999e9bb10f84bce79a0307b2' '74b7ce3045690a8fc290104f10cf8d42') +md5sums=('a20a06a5272717274a8b009368f237da' + '5ab63758999e9bb10f84bce79a0307b2') diff --git a/libre/dpkg/dpkg-gpg2.patch b/libre/dpkg/dpkg-gpg2.patch deleted file mode 100644 index 28671c484..000000000 --- a/libre/dpkg/dpkg-gpg2.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- dpkg-1.16.9/scripts/Dpkg/Source/Package.pm.orig 2013-01-09 01:28:47.000000000 -0500 -+++ dpkg-1.16.9/scripts/Dpkg/Source/Package.pm 2013-01-09 01:30:51.000000000 -0500 -@@ -344,7 +344,7 @@ - my $dsc = $self->get_filename(); - my @exec; - if (find_command('gpgv')) { -- push @exec, "gpgv"; -+ push @exec, "gpgv", "--verify"; - } elsif (find_command('gpg')) { - push @exec, "gpg", "--no-default-keyring", "-q", "--verify"; - } -- cgit v1.2.3-54-g00ecf From 64074768d63c5b5f1c880a74d564d203d9eb8de6 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 6 Jul 2013 18:21:21 -0600 Subject: update libre/libretools --- libre/libretools/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index 80b154dff..562692e48 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -9,8 +9,8 @@ pkgdesc="Programs for Parabola development" url="https://projects.parabolagnulinux.org/packages/libretools.git/" license=('GPL3' 'GPL2') -pkgver=20130627 -_libretools_commit=08375ed421d18b48388169c7fc7cf4ca076577ba +pkgver=20130706 +_libretools_commit=de47a853ef515db2b9a775c235239efacd16041b _devtools_commit=bf8513ae631484a0c292ad085ea7ede9859f8e0f _packages_url=https://projects.parabolagnulinux.org/packages @@ -74,5 +74,5 @@ package_libretools-mips64el() { make install-libretools-mips64el DESTDIR="$pkgdir" } -md5sums=('acbdcd22c1b922f943651dbf7c320bbd' +md5sums=('f30fbc4011acdd9065310f8295267bdd' 'b28b1492fda205be7c577fc03cbc3399') -- cgit v1.2.3-54-g00ecf From 71382135d5608d2819b6a3c2a8138a2e4aa04bde Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 7 Jul 2013 18:51:57 -0300 Subject: ath9k-htc-firmware-20130707-1: fix issues on PKGBUILD --- libre/ath9k-htc-firmware/PKGBUILD | 56 +++------------------------------------ 1 file changed, 3 insertions(+), 53 deletions(-) (limited to 'libre') diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD index d323ef8d2..f79aae173 100644 --- a/libre/ath9k-htc-firmware/PKGBUILD +++ b/libre/ath9k-htc-firmware/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ath9k-htc-firmware pkgver=$(LC_ALL=C date -u +%Y%m%d) -pkgrel=2 +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') @@ -25,37 +25,16 @@ build() { cd $srcdir/open-ath9k-htc-firmware - export CBUILD=$CHOST - export CHOST="xtensa-unknown-elf" export CTARGET="xtensa-unknown-elf" export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4" export CXXFLAGS="${CFLAGS}" - export CC=/usr/bin/xtensa-unknown-elf-gcc - export CPP=/usr/bin/xtensa-unknown-elf-cpp - export AR=/usr/bin/xtensa-unknown-elf-ar - export AS=/usr/bin/xtensa-unknown-elf-as - export LD=/usr/bin/xtensa-unknown-elf-ld - export NM=/usr/bin/xtensa-unknown-elf-nm - export OBJCOPY=/usr/bin/xtensa-unknown-elf-objcopy - export OBJDUMP=/usr/bin/xtensa-unknown-elf-objdump - export RANLIB=/usr/bin/xtensa-unknown-elf-ranlib - export STRIP=/usr/bin/xtensa-unknown-elf-strip - cat > target_firmware/build/toolchain.cmake < Date: Sun, 7 Jul 2013 19:35:25 -0300 Subject: ath9k-htc-firmware-1.3.2-1: build from stable version, not git --- libre/ath9k-htc-firmware/PKGBUILD | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'libre') diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD index f79aae173..40bfae1e2 100644 --- a/libre/ath9k-htc-firmware/PKGBUILD +++ b/libre/ath9k-htc-firmware/PKGBUILD @@ -2,28 +2,28 @@ # Maintainer: Márcio Silva pkgname=ath9k-htc-firmware -pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgver=1.3.2 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') -source=("git://github.com/qca/open-ath9k-htc-firmware" +makedepends=('cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc') +source=("https://github.com/qca/open-ath9k-htc-firmware/archive/$pkgver.tar.gz" 'LICENSE') -md5sums=('SKIP' +md5sums=('73c66751151dd47535cb4142477da480' '5163b2711bc481c77045850610b7dd31') prepare() { - cd $srcdir/open-ath9k-htc-firmware/target_firmware + cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware mkdir -p build/{k2,magpie} } build() { - cd $srcdir/open-ath9k-htc-firmware + cd $srcdir/open-ath9k-htc-firmware-$pkgver export CTARGET="xtensa-unknown-elf" export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4" @@ -39,17 +39,17 @@ 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 + cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/k2 - cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../.. + cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../.. cd - - cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/magpie + cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/magpie - cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../.. + cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../.. cd - - cd $srcdir/open-ath9k-htc-firmware/target_firmware + cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware make -C build/k2 make -C build/magpie @@ -61,7 +61,7 @@ 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 + cd $srcdir/open-ath9k-htc-firmware-$pkgver/target_firmware # move firmware files to firmware folder cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware -- cgit v1.2.3-54-g00ecf From 6be964b6c688fe9a544df7e5b61d6aaeeb871ca7 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 7 Jul 2013 21:39:08 -0300 Subject: ath9k-htc-firmware: change revision due which previous revision was tested from jxself webpage --- libre/ath9k-htc-firmware/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/ath9k-htc-firmware/PKGBUILD b/libre/ath9k-htc-firmware/PKGBUILD index 40bfae1e2..6aec27967 100644 --- a/libre/ath9k-htc-firmware/PKGBUILD +++ b/libre/ath9k-htc-firmware/PKGBUILD @@ -3,7 +3,7 @@ pkgname=ath9k-htc-firmware pkgver=1.3.2 -pkgrel=1 +pkgrel=3 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') -- cgit v1.2.3-54-g00ecf From 5e86afc29af9b7272f230615524ab99789e4a3f5 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sun, 7 Jul 2013 21:54:17 -0300 Subject: ath9k-htc-firmware-git: add git version of this firmware to libre repo --- libre/ath9k-htc-firmware-git/LICENSE | 33 +++++++++++++++ libre/ath9k-htc-firmware-git/PKGBUILD | 77 +++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+) create mode 100644 libre/ath9k-htc-firmware-git/LICENSE create mode 100644 libre/ath9k-htc-firmware-git/PKGBUILD (limited to 'libre') diff --git a/libre/ath9k-htc-firmware-git/LICENSE b/libre/ath9k-htc-firmware-git/LICENSE new file mode 100644 index 000000000..7668bcb97 --- /dev/null +++ b/libre/ath9k-htc-firmware-git/LICENSE @@ -0,0 +1,33 @@ +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 new file mode 100644 index 000000000..2f52f38fa --- /dev/null +++ b/libre/ath9k-htc-firmware-git/PKGBUILD @@ -0,0 +1,77 @@ +# Maintainer: André Silva +# Maintainer: Márcio Silva + +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/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 + + 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 < Date: Sun, 7 Jul 2013 23:22:23 -0300 Subject: linux-libre-manpages-3.9-1.1: fix spell Linux instead of linux => https://bugs.archlinux.org/task/35997 --- libre/linux-libre-manpages/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre-manpages/PKGBUILD b/libre/linux-libre-manpages/PKGBUILD index f8ce261db..695ea966e 100644 --- a/libre/linux-libre-manpages/PKGBUILD +++ b/libre/linux-libre-manpages/PKGBUILD @@ -5,8 +5,8 @@ pkgname=linux-libre-manpages pkgver=3.9 -pkgrel=1 -pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the linux-libre kernel" +pkgrel=1.1 +pkgdesc="Kernel hackers manual - Section 9 manpages that comes with the Linux-libre kernel" arch=('any') url="http://linux-libre.fsfla.org/" license=('GPL2') -- cgit v1.2.3-54-g00ecf From 6661c2d96141f1dfde61459a71c088614cd54308 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 8 Jul 2013 04:07:06 -0300 Subject: calibre-libre-0.9.38-1: updating version --- libre/calibre-libre/PKGBUILD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'libre') diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 339969ba1..7991897ce 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93260 2013-06-30 12:27:03Z jelle $ +# $Id: PKGBUILD 93610 2013-07-07 09:52:43Z jelle $ # Maintainer: jelle van der Waa # Maintainer: Daniel Wallace # Contributor: Giovanni Scafora @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=0.9.37 +pkgver=0.9.38 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,10 +30,9 @@ install=calibre.install source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('76db2eb11fe51d85ae9121203defb677' +md5sums=('7dac0c5896d3affb87667fe5dbdf9019' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') - prepare(){ cd "${srcdir}/${_pkgname}" #rm -rf src/{cherrypy,pyPdf} -- cgit v1.2.3-54-g00ecf From 13f9d20d4cd910574d3d92ffb96b1fe61df19427 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 8 Jul 2013 05:22:55 -0300 Subject: linux-libre-3.9.9-1.1: add patch to fix bug on ath9k-htc driver --- libre/linux-libre/PKGBUILD | 8 ++- .../ath9k_htc-fix-target-is-unresponsive.patch | 67 ++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 78293fad3..c28f53521 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 +pkgrel=1.1 _lxopkgver=${_basekernel}.8 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" @@ -29,6 +29,7 @@ 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' @@ -39,6 +40,7 @@ md5sums=('120df29f88622dabf7015a22c7cc8e25' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' + 'db6ad371bb61e04b960c453d95e1d5cd' '30092ce96affb12f89a9eddfad966741') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. @@ -64,6 +66,10 @@ 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 new file mode 100644 index 000000000..ff6bb410e --- /dev/null +++ b/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch @@ -0,0 +1,67 @@ +diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c +index f5dda84..90ce6f3 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..9b6a8c7 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, -- cgit v1.2.3-54-g00ecf From a23e5eb01b3702889ec5433c907ddd7bf2372d4e Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 8 Jul 2013 05:32:49 -0300 Subject: linux-libre: fix ath9k-htc patch --- libre/linux-libre/PKGBUILD | 2 +- libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index c28f53521..13fb52e58 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -40,7 +40,7 @@ md5sums=('120df29f88622dabf7015a22c7cc8e25' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'db6ad371bb61e04b960c453d95e1d5cd' + 'e0d1bfde44105d22a36507d0537d21c2' '30092ce96affb12f89a9eddfad966741') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. diff --git a/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch b/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch index ff6bb410e..39d318402 100644 --- a/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch +++ b/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch @@ -27,7 +27,7 @@ index f5dda84..90ce6f3 100644 - 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)) ++ if (!unplugged && (hif_dev->flags & HIF_USB_FW_LOADED)) ath9k_hif_usb_reboot(udev); kfree(hif_dev); @@ -61,7 +61,7 @@ index a47f5e0..9b6a8c7 100644 if (error != 0) goto err_rx; -+ ath9k_hw_disable(priv->ah); ++ 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, -- cgit v1.2.3-54-g00ecf From 00f63a28ed9d0ba489d854842a89769ae64e726a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 8 Jul 2013 05:43:07 -0300 Subject: linux-libre: fix blank spaces on patch --- libre/linux-libre/PKGBUILD | 2 +- libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 13fb52e58..8e96118c3 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -40,7 +40,7 @@ md5sums=('120df29f88622dabf7015a22c7cc8e25' '8267264d9a8966e57fdacd1fa1fc65c4' '04b21c79df0a952c22d681dd4f4562df' 'f3def2cefdcbb954c21d8505d23cc83c' - 'e0d1bfde44105d22a36507d0537d21c2' + '63b1d84fd82e5ea1c1e08a24d9d707b0' '30092ce96affb12f89a9eddfad966741') if [ "$CARCH" != "mips64el" ]; then # Don't use the Loongson-specific patches on non-mips64el arches. diff --git a/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch b/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch index 39d318402..3ba839940 100644 --- a/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch +++ b/libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch @@ -1,5 +1,5 @@ diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c -index f5dda84..90ce6f3 100644 +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) @@ -26,8 +26,8 @@ index f5dda84..90ce6f3 100644 - 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)) ++ * go back to first stage bootloader. */ ++ if (!unplugged && (hif_dev->flags & HIF_USB_FW_LOADED)) ath9k_hif_usb_reboot(udev); kfree(hif_dev); @@ -54,14 +54,14 @@ index 51496e7..d74697d 100644 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..9b6a8c7 100644 +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); ++ 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, -- cgit v1.2.3-54-g00ecf From f5208bd060d059ea6a130aca323fbfa5fa92bc1f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 8 Jul 2013 06:09:57 -0300 Subject: ath9k-htc-firmware-git: use suspend_fix branch to fix Target is unresponsive bug --- libre/ath9k-htc-firmware-git/PKGBUILD | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'libre') diff --git a/libre/ath9k-htc-firmware-git/PKGBUILD b/libre/ath9k-htc-firmware-git/PKGBUILD index 2f52f38fa..d04643491 100644 --- a/libre/ath9k-htc-firmware-git/PKGBUILD +++ b/libre/ath9k-htc-firmware-git/PKGBUILD @@ -11,7 +11,8 @@ 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/qca/open-ath9k-htc-firmware" +source=("git://github.com/olerem/open-ath9k-htc-firmware" + #"git://github.com/qca/open-ath9k-htc-firmware" 'LICENSE') md5sums=('SKIP' '5163b2711bc481c77045850610b7dd31') @@ -27,6 +28,9 @@ 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}" -- cgit v1.2.3-54-g00ecf From 63a807572d7973f21e86abfd3a3a8b3832e89f88 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 8 Jul 2013 11:27:45 -0300 Subject: linux-libre: revert changes --- .../ath9k_htc-fix-target-is-unresponsive.patch | 67 ---------------------- 1 file changed, 67 deletions(-) delete mode 100644 libre/linux-libre/ath9k_htc-fix-target-is-unresponsive.patch (limited to 'libre') 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, -- cgit v1.2.3-54-g00ecf From 0f9af994973b5ef29655ef8af1965ab094369c82 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Mon, 8 Jul 2013 11:31:04 -0300 Subject: ath9k-htc-firmware-git: add unstable version with testing changes on libre-testing --- libre-testing/ath9k-htc-firmware-git/LICENSE | 33 +++++++++++ libre-testing/ath9k-htc-firmware-git/PKGBUILD | 81 +++++++++++++++++++++++++++ libre/ath9k-htc-firmware-git/LICENSE | 33 ----------- libre/ath9k-htc-firmware-git/PKGBUILD | 81 --------------------------- 4 files changed, 114 insertions(+), 114 deletions(-) create mode 100644 libre-testing/ath9k-htc-firmware-git/LICENSE create mode 100644 libre-testing/ath9k-htc-firmware-git/PKGBUILD delete mode 100644 libre/ath9k-htc-firmware-git/LICENSE delete mode 100644 libre/ath9k-htc-firmware-git/PKGBUILD (limited to 'libre') diff --git a/libre-testing/ath9k-htc-firmware-git/LICENSE b/libre-testing/ath9k-htc-firmware-git/LICENSE new file mode 100644 index 000000000..7668bcb97 --- /dev/null +++ b/libre-testing/ath9k-htc-firmware-git/LICENSE @@ -0,0 +1,33 @@ +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-testing/ath9k-htc-firmware-git/PKGBUILD b/libre-testing/ath9k-htc-firmware-git/PKGBUILD new file mode 100644 index 000000000..d04643491 --- /dev/null +++ b/libre-testing/ath9k-htc-firmware-git/PKGBUILD @@ -0,0 +1,81 @@ +# Maintainer: André Silva +# Maintainer: Márcio Silva + +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 < -# Maintainer: Márcio Silva - -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 < Date: Mon, 8 Jul 2013 11:34:18 -0300 Subject: linux-libre: revert changes on PKGBUILD --- libre/linux-libre/PKGBUILD | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'libre') 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|" \ -- cgit v1.2.3-54-g00ecf