diff options
| -rw-r--r-- | package/uclibc-ng/Makefile | 8 | ||||
| -rw-r--r-- | target/config/Config.in.libc.choice | 4 | ||||
| -rw-r--r-- | target/config/Config.in.libc.default | 1 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile.inc | 8 |
4 files changed, 13 insertions, 8 deletions
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 68a37c866..0bd9d561e 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -10,8 +10,6 @@ PKG_NAME:= uClibc-ng 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 @@ -68,7 +66,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_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER} \ + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ @@ -82,9 +80,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_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER}/test \ + ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/test \ ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng - ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VER)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VER}/{Rules.mak,.config} \ + ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}/{Rules.mak,.config} \ ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng @find ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng -name \*.o -exec rm {} \; diff --git a/target/config/Config.in.libc.choice b/target/config/Config.in.libc.choice index 27bb037f0..629b7d399 100644 --- a/target/config/Config.in.libc.choice +++ b/target/config/Config.in.libc.choice @@ -64,6 +64,10 @@ endchoice choice prompt "C library version" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_0 + bool "1.0.0" + depends on ADK_TARGET_LIB_UCLIBC_NG + config ADK_TARGET_LIB_UCLIBC_NG_GIT bool "git" depends on ADK_TARGET_LIB_UCLIBC_NG diff --git a/target/config/Config.in.libc.default b/target/config/Config.in.libc.default index 3f2f6e7da..80f933575 100644 --- a/target/config/Config.in.libc.default +++ b/target/config/Config.in.libc.default @@ -22,6 +22,7 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string + default "1.0.0" if ADK_TARGET_LIB_UCLIBC_NG_1_0_0 default "1.1.6" if ADK_TARGET_LIB_MUSL_1_1_6 default "0.9.33.2" if ADK_TARGET_LIB_UCLIBC_0_9_33_2 default "2.20" if ADK_TARGET_LIB_GLIBC_2_20 diff --git a/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc index b616ec2e2..ac05645c9 100644 --- a/toolchain/uclibc-ng/Makefile.inc +++ b/toolchain/uclibc-ng/Makefile.inc @@ -3,11 +3,13 @@ PKG_NAME:= uClibc-ng ifeq ($(ADK_LIBC_VERSION),git) -PKG_VERSION:= 1.0.0 +PKG_VERSION:= git +PKG_RELEASE:= 1 PKG_SITES:= git://uclibc-ng.org/git/uclibc-ng else PKG_VERSION:= $(ADK_LIBC_VERSION) -PKG_SITES:= http://downloads.uclibc-ng.org/ -endif PKG_RELEASE:= 1 +PKG_SITES:= http://downloads.uclibc-ng.org/releases/$(ADK_LIBC_VERSION)/ +PKG_HASH:= 56258bfa62e3a70c5d29480ccd8f8d94fc2740233a493d8c66b6e7a37830b9d1 +endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz |