[linux] Upgrade to 5.10.62

Also: - Merge linux-headers into the linux package - Move linux from core group to base group - Move linux-headers from core-dev group to build-base group - Change initrd/initramfs compression algorithm to gzip Related to #166
jhuntwork · Sep 5, 2021 · 1e22bd0 · 1e22bd0
1 parent f2647ac
commit 1e22bd0
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/packages/linux/ChangeLog b/packages/linux/ChangeLog
@@ -1,3 +1,14 @@
+5.10.62-1 (2021-09-05)
+
+	Upgrade to 5.10.62
+	Merge linux-headers into the linux package
+	Move linux from core group to base group
+	Move linux-headers from core-dev group to build-base group
+
+5.10.61-2 (2021-08-31)
+
+	Use gzip for initrd/initramfs decompression
+
 5.10.61-1 (2021-08-31)
 
 	Upgrade to 5.10.61

diff --git a/packages/linux/PKGBUILD b/packages/linux/PKGBUILD
@@ -1,14 +1,13 @@
 #!/bin/bash
 # shellcheck disable=SC2034,SC2154,SC2068
 
-pkgname=linux
-pkgver=5.10.61
+pkgname=(linux linux-headers)
+pkgver=5.10.62
 pkgrel=1
 pkgdesc='System kernel'
 arch=(x86_64)
 url='http://www.kernel.org'
 license=(GPL2)
-groups=(core)
 depends=()
 makedepends=(bison flex perl python)
 options=()
@@ -20,22 +19,28 @@ source=(
 )
 
 sha256sums=(
-    82eae38cc5cd11dd6aaac91c02ff0d006c7bafd6d4cf5c6a791930820a3a91d1
-    5496860c89d9d682a9a9a1c3b2fb0816ef1bebad86ff2e25a95f1f7740115433
+    098dd5024d14b01a5ce85a6fec3dd829f4ac62488e4c59004a4687f8bbf886b1
+    2ffab9d900d51293596fcd0c0952f91a1fb03fbe2d49aa11d57ff145e30a00c4
     c8f3271471fd3c9b576fca983511da87f2f9c14dbc1e6eb1573fe98a771b0481
 )
 
 build() {
     cd_unpacked_src
     sed -i 's@/usr/bin/awk@/bin/awk@' scripts/ld-version.sh
+    sed -i \
+        -e "/rsync/s@rsync@find usr/include -not -type d -name '*.h' | cpio -dump --quiet \$\(INSTALL_HDR_PATH\); true@" \
+        -e '/^CC/s@gcc@cc@g' \
+        -e '/^HOSTCC/s@gcc@cc@g' Makefile
     # Some internal build scripts expect the GNU find command.
     # Specifically, they expect find will have the -printf flag.
     patch -Np1 -i "${srcdir}/busybox-find-compat.patch"
+    make LLVM=1 LLVM_IAS=1 mrproper
     cp "${srcdir}/linux-config" .config
     make LLVM=1 LLVM_IAS=1
 }
 
-package() {
+package_linux() {
+    groups=(base)
     cd_unpacked_src
     make LLVM=1 LLVM_IAS=1 INSTALL_MOD_PATH="$pkgdir" modules_install
     install -d "${pkgdir}/boot"
@@ -45,3 +50,11 @@ package() {
     rm -f "${pkgdir}/lib/modules/${pkgver}/build" \
           "${pkgdir}/lib/modules/${pkgver}/source"
 }
+
+package_linux-headers() {
+    groups=(build-base)
+    cd_unpacked_src
+    make LLVM=1 LLVM_IAS=1 INSTALL_HDR_PATH=dest HOSTCFLAGS="-D_GNU_SOURCE" headers_install
+    set -o pipefail
+    find usr -not -type d -name "*.h" | cpio -dump "${pkgdir}"
+}
diff --git a/packages/linux/linux-config b/packages/linux/linux-config
@@ -183,10 +183,10 @@ CONFIG_NET_NS=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_INITRAMFS_SOURCE=""
-# CONFIG_RD_GZIP is not set
+CONFIG_RD_GZIP=y
 # CONFIG_RD_BZIP2 is not set
 # CONFIG_RD_LZMA is not set
-CONFIG_RD_XZ=y
+# CONFIG_RD_XZ is not set
 # CONFIG_RD_LZO is not set
 # CONFIG_RD_LZ4 is not set
 # CONFIG_RD_ZSTD is not set