From 4de97ba5bd279723848aaadaf79c77c62dc7c2e5 Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Mon, 25 Feb 2019 00:49:09 +0100
Subject: libre: uboot4extlinux-sunxi: drop patch and useless sed

0001-parabola-arm-modifications.patch should not be necessary
anymore as u-boot configuration are now setup to support
configuration options for common GNU/Linux distributions.

More details are available in doc/README.distro in the u-boot
source code.

As for the sed command in prepare, the binman files already
have #!/usr/bin/env python2 in the current u-boot version.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 .../0001-parabola-arm-modifications.patch          | 39 ----------------------
 libre/uboot4extlinux-sunxi/PKGBUILD                | 11 +-----
 2 files changed, 1 insertion(+), 49 deletions(-)
 delete mode 100644 libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch

(limited to 'libre')

diff --git a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch b/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
deleted file mode 100644
index 83743ad5c..000000000
--- a/libre/uboot4extlinux-sunxi/0001-parabola-arm-modifications.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h
-index b01d1c3c84..d28019801d 100644
---- a/include/configs/sunxi-common.h
-+++ b/include/configs/sunxi-common.h
-@@ -416,6 +416,7 @@ extern int soft_i2c_gpio_scl;
- 	BOOT_TARGET_DEVICES_USB(func) \
- 	func(PXE, pxe, na) \
- 	func(DHCP, dhcp, na)
-+#include <config_distro_bootcmd.h>
- 
- #ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT
- #define BOOTCMD_SUNXI_COMPAT \
-@@ -433,8 +434,6 @@ extern int soft_i2c_gpio_scl;
- #define BOOTCMD_SUNXI_COMPAT
- #endif
- 
--#include <config_distro_bootcmd.h>
--
- #ifdef CONFIG_USB_KEYBOARD
- #define CONSOLE_STDIN_SETTINGS \
- 	"preboot=usb start\0" \
-@@ -498,6 +497,7 @@ extern int soft_i2c_gpio_scl;
- #endif
- 
- #define CONFIG_EXTRA_ENV_SETTINGS \
-+	BOOTENV \
- 	CONSOLE_ENV_SETTINGS \
- 	MEM_LAYOUT_ENV_SETTINGS \
- 	DFU_ALT_INFO_RAM \
-@@ -508,8 +508,7 @@ extern int soft_i2c_gpio_scl;
- 	"uuid_gpt_esp=" UUID_GPT_ESP "\0" \
- 	"uuid_gpt_system=" UUID_GPT_SYSTEM "\0" \
- 	"partitions=" PARTS_DEFAULT "\0" \
--	BOOTCMD_SUNXI_COMPAT \
--	BOOTENV
-+	BOOTCMD_SUNXI_COMPAT
- 
- #else /* ifndef CONFIG_SPL_BUILD */
- #define CONFIG_EXTRA_ENV_SETTINGS
diff --git a/libre/uboot4extlinux-sunxi/PKGBUILD b/libre/uboot4extlinux-sunxi/PKGBUILD
index b25bcc35c..86abb97f2 100644
--- a/libre/uboot4extlinux-sunxi/PKGBUILD
+++ b/libre/uboot4extlinux-sunxi/PKGBUILD
@@ -26,17 +26,15 @@ pkgname=('uboot4extlinux-a10-olinuxino-lime'
          'uboot4extlinux-orangepi_pc'
          'uboot4extlinux-orangepi_plus')
 pkgver=2019.01
-pkgrel=2
+pkgrel=3
 arch=('armv7h')
 url="http://git.denx.de/u-boot.git/"
 license=('GPL')
 makedepends=('bc' 'dtc' 'python' 'python2' 'swig')
 backup=(boot/extlinux/extlinux.conf)
 source=("ftp://ftp.denx.de/pub/u-boot/u-boot-${pkgver}.tar.bz2"
-        '0001-parabola-arm-modifications.patch'
         'extlinux.conf')
 sha256sums=('50bd7e5a466ab828914d080d5f6a432345b500e8fba1ad3b7b61e95e60d51c22'
-            'd8277b055e60da95286264f4affd8a1105ea9fda26442a25ccbc914f354646f6'
             '34550c6d700c6b4713f490d6d1b4e3ceb78a04072786225084fe6d13e232f105')
 
 boards=('A10-OLinuXino-Lime'
@@ -61,13 +59,6 @@ boards=('A10-OLinuXino-Lime'
         'orangepi_pc'
         'orangepi_plus')
 
-prepare() {
-  cd u-boot-${pkgver}
-
-  patch -Np1 -i ../0001-parabola-arm-modifications.patch
-  sed -i 's/env python$/&2/' tools/binman/binman{,.py}
-}
-
 build() {
   cd u-boot-${pkgver}
 
-- 
cgit v1.2.3