From 5f9e7fba0c879546703ef4f3580b0a148a7c84f7 Mon Sep 17 00:00:00 2001 From: David P Date: Mon, 9 Apr 2018 14:44:52 -0300 Subject: upgpkg: libre/linux-libre-firmware 1:1.1-2 --- libre/linux-libre-firmware/PKGBUILD | 30 ++++++++++++++++---------- libre/linux-libre-firmware/config | 2 +- libre/linux-libre-firmware/remove-wget.patch | 32 ++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+), 12 deletions(-) (limited to 'libre/linux-libre-firmware') diff --git a/libre/linux-libre-firmware/PKGBUILD b/libre/linux-libre-firmware/PKGBUILD index c7712415b..a2d78c816 100644 --- a/libre/linux-libre-firmware/PKGBUILD +++ b/libre/linux-libre-firmware/PKGBUILD @@ -5,14 +5,14 @@ pkgname=linux-libre-firmware pkgver=1.1 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Firmware files for Linux-libre' arch=('any') url='https://jxself.org/firmware' -license=('GPL3' 'GPL2' 'MPL' 'BSD3') +license=('GPL3' 'GPL2' 'MPL') depends=('ath9k-htc-firmware') -makedepends=('cmake' 'gmp' 'gperf' 'arm-linux-gnueabi-gcc') +makedepends=('cmake' 'gmp' 'gperf' 'arm-linux-gnueabi-gcc' 'sh-elf-gcc' 'sh-elf-newlib' 'xtensa-unknown-elf-gcc') provides=('linux-firmware') conflicts=('linux-firmware' 'linux-firmware-git' @@ -30,30 +30,38 @@ conflicts=('linux-firmware' 'amd-ucode' 'openfwwf') replaces=(${conflicts[@]}) +options=(!strip) source=("${url}/${pkgname}-${pkgver}.tar.lz"{,.asc} - 'remove-wget.patch' - 'config' # carl9170fw configuration + 'remove-wget.patch' # remove the download of external toolchains + 'config' # carl9170fw configuration ) sha512sums=('4ef111f86e8a87bab31e02be171e09f47d71884f1737f5329e9dd07e9f799436d8ff2de5aa0b2cfb4bc921ed02bb2b59b9a1ea69176dcef5f902364d8725e75a' 'SKIP' - 'b6579a0de9e66dcbeec350172764ebedc06a6056fc3592a040f6447d1806f29d82b8bdc36e33b6012aae2068dc6975e70e0c0d1381c84937317bc763c6f2290f' - '087371c69a8ba394822efa1a41f45ec8f2a7800bcfa63a9e0e492eceaa75b85b6ea5a534e7a37091199d72229c12fe44dc0ad34625ff1c4a09c3725bc09331a3') + 'ed4af53a48efd512809a490f9f558fc94f71950b847547bbec175c3bf805fa2bf7c6fea6cec77f454e37d4650b6339c384f5458b979221490921935bd7c044d1' + '4e596db89f88ed24db3eaff8ed2853d2a07128ba430a26bc63e08f29e4cd4c7093d358df35f580ede563103f0cf720f0f81f517108c79e80d8cf2aee786023f4') validpgpkeys=('F611A908FFA165C699584ED49D0DB31B545A3198') # Jason Self prepare() { cd $srcdir/$pkgname-$pkgver - # Some firmwares download compilers with wget. We don't want that + # Some firmwares download toolchains with wget. We don't want that patch -p1 -i ../remove-wget.patch # Although we still don't use carl9170fw yet, this is a step forward - cp ../config src/carl9170fw/.config - sed '13s|config/conf|config/conf --config|' -i src/carl9170fw/autogen.sh + cp -Tf ../config src/carl9170fw/.config + sed -e '13s|config/conf|config/conf --config|' \ + -i src/carl9170fw/autogen.sh } build() { cd "${srcdir}/${pkgname}-${pkgver}/src" - make cis isci keyspan_pda openfwwf av7110 dsp56k # usbdux carl9170fw ath9k_htc + make ath9k_htc + + # NOTE: usbdux will only build in 32-bits systems/chroots (i686 and armv7h for instance), + # however compiling it manually (without makepkg) on a 64-bits machine works. + # Building with makepkg in a 64-bits system or chroot ends into a segmentation fault. + # Source: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=887320 +# make cis isci keyspan_pda openfwwf av7110 dsp56k usbdux carl9170fw # ath9k_htc } package() { diff --git a/libre/linux-libre-firmware/config b/libre/linux-libre-firmware/config index 278abc9a1..3b53f7989 100644 --- a/libre/linux-libre-firmware/config +++ b/libre/linux-libre-firmware/config @@ -49,4 +49,4 @@ CONFIG_CARL9170FW_BUILD_MINIBOOT=y # # Firmware Tools # -CONFIG_CARL9170FW_BUILD_TOOLS=y +# CONFIG_CARL9170FW_BUILD_TOOLS is not set diff --git a/libre/linux-libre-firmware/remove-wget.patch b/libre/linux-libre-firmware/remove-wget.patch index 30c9e8a7d..59142b786 100644 --- a/libre/linux-libre-firmware/remove-wget.patch +++ b/libre/linux-libre-firmware/remove-wget.patch @@ -29409,6 +29409,38 @@ index e2d4639..4d0de5c 100755 TOOLCHAIN_FILE="$PWD/build/toolchain.cmake" +diff --git a/src/carl9170fw/extra/sh-elf-linux.cmake b/src/carl9170fw/extra/sh-elf-linux.cmake +index 3fdf98c..36e3b63 100644 +--- a/src/carl9170fw/extra/sh-elf-linux.cmake ++++ b/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) + +-set(CMAKE_FIND_ROOT_PATH ${CMAKE_SOURCE_DIR}/toolchain/inst/) ++set(CMAKE_FIND_ROOT_PATH /) + + set(CMAKE_C_FLAGS "-m2 -ml -Os -ffreestanding -nostartfiles") + set(CMAKE_C_LINK_FLAGS "-Wl,-static,-EL,-x,--gc-sections") + set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") + +-set(OBJCOPY ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-objcopy) +-set(CMAKE_C_COMPILER "${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-gcc") +-set(CMAKE_AR ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-ar) +-set(CMAKE_ASM_COMPILER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-as) +-set(CMAKE_ASM-ATT_COMPILER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-as) +-set(CMAKE_LINKER ${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-ld) +-set(CMAKE_C_LINK_EXECUTABLE "${CMAKE_SOURCE_DIR}/toolchain/inst/bin/sh-elf-gcc ${CMAKE_C_FLAGS} -o ") ++set(OBJCOPY /bin/sh-elf-objcopy) ++set(CMAKE_C_COMPILER "/bin/sh-elf-gcc") ++set(CMAKE_AR /bin/sh-elf-ar) ++set(CMAKE_ASM_COMPILER /bin/sh-elf-as) ++set(CMAKE_ASM-ATT_COMPILER /bin/sh-elf-as) ++set(CMAKE_LINKER /bin/sh-elf-ld) ++set(CMAKE_C_LINK_EXECUTABLE "/bin/sh-elf-gcc ${CMAKE_C_FLAGS} -o ") + + set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) + set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) diff --git a/src/carl9170fw/toolchain/Makefile a/src/carl9170fw/toolchain/Makefile deleted file mode 100644 index 3ee93a9..0000000 -- cgit v1.2.3