forked from marfrit/marfrit-packages
Merge pull request 'arch/linux-pinetab2-danctnix-besser: pkgrel=4 — first kernel-agent-managed release' (#28) from noether/add-linux-pinetab2-danctnix-besser into main
Reviewed-on: marfrit/marfrit-packages#28
This commit is contained in:
@@ -0,0 +1,19 @@
|
||||
# makepkg outputs and intermediate state
|
||||
src/
|
||||
pkg/
|
||||
*.pkg.tar.zst
|
||||
*.pkg.tar.zst.sig
|
||||
*-build.log*
|
||||
*-prepare.log
|
||||
*-package_*.log
|
||||
*.tar.xz
|
||||
*.tar.sign
|
||||
*.patch.zst
|
||||
*.patch.zst.sig
|
||||
logpipe.*
|
||||
|
||||
# build-time artifacts that must never be committed
|
||||
src/
|
||||
*.tar.xz
|
||||
*.tar.zst
|
||||
pkg/
|
||||
+4647
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,247 @@
|
||||
# Maintainer: Markus Fritsche <fritsche.markus@gmail.com>
|
||||
# Forked from: linux-pinetab2 by Danct12 <danct12@disroot.org>
|
||||
# Original Contributor: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
|
||||
#
|
||||
# linux-pinetab2-danctnix-besser: linux-pinetab2 + the BESser bes2600
|
||||
# driver patchset. Soft-upstream fork of linux-pinetab2 — drop-in
|
||||
# replacement, same kernel version, only the bes2600 staging driver
|
||||
# differs. See git.reauktion.de/marfrit/besser and
|
||||
# git.reauktion.de/marfrit/bes2600-dkms for full provenance.
|
||||
#
|
||||
# ─────────────────────────────────────────────────────────────────────
|
||||
# kernel-agent flow (effective pkgrel=4):
|
||||
#
|
||||
# The single 0001-bes2600-besser-kernel-agent-cumulative.patch is
|
||||
# regenerated by `ka-promote ohm` in
|
||||
# git.reauktion.de/marfrit/kernel-agent against fleet/ohm.yaml. Its
|
||||
# b2sum below MUST match the cumulative.b2sum recorded in the
|
||||
# co-located manifest.lock. Sibling manifest.lock pins the source-of-
|
||||
# truth manifest sha256 and per-include patch sha256s.
|
||||
#
|
||||
# To update for a new patch in the manifest:
|
||||
# 1. Edit kernel-agent:fleet/ohm.yaml (add/remove includes)
|
||||
# 2. `ka-promote ohm` → writes new cumulative.patch + manifest.lock
|
||||
# to kernel-agent/build/ohm/v7.0-danctnix1/
|
||||
# 3. Copy both files into this directory (replacing existing ones)
|
||||
# 4. Update the b2sum in this PKGBUILD for the cumulative
|
||||
# 5. Bump pkgrel
|
||||
# ─────────────────────────────────────────────────────────────────────
|
||||
|
||||
pkgbase=linux-pinetab2-danctnix-besser
|
||||
pkgver=7.0.danctnix1
|
||||
pkgrel=5
|
||||
pkgdesc='PineTab2 (BESser bes2600 driver patchset, kernel-agent managed)'
|
||||
_srcname=linux-pinetab2
|
||||
_srctag=v${pkgver%.*}-${pkgver##*.}
|
||||
arch=(aarch64)
|
||||
_url_git="https://codeberg.org/DanctNIX/${_srcname}"
|
||||
url="${_url_git}/commits/tag/$_srctag"
|
||||
license=(GPL-2.0-only)
|
||||
makedepends=(
|
||||
bc
|
||||
cpio
|
||||
gettext
|
||||
git
|
||||
libelf
|
||||
pahole
|
||||
perl
|
||||
python
|
||||
tar
|
||||
xz
|
||||
)
|
||||
options=(
|
||||
!debug
|
||||
!strip
|
||||
)
|
||||
source=(
|
||||
https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-${pkgver%.*}.tar.{xz,sign}
|
||||
${_url_git}/releases/download/${_srctag}/${_srctag}.patch.zst{,.sig}
|
||||
0001-bes2600-besser-kernel-agent-cumulative.patch
|
||||
config
|
||||
)
|
||||
validpgpkeys=(
|
||||
ABAF11C65A2970B130ABE3C479BE3E4300411886 # Linus Torvalds
|
||||
647F28654894E3BD457199BE38DBBDC86092693E # Greg Kroah-Hartman
|
||||
F09A933C0FE0331E558CA4E166CAB7EAA45DD781 # Danct12
|
||||
)
|
||||
b2sums=('3d9795083c8938f80f480de0d10bfd9c525640e59d5c7f22983de3f12ee42c84c31be902cafb05579ddb1c32bac5ed06b0d4953f9705450be185bd2d9ab08f89'
|
||||
'SKIP'
|
||||
'71fe98221e802b315e54b4b10d3e8c8f376695a36bae3541d876e5776a37f3fa33c8f8dfa6e51fcbd6f5396add02e5166634165f2351836a0ea0453c172fe56c'
|
||||
'SKIP'
|
||||
'50397711a6a3ba522283685a9e7397aeed6663f353f7cba214d4bb88bc98516065b2fca9a36ce13c52644617879f69f39c5305e86db5d9fb25c4dae5434eb9c4'
|
||||
'656a998ab40cb85ee4c00f087b071a91632a6c091da2c84b0f74236b51d2dea6e9db6886625f80ad81dc249d8494ec47cd79d6dd9ea4f5e44f3cde857f861e10')
|
||||
|
||||
export KBUILD_BUILD_HOST=archlinux
|
||||
export KBUILD_BUILD_USER=$pkgbase
|
||||
export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
|
||||
|
||||
prepare() {
|
||||
cd linux-${pkgver%.*}
|
||||
|
||||
echo "Setting version..."
|
||||
echo "-$pkgrel" > localversion.10-pkgrel
|
||||
echo "${pkgbase#linux}" > localversion.20-pkgname
|
||||
|
||||
local src
|
||||
for src in "${source[@]}"; do
|
||||
src="${src%%::*}"
|
||||
src="${src##*/}"
|
||||
src="${src%.zst}"
|
||||
[[ $src = *.patch ]] || continue
|
||||
echo "Applying patch: $src..."
|
||||
patch -Np1 < "../$src"
|
||||
done
|
||||
|
||||
echo "Setting config..."
|
||||
cp ../config .config
|
||||
make olddefconfig
|
||||
diff -u ../config .config || :
|
||||
|
||||
make -s kernelrelease > version
|
||||
echo "Prepared $pkgbase version $(<version)"
|
||||
}
|
||||
|
||||
build() {
|
||||
cd linux-${pkgver%.*}
|
||||
make DTC_FLAGS="-@" all
|
||||
make -C tools/bpf/bpftool vmlinux.h feature-clang-bpf-co-re=1
|
||||
}
|
||||
|
||||
_package() {
|
||||
pkgdesc="The $pkgdesc kernel and modules"
|
||||
depends=(
|
||||
coreutils
|
||||
kmod
|
||||
mkinitcpio
|
||||
)
|
||||
optdepends=(
|
||||
'wireless-regdb: to set the correct wireless channels of your country'
|
||||
'linux-firmware: firmware images needed for some devices'
|
||||
)
|
||||
provides=(
|
||||
KSMBD-MODULE
|
||||
WIREGUARD-MODULE
|
||||
"linux-pinetab2=$pkgver-$pkgrel"
|
||||
)
|
||||
conflicts=(linux-pinetab2)
|
||||
replaces=(
|
||||
wireguard-arch
|
||||
)
|
||||
|
||||
cd linux-${pkgver%.*}
|
||||
local modulesdir="$pkgdir/usr/lib/modules/$(<version)"
|
||||
|
||||
echo "Installing boot image..."
|
||||
# systemd expects to find the kernel here to allow hibernation
|
||||
# https://github.com/systemd/systemd/commit/edda44605f06a41fb86b7ab8128dcf99161d2344
|
||||
install -Dm644 "$(make -s image_name)" "$modulesdir/vmlinuz"
|
||||
|
||||
# Used by mkinitcpio to name the kernel
|
||||
echo "$pkgbase" | install -Dm644 /dev/stdin "$modulesdir/pkgbase"
|
||||
|
||||
echo "Installing modules..."
|
||||
ZSTD_CLEVEL=19 make INSTALL_MOD_PATH="$pkgdir/usr" INSTALL_MOD_STRIP=1 \
|
||||
DEPMOD=/doesnt/exist modules_install # Suppress depmod
|
||||
|
||||
echo "Installing device trees..."
|
||||
make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" dtbs_install
|
||||
|
||||
# Removing unnecessary device trees (keep only pinetab2 variants).
|
||||
# find -delete is robust to nullglob/cwd quirks where a bash for-loop
|
||||
# silently no-op'd in the makepkg environment.
|
||||
find "$pkgdir"/boot/dtbs/rockchip/ -mindepth 1 -maxdepth 1 -type f \
|
||||
! -name 'rk3566-pinetab2-*' -delete
|
||||
|
||||
# remove build link
|
||||
rm "$modulesdir"/build
|
||||
}
|
||||
|
||||
_package-headers() {
|
||||
pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
|
||||
depends=(pahole)
|
||||
|
||||
cd linux-${pkgver%.*}
|
||||
local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
|
||||
|
||||
echo "Installing build files..."
|
||||
install -Dt "$builddir" -m644 .config Makefile Module.symvers System.map \
|
||||
localversion.* version vmlinux tools/bpf/bpftool/vmlinux.h
|
||||
install -Dt "$builddir/kernel" -m644 kernel/Makefile
|
||||
install -Dt "$builddir/arch/arm64" -m644 arch/arm64/Makefile
|
||||
cp -t "$builddir" -a scripts
|
||||
|
||||
# required when DEBUG_INFO_BTF_MODULES is enabled
|
||||
install -Dt "$builddir/tools/bpf/resolve_btfids" tools/bpf/resolve_btfids/resolve_btfids
|
||||
|
||||
echo "Installing headers..."
|
||||
cp -t "$builddir" -a include
|
||||
cp -t "$builddir/arch/arm64" -a arch/arm64/include
|
||||
install -Dt "$builddir/arch/arm64/kernel" -m644 arch/arm64/kernel/asm-offsets.s
|
||||
|
||||
install -Dt "$builddir/drivers/md" -m644 drivers/md/*.h
|
||||
install -Dt "$builddir/net/mac80211" -m644 net/mac80211/*.h
|
||||
|
||||
# https://bugs.archlinux.org/task/13146
|
||||
install -Dt "$builddir/drivers/media/i2c" -m644 drivers/media/i2c/msp3400-driver.h
|
||||
|
||||
# https://bugs.archlinux.org/task/20402
|
||||
install -Dt "$builddir/drivers/media/usb/dvb-usb" -m644 drivers/media/usb/dvb-usb/*.h
|
||||
install -Dt "$builddir/drivers/media/dvb-frontends" -m644 drivers/media/dvb-frontends/*.h
|
||||
install -Dt "$builddir/drivers/media/tuners" -m644 drivers/media/tuners/*.h
|
||||
|
||||
# https://bugs.archlinux.org/task/71392
|
||||
install -Dt "$builddir/drivers/iio/common/hid-sensors" -m644 drivers/iio/common/hid-sensors/*.h
|
||||
|
||||
echo "Installing KConfig files..."
|
||||
find . -name 'Kconfig*' -exec install -Dm644 {} "$builddir/{}" \;
|
||||
|
||||
echo "Removing unneeded architectures..."
|
||||
local arch
|
||||
for arch in "$builddir"/arch/*/; do
|
||||
[[ $arch = */arm64/ ]] && continue
|
||||
echo "Removing $(basename "$arch")"
|
||||
rm -r "$arch"
|
||||
done
|
||||
|
||||
echo "Removing documentation..."
|
||||
rm -r "$builddir/Documentation"
|
||||
|
||||
echo "Removing broken symlinks..."
|
||||
find -L "$builddir" -type l -printf 'Removing %P\n' -delete
|
||||
|
||||
echo "Removing loose objects..."
|
||||
find "$builddir" -type f -name '*.o' -printf 'Removing %P\n' -delete
|
||||
|
||||
echo "Stripping build tools..."
|
||||
local file
|
||||
while read -rd '' file; do
|
||||
case "$(file -Sib "$file")" in
|
||||
application/x-sharedlib\;*) # Libraries (.so)
|
||||
strip -v $STRIP_SHARED "$file" ;;
|
||||
application/x-archive\;*) # Libraries (.a)
|
||||
strip -v $STRIP_STATIC "$file" ;;
|
||||
application/x-executable\;*) # Binaries
|
||||
strip -v $STRIP_BINARIES "$file" ;;
|
||||
application/x-pie-executable\;*) # Relocatable binaries
|
||||
strip -v $STRIP_SHARED "$file" ;;
|
||||
esac
|
||||
done < <(find "$builddir" -type f -perm -u+x ! -name vmlinux -print0)
|
||||
|
||||
echo "Stripping vmlinux..."
|
||||
strip -v $STRIP_STATIC "$builddir/vmlinux"
|
||||
|
||||
echo "Adding symlink..."
|
||||
mkdir -p "$pkgdir/usr/src"
|
||||
ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
|
||||
}
|
||||
|
||||
pkgname=(
|
||||
"$pkgbase"
|
||||
"$pkgbase-headers"
|
||||
)
|
||||
for _p in "${pkgname[@]}"; do
|
||||
eval "package_$_p() {
|
||||
$(declare -f "_package${_p#$pkgbase}")
|
||||
_package${_p#$pkgbase}
|
||||
}"
|
||||
done
|
||||
@@ -0,0 +1,52 @@
|
||||
# linux-pinetab2-danctnix-besser
|
||||
|
||||
DanctNIX PineTab2 kernel + the BESser bes2600 driver patchset.
|
||||
**kernel-agent managed** as of pkgrel=4 (2026-05-18).
|
||||
|
||||
## TL;DR
|
||||
|
||||
- **What**: drop-in replacement for `linux-pinetab2` with the BESser
|
||||
bes2600 patchset applied.
|
||||
- **For**: PineTab2 (RK3566) with the on-board BES2600 SDIO WiFi/BT chip.
|
||||
- **Install**: `pacman -U linux-pinetab2-danctnix-besser-*.pkg.tar.zst
|
||||
linux-pinetab2-danctnix-besser-headers-*.pkg.tar.zst`. It `provides`
|
||||
and `conflicts` with `linux-pinetab2`, so it slots in cleanly.
|
||||
- **Source of truth for patches**:
|
||||
[git.reauktion.de/marfrit/kernel-agent](https://git.reauktion.de/marfrit/kernel-agent)
|
||||
`fleet/ohm.yaml`.
|
||||
|
||||
## How the patch cumulative is built
|
||||
|
||||
1. `kernel-agent/fleet/ohm.yaml` lists the patch series-dir includes
|
||||
for this kernel.
|
||||
2. `kernel-agent/bin/ka-promote ohm` walks those includes, concatenates
|
||||
them into a single `cumulative.patch`, and emits a `manifest.lock`
|
||||
recording per-patch sha256s and the cumulative b2sum.
|
||||
3. The cumulative is dropped into this directory as
|
||||
`0001-bes2600-besser-kernel-agent-cumulative.patch`, the b2sum in
|
||||
`PKGBUILD` is updated to match, and `pkgrel` is bumped.
|
||||
4. `manifest.lock` is committed alongside the cumulative for an
|
||||
audit trail (which patches went in, in what order).
|
||||
|
||||
## pkgrel history
|
||||
|
||||
| pkgrel | Date | Notes |
|
||||
|--------|------------|-------------------------------------------------|
|
||||
| 1–3 | 2026-05-08…05-18 | hand-managed in `marfrit/besser/danctnix-besser-pkgbuild/` (DEPRECATED) |
|
||||
| 4 | 2026-05-18 | first kernel-agent-managed release; same source contents as the hand-managed pkgrel=3 (Patch I + SCS workaround folded into single cumulative); fixes pkgrel=3's duplicated `0003-arm64-...patch` source-array bug |
|
||||
|
||||
## Known caveats
|
||||
|
||||
- **`CONFIG_SHADOW_CALL_STACK=n`** in the config: GCC 15.2.1 fails to
|
||||
build `arch/arm64/lib/xor-neon.c` with `arm_neon.h` `#pragma GCC
|
||||
target()` blocks and `-fsanitize=shadow-call-stack`. See
|
||||
`reference_arm64_scs_arm_neon_gcc15` memory and the Makefile
|
||||
workaround patch included in the cumulative. Track upstream GCC
|
||||
resolution before re-enabling.
|
||||
- The `cumulative-c5x-danctnix` series-dir in kernel-agent is currently
|
||||
a single-file interim (the working hand-curated cumulative) because
|
||||
the per-series mirrors created in `kernel-agent#17` use DKMS-style
|
||||
root paths instead of in-tree staging paths and do not apply
|
||||
cleanly. Per-series reconstruction is a separate kernel-agent
|
||||
follow-up. The b2sum integrity check in `PKGBUILD` still pins the
|
||||
exact bytes shipped.
|
||||
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,37 @@
|
||||
baseline:
|
||||
ref: v7.0-danctnix1
|
||||
tree: DanctNIX/linux-pinetab2
|
||||
upstream_compat: linux-7.0
|
||||
url: https://codeberg.org/DanctNIX/linux-pinetab2
|
||||
cumulative:
|
||||
b2sum: 50397711a6a3ba522283685a9e7397aeed6663f353f7cba214d4bb88bc98516065b2fca9a36ce13c52644617879f69f39c5305e86db5d9fb25c4dae5434eb9c4
|
||||
path: cumulative.patch
|
||||
size: 162716
|
||||
generated_at: '2026-05-18T17:16:06.455474+00:00'
|
||||
host: ohm
|
||||
ka_promote_version: 1
|
||||
manifest:
|
||||
path: fleet/ohm.yaml
|
||||
sha256: da59ac2c965e5ad9c5004a115b10a37abf47ed3ecc8b7f5ab426470d2ee7b442
|
||||
resolved_patches:
|
||||
- apply_order: 1
|
||||
from_series: true
|
||||
include: driver/bes2600/cumulative-c5x-danctnix/0001-bes2600-besser-cumulative-series.patch
|
||||
sha256: e477a170567487fef84fe13be5b0a1f0498247ff1f201000d0085a2e49ff9026
|
||||
size: 148149
|
||||
- apply_order: 2
|
||||
from_series: true
|
||||
include: driver/bes2600/scan-filter-5ghz-danctnix/0001-bes2600-filter-5ghz-scan-and-allow-single-channel.patch
|
||||
sha256: 31e67569e00daead0784214aced1e077d3270cf1407baa0b330d474e17ec3931
|
||||
size: 7735
|
||||
- apply_order: 3
|
||||
from_series: true
|
||||
include: arch/arm64/xor-neon-ffixed-x18-scs-build-fix-danctnix/0001-arm64-xor-neon-ffixed-x18-build-fix.patch
|
||||
sha256: a49c50f0ebffc499970c24908b832c3e61c96ed87de35b3a82178eff587f94f1
|
||||
size: 1574
|
||||
- apply_order: 4
|
||||
from_series: true
|
||||
include: driver/bes2600/queue-pending-record-lock-bh-danctnix/0001-bes2600-take-pending-record-lock-with-bh.patch
|
||||
sha256: 089862e5f6da5783ed0db979144e4fa07cff7f743809a0bebd715c75a3bb8eb5
|
||||
size: 5258
|
||||
schema_version: 1
|
||||
Reference in New Issue
Block a user