Browse Source

Revert to in src building

Donald Carr 2 years ago
parent
commit
926b3e1fc4
1 changed files with 16 additions and 23 deletions
  1. 16 23
      PKGBUILD

+ 16 - 23
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.3.rc1.8.g88b3ea65f0e2
+pkgver=5.15.rc4.201.gdb84a4c10018
 pkgdesc="Kernel build from head"
 arch=("x86_64" "aarch64" "armv7h")
 license=("GPL2.1")
@@ -47,11 +47,7 @@ build() {
   set -o errexit
   #set -o xtrace
 
-  rm -Rf ${_builddir}
-  echo "mkdir -p ${_builddir} ${pkgdir}"
-  mkdir -p ${_builddir} $(dirname ${pkgdir})
-
-  cd $_kernel_src_dir
+  cd $_kernel_src_dir && git clean -xdf
 
   if [[ -n ${_config_preset} ]]; then
     echo ${_make_cmd} ${_config_preset}
@@ -76,9 +72,9 @@ build() {
 
 _package-headers() {
     pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
-    version=$(cat ${_builddir}/include/config/kernel.release)
+    version=$(cat ${_kernel_src_dir}/include/config/kernel.release)
 
-    cd $_builddir
+    cd $_kernel_src_dir
     local builddir="$pkgdir/usr/lib/modules/${version}/build"
 
     echo "Installing build files..."
@@ -150,28 +146,26 @@ _package-headers() {
     ln -sr "$builddir" "$pkgdir/usr/src/$pkgbase"
 }
 
-pkgname=("$pkgbase")
-#pkgname=("$pkgbase" "$pkgbase-headers")
-#for _p in "${pkgname[@]}"; do
-#  eval "package_$_p() {
-#    $(declare -f "_package${_p#$pkgbase}")
-#    _package${_p#$pkgbase}
-#  }"
-#done
-
-package() {
-  mkdir -p ${pkgdir}
+pkgname=("$pkgbase" "$pkgbase-headers")
+for _p in "${pkgname[@]}"; do
+  eval "package_$_p() {
+    $(declare -f "_package${_p#$pkgbase}")
+    _package${_p#$pkgbase}
+  }"
+done
+
+_package() {
   prepare
   boot_dir="${pkgdir}/boot"
   dtb_dir="${boot_dir}/dtbs"
   usr_dir="${pkgdir}/usr"
   usr_lib_dir="${usr_dir}/lib"
-  version=$(cat ${_builddir}/include/config/kernel.release)
+  version=$(cat ${_kernel_src_dir}/include/config/kernel.release)
   modules_dir="${usr_lib_dir}/modules/${version}"
   firmware_dir="${usr_lib_dir}/firmware"
   preset_dir=${pkgdir}/etc/mkinitcpio.d
 
-  cd $_builddir
+  cd $_kernel_src_dir
   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
@@ -234,5 +228,4 @@ else
     #_config_file="${_kernel_src_dir}/configs/desktop"
 fi
 
-_builddir=${BUILDDIR}/${pkgbase}
-_make_cmd="eval time make O=${_builddir} V=0 ${_xcompile_args}"
+_make_cmd="eval time make V=0 ${_xcompile_args}"