standardize

Signed-off-by: Dan Johansen <strit@manjaro.org>

PKGBUILD

@@ -4,9 +4,9 @@
 
 pkgname=uboot-pine-h64
 pkgver=2021.10
-pkgrel=1
+pkgrel=2
 _tfaver=2.5
-pkgdesc="U-Boot for Pine-h64"
+pkgdesc="U-Boot for Pine64 Pine-h64"
 arch=('aarch64')
 url='http://www.denx.de/wiki/U-Boot/WebHome'
 license=('GPL')
@@ -20,26 +20,42 @@ md5sums=('f1392080facf59dd2c34096a5fd95d4c'
          'cd0455f0dcd4161201074bacb93446b1')
 
 build() {
+  # Avoid build warnings by editing a .config option in place instead of
+  # appending an option to .config, if an option is already present
+  update_config() {
+    if ! grep -q "^$1=$2$" .config; then
+      if grep -q "^# $1 is not set$" .config; then
+        sed -i -e "s/^# $1 is not set$/$1=$2/g" .config
+      elif grep -q "^$1=" .config; then
+        sed -i -e "s/^$1=.*/$1=$2/g" .config
+      else
+        echo "$1=$2" >> .config
+      fi
+    fi
+  }
+
   unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
 
   cd trusted-firmware-a-$_tfaver
 
+  echo -e "\nBuilding TF-A for Pine64 Pine-h64...\n"
   make PLAT=sun50i_h6 bl31
   cp build/sun50i_h6/release/bl31.bin ../u-boot-${pkgver/rc/-rc}
 
   cd ../u-boot-${pkgver/rc/-rc}
 
-  make distclean
+  echo -e "\nBuilding U-Boot for Pine64 Pine-h64...\n"
   make pine_h64_defconfig
-  echo 'CONFIG_IDENT_STRING=" Manjaro ARM"' >> .config
+  update_config 'CONFIG_IDENT_STRING' '" Manjaro Linux ARM"'
+  update_config 'CONFIG_OF_LIBFDT_OVERLAY' 'y'
   make EXTRAVERSION=-${pkgrel}
-  cat u-boot-sunxi-with-spl.bin > u-boot-sunxi-with-spl-pine-h64.bin
+  cp -a u-boot-sunxi-with-spl.bin u-boot-sunxi-with-spl-pine-h64.bin
 }
 
 package() {
   cd u-boot-${pkgver/rc/-rc}
 
-  mkdir -p "${pkgdir}"/boot/extlinux
+  mkdir -p "${pkgdir}/boot/extlinux"
 
-  cp u-boot-sunxi-with-spl-pine-h64.bin "${pkgdir}"/boot
+  install -D -m 0644 u-boot-sunxi-with-spl-pine-h64.bin -t "${pkgdir}"/boot
 }

uboot-pine-h64.install

@@ -9,7 +9,7 @@ create_config() {
   echo "LABEL Manjaro ARM
 KERNEL /Image
 FDT /dtbs/allwinner/sun50i-h6-pine-h64-model-b.dtb
-APPEND initrd=/initramfs-linux.img console=ttyS0,115200 root=LABEL=ROOT_MNJRO rw rootwait quiet splash plymouth.ignore-serial-consoles" > /boot/extlinux/extlinux.conf
+APPEND initrd=/initramfs-linux.img console=ttyS0,115200 root=LABEL=ROOT_MNJRO rw rootwait audit=0 splash plymouth.ignore-serial-consoles" > /boot/extlinux/extlinux.conf
 }
 
 post_install() {