diff options
| -rw-r--r-- | package/base-files/Makefile | 6 | ||||
| -rw-r--r-- | rules.mk | 1 | ||||
| -rw-r--r-- | target/Config.in | 4 | ||||
| -rw-r--r-- | target/Config.in.x86 | 1 |
4 files changed, 9 insertions, 3 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a346dd41f..7786cdf83 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/mk/rootfs.mk PKG_NAME:= base-files PKG_VERSION:= 1.0 -PKG_RELEASE:= 31 +PKG_RELEASE:= 32 PKG_SECTION:= base PKG_DESCR:= basic files and scripts @@ -70,8 +70,8 @@ endif ${ADK_RUNTIME_PASSWORD}),g" $(IDIR_BASE_FILES)/etc/shadow git log -1|head -1|sed -e 's#commit ##' \ > $(IDIR_BASE_FILES)/etc/adkversion - test -z $(ADK_TARGET) || \ - echo $(ADK_TARGET) > $(IDIR_BASE_FILES)/etc/adktarget + test -z $(ADK_HW) || \ + echo $(ADK_HW) > $(IDIR_BASE_FILES)/etc/adktarget ifneq (${ADK_PACKAGE_CONFIG_IN_ETC},) gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/adkconfig.gz chmod 600 $(IDIR_BASE_FILES)/etc/adkconfig.gz @@ -26,6 +26,7 @@ endif # Strip off the annoying quoting ADK_TARGET:= $(strip $(subst ",, $(ADK_TARGET))) +ADK_HW:= $(strip $(subst ",, $(ADK_HW))) ADK_LIBC:= $(strip $(subst ",, $(ADK_LIBC))) ADK_HOST:= $(strip $(subst ",, $(ADK_HOST))) ADK_VENDOR:= $(strip $(subst ",, $(ADK_VENDOR))) diff --git a/target/Config.in b/target/Config.in index bcc9b20ab..95b00474d 100644 --- a/target/Config.in +++ b/target/Config.in @@ -137,6 +137,10 @@ config ADK_x86_64 config ADK_x86 tristate +config ADK_HW + string + default "ibmx40" if ADK_ibmx40 + config ADK_TARGET string default "alix" if ADK_alix diff --git a/target/Config.in.x86 b/target/Config.in.x86 index 9774d4c28..4a65f3d67 100644 --- a/target/Config.in.x86 +++ b/target/Config.in.x86 @@ -10,6 +10,7 @@ config ADK_HARDWARE_GENERIC_X86 config ADK_HARDWARE_IBMX40 bool "IBM X40 laptop" + select ADK_ibmx40 select ADK_CPU_PENTIUM_M select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_PCI |