From fd9d6db3db2d4413cae924b406aae816dc38f2f9 Mon Sep 17 00:00:00 2001 From: Tamas Jantvik Date: Thu, 8 Sep 2022 19:21:06 +0200 Subject: [PATCH 1/3] rpi-kernel: update to 5.15.65 (fixes issue #39129) --- srcpkgs/rpi-kernel/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 3183183b6a4e13..1e3f7856fb9fde 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -12,11 +12,11 @@ # # WARNING: keep all rpi*-kernel packages in sync -_githash="64ad74084fa44abe8689564071df5729ded4c589" +_githash="cbb47398aebff7605bc23c4727c27d16a566982e" _gitshort="${_githash:0:7}" pkgname=rpi-kernel -version=5.15.61 +version=5.15.65 revision=1 archs="armv6l*" wrksrc="linux-${_githash}" @@ -27,7 +27,7 @@ homepage="http://www.kernel.org" license="GPL-2.0-only" short_desc="Linux kernel for Raspberry Pi zero/1 (${version%.*} series [git ${_gitshort}])" distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz" -checksum=8257604cc47792007284cc2640d7dd9f70fab062a7c596e92903e99718434244 +checksum=efcfe8c0fddbe2b86a405cca3b79ba8af83d81870ac2ac350cefd3c6387a8e3d python_version=3 _kernver="${version}_${revision}" From a894a6ea7cffc906ff750262e807084d49dc0174 Mon Sep 17 00:00:00 2001 From: Tamas Jantvik Date: Thu, 8 Sep 2022 20:21:30 +0200 Subject: [PATCH 2/3] New package: 8812au-dkms-20210629 (a8450b030a187b71d6be147d004715e6858e0ef9) [WIP] --- ...0001-void-arch-generic-plumbing-bits.patch | 30 +++++++++++++ srcpkgs/8812au-dkms/template | 45 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 srcpkgs/8812au-dkms/patches/0001-void-arch-generic-plumbing-bits.patch create mode 100644 srcpkgs/8812au-dkms/template diff --git a/srcpkgs/8812au-dkms/patches/0001-void-arch-generic-plumbing-bits.patch b/srcpkgs/8812au-dkms/patches/0001-void-arch-generic-plumbing-bits.patch new file mode 100644 index 00000000000000..f94f354b73cd06 --- /dev/null +++ b/srcpkgs/8812au-dkms/patches/0001-void-arch-generic-plumbing-bits.patch @@ -0,0 +1,30 @@ +--- a/Makefile 2022-09-05 21:05:32.000000000 +0200 ++++ b/Makefile 2022-09-08 17:36:50.454771601 +0200 +@@ -144,7 +144,8 @@ + #bit0: ROAM_ON_EXPIRED, #bit1: ROAM_ON_RESUME, #bit2: ROAM_ACTIVE + CONFIG_ROAMING_FLAG = 0x3 + ###################### Platform Related ####################### +-CONFIG_PLATFORM_I386_PC = y ++CONFIG_PLATFORM_VOID_NATIVE = y ++CONFIG_PLATFORM_I386_PC = n + CONFIG_PLATFORM_ARM_RPI = n + CONFIG_PLATFORM_ARM64_RPI = n + CONFIG_PLATFORM_ANDROID_X86 = n +@@ -1352,6 +1353,17 @@ + EXTRA_CFLAGS += -DCONFIG_RTW_80211R + endif + ++ifeq ($(CONFIG_PLATFORM_VOID_NATIVE), y) ++EXTRA_CFLAGS += -DCONFIG_@@VOID_ENDIAN@@_ENDIAN ++EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++ARCH := @@VOID_ARCH@@ ++KVER ?= $(shell uname -r) ++KSRC ?= /usr/lib/modules/$(KVER)/build ++MODDESTDIR := /usr/lib/modules/$(KVER)/kernel/drivers/net/wireless/ ++INSTALL_PREFIX := ++STAGINGMODDIR := /usr/lib/modules/$(KVER)/kernel/drivers/staging ++endif ++ + ifeq ($(CONFIG_PLATFORM_I386_PC), y) + ifeq ($(CONFIG_CONCURRENT_MODE), y) + EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE diff --git a/srcpkgs/8812au-dkms/template b/srcpkgs/8812au-dkms/template new file mode 100644 index 00000000000000..f2f1cb5d189e09 --- /dev/null +++ b/srcpkgs/8812au-dkms/template @@ -0,0 +1,45 @@ +# Template file for '8812au-dkms' +pkgname=8812au-dkms +version=20210629 +revision=1 +_gitrev=a8450b030a187b71d6be147d004715e6858e0ef9 +wrksrc="8812au-${version}-${_gitrev}" +depends="dkms" +short_desc="Linux Driver for USB WiFi Adapters that are based on the RTL8812AU Chipset (DKMS)" +maintainer="Tamas Jantvik " +license="GPL-2.0-only" +homepage="http://www.alfa.com.tw" +distfiles="https://github.com/morrownr/8812au-${version}/archive/${_gitrev}.tar.gz" +checksum=a4ebed285b4315284c2ccdeaec1ba12aa6a66d9772b7416c81f055d3ab6f9bb8 +dkms_modules="8812au ${version}" + +case "$XBPS_TARGET_MACHINE" in + x86_64*) _karch="x86_64";; + i686*) _karch="i386";; + aarch64*) _karch="arm64";; + arm*) _karch="arm";; + ppc*) _karch="powerpc";; + mips*) _karch="mips";; + *) broken="kernel arch not defined";; +esac + +post_patch() { + if [ "$XBPS_TARGET_ENDIAN" = "be" ]; then + vsed -i 's,@@VOID_ENDIAN@@,BIG,g' Makefile + else + vsed -i 's,@@VOID_ENDIAN@@,LITTLE,g' Makefile + fi + vsed -i "s,@@VOID_ARCH@@,${_karch},g" Makefile +} + +do_install() { + local dest=/usr/src/8812au-${version} + + vmkdir ${dest} + cp -r dkms.conf Kconfig Makefile platform core hal include os_dep ${DESTDIR}/${dest} + + # modules-load.d(5) file. + vmkdir usr/lib/modules-load.d + echo "8812au" > ${DESTDIR}/usr/lib/modules-load.d/${pkgname}.conf + chmod 644 ${DESTDIR}/usr/lib/modules-load.d/${pkgname}.conf +} From 7a4170c9621accc05e520494ce95cc15972ab643 Mon Sep 17 00:00:00 2001 From: Tamas Jantvik Date: Thu, 8 Sep 2022 20:23:17 +0200 Subject: [PATCH 3/3] rpi-kernel: Addition of more include dirs, needed for building 8812au (and rtl8812au) modules - for instance --- srcpkgs/rpi-kernel/template | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rpi-kernel/template b/srcpkgs/rpi-kernel/template index 1e3f7856fb9fde..4507cf2f9e4c27 100644 --- a/srcpkgs/rpi-kernel/template +++ b/srcpkgs/rpi-kernel/template @@ -17,7 +17,7 @@ _gitshort="${_githash:0:7}" pkgname=rpi-kernel version=5.15.65 -revision=1 +revision=2 archs="armv6l*" wrksrc="linux-${_githash}" hostmakedepends="perl kmod uboot-mkimage openssl-devel bc bison flex xz" @@ -157,8 +157,9 @@ do_install() { # Remove firmware stuff provided by the "linux-firmware" pkg. rm -rf ${DESTDIR}/usr/lib/firmware - for i in acpi asm-generic clocksource config crypto drm generated linux \ - math-emu media net pcmcia scsi sound trace uapi vdso video xen; do + for i in acpi asm-generic clocksource config crypto drm dt-bindings \ + generated keys kunit kvm linux math-emu media memory misc net \ + pcmcia ras rdma scsi soc sound target trace uapi vdso video xen; do [ -d include/$i ] && cp -a include/$i ${hdrdest}/include done