diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2019-02-15 14:18:24 +0200 |
|---|---|---|
| committer | Timo Teräs <timo.teras@iki.fi> | 2019-02-15 14:18:24 +0200 |
| commit | 64c5d7842ff796ab257b1cdef4f996bf04990c97 (patch) | |
| tree | fbb3d6ebc03f27e3eb32f0940859318dcc460898 /main/alpine-conf | |
| parent | 680b40d3d2eebb2a9e83a6d3926f45a2daa58074 (diff) | |
| download | aports-64c5d7842ff796ab257b1cdef4f996bf04990c97.tar.bz2 aports-64c5d7842ff796ab257b1cdef4f996bf04990c97.tar.xz | |
main/alpine-conf: include wifi regulatory db in modloop
ref #9549
Diffstat (limited to 'main/alpine-conf')
| -rw-r--r-- | main/alpine-conf/0001-update-kernel-include-regulatory-database.patch | 33 | ||||
| -rw-r--r-- | main/alpine-conf/APKBUILD | 6 |
2 files changed, 37 insertions, 2 deletions
diff --git a/main/alpine-conf/0001-update-kernel-include-regulatory-database.patch b/main/alpine-conf/0001-update-kernel-include-regulatory-database.patch new file mode 100644 index 0000000000..053ccebabc --- /dev/null +++ b/main/alpine-conf/0001-update-kernel-include-regulatory-database.patch @@ -0,0 +1,33 @@ +From 74fd3c56ea44e4f2d8e050a21a91820762039212 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> +Date: Fri, 15 Feb 2019 13:27:09 +0200 +Subject: [PATCH] update-kernel: include regulatory database + +--- + update-kernel.in | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/update-kernel.in b/update-kernel.in +index 94458e1..eeb0716 100644 +--- a/update-kernel.in ++++ b/update-kernel.in +@@ -295,8 +295,15 @@ for _xfw in "$modloopfw"; do + fi + done + ++# wireless regulatory db ++if [ -e "$ROOT"/lib/modules/*/kernel/net/wireless/cfg80211.ko ]; then ++ for _regdb in "$ROOT"/lib/firmware/regulatory.db*; do ++ [ -e "$_regdb" ] && install -pD "$_regdb" "$MODLOOP"/modules/firmware/"${_regdb##*/}" ++ done ++fi ++ + # include bluetooth firmware in modloop +-if [ -d "$MODLOOP/modules/firmware/brcm" ]; then ++if [ -e "$ROOT"/lib/modules/*/kernel/drivers/bluetooth/btbcm.ko ]; then + for _btfw in "$ROOT"/lib/firmware/brcm/*.hcd; do + install -pD "$_btfw" \ + "$MODLOOP"/modules/firmware/brcm/"${_btfw##*/}" +-- +2.20.1 + diff --git a/main/alpine-conf/APKBUILD b/main/alpine-conf/APKBUILD index 7413366230..774ef818e7 100644 --- a/main/alpine-conf/APKBUILD +++ b/main/alpine-conf/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=alpine-conf pkgver=3.8.1 -pkgrel=1 +pkgrel=2 pkgdesc="Alpine configuration management scripts" url=http://git.alpinelinux.org/cgit/$pkgname arch="all" @@ -9,6 +9,7 @@ license="MIT" depends="openrc>=0.24.1-r6 busybox>=1.26.1-r3" source="https://dev.alpinelinux.org/archive/alpine-conf/alpine-conf-$pkgver.tar.xz 0001-setup-alpine-setup-ntp-before-repos.patch + 0001-update-kernel-include-regulatory-database.patch " builddir="$srcdir"/$pkgname-$pkgver @@ -26,4 +27,5 @@ package() { } sha512sums="6aa0f0eaab6ee1ff8f9259d5c4e4634bf6d736a2cb52efb3cbabfdfcdd5dcd81b9fe05073ac16f964e7b74b5006b5f4219b33ab4ff5f984273b3bb48982afd6a alpine-conf-3.8.1.tar.xz -4b1b88b66a0771720e1991534c0d55b17293d0d9c3e4064d4210c2edd2fcbe8f6691bf5336b5492312df6160aad8f17b4bb4f9174efd4bad342472b3ad2a16bc 0001-setup-alpine-setup-ntp-before-repos.patch" +4b1b88b66a0771720e1991534c0d55b17293d0d9c3e4064d4210c2edd2fcbe8f6691bf5336b5492312df6160aad8f17b4bb4f9174efd4bad342472b3ad2a16bc 0001-setup-alpine-setup-ntp-before-repos.patch +544498b30bd57c84521a4fd5fbd45791b9307dcd29532278f45b61fb14d6405b5454e98fb535fd31331793b806ef897e208c3c6f8bc772dbd55ae2c61abcb402 0001-update-kernel-include-regulatory-database.patch" |