system/easy-kernel: Replace with 5.15 test-kernel

1 files changed, 39 insertions, 37 deletions

diff --git a/system/easy-kernel/APKBUILD b/system/easy-kernel/APKBUILD
index 580e59ff9..cc2ff00d7 100644
--- a/system/easy-kernel/APKBUILD
+++ b/system/easy-kernel/APKBUILD
@@ -2,9 +2,9 @@
 # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
 # KEEP THIS IN SYNC with the other easy-kernel packages.
 _kflavour=""
-_patchver=1
+_patchver=1 # must match 1000-version.patch ???
 _pkgname=easy-kernel$_kflavour
-pkgver=5.4.66
+pkgver=5.15.11
 pkgrel=0
 pkgname=$_pkgname-$pkgver-mc$_patchver
 pkgdesc="The Linux kernel, packaged for your convenience"
@@ -17,12 +17,10 @@ makedepends="bc bison flex gzip kmod lzop openssl-dev rsync xz"
 provides="easy-kernel$_kflavour=$pkgver-r$pkgrel"
 replaces="easy-kernel-power8 easy-kernel-power8-64k"
 subpackages="$_pkgname-modules-$pkgver-mc$_patchver:modules
-	$_pkgname-src-$pkgver-mc$_patchver:src
-	linux-headers:headers"
+	$_pkgname-src-$pkgver-mc$_patchver:src"
 _pkgmajver=${pkgver%%.*}
 _pkgminver=${pkgver%.*}
 source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgminver}.tar.xz
-	https://distfiles.adelielinux.org/source/linux-${_pkgminver}-mc$_patchver-patches.tar.xz
 	config-aarch64
 	config-armv7
 	config-m68k
@@ -31,17 +29,29 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${_pkgmajver}.x/linux-${_pkgmin
 	config-ppc64
 	config-sparc64
 	config-x86_64
-	kernel.h
-	uapi-iphdr.patch
+
+	0100-linux-5.15.11.patch
+	0120-XATTR_USER_PREFIX.patch
+	0122-link-security-restrictions.patch
+	0124-bluetooth-keysize-check.patch
+	0126-sign-file-libressl.patch
+	0130-lrng.patch
+	0250-projectc-5.15-r1.patch
+	0255-ultra-ksm.patch
+	0260-reduce-swappiness.patch
+	0300-tmp513-regression-fix.patch
+	0500-print-fw-info.patch
+	0502-gcc9-kcflags.patch
+	1000-version.patch
+
+	no-require-gnu-tar.patch
+	no-require-lilo.patch
 
 	no-autoload-fb.conf
 	"
 builddir="$srcdir/linux-${_pkgminver}"
 
 prepare() {
-	for patch in "$srcdir/linux-${_pkgminver}-mc$_patchver-patches"/*; do
-		patch -p1 -i "$patch"
-	done
 	default_prepare
 
 	cd "$srcdir"
@@ -98,7 +108,7 @@ modules() {
 	provides="easy-kernel$_kflavour-modules=$pkgver-r$pkgrel"
 	autodeps=0  # modules should not depend on src just for symlink
 	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/modules "$subpkgdir"/lib/
+	mv "$pkgdir"/lib/modules "$subpkgdir"/lib
 	rm "$subpkgdir"/lib/modules/$pkgver-mc$_patchver-easy$_kflavour/build
 	rm "$subpkgdir"/lib/modules/$pkgver-mc$_patchver-easy$_kflavour/source
 	ln -s "../../../usr/src/linux-$pkgver-mc$_patchver$_kflavour" \
@@ -111,26 +121,6 @@ modules() {
 		"$subpkgdir"/etc/modprobe.d/no-autoload-fb.conf
 }
 
-headers() {
-	pkgdesc="System headers provided by the Linux kernel"
-	cd "$builddir"
-
-	mkdir -p "$subpkgdir"/usr
-	make headers_install INSTALL_HDR_PATH="$subpkgdir/usr"
-
-	find "$subpkgdir/usr" \( -name .install -o -name ..install.cmd \) -exec \
-		rm -f {} \;
-
-	# provided by libdrm
-	rm -rf "$subpkgdir"/usr/include/drm
-
-	# needed for spl, VMware on x86, etc
-	install -D -m644 "$builddir"/include/generated/utsrelease.h \
-		"$subpkgdir"/usr/include/linux/utsrelease.h
-
-	install -m644 "$srcdir"/kernel.h "$subpkgdir"/usr/include/linux/kernel.h
-}
-
 src() {
 	pkgdesc="Kernel source code used to build the kernel"
 	provides="easy-kernel$_kflavour-src=$pkgver-r$pkgrel"
@@ -138,16 +128,28 @@ src() {
 	mv "$srcdir"/linux-src "$subpkgdir"/usr/src/linux-$pkgver-mc$_patchver$_kflavour
 }
 
-sha512sums="9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f  linux-5.4.tar.xz
-e6a7a5933dbe638be42a1308fd64895e53fe38be1238016a560985127106356570e6ea6ba94e6fbfb5924e24728232487c91ff1affcc79af1d724b8c813f5036  linux-5.4-mc1-patches.tar.xz
+sha512sums="d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
 1559875f5abc07d478d7deb9a2b1eccbb2e1a37b300ed6e41b28787f3653a18d92fbff4fad74df300cf7d6c027ba4c98a65050e60ce6da8f2a48e01bbf56dee8  config-aarch64
 9f5279d20fc6eaad78ab27b7fb86553e310369c8a68a2ff60c7cd9895febd3002cae748ad3a8b4fddbb62c6e829104138fc2bbca939e1c88c0bfcf7aa42809bf  config-armv7
 93ca6d54fc377db12dfa7cf230d362f82d635cd05166815389ef4fb2b065f8b2bba1a78d234bd6a7445dd9b475f2c0ca01e3d4528881cfd2c10040dab174cf6a  config-m68k
 5945f918daf441e1f92012b608d560b693f09d8fa36eb6c7ecb9935dec6163c5e64e04d7345b3b9c958a15d62878f33ac88a4e24d5fcc60381455842636bd1c7  config-pmmx
 3f9ac256e11b9e469086cbc0d3ec84e7bed4ec79fe40111418eb70786c9d62e8ef8d208472fa65f91b883b959112e40ace18d98314dfa9eeaace6aa821834f8b  config-ppc
-c61fa4613d0d75a5387d12c2f72dc8ba1e6635cc47cc9fb46253095c6417241ef59639ddf9ad220947804ef0dca921de7df5057b1d02d156bf955b213851aaff  config-ppc64
+6a79665fbfbbb720d619c88d4145cb75b47b690aa5c341617651ebec3ece35f0bd5a53c7ea62b9be92e83f1cc43c781b3fac4c91ea860e725a2ab4ac0911a834  config-ppc64
 f43ae12574c81f6e0161c547eff93d70ff4686e6ec1654edbdea10447e424218a33b81c664828f82617e4ef522128f2e0460da0c9523538724048174b53a7313  config-sparc64
-557db84d1f45c91ed3e3ab5d0e7100766060507ae98632b735580813974e136343500f9683bb51dc3994277716651821523b476bc5143e636ebde14aa5e67f48  config-x86_64
-61dcd633d72876566b7738dd08856b26850c935b4a81ab2364711335fe01c397083160f530b3382bbc239c6a8135be6a032e93039083ec2cefdae2902429a2e0  kernel.h
-6f309a18c65c991240265afd200cc79a706f5d9e5d072838a9a641ab3676a5e4c32033f9767fc723ff4c45ee462169a0f77bd7dfe63b547d521dadd073f827a7  uapi-iphdr.patch
+19e35f80a23ed08613d61d2a5df78257664c66f4fee84d9464ab8587b9e0845596e428bfb770c9b4254aef4bc33cbde8e9fb4a2fa7f591cfca083733717948e2  config-x86_64
+508045b7150e025dbf3682528b62ee6162e3bd1acf4ff4b53c3b395f14bff0bb4769c4d8e4ea30604785a79ebb66953c4576574e15d1a5ade1c482d4c191fdf8  0100-linux-5.15.11.patch
+3ed100909f9aed72836a3c712e45e0116cd3c4331961a76a27b867a7098d0df9458387b656c9ea01385c3c37585436e48168ac35666b0e46dca7da05e5e38a61  0120-XATTR_USER_PREFIX.patch
+c97a3799a2d5e4da9c9dfe129756da629fba8183479b02ca82f9b6d9993f17a165a96bd35ac50eb25fb293785b9b529a95165b1a2eb79c05134bee8ccf22a5d3  0122-link-security-restrictions.patch
+dc47b18749d95a456f8bc47fd6a0618c286b646b38466c3d950dfbeb25adf3fc1a794e95552e4da1abb58e49f0bd841f7222e71c4d04cb0264ca23476ca9caef  0124-bluetooth-keysize-check.patch
+79eaf814d76402a445efc961666a7c7c74207e552b0cb32d93d5cb828da580f7dbe93509dc9f53321c7844663205a8dce4e518ba047e4c57fc55f5c3498088ec  0126-sign-file-libressl.patch
+27b0a76966f5ea36217a1686e9504e5cf34a319d7036f856c94ddc22f5e737b3c49bf8cc50508c20f476c4b24607eba194305d7073c50faad00046b0d72350a1  0130-lrng.patch
+c7760c874532a3268353bfc87977cfe8a58ae7dde85809c6dae2190a458c752401f8faf4119723b5583fb4f1834b34c278826b23c29c03412f7db431e6f2b20e  0250-projectc-5.15-r1.patch
+4c901fe38e197b0397702ec46329fac6cdd5b7ff6e2601f76f0cbabcf452581936c58028c3a93471782541ad3045b10d1030fad4b25121f35d091495d17fd308  0255-ultra-ksm.patch
+5f74e6a72876d3cf3b3188a43b999b981b6ea0ca401ad72b3c7d5cc65bf505f50e7ee17d435ec95b7a012dc92e6540aea1bdb501f48690c242705c47d2403513  0260-reduce-swappiness.patch
+4e637935c2f37cc18f347293e3c94b18f90e2caccca726304a95c4891257a5b2bb3093aee7a97571038b29c0c987cc60a9a80aefd0d4c9a063b33d102f03579e  0300-tmp513-regression-fix.patch
+a43fd7004715f4efd545fe27abad46cc6f8c4c5f3ba9ab27c74a004e74bd5e4106beaecd54ca785fee03a0b466021acfdba0afa07e9ee2965493334a24403ffc  0500-print-fw-info.patch
+f0e532539e93d19fc65b417b4a0663e3757823340b968f63bd3a2665f99524feebb843ecf88ccf6909f93a8e7e9290721677c8f43bc3a2a37d99a51c1281a469  0502-gcc9-kcflags.patch
+e48fdbae750c83aa64523e5f1e97f1969ec565946672ceff271ae12f099347556e421f6520ffab6d98363b11c46363de9707896197e792cf2b65a50bbb122503  1000-version.patch
+03a73db9eda84a52315499cb511f730946939d2de1b3aa52c60f9bd3a364377a65ddf2b62f505689a84d3e2f0fc7da5ca90429629d93d9909360ee0c3c599bbe  no-require-gnu-tar.patch
+aadf8a3cc46a08e3a396ebd45656aee235103db7a2155cc6980df20b750151a9938b8b73c9319c6cd1b5f8aba6ce707f857a47dabf69df8d91dd93d440cffcb5  no-require-lilo.patch
 7bb07eb22002cc48caf0cd55d17ce4097aa583e0ca4048c11c92e1519761b2ae982ffe98311543d4b0dfc991c8bc411b2e1c7be9488b6c6f19ffaa08e69e2f47  no-autoload-fb.conf"