diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-19 16:16:43 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-19 16:16:43 +0100 |
| commit | 8e057f22cef9225fb3bd627aebe762e8e5b15f0b (patch) | |
| tree | df21119484a282e3c85e5efcb15a924eb7e520fe /mk | |
| parent | b7a4fdd5b215632dc2fdf7c16711e9effd1d9a7a (diff) | |
| parent | de0e6feb779c1d4779a41761cf2f32d61f421260 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/build.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/mk/build.mk b/mk/build.mk index 7e0fe8e2a..e876bd1f5 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -331,24 +331,24 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/.defconfig; \ fi + @if [ ! -z "$(HW)" ];then \ + grep -h "^config" target/Config.in.* \ + |grep -i "$(HW)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(TOPDIR)/.defconfig; \ + fi ifneq (,$(filter %_qemu,${TARGET})) @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/.defconfig endif ifneq (,$(filter %_toolchain,${TARGET})) @echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/.defconfig endif -ifneq (,$(filter rescue%,${TARGET})) - @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/.defconfig -endif ifneq (,$(filter rb%,${TARGET})) @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/.defconfig endif ifneq (,$(filter alix%,${TARGET})) @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig endif -ifneq (,$(filter wrap%,${TARGET})) - @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/.defconfig -endif @if [ ! -z "$(TARGET)" ];then \ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ fi @@ -408,24 +408,24 @@ endif |sed -e "s#^config \(.*\)#\1=y#" \ >> $(TOPDIR)/all.config; \ fi + @if [ ! -z "$(HW)" ];then \ + grep -h "^config" target/Config.in.* \ + |grep -i "$(HW)" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(TOPDIR)/all.config; \ + fi ifneq (,$(filter %_qemu,${TARGET})) @echo ADK_LINUX_QEMU=y >> $(TOPDIR)/all.config endif ifneq (,$(filter %_toolchain,${TARGET})) @echo ADK_LINUX_TOOLCHAIN=y >> $(TOPDIR)/all.config endif -ifneq (,$(filter %_rescue,${TARGET})) - @echo ADK_LINUX_RESCUE=y >> $(TOPDIR)/all.config -endif ifneq (,$(filter rb%,${TARGET})) @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config endif ifneq (,$(filter alix%,${TARGET})) @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config endif -ifneq (,$(filter wrap%,${TARGET})) - @echo ADK_LINUX_ALIX=y >> $(TOPDIR)/all.config -endif menuconfig: $(CONFIG)/mconf defconfig .menu package/Config.in.auto @if [ ! -f .config ];then \ |