Explorar el Código

Fix errors in PKGBUILD

Donald Carr hace 4 años
padre
commit
35ec2efad3
Se han modificado 1 ficheros con 10 adiciones y 7 borrados
  1. 10 7
      PKGBUILD

+ 10 - 7
PKGBUILD

@@ -12,6 +12,9 @@ arch=("x86_64" "aarch64" "armv7h")
 license=("GPL2.1")
 log_path="${PWD}/$(date +"%Y-%m-%d-%H%M").log"
 _kernel_src_dir=/opt/src/OSS/linux
+_config_preset=""
+_pi_ver="${LOCAL_PI_VER:-}"
+
 pkgbase() {
     oldpath=${PWD}
     cd $_kernel_src_dir
@@ -24,7 +27,7 @@ pkgbase() {
 }
 pkgbase
 
-if [ -z "${LOCAL_PI_VER}" ]; then
+if [ -z "${_pi_ver}" ]; then
     install=spudd.install
 fi
 
@@ -58,7 +61,7 @@ build() {
 
   ${_make_cmd} all 2>&1 | tee ${log_path}
 
-  if [ -n "${LOCAL_PI_VER}" ]; then
+  if [ -n "${_pi_ver}" ]; then
     ${_make_cmd} dtbs 2>&1 | tee -a ${log_path}
   fi
 
@@ -160,15 +163,15 @@ _package() {
 
   cd $_kernel_src_dir
   INSTALL_MOD_PATH=${usr_dir} INSTALL_MOD_STRIP=1 ${_make_cmd} modules_install
-  if [ -n "${LOCAL_PI_VER}" ]; then
+  if [ -n "${_pi_ver}" ]; then
     INSTALL_DTBS_PATH=${dtb_dir} ${_make_cmd} dtbs_install
   fi
 
   mkdir -p ${boot_dir}
-  if [ "${LOCAL_PI_VER}" = "3" ] || [ "${LOCAL_PI_VER}" = "4" ]; then
+  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
-  elif [ "${LOCAL_PI_VER}" = "2" ]; then
+  elif [ "${_pi_ver}" = "2" ]; then
     cp arch/arm/boot/zImage ${boot_dir}/vmlinuz-${postfix}
   else
     cp arch/x86/boot/bzImage ${boot_dir}/vmlinuz-${postfix}
@@ -184,8 +187,8 @@ _package() {
   fi
 }
 
-if [ -n "${LOCAL_PI_VER}" ]; then
-    case ${LOCAL_PI_VER} in
+if [ -n "${_pi_ver}" ]; then
+    case ${_pi_ver} in
     2)
         echo "Compiling for the RPi 2 aarch32"
         _config_file="${startdir}/rpi2"