summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbrodkorb@conet.de>2016-01-11 16:29:30 +0100
committerWaldemar Brodkorb <wbrodkorb@conet.de>2016-01-11 16:29:30 +0100
commitcbbf09a6592e70db5b401fe73a7fe9d49e79be4e (patch)
treec1756ed7feebeddba8354ef002f534a2a12267cb /mk
parent8f334ab4d02f9568e1380d9e88bf1179cffcd115 (diff)
fix preseeding libc git version
Diffstat (limited to 'mk')
-rw-r--r--mk/build.mk23
1 files changed, 12 insertions, 11 deletions
diff --git a/mk/build.mk b/mk/build.mk
index 6dcc85887..4e2d195e4 100644
--- a/mk/build.mk
+++ b/mk/build.mk
@@ -317,17 +317,6 @@ $(CONFIG)/mconf:
@$(MAKE) -C $(CONFIG)
defconfig: .menu $(CONFIG)/conf
- @if [ ! -z "$(ADK_LIBC_GIT)" ];then \
- if [ "$(ADK_TARGET_LIBC)" = "glibc" ];then \
- echo "ADK_TARGET_LIB_GLIBC_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \
- fi; \
- if [ "$(ADK_TARGET_LIBC)" = "uclibc-ng" ];then \
- echo "ADK_TARGET_LIB_UCLIBC_NG_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \
- fi; \
- if [ "$(ADK_TARGET_LIBC)" = "musl" ];then \
- echo "ADK_TARGET_LIB_MUSL_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \
- fi; \
- fi
@if [ ! -z "$(ADK_NO_CHECKSUM)" ];then \
echo "ADK_DISABLE_CHECKSUM=y" >> $(ADK_TOPDIR)/.defconfig; \
fi
@@ -447,10 +436,22 @@ defconfig: .menu $(CONFIG)/conf
fi
@if [ ! -z "$(ADK_TARGET_LIBC_VERSION)" ];then \
libcversion=$$(echo "$(ADK_TARGET_LIBC_VERSION)"|sed -e "s/\./_/g"); \
+ if [ "$$libcversion" = "git" ];then \
+ if [ "$(ADK_TARGET_LIBC)" = "glibc" ];then \
+ echo "ADK_TARGET_LIB_GLIBC_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \
+ fi; \
+ if [ "$(ADK_TARGET_LIBC)" = "uclibc-ng" ];then \
+ echo "ADK_TARGET_LIB_UCLIBC_NG_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \
+ fi; \
+ if [ "$(ADK_TARGET_LIBC)" = "musl" ];then \
+ echo "ADK_TARGET_LIB_MUSL_GIT=y" >> $(ADK_TOPDIR)/.defconfig; \
+ fi; \
+ else \
grep "^config" target/config/Config.in.libc \
|grep -i "$$libcversion$$" \
|sed -e "s#^config \(.*\)#\1=y#" \
>> $(ADK_TOPDIR)/.defconfig; \
+ fi; \
fi
@if [ ! -z "$(ADK_TARGET_XTENSA)" ];then \
grep "^config" target/config/Config.in.xtensa \