diff options
-rw-r--r-- | mk/build.mk | 4 | ||||
-rwxr-xr-x | scripts/update-pkg | 4 | ||||
-rwxr-xr-x | scripts/update-sys | 1 | ||||
-rw-r--r-- | target/x86/sys-available/ibm-x40 | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/mk/build.mk b/mk/build.mk index ef9ad885c..f8143311c 100644 --- a/mk/build.mk +++ b/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 diff --git a/scripts/update-pkg b/scripts/update-pkg index b2ff3feca..4fb16fbe3 100755 --- a/scripts/update-pkg +++ b/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 diff --git a/scripts/update-sys b/scripts/update-sys index d242e67c3..7b5688b83 100755 --- a/scripts/update-sys +++ b/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)) diff --git a/target/x86/sys-available/ibm-x40 b/target/x86/sys-available/ibm-x40 index 37f3897e3..7ad8472bd 100644 --- a/target/x86/sys-available/ibm-x40 +++ b/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. |