update to 2020.10

4 files changed, 36 insertions, 21 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b6524cf..354c9d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,8 @@
-build-package:
+package:
   tags:
     - aarch64
   script:
-    - sudo pacman -Syy && makepkg -scr --noconfirm
+    - sudo pacman -Syu --noconfirm && makepkg -scr --noconfirm
   artifacts:
     paths:
     - ./*.pkg.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index 17267f2..13d67f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,23 @@
-# U-Boot: Pine64
+# U-Boot: Pinebook, based on Pine64 PKGBUILD
 # Maintainer: Dan Johansen <strit@manjaro.org>
 # Contributor: Kevin Mihelich <kevin@archlinuxarm.org>
 
 pkgname=uboot-pinebook
-pkgver=2020.07
+pkgver=2020.10
 pkgrel=1
 _tfaver=2.3
-pkgdesc="U-Boot for Pine64"
+pkgdesc="U-Boot for Pinebook"
 arch=('aarch64')
 url='http://www.denx.de/wiki/U-Boot/WebHome'
 license=('GPL')
 makedepends=('bc' 'git' 'python' 'swig' 'dtc')
-backup=('boot/extlinux/extlinux.conf')
+provides=('uboot')
+conflicts=('uboot')
 install=${pkgname}.install
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver/rc/-rc}.tar.bz2"
-        "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-$_tfaver.tar.gz"
-        'extlinux.conf')
-md5sums=('86e51eeccd15e658ad1df943a0edf622'
-         '628a32a3c3b3f0c567d1ea6ee5582807'
-         '7e6fbff584c11762048d9aecdc50b075')
+        "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot/trusted-firmware-a-$_tfaver.tar.gz")
+md5sums=('14656f08aa73a8dbbde2424fe78bbe3b'
+         '628a32a3c3b3f0c567d1ea6ee5582807')
 
 build() {
   unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS
@@ -43,5 +42,4 @@ package() {
   mkdir -p "${pkgdir}"/boot/extlinux
 
   cp u-boot-sunxi-with-spl-pinebook.bin "${pkgdir}"/boot
-  cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux/
 }
diff --git a/extlinux.conf b/extlinux.conf
deleted file mode 100644
index f62d83b..0000000
--- a/extlinux.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-LABEL Manjaro ARM
-KERNEL /Image
-FDT /dtbs/allwinner/sun50i-a64-pinebook.dtb
-APPEND initrd=/initramfs-linux.img console=tty1 console=ttyS0,115200 root=LABEL=ROOT rw rootwait bootsplash.bootfile=bootsplash-themes/manjaro/bootsplash
diff --git a/uboot-pinebook.install b/uboot-pinebook.install
index 2d33ecc..9159889 100644
--- a/uboot-pinebook.install
+++ b/uboot-pinebook.install
@@ -1,16 +1,37 @@
 flash_uboot() {
   echo "A new U-Boot version can be flashed onto your install drive. Please use lsblk to determine your drive, before proceeding."
-  echo "# dd if=/boot/u-boot-sunxi-with-spl-pinebook.bin of=/dev/mmcblkX bs=8k seek=1"
+    echo "You can do this by running:"
+	echo "# dd if=/boot/u-boot-sunxi-with-spl-pinebook.bin of=/dev/mmcblkX bs=8k seek=1"
 }
 
-## arg 1:  the new package version
 post_install() {
   flash_uboot
-  sed -i s/"LABEL=ROOT"/"LABEL=ROOT_MNJRO"/g /boot/extlinux/extlinux.conf
+  if [ -f /boot/extlinux/extlinux.conf.pacsave ]; then
+  mv /boot/extlinux/extlinux.conf.pacsave /boot/extlinux/extlinux.conf
+  fi
+  if [ -f /boot/extlinux/extlinux.conf ]; then
+  echo "Keeping old extlinux.conf file..."
+  else
+  mkdir -p /boot/extlinux/
+  echo "LABEL Manjaro ARM
+KERNEL /Image
+FDT /dtbs/allwinner/sun50i-a64-pinebook.dtb
+APPEND initrd=/initramfs-linux.img console=tty1 console=ttyS0,115200 root=LABEL=ROOT_MNJRO rw rootwait bootsplash.bootfile=bootsplash-themes/manjaro/bootsplash" > /boot/extlinux/extlinux.conf
+  fi
 }
 
-## arg 1:  the new package version
-## arg 2:  the old package version
 post_upgrade() {
   flash_uboot
+  if [ -f /boot/extlinux/extlinux.conf.pacsave ]; then
+  mv /boot/extlinux/extlinux.conf.pacsave /boot/extlinux/extlinux.conf
+  fi
+  if [ -f /boot/extlinux/extlinux.conf ]; then
+  echo "Keeping old extlinux.conf file..."
+  else
+  mkdir -p /boot/extlinux/
+  echo "LABEL Manjaro ARM
+KERNEL /Image
+FDT /dtbs/allwinner/sun50i-a64-pinebook.dtb
+APPEND initrd=/initramfs-linux.img console=tty1 console=ttyS0,115200 root=LABEL=ROOT_MNJRO rw rootwait bootsplash.bootfile=bootsplash-themes/manjaro/bootsplash" > /boot/extlinux/extlinux.conf
+  fi
 }