Explorar el Código

fix native builds, enable hardware choices. enable parallelport for ibm-x40

Waldemar Brodkorb hace 13 años
padre
commit
e1bb308860
Se han modificado 4 ficheros con 8 adiciones y 3 borrados
  1. 2 2
      mk/build.mk
  2. 3 1
      scripts/update-pkg
  3. 1 0
      scripts/update-sys
  4. 2 0
      target/x86/sys-available/ibm-x40

+ 2 - 2
mk/build.mk

@@ -314,7 +314,7 @@ endif
 ifeq ($(ADKtype),ibm-x40)
 	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
 	@echo ADK_TARGET_SYSTEM_IBM_X40=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#TARGET#NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \
+	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \
 		target/$(HOSTARCH)/sys-enabled/.$(ADKtype)
 	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
 	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native
@@ -324,7 +324,7 @@ endif
 ifeq ($(ADKtype),lemote-yeelong)
 	@echo ADK_LINUX_NATIVE=y >> $(TOPDIR)/.defconfig
 	@echo ADK_TARGET_SYSTEM_LEMOTE_YEELONG=y >> $(TOPDIR)/.defconfig
-	@sed -e "s#TARGET#NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \
+	@sed -e "s#config ADK_TARGET#config ADK_NATIVE#" target/$(HOSTARCH)/sys-available/$(ADKtype) > \
 		target/$(HOSTARCH)/sys-enabled/.$(ADKtype)
 	@echo "choice" > $(TOPDIR)/target/config/Config.in.native
 	@echo "prompt \"Target system (autodetected)\"" >> $(TOPDIR)/target/config/Config.in.native

+ 3 - 1
scripts/update-pkg

@@ -1,4 +1,6 @@
-#!/bin/sh
+#!/usr/bin/env bash
+# create package collection Config.in file
+
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
 if [ -d "$topdir/target/packages/pkg-enabled" ];then
 	cat $topdir/target/packages/pkg-enabled/* > $topdir/target/packages/Config.in 2>/dev/null

+ 1 - 0
scripts/update-sys

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 # 1. create Config.in.systems with all available target systems for each architecture
 # 2. if ADK configuration exist, create Config.in.arch/Config.in.system with fixed values
+# 3. exit when native system build is detected
 
 topdir=$(readlink -nf $(dirname $0)/.. 2>/dev/null || (cd $(dirname $0)/..; pwd -P))
 

+ 2 - 0
target/x86/sys-available/ibm-x40

@@ -16,6 +16,8 @@ config ADK_TARGET_SYSTEM_IBM_X40
 	select ADK_TARGET_WITH_RTC
 	select ADK_TARGET_WITH_CF
 	select ADK_TARGET_WITH_HDD
+	# with docking station 
+	select ADK_TARGET_WITH_PP
 	help
          System profile for IBM X40 laptop.