From 574be7070a489a2c5268baa0191d8f2d6bac0618 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= Date: Fri, 9 Oct 2020 12:36:08 +0000 Subject: main/linux-firmware: upgrade to 20200918 use source from upstream tarballs instead of 'git clone' and build tarball locally and upload it to dev.alpinelinux.org upstream started to make (about) monthly releases in tarballs from 2019-03-12 remove snapshot(), not needed now remove not needed variables clean-up little --- main/linux-firmware/APKBUILD | 30 +++++------------------------- 1 file changed, 5 insertions(+), 25 deletions(-) diff --git a/main/linux-firmware/APKBUILD b/main/linux-firmware/APKBUILD index 963734834d..4485ec7ff7 100644 --- a/main/linux-firmware/APKBUILD +++ b/main/linux-firmware/APKBUILD @@ -1,15 +1,14 @@ # Contributor: Oliver Smith # Maintainer: Natanael Copa pkgname=linux-firmware -pkgver=20200519 -pkgrel=2 +pkgver=20200918 +pkgrel=0 pkgdesc="firmware files for linux" #url="https://git.kernel.org/?p=linux/kernel/git/dwmw2/linux-firmware.git;a=summary" -url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" +url="https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" arch="all" license="custom:multiple" makedepends="libarchive-tools" -install="" provides="linux-firmware-any" provider_priority=1 options="!strip !check !archcheck !tracedeps !spdx" @@ -17,15 +16,12 @@ options="!strip !check !archcheck !tracedeps !spdx" _rpi_bt=fff76cb15527c435ce99a9787848eacd6288282c # cypress fmac: https://community.cypress.com/docs/DOC-19375 -source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-${pkgver}.tar.gz +source="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-$pkgver.tar.gz https://community.cypress.com/servlet/JiveServlet/download/19375-1-53475/cypress-fmac-v5.4.18-2020_0402.zip BCM43430A1.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM43430A1.hcd BCM4345C0.hcd.${_rpi_bt::8}::https://github.com/RPi-Distro/bluez-firmware/raw/$_rpi_bt/broadcom/BCM4345C0.hcd " -_giturl="git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git" -_upload=dev.alpinelinux.org:/archive/$pkgname/ - _builddir="$srcdir"/$pkgname-$pkgver # Put /lib/firmware/* folders in subpackages @@ -46,22 +42,6 @@ for i in $_folders; do done subpackages="amd-ucode::noarch $subpackages" -snapshot() { - local _date=$(date +%Y%m%d) - local _pkg=$pkgname-$_date.tar.gz - mkdir -p "$srcdir" - cd "$srcdir" - rm -rf "$pkgname" - git clone --depth=1 --bare $_giturl - git --git-dir ${_giturl##*/} archive -o $_pkg \ - --prefix=$pkgname-$_date/ HEAD - msg "New snapshot: $_pkg" - if [ -n "$_upload" ]; then - msg "Uploading to $_upload" - scp $_pkg $_upload && abump $pkgname-$_date - fi -} - package() { cd "${_builddir}" make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" install @@ -160,7 +140,7 @@ ucode() { bsdtar --null -cf - --format=newc @- > "$subpkgdir"/boot/amd-ucode.img } -sha512sums="9724cf3d1aea73f264d53564ef160a62e90bb35766f3300bbbeaf7c7c6a356ef50c7d17bfa01197e8e991ff72b1aeef002bb78f5dc78243b2792cafbf1139dff linux-firmware-20200519.tar.gz +sha512sums="1e2972eaa9d6a116de08d0aa41f4660ef2cc0d1499ce413fd0f41290391519e677519c27113103a5844a862fbab1e9e39f817f9336d2fb228ebad2d5cd1ce0ed linux-firmware-20200918.tar.gz d3d976799f43b3b344305959b10d220709f6881cec102dfe391347869748f76d517d1b0d31076e2baa9759cb6a622eb5fc6f4fe45d6d3151974725e254255afa cypress-fmac-v5.4.18-2020_0402.zip a7b37bce092367125e390017bb0329c3b7f8fa891cf30d422ee73ce53d0592d4ff0fc2e2a94a87eefb641d5dd8631fae1cc46664224dea987ca04b68a8af8519 BCM43430A1.hcd.fff76cb1 a52fdb876131affa85b39434d619580c0e1605094992ffa3bb321af387dd79739736842dea9ffa759e6658aecde40eda6b06d93dbb58234a4b126b756c28521e BCM4345C0.hcd.fff76cb1" -- cgit v1.2.3