mk/vars.mk

@@ -76,7 +76,7 @@ ifeq ($(ADK_TARGET_ARCH_C6X),y)
 GNU_TARGET_NAME:=	$(ADK_TARGET_CPU_ARCH)-$(ADK_TARGET_LINUXTYPE)
 endif
 ifeq ($(ADK_TARGET_ARCH_CSKY),y)
-ifeq ($(ADK_TARGET_CPU_CSKY_CK610F),y)
+ifeq ($(ADK_TARGET_CPU_CSKY_CK610),y)
 GNU_TARGET_NAME:=	$(ADK_TARGET_CPU_ARCH)-unknown-$(ADK_TARGET_LINUXTYPE)
 else
 GNU_TARGET_NAME:=	$(ADK_TARGET_CPU_ARCH)-abiv2-$(ADK_TARGET_LINUXTYPE)

package/barebox/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		barebox
-PKG_VERSION:=		2017.02.0
+PKG_VERSION:=		2017.11.0
 PKG_RELEASE:=		1
-PKG_HASH:=		d65d864fe598d61ed9c6712e32d50742e6996aae02acaae5955c3b22166344cb
+PKG_HASH:=		7dff97dd94807fd7c0012fd9ddb8bc799a220e2b65e46dcc56724105a56feecc
 PKG_DESCR:=		portable bootloader
 PKG_SECTION:=		base/boot
 PKG_BUILDDEP:=		lzop-host
@@ -24,6 +24,14 @@ CONFIG_STYLE:=		manual
 BUILD_STYLE:=		manual
 INSTALL_STYLE:=		manual
 
+BAREBOX_ARCH:=		$(ADK_TARGET_ARCH)
+ifeq ($(ADK_TARGET_ARCH_X86),y)
+CONFIG:=		efi_defconfig
+endif
+ifeq ($(ADK_TARGET_ARCH_X86_64),y)
+CONFIG:=		efi_defconfig
+BAREBOX_ARCH:=		x86
+endif
 ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS),y)
 CONFIG:=		qemu-malta_defconfig
 endif
@@ -32,12 +40,12 @@ CONFIG:=		vexpress_ca9_defconfig
 endif
 
 do-configure:
-	(cd $(WRKBUILD) && $(MAKE) ARCH='$(ADK_TARGET_ARCH)' $(CONFIG))
+	(cd $(WRKBUILD) && $(MAKE) ARCH=$(BAREBOX_ARCH) $(CONFIG))
 
 do-build:
 	(cd $(WRKBUILD) && env \
 		PATH='$(HOST_PATH)' \
-		ARCH='$(ADK_TARGET_ARCH)' \
+		ARCH=$(BAREBOX_ARCH) \
 		CROSS_COMPILE='$(TARGET_CROSS)' \
 		$(MAKE))
 

package/gdb/Makefile

@@ -20,6 +20,8 @@ include ${ADK_TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,GDB,gdb,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+XAKE_FLAGS+=		MAKEINFO=true
+
 # --enable-static is required to build libbfd.a
 CONFIGURE_ARGS+=	--enable-static \
 			--without-uiout \

package/kodi/Makefile

@@ -6,11 +6,11 @@ include $(ADK_TOPDIR)/rules.mk
 PKG_NAME:=		kodi
 PKG_VERSION:=		17.3
 PKG_RELEASE:=		1
-PKG_HASH:=		1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1
+PKG_HASH:=		ca97d044dc544568f34f067688b783d29f180b5e504814d5d947143b2f7e6d7b
 PKG_DESCR:=		software media player
 PKG_SECTION:=		mm/video
 PKG_DEPENDS:=		python2 libsquish libressl libxz
-PKG_DEPENDS+=		libass libmpeg2 libmad
+PKG_DEPENDS+=		libass libmpeg2 libmad libiconv
 PKG_DEPENDS+=		libogg libvorbis libmodplug libcurl
 PKG_DEPENDS+=		libflac libbz2 libtiff libnettle librtmp liblzo
 PKG_DEPENDS+=		yajl tinyxml libsqlite libpcrecpp libncurses
@@ -28,7 +28,7 @@ PKG_BUILDDEP+=		libgpg-error libvorbis
 PKG_BUILDDEP+=		swig-host liblzo-host libpng-host libjpeg-turbo-host
 PKG_BUILDDEP+=		zip-host unzip-host giflib-host libsquish libdcadec
 PKG_BUILDDEP+=		libcrossguid libressl xz bzip2 liblzo
-PKG_NEEDS:=		threads c++ iconv data
+PKG_NEEDS:=		threads c++ data
 PKG_URL:=		http://kodi.tv/
 PKG_SITES:=		https://github.com/xbmc/xbmc/archive/
 

package/libressl/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libressl
-PKG_VERSION:=		2.5.5
-PKG_RELEASE:=		2
-PKG_HASH:=		e57f5e3d5842a81fe9351b6e817fcaf0a749ca4ef35a91465edba9e071dce7c4
+PKG_VERSION:=		2.6.3
+PKG_RELEASE:=		1
+PKG_HASH:=		aead6598263171b96970da0d881e616d0813b69b35ebdc5991f87ff2ea7f5c98
 PKG_DESCR:=		ssl/tls library
 PKG_SECTION:=		libs/crypto
 PKG_URL:=		http://www.libressl.org

package/openssh/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		openssh
-PKG_VERSION:=		7.5p1
+PKG_VERSION:=		7.6p1
 PKG_RELEASE:=		1
-PKG_HASH:=		9846e3c5fab9f0547400b4d2c017992f914222b3fd1f8eee6c7dc6bc5e59f9f0
+PKG_HASH:=		a323caeeddfe145baaa0db16e98d784b1fbc7dd436a6bf1f479dfd5cd1d21723
 PKG_DESCR:=		secure shell implementation
 PKG_SECTION:=		net/security
 PKG_BUILDDEP:=		zlib libressl

package/openssh/patches/patch-openbsd-compat_port-tun_c

@@ -1,11 +0,0 @@
---- openssh-5.6p1.orig/openbsd-compat/port-tun.c	2010-08-10 04:47:42.000000000 +0200
-+++ openssh-5.6p1/openbsd-compat/port-tun.c	2011-01-27 18:16:39.000000000 +0100
-@@ -215,7 +215,7 @@ sys_tun_infilter(struct Channel *c, char
- 	if (len <= 0 || len > (int)(sizeof(rbuf) - sizeof(*af)))
- 		return (-1);
- 	ptr = (char *)&rbuf[0];
--	bcopy(buf, ptr + sizeof(u_int32_t), len);
-+	memcpy(ptr + sizeof(u_int32_t), buf, len);
- 	len += sizeof(u_int32_t);
- 	af = (u_int32_t *)ptr;
- 

scripts/prereq.sh

@@ -225,7 +225,7 @@ printf " --->  checking if bash is installed.. "
 if which bash >/dev/null; then
   printf "found\n"
   printf " --->  checking if it is bash 4.x.. "
-  bash --version 2>/dev/null| grep -i "Version 4" >/dev/null
+  bash --version 2>/dev/null| grep "GNU bash" | grep -i " 4." >/dev/null
   if [ $? -eq 0 ]; then
     printf "yes\n"
   else

target/config/Config.in.binutils

@@ -3,7 +3,6 @@
 
 choice
 prompt "Binutils version"
-default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_ARCH_ARC
 default ADK_TOOLCHAIN_BINUTILS_CSKY if ADK_TARGET_ARCH_CSKY
 default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32
 default ADK_TOOLCHAIN_BINUTILS_2_20_1 if ADK_TARGET_ARCH_AVR32
@@ -34,10 +33,6 @@ config ADK_TOOLCHAIN_BINUTILS_NDS32
 	bool "2.24-nds32"
 	depends on ADK_TARGET_ARCH_NDS32
 
-config ADK_TOOLCHAIN_BINUTILS_ARC
-	bool "arc-2017.09-release"
-	depends on ADK_TARGET_ARCH_ARC
-
 config ADK_TOOLCHAIN_BINUTILS_CSKY
 	bool "2.27-c-sky"
 	depends on ADK_TARGET_ARCH_CSKY

target/config/Config.in.compiler

@@ -16,7 +16,6 @@ endchoice
 choice
 prompt "GCC version"
 depends on ADK_BUILD_COMPILER_GCC
-default ADK_TOOLCHAIN_GCC_ARC if ADK_TARGET_ARCH_ARC
 default ADK_TOOLCHAIN_GCC_CSKY if ADK_TARGET_ARCH_CSKY
 default ADK_TOOLCHAIN_GCC_OR1K if ADK_TARGET_ARCH_OR1K
 default ADK_TOOLCHAIN_GCC_NDS32 if ADK_TARGET_ARCH_NDS32
@@ -59,10 +58,6 @@ config ADK_TOOLCHAIN_GCC_NDS32
 	bool "4.9.4-nds32"
 	depends on ADK_TARGET_ARCH_NDS32
 
-config ADK_TOOLCHAIN_GCC_ARC
-	bool "arc-2017.09-release"
-	depends on ADK_TARGET_ARCH_ARC
-
 config ADK_TOOLCHAIN_GCC_4_4
 	bool "4.4.7"
 	depends on ADK_TARGET_ARCH_AVR32

target/config/Config.in.cpu

@@ -489,13 +489,14 @@ config ADK_TARGET_CPU_CRIS_CRISV32
 	depends on ADK_TARGET_ARCH_CRIS
 
 # c-sky
-config ADK_TARGET_CPU_CSKY_CK610F
-	bool "ck610f"
+config ADK_TARGET_CPU_CSKY_CK610
+	bool "ck610"
 	select ADK_TARGET_SUPPORTS_THREADS
 	select ADK_TARGET_SUPPORTS_LT
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_CSKY
+	depends on ADK_TARGET_LITTLE_ENDIAN
 
 config ADK_TARGET_CPU_CSKY_CK810F
 	bool "ck810f"
@@ -504,6 +505,7 @@ config ADK_TARGET_CPU_CSKY_CK810F
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_CSKY
+	depends on ADK_TARGET_LITTLE_ENDIAN
 
 config ADK_TARGET_CPU_CSKY_CK807F
 	bool "ck807f"
@@ -512,6 +514,7 @@ config ADK_TARGET_CPU_CSKY_CK807F
 	select ADK_TARGET_SUPPORTS_NPTL
 	select ADK_TARGET_WITH_MMU
 	depends on ADK_TARGET_ARCH_CSKY
+	depends on ADK_TARGET_LITTLE_ENDIAN
 
 # epiphany
 config ADK_TARGET_CPU_EPIPHANY
@@ -2077,7 +2080,7 @@ config ADK_TARGET_CPU_FLAGS
 	default "-mcpu=bf549m" if ADK_TARGET_CPU_BFIN_BF549M
 	default "-mcpu=bf561" if ADK_TARGET_CPU_BFIN_BF561
 	default "-mcpu=bf592" if ADK_TARGET_CPU_BFIN_BF592
-	default "-mcpu=ck610f" if ADK_TARGET_CPU_CSKY_CK610F
+	default "-mcpu=ck610" if ADK_TARGET_CPU_CSKY_CK610
 	default "-mcpu=ck810f" if ADK_TARGET_CPU_CSKY_CK810F
 	default "-mcpu=ck807f" if ADK_TARGET_CPU_CSKY_CK807F
 	default "-mcpu=v10" if ADK_TARGET_CPU_CRIS_CRISV10

target/config/Config.in.endian

@@ -6,6 +6,7 @@ prompt "Endianess"
 depends on ADK_TARGET_ARCH_ARC \
 	|| ADK_TARGET_ARCH_AARCH64 \
 	|| ADK_TARGET_ARCH_ARM \
+	|| ADK_TARGET_ARCH_CSKY \
 	|| ADK_TARGET_ARCH_C6X \
 	|| ADK_TARGET_ARCH_MICROBLAZE \
 	|| ADK_TARGET_ARCH_MIPS \

target/config/Config.in.kernelversion

@@ -227,7 +227,7 @@ config ADK_TARGET_KERNEL_GIT_REPO_NAME
 config ADK_TARGET_KERNEL_GIT
 	string "git version"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
-	default "314c498ddc8c43a66ca96ff3af7da98e10fa1cc6" if ADK_TARGET_ARCH_CSKY
+	default "6064a9bdf48cefbccc4f6472dd04251f0dec1931" if ADK_TARGET_ARCH_CSKY
 	default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32
 	default "1cd2e072bbd1a518e11b551435be0ad84a2c52af" if ADK_TARGET_ARCH_RISCV32 || ADK_TARGET_ARCH_RISCV64
 	default "cfa29b46af94d83e31aa000dbaee553f9c4d670c" if ADK_TARGET_BOARD_BCM28XX
@@ -241,7 +241,7 @@ config ADK_TARGET_KERNEL_GIT
 config ADK_TARGET_KERNEL_GIT_VER
 	string "kernel version"
 	depends on ADK_TARGET_KERNEL_VERSION_GIT
-	default "4.9.13" if ADK_TARGET_ARCH_CSKY
+	default "4.9.56" if ADK_TARGET_ARCH_CSKY
 	default "4.9.37" if ADK_TARGET_BOARD_BCM28XX
 	default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 	default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA

target/config/Config.in.libc

@@ -136,8 +136,8 @@ endchoice
 choice
 prompt "C library version"
 
-config ADK_TARGET_LIB_UCLIBC_NG_1_0_26
-	bool "1.0.26"
+config ADK_TARGET_LIB_UCLIBC_NG_1_0_27
+	bool "1.0.27"
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 
 config ADK_TARGET_LIB_UCLIBC_NG_GIT
@@ -224,7 +224,7 @@ config ADK_TARGET_LIBC
 
 config ADK_LIBC_VERSION
 	string
-	default "1.0.26" if ADK_TARGET_LIB_UCLIBC_NG_1_0_26
+	default "1.0.27" if ADK_TARGET_LIB_UCLIBC_NG_1_0_27
 	default "1.1.18" if ADK_TARGET_LIB_MUSL_1_1_18
 	default "2.26" if ADK_TARGET_LIB_GLIBC_2_26
 	default "2.4.0" if ADK_TARGET_LIB_NEWLIB_2_4_0

target/config/Config.in.rootfs

@@ -115,7 +115,8 @@ config ADK_TARGET_ROOTFS_USB
 	select ADK_KERNEL_USB_UHCI_HCD
 	select ADK_KERNEL_USB_STORAGE
 	select ADK_PACKAGE_ADKINSTALL
-	depends on ADK_TARGET_WITH_USB_BOOT
+	depends on ADK_TARGET_WITH_USB_BOOT \
+		|| ADK_TARGET_GENERIC
 	help
 	  Boot system from USB stick. 
 

target/config/Config.in.toolchain

@@ -36,7 +36,7 @@ config ADK_TARGET_LIBC_WITH_LIBINTL
 
 config ADK_TARGET_LIBC_WITH_LIBICONV
 	bool "Enable basic libiconv"
-	depends on ADK_TARGET_LIB_UCLIBC_NG
+	depends on ADK_TARGET_LIB_UCLIBC_NG && !ADK_PACKAGE_LIBICONV
 	help
 	  Enables uClibc-ng included basic libiconv support.
 

target/or1k/systems/qemu-or1k

@@ -2,6 +2,7 @@ config ADK_TARGET_SYSTEM_QEMU_OR1K
 	bool "Qemu Emulator"
 	select ADK_TARGET_QEMU
 	select ADK_TARGET_CPU_OR1K
+	select ADK_TARGET_KERNEL_WITH_COMPRESSION
 	help
 	  Qemu Emulator for OR1K architecture.
 

toolchain/binutils/Makefile.inc

@@ -16,13 +16,6 @@ PKG_HASH:=		cd717966fc761d840d451dbd58d44e1e5b92949d2073d75b73fccb476d772fcf
 PKG_SITES:=		${MASTER_SITE_GNU:=binutils/}
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 endif
-ifeq ($(ADK_TOOLCHAIN_BINUTILS_ARC),y)
-PKG_VERSION:=		arc-2017.09-release
-PKG_GIT:=		tag
-PKG_RELEASE:=		1
-PKG_SITES:=		https://github.com/foss-for-synopsys-dwc-arc-processors/binutils-gdb.git
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
 ifeq ($(ADK_TOOLCHAIN_BINUTILS_CSKY),y)
 PKG_VERSION:=		binutils-2_27-branch-csky
 PKG_GIT:=		branch

toolchain/gcc/Makefile.inc

@@ -26,13 +26,6 @@ PKG_RELEASE:=		1
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		20
 endif
-ifeq ($(ADK_TOOLCHAIN_GCC_ARC),y)
-PKG_VERSION:=		arc-2017.09-release
-PKG_GIT:=		tag
-PKG_SITES:=		https://github.com/foss-for-synopsys-dwc-arc-processors/gcc.git
-PKG_RELEASE:=		1
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
-endif
 ifeq ($(ADK_TOOLCHAIN_GCC_CSKY),y)
 PKG_VERSION:=		gcc-6-branch-csky
 PKG_GIT:=		branch

toolchain/uclibc-ng/Makefile.inc

@@ -7,10 +7,10 @@ PKG_VERSION:=		git
 PKG_RELEASE:=		1
 PKG_SITES:=		git://uclibc-ng.org/git/uclibc-ng
 endif
-ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_26),y)
-PKG_VERSION:=		1.0.26
+ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_27),y)
+PKG_VERSION:=		1.0.27
 PKG_RELEASE:=		1
-PKG_SITES:=		http://downloads.uclibc-ng.org/releases/1.0.26/
-PKG_HASH:=		d88470775192b01d278633953ccc9fecacd090e52f401d506a71add3e47d4694
+PKG_SITES:=		http://downloads.uclibc-ng.org/releases/1.0.27/
+PKG_HASH:=		9452b0e92f76db19d8ff30b2d6d10a80e1ed01e4c504a36fef34cfc9de490b24
 endif
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz