diff options
Diffstat (limited to 'mk/build.mk')
| -rw-r--r-- | mk/build.mk | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/mk/build.mk b/mk/build.mk index a0a4242bd..89c7303bf 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 \ @@ -34,8 +33,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_TARGET_USE_SSP=n \ ADK_TOOLCHAIN_WITH_LTO=n \ ADK_TARGET_USE_LTO=n \ - ADK_TOOLCHAIN_WITH_GOLD=n \ - ADK_TARGET_USE_GOLD=n \ ADK_TARGET_USE_GNU_HASHSTYLE=n \ ADK_TARGET_USE_PIE=n \ ADK_TARGET_USE_STATIC_LIBS_ONLY=n \ @@ -104,6 +101,12 @@ POSTCONFIG= -@\ rebuild=1;\ fi; \ done; \ + for i in ADK_TARGET_DUAL_BOOT ADK_TARGET_QEMU_WITH_GRAPHIC;do \ + if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \ + touch .rebuild.grub;\ + rebuild=1;\ + fi; \ + done; \ for i in ADK_TARGET_GPU_MEM ADK_LINUX_KERNEL_SND_BCM2708;do \ if [ "$$(grep ^$$i .config|md5sum)" != "$$(grep ^$$i .config.old|md5sum)" ];then \ touch .rebuild.bcm28xx-bootloader;\ @@ -160,6 +163,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 @@ -180,9 +185,13 @@ ifeq ($(ADK_TARGET_OS_BAREMETAL),y) $(MAKE) -f mk/build.mk package/hostcompile toolchain/final endif ifeq ($(ADK_TARGET_OS_LINUX),y) +ifeq ($(ADK_TARGET_NO_KERNEL),y) + $(MAKE) -f mk/build.mk package/hostcompile toolchain/final package_clean package/compile root_clean package/install package_index +else $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile package_clean package/compile root_clean package/install target/install package_index endif endif +endif package_index: ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) @@ -232,9 +241,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 +573,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; \ @@ -626,13 +640,13 @@ distclean cleandir: endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) $(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c - @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c + @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c $(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_TOPDIR)/adk/tools/strmap.c - @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c + @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c $(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c - @$(HOST_CC) $(HOST_CFLAGS) -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c + @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard tasks/*) @printf " ---> generating menu structure.. " |