Browse Source

fix for native builds

Waldemar Brodkorb 13 years ago
parent
commit
5dbcba4b71
5 changed files with 6 additions and 7 deletions
  1. 2 2
      mk/build.mk
  2. 1 1
      target/Config.in.alix
  3. 1 1
      target/Config.in.x86
  4. 1 1
      target/Config.in.x86_64
  5. 1 2
      target/Makefile

+ 2 - 2
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 2
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