diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-19 01:42:49 -0600 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-12-19 01:49:30 -0600 |
| commit | 949d8663f2f12c986ef2983b7b307f5ecddf060e (patch) | |
| tree | 258f4f1f62c469b54e0f342fcf36847333c68bda /mk/build.mk | |
| parent | 7c89a2bc80d4d3c33a5345fd673cd2fe424c1fae (diff) | |
use the new concept of appliances
- Sync with Kernel upstream Kconfig
- use new feature visible
- add a patch for select on choices
https://lkml.org/lkml/2011/2/17/379
- rename ADK_LINUX -> ADK_TARGET_ARCH
- remove package collection feature
- add appliance feature to define a appliance
more complete
Diffstat (limited to 'mk/build.mk')
| -rw-r--r-- | mk/build.mk | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/mk/build.mk b/mk/build.mk index 4e12c76c4..7b26bfe80 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -30,12 +30,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_KERNEL_ADDON_GRSEC=n \ ADK_KERNEL_ADDON_MPTCP=n \ ADK_KERNEL_MPTCP=n \ - ADK_PKG_XORG=n \ - ADK_PKG_CONSOLE=n \ - ADK_PKG_TEST=n \ - ADK_PKG_MPDBOX=n \ - ADK_PKG_KODIBOX=n \ - ADK_PKG_DEVELOPMENT=n \ ADK_STATIC_TOOLCHAIN=n \ ADK_TOOLCHAIN_WITH_SSP=n \ ADK_TARGET_USE_SSP=n \ @@ -287,13 +281,16 @@ cleansystem: distclean: @$(TRACE) distclean @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) - @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DL_DIR) \ - ${ADK_TOPDIR}/package/pkglist.d ${ADK_TOPDIR}/package/pkgconfigs.d @rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_HOST_DIR_PFX) @rm -rf $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${ADK_TOPDIR}/prereq.mk \ - .menu ${ADK_TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* \ - ${ADK_TOPDIR}/target/*/Config.in.{arch*,system*} ${ADK_TOPDIR}/package/Config.in.auto* + @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DL_DIR) + @rm -rf package/pkglist.d package/pkgconfigs.d + @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config prereq.mk + @rm -f .menu package/Depends.mk .ADK_HAVE_DOT_CONFIG .rebuild.* + @rm -f target/*/Config.in.arch* target/*/Config.in.system* + @rm -f package/Config.in.auto* package/Config.in.collections + @rm -f target/config/Config.in.prereq target/config/Config.in.scripts + @rm -f adk/tools/pkgmaker adk/tools/depmaker adk/tools/pkgrebuild else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) @@ -516,7 +513,7 @@ endif menuconfig: $(CONFIG)/mconf defconfig .menu @if [ ! -f .config ];then \ - $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ + $(CONFIG)/conf --olddefconfig $(CONFIG_CONFIG_IN); \ fi @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} @@ -533,13 +530,17 @@ _mconfig2: ${CONFIG}/conf modconfig .menu distclean: @$(MAKE) -C $(CONFIG) clean - @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DL_DIR) \ - ${ADK_TOPDIR}/package/pkglist.d ${ADK_TOPDIR}/package/pkgconfigs.d + @rm -rf $(BUILD_DIR_PFX) $(FW_DIR_PFX) $(TARGET_DIR_PFX) $(DL_DIR) @rm -rf $(TOOLCHAIN_DIR_PFX) $(STAGING_TARGET_DIR_PFX) @rm -rf $(STAGING_HOST_DIR_PFX) $(STAGING_TARGET_DIR_PFX) $(STAGING_PKG_DIR_PFX) - @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config ${ADK_TOPDIR}/prereq.mk \ - .menu .rebuild.* ${ADK_TOPDIR}/package/Depends.mk .ADK_HAVE_DOT_CONFIG \ - ${ADK_TOPDIR}/target/*/Config.in.{arch*,system*} ${ADK_TOPDIR}/package/Config.in.auto* + @rm -rf package/pkglist.d package/pkgconfigs.d + @rm -f .adkinit .config* .defconfig .tmpconfig.h all.config + @rm -f .menu .rebuild.* package/Depends.mk .ADK_HAVE_DOT_CONFIG prereq.mk + @rm -f target/*/Config.in.arch* + @rm -f target/*/Config.in.system* + @rm -f package/Config.in.auto* package/Config.in.collections + @rm -f target/config/Config.in.prereq target/config/Config.in.scripts + @rm -f adk/tools/pkgmaker adk/tools/depmaker adk/tools/pkgrebuild endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) |