Update to 2017.09

5 files changed, 50 insertions, 12 deletions

diff --git a/sysutils/u-boot-pinebook/Makefile b/sysutils/u-boot-pinebook/Makefile
index f3ef41e3f05..45acc86bac1 100644
--- a/sysutils/u-boot-pinebook/Makefile
+++ b/sysutils/u-boot-pinebook/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2017/09/10 17:00:41 jmcneill Exp $
+# $NetBSD: Makefile,v 1.2 2017/11/19 16:50:35 jmcneill Exp $
 
-UBOOT_VERSION=		2017.09rc2
+UBOOT_VERSION=		2017.09
 UBOOT_TARGET=		pinebook
 UBOOT_CONFIG=		pinebook_defconfig
 UBOOT_BIN=		u-boot-sunxi-with-spl.bin
@@ -8,7 +8,7 @@ UBOOT_BIN=		u-boot-sunxi-with-spl.bin
 # Use anarsoul's fork of mainline U-Boot with Pinebook support patched in
 MASTER_SITES=		${MASTER_SITE_GITHUB:=anarsoul/}
 GITHUB_PROJECT=		u-boot-pine64
-GITHUB_TAG=		ccba9fb2248b6206cb55452b7623b964b0e02cf4
+GITHUB_TAG=		0e9350e3ff11c91eb6959d0d4589a4cc5e576e35
 DISTNAME=		u-boot-${UBOOT_TARGET}-${UBOOT_VERSION}
 EXTRACT_SUFX=		.tar.gz
 
diff --git a/sysutils/u-boot-pinebook/distinfo b/sysutils/u-boot-pinebook/distinfo
index 9610639da7c..517264f5d6a 100644
--- a/sysutils/u-boot-pinebook/distinfo
+++ b/sysutils/u-boot-pinebook/distinfo
@@ -1,10 +1,12 @@
-$NetBSD: distinfo,v 1.1 2017/09/10 17:00:41 jmcneill Exp $
+$NetBSD: distinfo,v 1.2 2017/11/19 16:50:35 jmcneill Exp $
 
-SHA1 (u-boot-pinebook-2017.09rc2-ccba9fb2248b6206cb55452b7623b964b0e02cf4.tar.gz) = 7739ac071f86cd2ef61afe89390956dc05ca2ff4
-RMD160 (u-boot-pinebook-2017.09rc2-ccba9fb2248b6206cb55452b7623b964b0e02cf4.tar.gz) = b3fa5901238ac78b90c7b911f1c8a8068f57b921
-SHA512 (u-boot-pinebook-2017.09rc2-ccba9fb2248b6206cb55452b7623b964b0e02cf4.tar.gz) = 0c0c3f45b8c390c8d1e2af4db89085a0eaf6a10cda2cecdabc23db0ca4ff813229ab787f06615d89abcb8dacf5131af5d3740c26ca47e287b38f4e14411758c8
-Size (u-boot-pinebook-2017.09rc2-ccba9fb2248b6206cb55452b7623b964b0e02cf4.tar.gz) = 14440630 bytes
+SHA1 (u-boot-pinebook-2017.09-0e9350e3ff11c91eb6959d0d4589a4cc5e576e35.tar.gz) = aa152afc2ba083fdb7a9f86519489c59d84e2e47
+RMD160 (u-boot-pinebook-2017.09-0e9350e3ff11c91eb6959d0d4589a4cc5e576e35.tar.gz) = 7de7b4fd529a2e29f6d2b9848a5a7a34e4b4d754
+SHA512 (u-boot-pinebook-2017.09-0e9350e3ff11c91eb6959d0d4589a4cc5e576e35.tar.gz) = 40329433d72cd86f6d2a74fe83555f12316ea583b9b2ebafdaf7fe4149fd5f72ab36ee9a03a975980dddd62c28a8c09d71a59fb18ea482bb47acf3a4a69f768b
+Size (u-boot-pinebook-2017.09-0e9350e3ff11c91eb6959d0d4589a4cc5e576e35.tar.gz) = 14828817 bytes
+SHA1 (patch-Kconfig) = 80318752f7e06220120c7bea2687b7c412cfe2e8
 SHA1 (patch-arch_arm_cpu_armv8_Kconfig) = 63cbbf2e3cebd46793fc03cc8e62297f6dc01aa9
 SHA1 (patch-drivers_video_sunxi_sunxi__de2.c) = a64bd9d6fbe075d9d01d196cfca8658d9ecd4bd2
 SHA1 (patch-include_configs_sunxi-common.h) = b71c28480cc084860d63e95af33bc7eead8ac6ac
-SHA1 (patch-lib_bch.c) = e346680a94696713f6d0e71e965283b9bdfbbdbf
+SHA1 (patch-lib_bch.c) = 264366742bcb364a017dfb1709a711492904a4e3
+SHA1 (patch-tools_Makefile) = 5b3d6d377a4bc1629fe76d458f266e19f63fd5d8
diff --git a/sysutils/u-boot-pinebook/patches/patch-Kconfig b/sysutils/u-boot-pinebook/patches/patch-Kconfig
new file mode 100644
index 00000000000..9b8c0376eed
--- /dev/null
+++ b/sysutils/u-boot-pinebook/patches/patch-Kconfig
@@ -0,0 +1,10 @@
+$NetBSD: patch-Kconfig,v 1.1 2017/11/19 16:50:35 jmcneill Exp $
+
+--- Kconfig.orig	2017-09-21 06:16:57.000000000 +0000
++++ Kconfig
+@@ -398,5 +398,3 @@ source "fs/Kconfig"
+ source "lib/Kconfig"
+ 
+ source "test/Kconfig"
+-
+-source "scripts/Kconfig"
diff --git a/sysutils/u-boot-pinebook/patches/patch-lib_bch.c b/sysutils/u-boot-pinebook/patches/patch-lib_bch.c
index 6d15d2464f8..cd571cb0cb9 100644
--- a/sysutils/u-boot-pinebook/patches/patch-lib_bch.c
+++ b/sysutils/u-boot-pinebook/patches/patch-lib_bch.c
@@ -1,13 +1,26 @@
-$NetBSD: patch-lib_bch.c,v 1.1 2017/09/10 17:00:41 jmcneill Exp $
+$NetBSD: patch-lib_bch.c,v 1.2 2017/11/19 16:50:35 jmcneill Exp $
 
---- lib/bch.c.orig	2017-07-10 17:07:38.000000000 +0000
+--- lib/bch.c.orig	2017-09-21 06:16:57.000000000 +0000
 +++ lib/bch.c
-@@ -61,7 +61,7 @@
+@@ -61,8 +61,11 @@
  #include <linux/bitops.h>
  #else
  #include <errno.h>
 -#if defined(__FreeBSD__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__)
  #include <sys/endian.h>
++#elif defined(__APPLE__)
++#include <machine/endian.h>
++#define htobe32 htonl
  #else
  #include <endian.h>
+ #endif
+@@ -117,7 +120,7 @@ struct gf_poly_deg1 {
+ };
+ 
+ #ifdef USE_HOSTCC
+-#if !defined(__DragonFly__) && !defined(__FreeBSD__)
++#if !defined(__DragonFly__) && !defined(__FreeBSD__) && !defined(__APPLE__)
+ static int fls(int x)
+ {
+ 	int r = 32;
diff --git a/sysutils/u-boot-pinebook/patches/patch-tools_Makefile b/sysutils/u-boot-pinebook/patches/patch-tools_Makefile
new file mode 100644
index 00000000000..3b37e598480
--- /dev/null
+++ b/sysutils/u-boot-pinebook/patches/patch-tools_Makefile
@@ -0,0 +1,13 @@
+$NetBSD: patch-tools_Makefile,v 1.1 2017/11/19 16:50:35 jmcneill Exp $
+
+--- tools/Makefile.orig	2017-09-21 06:16:57.000000000 +0000
++++ tools/Makefile
+@@ -69,7 +69,7 @@ LIBFDT_CSRCS := fdt.c fdt_ro.c fdt_wip.c
+ # Fatal error: can't create build/temp.linux-x86_64-2.7/../lib/libfdt/fdt.o:
+ #    No such file or directory
+ # To fix this, use an absolute path.
+-libfdt_tree := $(shell readlink -f $(srctree)/lib/libfdt)
++libfdt_tree := $(realpath $(srctree)/lib/libfdt)
+ 
+ LIBFDT_SRCS := $(addprefix $(libfdt_tree)/, $(LIBFDT_CSRCS))
+ LIBFDT_SWIG := $(addprefix $(libfdt_tree)/, pylibfdt/libfdt.i)