浏览代码

tune packaging

Donald Carr 3 年之前
父节点
当前提交
35203fd413
共有 1 个文件被更改,包括 4 次插入3 次删除
  1. 4 3
      PKGBUILD

+ 4 - 3
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.rc6.103.g0fd116a94c1d
+pkgver=5.15.rc4.201.gdb84a4c10018
 pkgdesc="Kernel build from head"
 arch=("x86_64" "aarch64" "armv7h")
 license=("GPL2.1")
@@ -158,14 +158,15 @@ _package() {
   prepare
   boot_dir="${pkgdir}/boot"
   dtb_dir="${boot_dir}/dtbs"
-  usr_lib_dir="${pkgdir}/usr/lib"
+  usr_dir="${pkgdir}/usr"
+  usr_lib_dir="${usr_dir}/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
-  INSTALL_MOD_PATH=${usr_lib_dir} INSTALL_MOD_STRIP=1 ${_make_cmd} modules_install
+  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
   fi