linux-libre: fix _package-headers mistaken variable, for armv7h

use kernver instead of _kernver in _package-headers

And remove more brakets from variables

Signed-off-by: David P <megver83@parabola.nu>

1 files changed, 21 insertions, 21 deletions

diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index d942b7d4a..b5e0eb8ae 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -108,7 +108,7 @@ _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}")
 _replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}")
 _replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}")
 
-case "${CARCH}" in
+case "$CARCH" in
   i686|x86_64) KARCH=x86;;
   armv7h) KARCH=arm;;
 esac
@@ -126,7 +126,7 @@ prepare() {
     patch -p1 -i ../patch-${_srcver%-*}-${_archrel}.patch
   fi
 
-  if [ "${CARCH}" = "armv7h" ]; then
+  if [ "$CARCH" = "armv7h" ]; then
     # RCN patch (CM3 firmware deblobbed and AUFS/WireGuard removed)
     # Note: For stability reasons, AUFS has been removed in the RCN patch.
     # We are supporting AUFS in linux-libre-pck through PCK patch.
@@ -169,7 +169,7 @@ prepare() {
   echo "$_kernelname" > localversion.20-pkgname
 
   msg2 "Setting config..."
-  cp ../config.${CARCH} .config
+  cp ../config.$CARCH .config
   make olddefconfig
 
   make -s kernelrelease > ../version
@@ -178,9 +178,9 @@ prepare() {
 
 build() {
   cd $_srcname
-  if [ "${CARCH}" = "armv7h" ]; then
-    make ${MAKEFLAGS} zImage modules dtbs
-  elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
+  if [ "$CARCH" = "armv7h" ]; then
+    make $MAKEFLAGS zImage modules dtbs
+  elif [ "$CARCH" = "x86_64" ] || [ "$CARCH" = "i686" ]; then
     make bzImage modules
   fi
 }
@@ -201,10 +201,10 @@ _package() {
   cd $_srcname
 
   msg2 "Installing boot image..."
-  if [ "${CARCH}" = "armv7h" ]; then
-    make INSTALL_DTBS_PATH="${pkgdir}/boot/dtbs/${pkgbase}" dtbs_install
-    cp arch/$KARCH/boot/zImage "${pkgdir}/boot/vmlinuz-${pkgbase}"
-  elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
+  if [ "$CARCH" = "armv7h" ]; then
+    make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs/$pkgbase" dtbs_install
+    cp arch/$KARCH/boot/zImage "$pkgdir/boot/vmlinuz-$pkgbase"
+  elif [ "$CARCH" = "x86_64" ] || [ "$CARCH" = "i686" ]; then
     install -Dm644 "$(make -s image_name)" "$pkgdir/boot/vmlinuz-$pkgbase"
   fi
 
@@ -225,17 +225,17 @@ _package() {
 
   msg2 "Installing hooks..."
   # sed expression for following substitutions
-  if [ "${CARCH}" = "armv7h" ]; then
+  if [ "$CARCH" = "armv7h" ]; then
   local _subst="
-    s|/boot/vmlinuz-%PKGBASE%|$_kernver|g
+    s|/boot/vmlinuz-%PKGBASE%|$kernver|g
     s|%PKGBASE%|$pkgbase|g
-    s|%KERNVER%|$_kernver|g
+    s|%KERNVER%|$kernver|g
     s|%EXTRAMODULES%|$_extramodules|g
   "
-  elif [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then
+  elif [ "$CARCH" = "x86_64" ] || [ "$CARCH" = "i686" ]; then
   local _subst="
     s|%PKGBASE%|$pkgbase|g
-    s|%KERNVER%|$_kernver|g
+    s|%KERNVER%|$kernver|g
     s|%EXTRAMODULES%|$_extramodules|g
   "
   fi
@@ -278,7 +278,7 @@ _package-headers() {
   # add xfs and shmem for aufs building
   mkdir -p "$builddir"/{fs/xfs,mm}
 
-  if [[ ${CARCH} = i686 ]]; then
+  if [[ $CARCH = i686 ]]; then
     install -t "$builddir/arch/$KARCH" -m644 arch/$KARCH/Makefile_32.cpu
   fi
 
@@ -319,14 +319,14 @@ _package-headers() {
   # 
   # since we don't want to diverge too much from arch's pkgbuild, we'll
   # start marking our changes as such
-  if [ "${CARCH}" = "armv7h" ]; then
+  if [ "$CARCH" = "armv7h" ]; then
     for i in dove exynos omap2; do
-      mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH/mach-${i}"
-      cp -a arch/$KARCH/mach-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH/mach-${i}/"
+      mkdir -p "$pkgdir/usr/lib/modules/$kernver/build/arch/$KARCH/mach-$i"
+      cp -a arch/$KARCH/mach-$i/include "$pkgdir/usr/lib/modules/$kernver/build/arch/$KARCH/mach-$i/"
     done
     for i in omap orion samsung versatile; do
-      mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH/plat-${i}"
-      cp -a arch/$KARCH/plat-${i}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/$KARCH/plat-${i}/"
+      mkdir -p "$pkgdir/usr/lib/modules/$kernver/build/arch/$KARCH/plat-$i"
+      cp -a arch/$KARCH/plat-$i/include "$pkgdir/usr/lib/modules/$kernver/build/arch/$KARCH/plat-$i/"
     done
   fi
   # end of parabola changes