Merge branch 'master' of git+ssh://openadk.org/git/openadk

package/kodi/Makefile

@@ -177,6 +177,7 @@ pre-configure:
 	(cd $(WRKBUILD)/lib/cpluff && env PATH=$(AUTOTOOL_PATH) ./autogen.sh)
 
 pre-build:
+	PATH=$(HOST_PATH) \
 	make CXX="${HOST_CXX}" CC="${HOST_CC}" CFLAGS="${HOST_CFLAGS}" \
 		CXXFLAGS="${HOST_CXXFLAGS}" LDFLAGS="${HOST_LDFLAGS}" \
 		 -C $(WRKBUILD)/tools/depends/native/JsonSchemaBuilder

package/uclibc-ng/Makefile

@@ -11,6 +11,7 @@ PKG_DESCR:=		embedded c library
 PKG_SECTION:=		base/libs
 PKG_OPTS:=		noremove nostaging noscripts
 PKG_VERSION:=		1.0.0-git
+PKG_VER:=		1.0.0
 
 PKG_SUBPKGS:=		UCLIBC_NG UCLIBC_NG_DEV UCLIBC_NG_TEST
 PKGSD_UCLIBC_NG_DEV:=	development files for uclibc-ng
@@ -67,7 +68,7 @@ uclibc-ng-dev-install:
 		$(KERNEL_MAKE_OPTS) \
 		INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr \
 		headers_install
-	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_DIR)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \
+	$(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER} \
 		PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \
 		DEVEL_PREFIX=/usr/ \
 		RUNTIME_PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \
@@ -81,9 +82,9 @@ uclibc-ng-test-install:
 	${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/etc
 	echo '00:11:22:33:44:55 teeth' > ${IDIR_UCLIBC_NG_TEST}/etc/ethers
 	${INSTALL_DIR} ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
-	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/test \
+	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER}/test \
 		${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
-	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/{Rules.mak,.config} \
+	${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER}/{Rules.mak,.config} \
 		${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng
 	@find ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng -name \*.o -exec rm {} \;
 

target/config/Config.in.libc.choice

@@ -72,6 +72,11 @@ config ADK_TARGET_LIB_UCLIBC_NG_GIT
 	select ADK_DISABLE_CHECKSUM
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 
+config ADK_TARGET_LIB_GLIBC_2_20
+	prompt "2.20"
+	boolean
+	depends on ADK_TARGET_LIB_GLIBC
+
 config ADK_TARGET_LIB_GLIBC_2_19
 	prompt "2.19"
 	boolean

target/config/Config.in.libc.default

@@ -24,7 +24,7 @@ config ADK_LIBC_VERSION
 	string
 	default "1.1.4" if ADK_TARGET_LIB_MUSL_1_1_4
 	default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2
-	default "2.19" if ADK_TARGET_LIB_GLIBC_2_19
+	default "2.20" if ADK_TARGET_LIB_GLIBC_2_20
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
 		         ADK_TARGET_LIB_UCLIBC_GIT || \
 		         ADK_TARGET_LIB_MUSL_GIT || \

target/linux/config/Config.in.kernel

@@ -104,13 +104,6 @@ config ADK_KERNEL_CPU_MIPS64_R1
 config ADK_KERNEL_CPU_MIPS64_R2
 	boolean
 
-# page size
-config ADK_KERNEL_PAGE_SIZE_4KB
-	boolean
-
-config ADK_KERNEL_PAGE_SIZE_16KB
-	boolean
-
 # ARM specific
 config ADK_KERNEL_AEABI
 	boolean
@@ -212,4 +205,23 @@ config ADK_KERNEL_CC_OPTIMIZE_FOR_SIZE
 	depends on !ADK_LINUX_MICROBLAZE
 	default y
 
+choice
+prompt "Page size"
+depends on ADK_LINUX_MIPS64
+default ADK_KERNEL_PAGE_SIZE_16KB if ADK_TARGET_SYSTEM_LEMOTE_YEELONG
+default ADK_KERNEL_PAGE_SIZE_4KB
+
+config ADK_KERNEL_PAGE_SIZE_4KB
+	prompt "4kB"
+	boolean
+
+config ADK_KERNEL_PAGE_SIZE_16KB
+	prompt "16kB"
+	boolean
+
+config ADK_KERNEL_PAGE_SIZE_64KB
+	prompt "64kB"
+	boolean
+
+endchoice
 endmenu

toolchain/glibc/Makefile.inc

@@ -5,12 +5,19 @@ PKG_NAME:=		glibc
 ifeq ($(ADK_LIBC_VERSION),git)
 PKG_VERSION:=		2.19.90
 PKG_REPO:=		git://sourceware.org/git/glibc.git
-else
-PKG_VERSION:=		$(ADK_LIBC_VERSION)
+endif
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_20),y)
+PKG_VERSION:=		2.20
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		948a6e06419a01bd51e97206861595b0
 endif
+ifeq ($(ADK_TARGET_LIB_GLIBC_2_19),y)
+PKG_VERSION:=		2.19
+PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		e26b8cc666b162f999404b03970f14e4
+endif
 DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.xz
 GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--host=$(GNU_TARGET_NAME) \