diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-14 08:47:52 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-08-14 08:48:05 +0200 |
| commit | 09bc9a7f29e1f5642f8ef96ae78f6ee392053598 (patch) | |
| tree | 612da65f41af8b42f940dbae1b00f4f180c097a5 | |
| parent | fd885dbb0e775ac5349a19e93c4d3c745ec63249 (diff) | |
fix test suite install, when git is used
| -rw-r--r-- | package/uclibc-ng/Makefile | 12 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile.inc | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/package/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index 68b9e5e01..512daef07 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -10,8 +10,12 @@ PKG_NAME:= uClibc-ng PKG_DESCR:= embedded c library PKG_SECTION:= base/libs PKG_OPTS:= noremove nostaging noscripts +ifneq ($(ADK_LIBC_VERSION),git) PKG_VERSION:= 1.0.0 -RC:= rc1 +PKG_DIR:= $(ADK_LIBC_VERSION) +else +PKG_DIR:= ${PKG_VERSION} +endif PKG_SUBPKGS:= UCLIBC_NG UCLIBC_NG_DEV UCLIBC_NG_TEST PKGSD_UCLIBC_NG_DEV:= development files for uclibc-ng @@ -68,7 +72,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_VERSION)$(RC)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}$(RC) \ + $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_DIR)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_DIR} \ PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(IDIR_UCLIBC_NG_DEV)/ \ @@ -82,9 +86,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)$(RC)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}$(RC)/test \ + ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_DIR)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_DIR}/test \ ${IDIR_UCLIBC_NG_TEST}/opt/uclibc-ng - ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)$(RC)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION}$(RC)/{Rules.mak,.config} \ + ${CP} $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_DIR)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_DIR}/{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/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc index fe3c5529e..d1ff82c71 100644 --- a/toolchain/uclibc-ng/Makefile.inc +++ b/toolchain/uclibc-ng/Makefile.inc @@ -3,7 +3,7 @@ PKG_NAME:= uClibc-ng ifeq ($(ADK_LIBC_VERSION),git) -PKG_VERSION:= git +PKG_VERSION:= 1.0.0 PKG_REPO:= http://git.uclibc-ng.org/uClibc-ng.git else PKG_VERSION:= $(ADK_LIBC_VERSION) |