Donald Carr 5 лет назад
Родитель
Сommit
3ad5e8bcbf
1 измененных файлов с 7 добавлено и 7 удалено
  1. 7 7
      PKGBUILD

+ 7 - 7
PKGBUILD

@@ -11,11 +11,11 @@ pkgname=linux-${postfix}
 # The firmware the kernel produces blows: don't falsify this lightly
 # "linux-firmware=20170309.695f2d6-1"
 pkgrel=1
-pkgver=.6.ck1.r34.g4db000cc9f80
+pkgver=5.7.rc6.89.g254d929d7df7
 pkgdesc="Kernel build from head"
 arch=("x86_64" "aarch64" "armv7h")
 license=("GPL2.1")
-current_date=$(date +"%Y-%m-%d-%H%M")
+log_path="${PWD}/$(date +"%Y-%m-%d-%H%M").log"
 _kernel_src_dir=/opt/dev/src/OSS/linux
 
 if [ -z "${LOCAL_PI_VER}" ]; then
@@ -26,17 +26,17 @@ _make_cmd="make ${_xcompile_args}"
 
 pkgver() {
   cd $_kernel_src_dir
-  git describe --tags | sed -e "s/^v//"
+  git describe --tags | sed -e "s/^v//" | tr '-' '.'
 }
 
 build() {
   cd $_kernel_src_dir && git clean -xdf
   cp ${_config_file} ${_kernel_src_dir}/.config
-  ${_make_cmd} > ${current_date}-kernel.log
-  ${_make_cmd} modules > ${current_date}-modules.log
+  ${_make_cmd} | tee ${log_path}
+  ${_make_cmd} modules | tee ${log_path}
 
   if [ -n "${LOCAL_PI_VER}" ]; then
-    ${_make_cmd} dtbs > ${current_date}-dtbs.log
+    ${_make_cmd} dtbs | tee ${log_path}
   fi
 }
 
@@ -97,4 +97,4 @@ else
     _config_file="${_kernel_src_dir}/configs/desktop"
 fi
 
-_make_cmd="time make VERBOSE=1 ${_xcompile_args}"
+_make_cmd="eval time make VERBOSE=1 ${_xcompile_args}"