Browse Source

create empty modules directory

Donald Carr 4 years ago
parent
commit
3e228d32a8
1 changed files with 9 additions and 5 deletions
  1. 9 5
      PKGBUILD

+ 9 - 5
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=5.13.rc2.12.ge87bbc77e192
+pkgver=5.13.rc4.292.gf928a486b385
 pkgdesc="Kernel build from head"
 arch=("x86_64" "aarch64" "armv7h")
 license=("GPL2.1")
@@ -72,9 +72,10 @@ build() {
 
 _package-headers() {
     pkgdesc="Headers and scripts for building modules for the $pkgdesc kernel"
+    version=$(cat ${_kernel_src_dir}/include/config/kernel.release)
 
     cd $_kernel_src_dir
-    local builddir="$pkgdir/usr/lib/modules/$(<version)/build"
+    local builddir="$pkgdir/usr/lib/modules/${version}/build"
 
     echo "Installing build files..."
     install -Dt "$builddir" -m644 .config Makefile System.map \
@@ -157,8 +158,10 @@ _package() {
   prepare
   boot_dir="${pkgdir}/boot"
   dtb_dir="${boot_dir}/dtbs"
-  usr_dir="${pkgdir}/usr"
-  firmware_dir="${usr_dir}/lib/firmware"
+  usr_lib_dir="${pkgdir}/usr/lib"
+  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 $_kernel_src_dir
@@ -166,7 +169,8 @@ _package() {
     INSTALL_DTBS_PATH=${dtb_dir} ${_make_cmd} dtbs_install
   fi
 
-  mkdir -p ${boot_dir}
+  mkdir -p ${boot_dir} ${modules_dir}
+  touch ${modules_dir}/.force-existence
   if [ "${_pi_ver}" = "3" ] || [ "${_pi_ver}" = "4" ]; then
     cp arch/arm64/boot/Image ${boot_dir}/Image
     cp arch/arm64/boot/Image.gz ${boot_dir}/Image.gz