diff options
Diffstat (limited to 'mk/build.mk')
-rw-r--r-- | mk/build.mk | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/mk/build.mk b/mk/build.mk index a0a4242bd..1fe387598 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -24,7 +24,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_USE_CCACHE=n \ ADK_RUNTIME_START_SERVICES=n \ ADK_PACKAGE_BASE_FILES=y \ - ADK_PACKAGE_DBUS_WITH_SYSTEMD=n \ ADK_PACKAGE_KEXECINIT=n \ ADK_PACKAGE_CLASSPATH=n \ ADK_PACKAGE_LM_SENSORS_DETECT=n \ @@ -160,6 +159,8 @@ endif ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) include $(ADK_TOPDIR)/rules.mk +include $(ADK_TOPDIR)/mk/kernel-vars.mk + all: world ${ADK_TOPDIR}/package/Depends.mk: ${ADK_TOPDIR}/.config $(wildcard ${ADK_TOPDIR}/package/*/Makefile) $(ADK_TOPDIR)/adk/tools/depmaker @@ -232,9 +233,8 @@ targethelp: $(MAKE) -C target targethelp kernelconfig: - ${KERNEL_MAKE_ENV} ${MAKE} -C "${LINUX_DIR}" \ + ${MAKE} -C "${LINUX_DIR}" \ ARCH=$(ADK_TARGET_KARCH) \ - ${KERNEL_MAKE_OPTS} \ menuconfig ifeq ($(ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG),y) @@ -565,11 +565,17 @@ allconfig: |sed -e "s#^config \(.*\)#\1=y#" \ >> $(ADK_TOPDIR)/all.config; \ fi + @if [ ! -z "$(ADK_TARGET_OS)" ];then \ + grep "^config" target/config/Config.in.os \ + |grep -i "_$(ADK_TARGET_OS)$$" \ + |sed -e "s#^config \(.*\)#\1=y#" \ + >> $(ADK_TOPDIR)/all.config; \ + fi @if [ ! -z "$(ADK_TARGET_ARCH)" ];then \ grep "^config" target/config/Config.in.arch.choice \ - |grep -i "$(ADK_TARGET_ARCH)"\$$ \ + |grep -i "$(ADK_TARGET_OS)_ARCH_$(ADK_TARGET_ARCH)$$" \ |sed -e "s#^config \(.*\)#\1=y#" \ - >> $(ADK_TOPDIR)/all.config; \ + >> $(ADK_TOPDIR)/all.config; \ fi @for symbol in ${DEFCONFIG}; do \ echo $$symbol >> $(ADK_TOPDIR)/all.config; \ |