4 files changed, 51 insertions, 5 deletions
diff --git a/libre/uboot-wandboard-linux-libre/PKGBUILD b/libre/uboot-wandboard-linux-libre/PKGBUILD
index 5fe3c3927..17a8aeef7 100644
--- a/libre/uboot-wandboard-linux-libre/PKGBUILD
+++ b/libre/uboot-wandboard-linux-libre/PKGBUILD
@@ -41,7 +41,7 @@ build() {
 package_uboot-wandboard-solo-linux-libre() {
   pkgdesc="U-Boot for Wandboard Solo (built for the linux-libre kernel package)"
   replaces=('uboot-wandboard-solo')
-  install=${pkgbase}.install
+  install=${pkgname}.install
 
   mkdir -p "${pkgdir}/boot/${pkgname}"
   cp u-boot-${pkgver}/bins/u-boot-solo.imx "${pkgdir}/boot/${pkgname}"/u-boot.imx
@@ -50,7 +50,7 @@ package_uboot-wandboard-solo-linux-libre() {
 package_uboot-wandboard-dual-linux-libre() {
   pkgdesc="U-Boot for Wandboard Dual (built for the linux-libre kernel package)"
   replaces=('uboot-wandboard-dual')
-  install=${pkgbase}.install
+  install=${pkgname}.install
 
   mkdir -p "${pkgdir}/boot/${pkgname}"
   cp u-boot-${pkgver}/bins/u-boot-dl.imx "${pkgdir}/boot/${pkgname}"/u-boot.imx
@@ -59,7 +59,7 @@ package_uboot-wandboard-dual-linux-libre() {
 package_uboot-wandboard-quad-linux-libre() {
   pkgdesc="U-Boot for Wandboard Quad (built for the linux-libre kernel package)"
   replaces=('uboot-wandboard-quad')
-  install=${pkgbase}.install
+  install=${pkgname}.install
 
   mkdir -p "${pkgdir}/boot/${pkgname}"
   cp u-boot-${pkgver}/bins/u-boot-quad.imx "${pkgdir}/boot/${pkgname}"/u-boot.imx
diff --git a/libre/uboot-wandboard-linux-libre/uboot-wandboard-linux-libre.install b/libre/uboot-wandboard-linux-libre/uboot-wandboard-dual-linux-libre.install
index 2166fcfc6..ebaae6b51 100644
--- a/libre/uboot-wandboard-linux-libre/uboot-wandboard-linux-libre.install
+++ b/libre/uboot-wandboard-linux-libre/uboot-wandboard-dual-linux-libre.install
@@ -3,11 +3,11 @@ flash_uboot() {
   echo "Do you want to do this now? [y|N]"
   read -r shouldwe
   if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
-    dd if=/boot/boot-wandboard-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
+    dd if=/boot/boot-wandboard-dual-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
     sync
   else
     echo "You can do this later by running:"
-    echo "# dd if=/boot/boot-wandboard-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
+    echo "# dd if=/boot/boot-wandboard-dual-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
   fi
 }
 
diff --git a/libre/uboot-wandboard-linux-libre/uboot-wandboard-quad-linux-libre.install b/libre/uboot-wandboard-linux-libre/uboot-wandboard-quad-linux-libre.install
new file mode 100644
index 000000000..a691eb3aa
--- /dev/null
+++ b/libre/uboot-wandboard-linux-libre/uboot-wandboard-quad-linux-libre.install
@@ -0,0 +1,23 @@
+flash_uboot() {
+  echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
+  echo "Do you want to do this now? [y|N]"
+  read -r shouldwe
+  if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
+    dd if=/boot/boot-wandboard-quad-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
+    sync
+  else
+    echo "You can do this later by running:"
+    echo "# dd if=/boot/boot-wandboard-quad-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
+  fi
+}
+
+## arg 1:  the new package version
+post_install() {
+  flash_uboot
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  flash_uboot
+}
diff --git a/libre/uboot-wandboard-linux-libre/uboot-wandboard-solo-linux-libre.install b/libre/uboot-wandboard-linux-libre/uboot-wandboard-solo-linux-libre.install
new file mode 100644
index 000000000..1e5478371
--- /dev/null
+++ b/libre/uboot-wandboard-linux-libre/uboot-wandboard-solo-linux-libre.install
@@ -0,0 +1,23 @@
+flash_uboot() {
+  echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
+  echo "Do you want to do this now? [y|N]"
+  read -r shouldwe
+  if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
+    dd if=/boot/boot-wandboard-solo-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
+    sync
+  else
+    echo "You can do this later by running:"
+    echo "# dd if=/boot/boot-wandboard-solo-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
+  fi
+}
+
+## arg 1:  the new package version
+post_install() {
+  flash_uboot
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+  flash_uboot
+}