diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-25 21:19:08 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-11-25 21:19:08 +0100 |
| commit | 5683c8576efcdb830683a8b26f576892de7dbfce (patch) | |
| tree | a64c02e353bc45342e34cf8a32594565cf50c4d2 | |
| parent | 58f64bd864061ae4810dc9fec6b0a1ffa5808478 (diff) | |
| parent | 5dbcba4b7121bf7796b28ef25a2f15da3028d84b (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
| -rw-r--r-- | mk/build.mk | 4 | ||||
| -rw-r--r-- | target/Config.in.alix | 2 | ||||
| -rw-r--r-- | target/Config.in.x86 | 2 | ||||
| -rw-r--r-- | target/Config.in.x86_64 | 2 | ||||
| -rw-r--r-- | target/Makefile | 3 |
5 files changed, 6 insertions, 7 deletions
diff --git a/mk/build.mk b/mk/build.mk index 353deda70..443441cda 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -184,9 +184,9 @@ ifeq ($(ADKtype),) $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADK_TARGET)/kernel.config else - cp $(TOPDIR)/target/$(ADKtype)/kernel.config $(BUILD_DIR)/linux/.config + cp $(TOPDIR)/target/$(ARCH)/kernel.config $(BUILD_DIR)/linux/.config $(MAKE) -C $(BUILD_DIR)/linux/ ARCH=$(ARCH) menuconfig - cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ADKtype)/kernel.config + cp $(BUILD_DIR)/linux/.config $(TOPDIR)/target/$(ARCH)/kernel.config endif # create a new package from package/.template diff --git a/target/Config.in.alix b/target/Config.in.alix index f496d29e9..70ff5bfbb 100644 --- a/target/Config.in.alix +++ b/target/Config.in.alix @@ -1,5 +1,5 @@ choice -depends on ADK_LINUX_X86_ALIX +depends on ADK_LINUX_X86_ALIX || ADK_LINUX_NATIVE prompt "Hardware model" config ADK_HARDWARE_ALIX1C diff --git a/target/Config.in.x86 b/target/Config.in.x86 index fd461cb7d..678b6f08e 100644 --- a/target/Config.in.x86 +++ b/target/Config.in.x86 @@ -1,5 +1,5 @@ choice -depends on ADK_LINUX_X86 +depends on ADK_LINUX_X86 || ADK_LINUX_NATIVE prompt "Hardware model" config ADK_HARDWARE_GENERIC_X86 diff --git a/target/Config.in.x86_64 b/target/Config.in.x86_64 index 1a7dac302..d004e3968 100644 --- a/target/Config.in.x86_64 +++ b/target/Config.in.x86_64 @@ -1,5 +1,5 @@ choice -depends on ADK_LINUX_X86_64 +depends on ADK_LINUX_X86_64 || ADK_LINUX_NATIVE prompt "Hardware model" config ADK_HARDWARE_GENERIC_X86_64 diff --git a/target/Makefile b/target/Makefile index 2c1f7b686..65c59b144 100644 --- a/target/Makefile +++ b/target/Makefile @@ -41,8 +41,7 @@ config-prepare: $(TOPDIR)/.config >${BUILD_DIR}/.kernelconfig.nokernel ifeq ($(ADK_NATIVE),y) @if [ -f /etc/adktarget ];then \ - target=$$(cat /etc/adktarget); \ - cp $(TOPDIR)/target/$$target/kernel.config ${BUILD_DIR}/.kernelconfig.board; \ + cp $(TOPDIR)/target/$(ARCH)/kernel.config ${BUILD_DIR}/.kernelconfig.board; \ else \ if [ -f /proc/config.gz ];then zcat /proc/config.gz > ${BUILD_DIR}/.kernelconfig.board; else cp ${ADK_TARGET}/kernel.config.$(ARCH) ${BUILD_DIR}/.kernelconfig.board; fi; \ fi |