Remove packing of headers complexity now that binaries and source are no longer coresident

PKGBUILD

@@ -6,7 +6,7 @@ options=('!strip')
 # The firmware the kernel produces blows: don't falsify this lightly
 # "linux-firmware=20170309.695f2d6-1"
 pkgrel=1
-pkgver=6.2.12493.gb0538215e9a7
+pkgver=6.2.13006.g2a0c9af33128
 pkgdesc="Kernel build from head"
 arch=("x86_64" "aarch64" "armv7h")
 license=("GPL2.1")
@@ -75,9 +75,9 @@ build() {
 
 _package-headers() {
     pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
-    version=$(cat ${_kernel_src_dir}/include/config/kernel.release)
+    version=$(cat ${_builddir}/include/config/kernel.release)
 
-    cd $_kernel_src_dir
+    cd $_builddir
     local builddir="$pkgdir/usr/lib/modules/${version}/build"
 
     echo "Installing build files..."
@@ -149,26 +149,27 @@ _package-headers() {
     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
+pkgname=("$pkgbase")
+#pkgname=("$pkgbase" "$pkgbase-headers")
+#for _p in "${pkgname[@]}"; do
+#  eval "package_$_p() {
+#    $(declare -f "_package${_p#$pkgbase}")
+#    _package${_p#$pkgbase}
+#  }"
+#done
 
-_package() {
+package() {
   prepare
   boot_dir="${pkgdir}/boot"
   dtb_dir="${boot_dir}/dtbs"
   usr_dir="${pkgdir}/usr"
   usr_lib_dir="${usr_dir}/lib"
-  version=$(cat ${_kernel_src_dir}/include/config/kernel.release)
+  version=$(cat ${_builddir}/include/config/kernel.release)
   modules_dir="${usr_lib_dir}/modules/${version}"
   firmware_dir="${usr_lib_dir}/firmware"
   preset_dir=${pkgdir}/etc/mkinitcpio.d
 
-  cd $_kernel_src_dir
+  cd $_builddir
   INSTALL_MOD_PATH=${usr_dir} INSTALL_MOD_STRIP=1 ${_make_cmd} modules_install
   if [ -n "${_pi_ver}" ]; then
     INSTALL_DTBS_PATH=${dtb_dir} ${_make_cmd} dtbs_install