uboot-udoo-linux-libre: fix install files

3 files changed, 28 insertions, 5 deletions

diff --git a/libre/uboot-udoo-linux-libre/PKGBUILD b/libre/uboot-udoo-linux-libre/PKGBUILD
index 380636ff6..001d5bf99 100644
--- a/libre/uboot-udoo-linux-libre/PKGBUILD
+++ b/libre/uboot-udoo-linux-libre/PKGBUILD
@@ -8,7 +8,7 @@ _pkgbase=linux-libre
 pkgbase=uboot-udoo-${_pkgbase}
 pkgname=("uboot-udoo-dual-${_pkgbase}" "uboot-udoo-quad-${_pkgbase}")
 pkgver=2015.01
-pkgrel=1
+pkgrel=1.1
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -45,7 +45,7 @@ build() {
 package_uboot-udoo-dual-linux-libre() {
   pkgdesc="U-Boot for UDOO Dual (built for the linux-libre kernel package)"
   replaces=('uboot-udoo-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
@@ -54,7 +54,7 @@ package_uboot-udoo-dual-linux-libre() {
 package_uboot-udoo-quad-linux-libre() {
   pkgdesc="U-Boot for UDOO Quad (built for the linux-libre kernel package)"
   replaces=('uboot-udoo-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-udoo-linux-libre/uboot-udoo-linux-libre.install b/libre/uboot-udoo-linux-libre/uboot-udoo-dual-linux-libre.install
index 60c6fb6b5..64a7695b0 100644
--- a/libre/uboot-udoo-linux-libre/uboot-udoo-linux-libre.install
+++ b/libre/uboot-udoo-linux-libre/uboot-udoo-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/uboot-udoo-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2
+    dd if=/boot/uboot-udoo-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/uboot-udoo-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
+    echo "# dd if=/boot/uboot-udoo-dual-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2"
   fi
 }
 
diff --git a/libre/uboot-udoo-linux-libre/uboot-udoo-quad-linux-libre.install b/libre/uboot-udoo-linux-libre/uboot-udoo-quad-linux-libre.install
new file mode 100644
index 000000000..60376bc46
--- /dev/null
+++ b/libre/uboot-udoo-linux-libre/uboot-udoo-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/uboot-udoo-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/uboot-udoo-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
+}