Made headers more flexible

3 files changed, 7 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc525c8d481d..5fb2744bde47 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-amd-raven
 	pkgver = 5.4.v.84
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.kernel.org/
 	arch = x86_64
 	license = GPL2
@@ -19,7 +19,7 @@ pkgbase = linux-amd-raven
 	source = linux.install
 	source = 5013_enable-cpu-optimizations-for-gcc10.patch
 	sha256sums = SKIP
-	sha256sums = cdff844295b852e20c45860b7aae960b4af1c165ef2de123a46d1c0f352b7125
+	sha256sums = e0efbbeb7a85ccdbe02ab66eaa20ce9b6111b90888df1a26fd39849d592db3d0
 	sha256sums = fd220b9f47a86162247b042f06311848678f9acb64b92f716572972f3aeb3d18
 	sha256sums = d590e751ab4cf424b78fd0d57e53d187f07401a68c8b468d17a5f39a337dacf0
 	sha256sums = 27b7fc535ade94b636c3ec4e809e141831e9465a0ef55215a9852b87048629e2
diff --git a/PKGBUILD b/PKGBUILD
index df9fe8bab3f1..341409f10e84 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgbase=linux-amd-raven
 _srcname=linux
 gitver=v5.4.84
 pkgver=5.4.v.84
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://www.kernel.org/"
 license=('GPL2')
@@ -23,7 +23,7 @@ source=("git+https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git#ta
 )
 sha256sums=('SKIP'
             #config.x86_64
-            'cdff844295b852e20c45860b7aae960b4af1c165ef2de123a46d1c0f352b7125'
+            'e0efbbeb7a85ccdbe02ab66eaa20ce9b6111b90888df1a26fd39849d592db3d0'
             #.preset file
             'fd220b9f47a86162247b042f06311848678f9acb64b92f716572972f3aeb3d18'
             #linux install file
@@ -160,8 +160,7 @@ _package-headers() {
 
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/include"
 
-  for i in acpi asm-generic config crypto drm generated keys linux math-emu \
-    media net pcmcia scsi sound trace uapi video xen; do
+  for i in $(ls include/); do
     cp -a include/${i} "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
   done
 
@@ -177,14 +176,9 @@ _package-headers() {
   chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts"
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions"
 
+  # add kernel files to headers
   mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel"
-
   cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-
-  if [ "${CARCH}" = "i686" ]; then
-    cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/"
-  fi
-
   cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/"
 
   # add dm headers
@@ -232,9 +226,6 @@ _package-headers() {
   while read modarch; do
    rm -rf $modarch
   done <<< $(find "${pkgdir}"/usr/lib/modules/${_kernver}/build/arch/ -maxdepth 1 -mindepth 1 -type d | grep -v /x86$)
-
-  #Fix missing vdso files after overhaul
-  cp -r "include/vdso/" "${pkgdir}/usr/lib/modules/${_kernver}/build/include/"
 }
 
 _package-docs() {
diff --git a/config.x86_64 b/config.x86_64
index af6852338297..1eb0cee2ecdf 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -8991,7 +8991,7 @@ CONFIG_ASYNC_RAID6_TEST=m
 CONFIG_TEST_KSTRTOX=m
 # CONFIG_TEST_PRINTF is not set
 # CONFIG_TEST_BITMAP is not set
-CONFIG_TEST_BITFIELD=m
+# CONFIG_TEST_BITFIELD is not set
 # CONFIG_TEST_UUID is not set
 CONFIG_TEST_XARRAY=m
 CONFIG_TEST_OVERFLOW=m