From ffec767572058f3ad0fb869e59b4df2f64b80f04 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Wed, 2 Mar 2016 02:55:30 -0300
Subject: uboot-usbarmory: add new package to [libre]

---
 .../0001-parabola-arm-modifications.patch          | 28 -----------
 libre/uboot-usbarmory-linux-libre/PKGBUILD         | 55 ----------------------
 libre/uboot-usbarmory-linux-libre/boot.txt         | 12 -----
 libre/uboot-usbarmory-linux-libre/mkscr            |  9 ----
 .../uboot-usbarmory-linux-libre.install            | 22 ---------
 .../0001-parabola-arm-modifications.patch          | 28 +++++++++++
 libre/uboot-usbarmory/PKGBUILD                     | 53 +++++++++++++++++++++
 libre/uboot-usbarmory/boot.txt                     | 12 +++++
 libre/uboot-usbarmory/mkscr                        |  9 ++++
 libre/uboot-usbarmory/uboot-usbarmory.install      | 22 +++++++++
 10 files changed, 124 insertions(+), 126 deletions(-)
 delete mode 100644 libre/uboot-usbarmory-linux-libre/0001-parabola-arm-modifications.patch
 delete mode 100644 libre/uboot-usbarmory-linux-libre/PKGBUILD
 delete mode 100644 libre/uboot-usbarmory-linux-libre/boot.txt
 delete mode 100755 libre/uboot-usbarmory-linux-libre/mkscr
 delete mode 100644 libre/uboot-usbarmory-linux-libre/uboot-usbarmory-linux-libre.install
 create mode 100644 libre/uboot-usbarmory/0001-parabola-arm-modifications.patch
 create mode 100644 libre/uboot-usbarmory/PKGBUILD
 create mode 100644 libre/uboot-usbarmory/boot.txt
 create mode 100755 libre/uboot-usbarmory/mkscr
 create mode 100644 libre/uboot-usbarmory/uboot-usbarmory.install

diff --git a/libre/uboot-usbarmory-linux-libre/0001-parabola-arm-modifications.patch b/libre/uboot-usbarmory-linux-libre/0001-parabola-arm-modifications.patch
deleted file mode 100644
index a252648ee..000000000
--- a/libre/uboot-usbarmory-linux-libre/0001-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
-index 8237239..2477edf 100644
---- a/include/config_distro_defaults.h
-+++ b/include/config_distro_defaults.h
-@@ -59,4 +59,7 @@
- #define CONFIG_SUPPORT_RAW_INITRD
- #define CONFIG_SYS_HUSH_PARSER
- 
-+#define CONFIG_CMD_PART
-+#define CONFIG_PARTITION_UUIDS
-+
- #endif	/* _CONFIG_CMD_DISTRO_DEFAULTS_H */
-diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
-index f29ab2d..9a947d2 100644
---- a/include/configs/usbarmory.h
-+++ b/include/configs/usbarmory.h
-@@ -24,6 +24,8 @@
- 
- #include <config_distro_defaults.h>
- 
-+#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
-+
- /* U-Boot commands */
- #define CONFIG_CMD_MEMTEST
- #undef CONFIG_CMD_IMLS
--- 
-2.4.4
-
diff --git a/libre/uboot-usbarmory-linux-libre/PKGBUILD b/libre/uboot-usbarmory-linux-libre/PKGBUILD
deleted file mode 100644
index 72ab2db42..000000000
--- a/libre/uboot-usbarmory-linux-libre/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# U-Boot: Inverse Path USB armory
-# Maintainer (Arch): Kevin Mihelich <kevin@archlinuxarm.org>
-# Maintainer (Arch): Jason Plum <jplum@archlinuxarm.org>
-# Contributor: André Silva <emulatorman@parabola.nu>
-
-buildarch=4
-
-_pkgname=linux-libre
-pkgname=uboot-usbarmory-${_pkgname}
-pkgver=2015.04
-pkgrel=1
-pkgdesc="U-Boot for USB Armory (built for the linux-libre kernel package)"
-arch=('armv7h')
-url="http://git.denx.de/u-boot.git/"
-license=('GPL')
-makedepends=('bc')
-depends=('linux-libre')
-replaces=('uboot-usbarmory')
-install=${pkgname}.install
-backup=(boot/${pkgname}/boot.txt boot/${pkgname}/boot.scr)
-source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
-        'boot.txt'
-        'mkscr')
-md5sums=('570bdc2c47270c2a98ca60ff6c5c74cd'
-         '2ca10f4a7eeb0073035263fbbf3dd33a'
-         'eb83db44c372a6ff3349e026083f15f9'
-         '021623a04afd29ac3f368977140cfbfd')
-
-prepare() {
-  cd u-boot-${pkgver}
-
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-}
-
-build() {
-  cd u-boot-${pkgver}
-
-  unset CFLAGS CXXFLAGS LDFLAGS
-
-  make distclean
-  make usbarmory_config
-  make
-}
-
-package() {
-  cd u-boot-${pkgver}
-
-  install -d "${pkgdir}/boot/${pkgname}"
-  install -Dm644 u-boot.imx "${pkgdir}/boot/${pkgname}"
-
-  install -Dm644 ../boot.txt "${pkgdir}/boot/${pkgname}"/boot.txt
-  tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt "${pkgdir}/boot/${pkgname}"/boot.scr
-  install -Dm755 ../mkscr "${pkgdir}/boot/${pkgname}"/mkscr
-}
diff --git a/libre/uboot-usbarmory-linux-libre/boot.txt b/libre/uboot-usbarmory-linux-libre/boot.txt
deleted file mode 100644
index 2454291f8..000000000
--- a/libre/uboot-usbarmory-linux-libre/boot.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-part uuid ${devtype} ${devnum}:${bootpart} uuid
-setenv bootargs console=ttyGS0,115200 console=${console} root=PARTUUID=${uuid} rw rootwait
-
-if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/vmlinuz-linux-libre; then
-  if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/${fdtfile}; then
-    if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r} /boot/initramfs-linux-libre.img; then
-      bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
-    else
-      bootz ${kernel_addr_r} - ${fdt_addr_r};
-    fi;
-  fi;
-fi
diff --git a/libre/uboot-usbarmory-linux-libre/mkscr b/libre/uboot-usbarmory-linux-libre/mkscr
deleted file mode 100755
index 272b6a7a5..000000000
--- a/libre/uboot-usbarmory-linux-libre/mkscr
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ ! -x /usr/bin/mkimage ]]; then
-  echo "mkimage not found. Please install uboot-tools:"
-  echo "  pacman -S uboot-tools"
-  exit 1
-fi
-
-mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d boot.txt boot.scr
diff --git a/libre/uboot-usbarmory-linux-libre/uboot-usbarmory-linux-libre.install b/libre/uboot-usbarmory-linux-libre/uboot-usbarmory-linux-libre.install
deleted file mode 100644
index 6c0ddcf9e..000000000
--- a/libre/uboot-usbarmory-linux-libre/uboot-usbarmory-linux-libre.install
+++ /dev/null
@@ -1,22 +0,0 @@
-flash_uboot() {
-  echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
-  echo "Do this now? [y|N]"
-  read -r shouldwe
-  if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
-    dd if=/boot/uboot-usbarmory-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2 conv=fsync
-  else
-    echo "You can do this later by running:"
-    echo "# dd if=/boot/uboot-usbarmory-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2 conv=fsync"
-  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-usbarmory/0001-parabola-arm-modifications.patch b/libre/uboot-usbarmory/0001-parabola-arm-modifications.patch
new file mode 100644
index 000000000..9b14cabec
--- /dev/null
+++ b/libre/uboot-usbarmory/0001-parabola-arm-modifications.patch
@@ -0,0 +1,28 @@
+diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h
+index d8165cc..377322b 100644
+--- a/include/config_distro_defaults.h
++++ b/include/config_distro_defaults.h
+@@ -68,4 +68,7 @@
+ #define CONFIG_SUPPORT_RAW_INITRD
+ #define CONFIG_SYS_HUSH_PARSER
+ 
++#define CONFIG_CMD_PART
++#define CONFIG_PARTITION_UUIDS
++
+ #endif	/* _CONFIG_CMD_DISTRO_DEFAULTS_H */
+diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h
+index 714e3e2..6be57dc 100644
+--- a/include/configs/usbarmory.h
++++ b/include/configs/usbarmory.h
+@@ -23,6 +23,8 @@
+ 
+ #include <config_distro_defaults.h>
+ 
++#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre"
++
+ /* U-Boot commands */
+ #define CONFIG_CMD_MEMTEST
+ 
+-- 
+2.6.1
+
diff --git a/libre/uboot-usbarmory/PKGBUILD b/libre/uboot-usbarmory/PKGBUILD
new file mode 100644
index 000000000..86a8db13e
--- /dev/null
+++ b/libre/uboot-usbarmory/PKGBUILD
@@ -0,0 +1,53 @@
+# U-Boot: Inverse Path USB Armory
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+buildarch=4
+
+pkgname=uboot-usbarmory
+pkgver=2016.01
+pkgrel=1.parabola1
+pkgdesc="U-Boot for USB Armory"
+arch=('armv7h')
+url="http://git.denx.de/u-boot.git/"
+license=('GPL')
+makedepends=('bc')
+depends=('linux-libre')
+replaces=('uboot-usbarmory-linux-libre')
+conflicts=('uboot4extlinux-usbarmory' 'uboot4grub-usbarmory')
+install=${pkgname}.install
+backup=(boot/boot.txt boot/boot.scr)
+source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
+        '0001-parabola-arm-modifications.patch'
+        'boot.txt'
+        'mkscr')
+md5sums=('7d4f65fd43d4d706f5c5650e020d899d'
+         '15bacb3ff7c9bfb350e7e43f081bd9b3'
+         'eb83db44c372a6ff3349e026083f15f9'
+         '021623a04afd29ac3f368977140cfbfd')
+
+prepare() {
+  cd u-boot-${pkgver}
+
+  patch -Np1 -i ../0001-parabola-arm-modifications.patch
+}
+
+build() {
+  cd u-boot-${pkgver}
+
+  unset CFLAGS CXXFLAGS LDFLAGS
+
+  make distclean
+  make usbarmory_config
+  make
+}
+
+package() {
+  cd u-boot-${pkgver}
+
+  install -d "${pkgdir}"/boot
+  install -Dm644 u-boot.imx "${pkgdir}"/boot
+
+  install -Dm644 ../boot.txt "${pkgdir}"/boot/boot.txt
+  tools/mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d ../boot.txt "${pkgdir}"/boot/boot.scr
+  install -Dm755 ../mkscr "${pkgdir}"/boot/mkscr
+}
diff --git a/libre/uboot-usbarmory/boot.txt b/libre/uboot-usbarmory/boot.txt
new file mode 100644
index 000000000..2454291f8
--- /dev/null
+++ b/libre/uboot-usbarmory/boot.txt
@@ -0,0 +1,12 @@
+part uuid ${devtype} ${devnum}:${bootpart} uuid
+setenv bootargs console=ttyGS0,115200 console=${console} root=PARTUUID=${uuid} rw rootwait
+
+if load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} /boot/vmlinuz-linux-libre; then
+  if load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} /boot/dtbs/${fdtfile}; then
+    if load ${devtype} ${devnum}:${bootpart} ${ramdisk_addr_r} /boot/initramfs-linux-libre.img; then
+      bootz ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdt_addr_r};
+    else
+      bootz ${kernel_addr_r} - ${fdt_addr_r};
+    fi;
+  fi;
+fi
diff --git a/libre/uboot-usbarmory/mkscr b/libre/uboot-usbarmory/mkscr
new file mode 100755
index 000000000..272b6a7a5
--- /dev/null
+++ b/libre/uboot-usbarmory/mkscr
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [[ ! -x /usr/bin/mkimage ]]; then
+  echo "mkimage not found. Please install uboot-tools:"
+  echo "  pacman -S uboot-tools"
+  exit 1
+fi
+
+mkimage -A arm -O linux -T script -C none -n "U-Boot boot script" -d boot.txt boot.scr
diff --git a/libre/uboot-usbarmory/uboot-usbarmory.install b/libre/uboot-usbarmory/uboot-usbarmory.install
new file mode 100644
index 000000000..6c0ddcf9e
--- /dev/null
+++ b/libre/uboot-usbarmory/uboot-usbarmory.install
@@ -0,0 +1,22 @@
+flash_uboot() {
+  echo "A new U-Boot version needs to be flashed onto /dev/mmcblk0."
+  echo "Do this now? [y|N]"
+  read -r shouldwe
+  if [[ $shouldwe =~ ^([yY][eE][sS]|[yY])$ ]]; then
+    dd if=/boot/uboot-usbarmory-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2 conv=fsync
+  else
+    echo "You can do this later by running:"
+    echo "# dd if=/boot/uboot-usbarmory-linux-libre/u-boot.imx of=/dev/mmcblk0 bs=512 seek=2 conv=fsync"
+  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
+}
-- 
cgit v1.2.3