From f288cdaa774db2122a311ab58b65dcd4465fae63 Mon Sep 17 00:00:00 2001 From: Oliver Smith Date: Sun, 30 Oct 2022 13:31:55 +0100 Subject: [PATCH] treewide: remove linux-headers replacements (MR 3597) Remove the -dev subpackages of kernels that replace the linux-headers package. As I understand, the only case where this would make sense is if you wanted to build a kernel module against headers that need to be newer than the headers in Alpine's linux-headers package (currently 5.19.5). While this might have been historically relevant when wireguard wasn't in the kernel and you might have needed newer linux-headers to build the module, it seems irrelevant today. If somebody should need this in the future, then bring it back properly / consider getting the linux-headers package in Alpine upgraded. Right now the -dev packages are broken in several ways: * Use of unversioned provides= (pma#1766) * Don't contain binaries needed to build binary packages (pma#462). This was worked around in 6aba5f ("Package kernel-scripts separately"), but later this didn't build anymore and we removed it. So in short: broken and unused, drop them. --- device/main/linux-postmarketos-allwinner/APKBUILD | 14 +------------- device/main/linux-purism-librem5/APKBUILD | 14 +------------- device/testing/linux-sourceparts-pocketpc/APKBUILD | 14 +------------- 3 files changed, 3 insertions(+), 39 deletions(-) diff --git a/device/main/linux-postmarketos-allwinner/APKBUILD b/device/main/linux-postmarketos-allwinner/APKBUILD index a29e7fd1d..3c5a557d4 100644 --- a/device/main/linux-postmarketos-allwinner/APKBUILD +++ b/device/main/linux-postmarketos-allwinner/APKBUILD @@ -7,7 +7,7 @@ _flavor=postmarketos-allwinner _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=6.0.3_git20221022 -pkgrel=1 +pkgrel=2 _tag="orange-pi-6.0-20221022-2043" pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)" arch="aarch64 armv7" @@ -48,7 +48,6 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar 0011-sunxi-mmc-h6-fix.patch 0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch " -subpackages="$pkgname-dev" builddir="$srcdir/linux-$_tag" case "$CARCH" in @@ -82,17 +81,6 @@ package() { INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } -dev() { - provides="linux-headers" - replaces="linux-headers" - - cd $builddir - - # https://github.com/torvalds/linux/blob/master/Documentation/kbuild/headers_install.rst - make -j1 headers_install \ - ARCH="$_carch" \ - INSTALL_HDR_PATH="$subpkgdir"/usr -} sha512sums=" 476009ec3d0114d486a1c61fdfd6fb2fbaa9d8f9bce384b4f8732f088444d5f044b67dc2270c303c70aaf099cad9fb273671f1d7c81d000eb36a085a688be800 linux-postmarketos-allwinner-orange-pi-6.0-20221022-2043.tar.gz eb9cbef2d40eb9d47e94cf85a50df42e02c29a359638443f72c89cdfe25b395058be8139c4437be56bf5e30fdcc32a4dacba55e2fab64e7590af8b9eff5e4bb8 config-postmarketos-allwinner.aarch64 diff --git a/device/main/linux-purism-librem5/APKBUILD b/device/main/linux-purism-librem5/APKBUILD index da6b454f2..15ca8fc36 100644 --- a/device/main/linux-purism-librem5/APKBUILD +++ b/device/main/linux-purism-librem5/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Bhushan Shah pkgname=linux-purism-librem5 pkgver=6.0.2 -pkgrel=0 +pkgrel=1 _purismrel=1 # . _purismver=${pkgver}pureos$_purismrel @@ -29,7 +29,6 @@ makedepends=" rsync xz " -subpackages="$pkgname-dev" install="$pkgname.post-upgrade" # Source @@ -71,17 +70,6 @@ package() { } -dev() { - provides="linux-headers" - replaces="linux-headers" - - cd $builddir - - # https://github.com/torvalds/linux/blob/master/Documentation/kbuild/headers_install.rst - make -j1 headers_install \ - ARCH="$_carch" \ - INSTALL_HDR_PATH="$subpkgdir"/usr -} sha512sums=" 5fc6d1f6e944bdf3d0d3401ea8b86703547404843be478b9d15764155e46292096234d4c5ae3fc5ad6e61e3916b19763fa4b0120da6718084665a9f8db212aa5 linux-purism-librem5-6.0.2pureos1.tar.gz 765858ba4ab66468b409f64b43eb6c15f235f5f830f9b7f1a43a41d6fb09bb678baa99777fe59ee750045cd9e0911d59904e07c8dea992435ad7600d7d53a5ff config-purism-librem5.aarch64 diff --git a/device/testing/linux-sourceparts-pocketpc/APKBUILD b/device/testing/linux-sourceparts-pocketpc/APKBUILD index bd186b94e..e9eaaff9a 100644 --- a/device/testing/linux-sourceparts-pocketpc/APKBUILD +++ b/device/testing/linux-sourceparts-pocketpc/APKBUILD @@ -3,7 +3,7 @@ _flavor=sourceparts-pocketpc _config="config-$_flavor.$CARCH" pkgname=linux-$_flavor pkgver=5.14.6_git20210920 -pkgrel=1 +pkgrel=2 _tag="81a7953afc5cd1001b727701dc99625ec656160a" _wifi_ref="1b6ddd544b4a829ed2b7feb32575359b6443cd3d" pkgdesc="Kernel fork for the Pocket P.C." @@ -36,7 +36,6 @@ source="$pkgname-$_tag.tar.gz::https://github.com/PopcornComputer/PocketPC-Linux 0001-rtl8723ds.patch config-$_flavor.aarch64 " -subpackages="$pkgname-dev" builddir="$srcdir/PocketPC-Linux-$_tag" case "$CARCH" in @@ -72,17 +71,6 @@ package() { INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" } -dev() { - provides="linux-headers" - replaces="linux-headers" - - cd $builddir - - # https://github.com/torvalds/linux/blob/master/Documentation/kbuild/headers_install.rst - make -j1 headers_install \ - ARCH="$_carch" \ - INSTALL_HDR_PATH="$subpkgdir"/usr -} sha512sums=" 49e091de60b820c48e19bb9d3602cb0e5c3470b99112ad63da3f112b503569e6bab21738f2be014705212974a3a824c9f91acd98fa33632e7bc8bf2057f51d75 linux-sourceparts-pocketpc-81a7953afc5cd1001b727701dc99625ec656160a.tar.gz 68001a7fdc022b4ff82e3f1762a00369c2be18a4c9f5ea2074e3e9248678c48525f4bcec47ef0c4678d6a0b6aef031eb52cac9a9811f3291a73e00cb33fb5c85 1b6ddd544b4a829ed2b7feb32575359b6443cd3d.tar.gz