38 files changed, 42 insertions, 73 deletions

diff --git a/libre/uboot4extlinux-am335x_bone/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-am335x_bone/0001-parabola-arm-modifications.patch
index 0f1c145da..0f1c145da 100644
--- a/libre/uboot4extlinux-am335x_bone/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot4extlinux-am335x_bone/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot4extlinux-am335x_bone/PKGBUILD b/libre-testing/uboot4extlinux-am335x_bone/PKGBUILD
index f1436af02..ac468fc50 100644
--- a/libre/uboot4extlinux-am335x_bone/PKGBUILD
+++ b/libre-testing/uboot4extlinux-am335x_bone/PKGBUILD
@@ -7,16 +7,11 @@ buildarch=4
 
 pkgname=uboot4extlinux-am335x_bone
 pkgver=2015.04
-pkgrel=1
+pkgrel=2
 pkgdesc="U-Boot with Extlinux support for BeagleBone and BeagleBone Black"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
-replaces=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts'
-          'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck'
-          'uboot-beaglebone' 'uboot-am335x_bone')
-conflicts=('uboot-beaglebone-linux-libre' 'uboot-beaglebone-linux-libre-lts'
-           'uboot-beaglebone-linux-libre-grsec' 'uboot-beaglebone-linux-libre-pck'
-           'uboot-beaglebone' 'uboot-am335x_bone' 'uboot4grub-am335x_bone')
+conflicts=('uboot-am335x_bone' 'uboot4grub-am335x_bone')
 makedepends=('bc')
 license=('GPL')
 backup=(boot/extlinux/extlinux.conf)
diff --git a/libre/uboot4extlinux-am335x_bone/extlinux.conf b/libre-testing/uboot4extlinux-am335x_bone/extlinux.conf
index 52de94d49..52de94d49 100644
--- a/libre/uboot4extlinux-am335x_bone/extlinux.conf
+++ b/libre-testing/uboot4extlinux-am335x_bone/extlinux.conf
diff --git a/libre/uboot4extlinux-am335x_bone/uEnv.txt b/libre-testing/uboot4extlinux-am335x_bone/uEnv.txt
index f432efc6b..f432efc6b 100644
--- a/libre/uboot4extlinux-am335x_bone/uEnv.txt
+++ b/libre-testing/uboot4extlinux-am335x_bone/uEnv.txt
diff --git a/libre/uboot4extlinux-am335x_bone/uboot4extlinux-am335x_bone.install b/libre-testing/uboot4extlinux-am335x_bone/uboot4extlinux-am335x_bone.install
index 4467c694e..4467c694e 100644
--- a/libre/uboot4extlinux-am335x_bone/uboot4extlinux-am335x_bone.install
+++ b/libre-testing/uboot4extlinux-am335x_bone/uboot4extlinux-am335x_bone.install
diff --git a/libre/uboot4extlinux-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch b/libre-testing/uboot4extlinux-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
index bdb6699e6..bdb6699e6 100644
--- a/libre/uboot4extlinux-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
+++ b/libre-testing/uboot4extlinux-chiliboard/0001-Add-linux-compiler-gcc5.h-to-fix-builds-with-gcc5.patch
diff --git a/libre/uboot4extlinux-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch b/libre-testing/uboot4extlinux-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch
index 6ec3d82fc..6ec3d82fc 100644
--- a/libre/uboot4extlinux-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch
+++ b/libre-testing/uboot4extlinux-chiliboard/0002-ARM-asm-io.h-use-static-inline.patch
diff --git a/libre/uboot4extlinux-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch b/libre-testing/uboot4extlinux-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch
index baf1efd5d..baf1efd5d 100644
--- a/libre/uboot4extlinux-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch
+++ b/libre-testing/uboot4extlinux-chiliboard/0003-common-main.c-make-show_boot_progress-__weak.patch
diff --git a/libre/uboot4extlinux-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch b/libre-testing/uboot4extlinux-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch
index f2237a229..f2237a229 100644
--- a/libre/uboot4extlinux-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch
+++ b/libre-testing/uboot4extlinux-chiliboard/0004-common-board_f-cosmetic-use-__weak-for-leds.patch
diff --git a/libre/uboot4extlinux-chiliboard/0005-chiliboard-support.patch b/libre-testing/uboot4extlinux-chiliboard/0005-chiliboard-support.patch
index cbe029a69..cbe029a69 100644
--- a/libre/uboot4extlinux-chiliboard/0005-chiliboard-support.patch
+++ b/libre-testing/uboot4extlinux-chiliboard/0005-chiliboard-support.patch
diff --git a/libre/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch
index fc41962ef..fc41962ef 100644
--- a/libre/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch
+++ b/libre-testing/uboot4extlinux-chiliboard/0006-parabola-arm-modifications.patch
diff --git a/libre/uboot4extlinux-chiliboard/PKGBUILD b/libre-testing/uboot4extlinux-chiliboard/PKGBUILD
index 0a2f97131..61c0208c1 100644
--- a/libre/uboot4extlinux-chiliboard/PKGBUILD
+++ b/libre-testing/uboot4extlinux-chiliboard/PKGBUILD
@@ -9,8 +9,7 @@ pkgrel=1
 pkgdesc="U-Boot with Extlinux support for ChiliBoard"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
-replaces=('uboot-chiliboard-linux-libre' 'uboot-chiliboard')
-conflicts=('uboot-chiliboard-linux-libre' 'uboot-chiliboard' 'uboot4grub-chiliboard')
+conflicts=('uboot-chiliboard' 'uboot4grub-chiliboard')
 makedepends=('bc')
 license=('GPL')
 backup=(boot/extlinux/extlinux.conf)
diff --git a/libre/uboot4extlinux-chiliboard/extlinux.conf b/libre-testing/uboot4extlinux-chiliboard/extlinux.conf
index 52de94d49..52de94d49 100644
--- a/libre/uboot4extlinux-chiliboard/extlinux.conf
+++ b/libre-testing/uboot4extlinux-chiliboard/extlinux.conf
diff --git a/libre/uboot4extlinux-chiliboard/uEnv.txt b/libre-testing/uboot4extlinux-chiliboard/uEnv.txt
index a9f26096d..a9f26096d 100644
--- a/libre/uboot4extlinux-chiliboard/uEnv.txt
+++ b/libre-testing/uboot4extlinux-chiliboard/uEnv.txt
diff --git a/libre/uboot4extlinux-chiliboard/uboot4extlinux-chiliboard.install b/libre-testing/uboot4extlinux-chiliboard/uboot4extlinux-chiliboard.install
index 4467c694e..4467c694e 100644
--- a/libre/uboot4extlinux-chiliboard/uboot4extlinux-chiliboard.install
+++ b/libre-testing/uboot4extlinux-chiliboard/uboot4extlinux-chiliboard.install
diff --git a/libre/uboot4extlinux-omap3_beagle/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-omap3_beagle/0001-parabola-arm-modifications.patch
index c99cd89b8..c99cd89b8 100644
--- a/libre/uboot4extlinux-omap3_beagle/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot4extlinux-omap3_beagle/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot4extlinux-omap3_beagle/PKGBUILD b/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD
index a3c16f7cc..c3d833ad8 100644
--- a/libre/uboot4extlinux-omap3_beagle/PKGBUILD
+++ b/libre-testing/uboot4extlinux-omap3_beagle/PKGBUILD
@@ -5,17 +5,12 @@ buildarch=4
 
 pkgname=uboot4extlinux-omap3_beagle
 pkgver=2016.01
-pkgrel=1
+pkgrel=2
 pkgdesc="U-Boot with Extlinux support for BeagleBoard and BeagleBoard-xM"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
-replaces=('uboot-beagleboard-linux-libre' 'uboot-beagleboard-linux-libre-lts'
-          'uboot-beagleboard-linux-libre-grsec' 'uboot-beagleboard-linux-libre-pck'
-          'uboot-beagleboard' 'uboot-omap3_beagle')
-conflicts=('uboot-beagleboard-linux-libre' 'uboot-beagleboard-linux-libre-lts'
-           'uboot-beagleboard-linux-libre-grsec' 'uboot-beagleboard-linux-libre-pck'
-           'uboot-beagleboard' 'uboot-omap3_beagle' 'uboot4grub-omap3_beagle')
+conflicts=('uboot-omap3_beagle' 'uboot4grub-omap3_beagle')
 makedepends=('bc')
 backup=(boot/extlinux/extlinux.conf)
 install=${pkgname}.install
diff --git a/libre/uboot4extlinux-omap3_beagle/extlinux.conf b/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf
index 708bfcddb..708bfcddb 100644
--- a/libre/uboot4extlinux-omap3_beagle/extlinux.conf
+++ b/libre-testing/uboot4extlinux-omap3_beagle/extlinux.conf
diff --git a/libre/uboot4extlinux-omap3_beagle/uEnv.txt b/libre-testing/uboot4extlinux-omap3_beagle/uEnv.txt
index e69de29bb..e69de29bb 100644
--- a/libre/uboot4extlinux-omap3_beagle/uEnv.txt
+++ b/libre-testing/uboot4extlinux-omap3_beagle/uEnv.txt
diff --git a/libre/uboot4extlinux-omap3_beagle/uboot4extlinux-omap3_beagle.install b/libre-testing/uboot4extlinux-omap3_beagle/uboot4extlinux-omap3_beagle.install
index 8aff26699..8aff26699 100644
--- a/libre/uboot4extlinux-omap3_beagle/uboot4extlinux-omap3_beagle.install
+++ b/libre-testing/uboot4extlinux-omap3_beagle/uboot4extlinux-omap3_beagle.install
diff --git a/libre/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch
index 09aee7ce0..09aee7ce0 100644
--- a/libre/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot4extlinux-omap4_panda/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot4extlinux-omap4_panda/PKGBUILD b/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD
index cf9132074..6cb84e451 100644
--- a/libre/uboot4extlinux-omap4_panda/PKGBUILD
+++ b/libre-testing/uboot4extlinux-omap4_panda/PKGBUILD
@@ -5,12 +5,11 @@ buildarch=4
 
 pkgname=uboot4extlinux-omap4_panda
 pkgver=2016.01
-pkgrel=1
+pkgrel=2
 pkgdesc="U-Boot with Extlinux support for PandaBoard and PandaBoard ES"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
-replaces=('uboot-pandaboard-linux-libre' 'uboot-pandaboard' 'uboot-omap4_panda')
-conflicts=('uboot-pandaboard-linux-libre' 'uboot-pandaboard' 'uboot-omap4_panda' 'uboot4grub-omap4_panda')
+conflicts=('uboot-omap4_panda' 'uboot4grub-omap4_panda')
 makedepends=('bc')
 license=('GPL')
 install=${pkgname}.install
diff --git a/libre/uboot4extlinux-omap4_panda/extlinux.conf b/libre-testing/uboot4extlinux-omap4_panda/extlinux.conf
index 725121811..725121811 100644
--- a/libre/uboot4extlinux-omap4_panda/extlinux.conf
+++ b/libre-testing/uboot4extlinux-omap4_panda/extlinux.conf
diff --git a/libre/uboot4extlinux-omap4_panda/uEnv.txt b/libre-testing/uboot4extlinux-omap4_panda/uEnv.txt
index 55298e1a9..55298e1a9 100644
--- a/libre/uboot4extlinux-omap4_panda/uEnv.txt
+++ b/libre-testing/uboot4extlinux-omap4_panda/uEnv.txt
diff --git a/libre/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install b/libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install
index 771f1f0b3..771f1f0b3 100644
--- a/libre/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install
+++ b/libre-testing/uboot4extlinux-omap4_panda/uboot4extlinux-omap4_panda.install
diff --git a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
index 5b59f18af..5b59f18af 100644
--- a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre-testing/uboot4extlinux-sunxi/PKGBUILD
index 7c82f57e8..3237c4913 100644
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ b/libre-testing/uboot4extlinux-sunxi/PKGBUILD
@@ -18,7 +18,7 @@ pkgname=('uboot4extlinux-a10-olinuxino-lime'
          'uboot4extlinux-pcduino3'
          'uboot4extlinux-pcduino3-nano')
 pkgver=2016.01
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -70,9 +70,8 @@ build() {
 package_uboot4extlinux-a10-olinuxino-lime() {
   pkgdesc="U-Boot with Extlinux support for A10 OLinuXino Lime"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a10-olinuxino-lime' 'uboot-a10-olinuxino-lime-linux-libre')
-  replaces=('uboot-a10-olinuxino-lime' 'uboot-a10-olinuxino-lime-linux-libre' 'uboot4grub-a10-olinuxino-lime')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_A10-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -83,9 +82,8 @@ package_uboot4extlinux-a10-olinuxino-lime() {
 package_uboot4extlinux-a10s-olinuxino-micro() {
   pkgdesc="U-Boot with Extlinux support for A10s OLinuXino Micro"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a10s-olinuxino-micro' 'uboot-a10s-olinuxino-micro-linux-libre')
-  replaces=('uboot-a10s-olinuxino-micro' 'uboot-a10s-olinuxino-micro-linux-libre' 'uboot4grub-a10s-olinuxino-micro')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_A10s-OLinuXino-M/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -96,9 +94,8 @@ package_uboot4extlinux-a10s-olinuxino-micro() {
 package_uboot4extlinux-a13-olinuxino() {
   pkgdesc="U-Boot with Extlinux support for A13 OLinuXino"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a13-olinuxino' 'uboot-a13-olinuxino-linux-libre')
-  replaces=('uboot-a13-olinuxino' 'uboot-a13-olinuxino-linux-libre' 'uboot4grub-a13-olinuxino')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_A13-OLinuXino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -109,9 +106,8 @@ package_uboot4extlinux-a13-olinuxino() {
 package_uboot4extlinux-a13-olinuxino-micro() {
   pkgdesc="U-Boot with Extlinux support for A13 OLinuXino Micro"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a13-olinuxino-micro' 'uboot-a13-olinuxino-micro-linux-libre')
-  replaces=('uboot-a13-olinuxino-micro' 'uboot-a13-olinuxino-micro-linux-libre' 'uboot4grub-a13-olinuxino-micro')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_A13-OLinuXinoM/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -122,9 +118,8 @@ package_uboot4extlinux-a13-olinuxino-micro() {
 package_uboot4extlinux-a20-olinuxino-lime() {
   pkgdesc="U-Boot with Extlinux support for A20 OLinuXino Lime"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a20-olinuxino-lime' 'uboot-a20-olinuxino-lime-linux-libre')
-  replaces=('uboot-a20-olinuxino-lime' 'uboot-a20-olinuxino-lime-linux-libre' 'uboot4grub-a20-olinuxino-lime')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -135,9 +130,8 @@ package_uboot4extlinux-a20-olinuxino-lime() {
 package_uboot4extlinux-a20-olinuxino-lime2() {
   pkgdesc="U-Boot with Extlinux support for A20 OLinuXino Lime2"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a20-olinuxino-lime2' 'uboot-a20-olinuxino-lime2-linux-libre')
-  replaces=('uboot-a20-olinuxino-lime2' 'uboot-a20-olinuxino-lime2-linux-libre' 'uboot4grub-a20-olinuxino-lime2')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_A20-OLinuXino-Lime2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -148,9 +142,8 @@ package_uboot4extlinux-a20-olinuxino-lime2() {
 package_uboot4extlinux-a20-olinuxino-micro() {
   pkgdesc="U-Boot with Extlinux support for A20 OLinuXino Micro"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-a20-olinuxino-micro' 'uboot-a20-olinuxino-micro-linux-libre')
-  replaces=('uboot-a20-olinuxino-micro' 'uboot-a20-olinuxino-micro-linux-libre' 'uboot4grub-a20-olinuxino-micro')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_A20-OLinuXino_MICRO/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -161,9 +154,8 @@ package_uboot4extlinux-a20-olinuxino-micro() {
 package_uboot4extlinux-cubieboard() {
   pkgdesc="U-Boot with Extlinux support for Cubieboard"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-cubieboard' 'uboot-cubieboard-linux-libre')
-  replaces=('uboot-cubieboard' 'uboot-cubieboard-linux-libre' 'uboot4grub-cubieboard')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_Cubieboard/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
@@ -174,9 +166,8 @@ package_uboot4extlinux-cubieboard() {
 package_uboot4extlinux-cubieboard2() {
   pkgdesc="U-Boot with Extlinux support for Cubieboard 2"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-cubieboard2' 'uboot-cubieboard2-linux-libre')
-  replaces=('uboot-cubieboard2' 'uboot-cubieboard2-linux-libre' 'uboot4grub-cubieboard2')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_Cubieboard2/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
@@ -187,9 +178,8 @@ package_uboot4extlinux-cubieboard2() {
 package_uboot4extlinux-cubietruck() {
   pkgdesc="U-Boot with Extlinux support for Cubietruck"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-cubietruck' 'uboot-cubietruck-linux-libre')
-  replaces=('uboot-cubietruck' 'uboot-cubietruck-linux-libre' 'uboot4grub-cubietruck')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_Cubietruck/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot/u-boot-sunxi-with-spl.bin
@@ -200,9 +190,8 @@ package_uboot4extlinux-cubietruck() {
 package_uboot4extlinux-pcduino() {
   pkgdesc="U-Boot with Extlinux support for pcDuino"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-pcduino' 'uboot-pcduino-linux-libre')
-  replaces=('uboot-pcduino' 'uboot-pcduino-linux-libre' 'uboot4grub-pcduino')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_Linksprite_pcDuino/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -213,9 +202,8 @@ package_uboot4extlinux-pcduino() {
 package_uboot4extlinux-pcduino3() {
   pkgdesc="U-Boot with Extlinux support for pcDuino3"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-pcduino3' 'uboot-pcduino3-linux-libre')
-  replaces=('uboot-pcduino3' 'uboot-pcduino3-linux-libre' 'uboot4grub-pcduino3')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_Linksprite_pcDuino3/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
@@ -226,9 +214,8 @@ package_uboot4extlinux-pcduino3() {
 package_uboot4extlinux-pcduino3-nano() {
   pkgdesc="U-Boot with Extlinux support for pcDuino3 Nano"
   install=${pkgbase}.install
-  provides=('uboot-sunxi')
-  conflicts=('uboot-sunxi' 'uboot-pcduino3-nano' 'uboot-pcduino3-nano-linux-libre')
-  replaces=('uboot-pcduino3-nano' 'uboot-pcduino3-nano-linux-libre' 'uboot4grub-pcduino3-nano')
+  provides=('uboot4extlinux-sunxi')
+  conflicts=('uboot-sunxi' 'uboot4extlinux-sunxi' 'uboot4grub-sunxi')
 
   install -d "${pkgdir}"/boot/extlinux
   install -Dm644 bin_Linksprite_pcDuino3_Nano/u-boot-sunxi-with-spl.bin "${pkgdir}"/boot
diff --git a/libre/uboot4extlinux-sunxi/extlinux.conf b/libre-testing/uboot4extlinux-sunxi/extlinux.conf
index 66f6b30d5..66f6b30d5 100644
--- a/libre/uboot4extlinux-sunxi/extlinux.conf
+++ b/libre-testing/uboot4extlinux-sunxi/extlinux.conf
diff --git a/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install b/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
index e39c2cd2e..e39c2cd2e 100644
--- a/libre/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
+++ b/libre-testing/uboot4extlinux-sunxi/uboot4extlinux-sunxi.install
diff --git a/libre/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch
index 7328d1ad7..7328d1ad7 100644
--- a/libre/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot4extlinux-udoo/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch b/libre-testing/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch
index 30718c561..30718c561 100644
--- a/libre/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch
+++ b/libre-testing/uboot4extlinux-udoo/0002-kernel-add-support-for-gcc-5.patch
diff --git a/libre/uboot4extlinux-udoo/PKGBUILD b/libre-testing/uboot4extlinux-udoo/PKGBUILD
index 41f6960a4..56584e572 100644
--- a/libre/uboot4extlinux-udoo/PKGBUILD
+++ b/libre-testing/uboot4extlinux-udoo/PKGBUILD
@@ -6,7 +6,7 @@ buildarch=4
 pkgbase=uboot4extlinux-udoo
 pkgname=('uboot4extlinux-udoo_dl' 'uboot4extlinux-udoo_quad')
 pkgver=2015.01
-pkgrel=1
+pkgrel=2
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
@@ -44,10 +44,8 @@ build() {
 
 package_uboot4extlinux-udoo_dl() {
   pkgdesc="U-Boot with Extlinux support for UDOO Dual"
-  replaces=('uboot-udoo-dual-linux-libre' 'uboot-udoo-dual-linux-libre-grsec'
-            'uboot-udoo-dual' 'uboot-udoo_dl')
-  conflicts=('uboot-udoo-dual-linux-libre' 'uboot-udoo-dual-linux-libre-grsec'
-             'uboot-udoo-dual' 'uboot-udoo_dl' 'uboot4extlinux-udoo_quad' 'uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
+  conflicts=('uboot-udoo' 'uboot4extlinux-udoo' 'uboot4grub-udoo')
+  provides=('uboot4extlinux-udoo')
   install=${pkgbase}.install
 
   mkdir -p "${pkgdir}"/boot/extlinux
@@ -57,10 +55,8 @@ package_uboot4extlinux-udoo_dl() {
 
 package_uboot4extlinux-udoo_quad() {
   pkgdesc="U-Boot with Extlinux support for UDOO Quad"
-  replaces=('uboot-udoo-quad-linux-libre' 'uboot-udoo-quad-linux-libre-grsec'
-            'uboot-udoo-quad' 'uboot-udoo_quad')
-  conflicts=('uboot-udoo-quad-linux-libre' 'uboot-udoo-quad-linux-libre-grsec'
-             'uboot-udoo-quad' 'uboot-udoo_quad' 'uboot4extlinux-udoo_dl'  'uboot4grub-udoo_dl' 'uboot4grub-udoo_quad')
+  conflicts=('uboot-udoo' 'uboot4extlinux-udoo' 'uboot4grub-udoo')
+  provides=('uboot4extlinux-udoo')
   install=${pkgbase}.install
 
   mkdir -p "${pkgdir}"/boot/extlinux
diff --git a/libre/uboot4extlinux-udoo/extlinux.conf b/libre-testing/uboot4extlinux-udoo/extlinux.conf
index 45d603094..45d603094 100644
--- a/libre/uboot4extlinux-udoo/extlinux.conf
+++ b/libre-testing/uboot4extlinux-udoo/extlinux.conf
diff --git a/libre/uboot4extlinux-udoo/uboot4extlinux-udoo.install b/libre-testing/uboot4extlinux-udoo/uboot4extlinux-udoo.install
index 8a45c3b16..8a45c3b16 100644
--- a/libre/uboot4extlinux-udoo/uboot4extlinux-udoo.install
+++ b/libre-testing/uboot4extlinux-udoo/uboot4extlinux-udoo.install
diff --git a/libre/uboot4extlinux-wandboard/0001-parabola-arm-modifications.patch b/libre-testing/uboot4extlinux-wandboard/0001-parabola-arm-modifications.patch
index c50ca9e00..c50ca9e00 100644
--- a/libre/uboot4extlinux-wandboard/0001-parabola-arm-modifications.patch
+++ b/libre-testing/uboot4extlinux-wandboard/0001-parabola-arm-modifications.patch
diff --git a/libre/uboot4extlinux-wandboard/PKGBUILD b/libre-testing/uboot4extlinux-wandboard/PKGBUILD
index b97e0b1df..a3431b1a0 100644
--- a/libre/uboot4extlinux-wandboard/PKGBUILD
+++ b/libre-testing/uboot4extlinux-wandboard/PKGBUILD
@@ -5,14 +5,13 @@ buildarch=4
 
 pkgname=uboot4extlinux-wandboard
 pkgver=2015.10
-pkgrel=1
+pkgrel=2
 pkgdesc="U-Boot with Extlinux support for Wandboard"
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
 makedepends=('bc')
-replaces=('uboot-wandboard-solo' 'uboot-wandboard-dual' 'uboot-wandboard-quad' 'uboot-wandboard' 'uboot-wandboard-linux-libre')
-conflicts=('uboot-wandboard' 'uboot-wandboard-linux-libre' 'uboot4grub-wandboard')
+conflicts=('uboot-wandboard' 'uboot4grub-wandboard')
 install=${pkgname}.install
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
         '0001-parabola-arm-modifications.patch'
@@ -38,9 +37,8 @@ build() {
 
 package() {
   cd u-boot-${pkgver}
-  mkdir -p "${pkgdir}"/boot/extlinux
 
-  mkdir -p "${pkgdir}"/boot
+  mkdir -p "${pkgdir}"/boot/extlinux
   cp SPL u-boot.img "${pkgdir}"/boot
   cp "${srcdir}"/extlinux.conf "${pkgdir}"/boot/extlinux
 }
diff --git a/libre/uboot4extlinux-wandboard/extlinux.conf b/libre-testing/uboot4extlinux-wandboard/extlinux.conf
index 16cc3a38f..16cc3a38f 100644
--- a/libre/uboot4extlinux-wandboard/extlinux.conf
+++ b/libre-testing/uboot4extlinux-wandboard/extlinux.conf
diff --git a/libre/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install b/libre-testing/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install
index ddfb5c83f..ddfb5c83f 100644
--- a/libre/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install
+++ b/libre-testing/uboot4extlinux-wandboard/uboot4extlinux-wandboard.install