From 1c8d49e1ee453e44af6c57f10e8b929d5ccdd3a2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sat, 19 Dec 2009 22:53:46 +0059 Subject: create package/Depends.mk dynamically; add PKG_BUILDDEP to all Makefiles Signed-off-by: Thorsten Glaser --- mk/build.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 9f35a3827..c1828599f 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -79,6 +79,9 @@ include ${TOPDIR}/mk/split-cfg.mk all: world +${TOPDIR}/package/Depends.mk: ${TOPDIR}/.config + mksh ${TOPDIR}/package/depmaker + .NOTPARALLEL: .PHONY: all world clean cleantarget cleandir distclean image_clean @@ -120,7 +123,7 @@ ${STAGING_DIR}/etc/ipkg.conf: ${STAGING_DIR}/etc echo "dest root /" >${STAGING_DIR}/etc/ipkg.conf echo "option offline_root ${TARGET_DIR}" >>$(STAGING_DIR)/etc/ipkg.conf -package/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf +package/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG ${STAGING_DIR}/etc/ipkg.conf ${TOPDIR}/package/Depends.mk $(MAKE) -C package $(patsubst package/%,%,$@) target/%: ${TOPDIR}/.cfg/ADK_HAVE_DOT_CONFIG -- cgit v1.2.3 From fed4931572ca5a46b4f316184f3f8d357636fbfb Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 11:25:09 +0100 Subject: add subpackage descriptions and make menu pkgmaker should only be run by developers. takes to long otherwise. generated Config.in data can be committed. --- mk/build.mk | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index c1828599f..f70d40cb1 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -352,3 +352,7 @@ distclean: ${TOPDIR}/package/*/info.mk endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) + +menu: + mksh $(TOPDIR)/package/pkgmaker + -- cgit v1.2.3 From 89192ea453b664cabb05b0a3037269bf02c3fae2 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 15:29:27 +0059 Subject: introduce pkgmaker into the build at (I hope) all right places Signed-off-by: Thorsten Glaser --- mk/build.mk | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index f70d40cb1..781da5f41 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -227,7 +227,7 @@ $(CONFIG)/conf: $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) -defconfig: +defconfig: _menu ifeq (${OStype},Linux) @echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig endif @@ -318,21 +318,21 @@ ifneq (,$(filter rb%,${TARGET})) @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config endif -menuconfig: $(CONFIG)/mconf defconfig +menuconfig: $(CONFIG)/mconf defconfig _menu @if [ ! -f .config ];then \ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ fi @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} -_config: $(CONFIG)/conf +_config: $(CONFIG)/conf _menu -@touch .config @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) >/dev/null ${POSTCONFIG} .NOTPARALLEL: _mconfig _mconfig: ${CONFIG}/conf _mconfig2 _config -_mconfig2: ${CONFIG}/conf modconfig +_mconfig2: ${CONFIG}/conf modconfig _menu @${CONFIG}/conf -m ${RCONFIG} >/dev/null # build all targets and combinations @@ -342,7 +342,7 @@ bulk: $(MAKE) v $(CP) $(BIN_DIR) $(TOPDIR)/bulk $(MAKE) cleantarget - + distclean: @$(MAKE) -C $(CONFIG) clean @rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \ @@ -353,6 +353,5 @@ distclean: endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) -menu: +_menu: .PHONY mksh $(TOPDIR)/package/pkgmaker - -- cgit v1.2.3 From 61a7366c9306f17c45b7832de1c2838ab017ac38 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 15:41:32 +0059 Subject: =?UTF-8?q?fix=20clean=20targets=20(some;=20git=20has=20no=20?= =?UTF-8?q?=E2=80=9Csvn=20st=20--no-ignore=E2=80=9D)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Thorsten Glaser --- mk/build.mk | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 781da5f41..3adea0d8c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -177,8 +177,9 @@ clean: rm $$f ; \ done \ done - rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg - rm -f ${TOPDIR}/package/*/info.mk + rm -rf $(BUILD_DIR) $(BIN_DIR) $(TARGET_DIR) ${TOPDIR}/.cfg \ + ${TOPDIR}/package/pkglist.d + rm -f ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk cleankernel: @$(TRACE) cleankernel @@ -188,9 +189,11 @@ cleandir: @$(TRACE) cleandir @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) \ - ${TOPDIR}/.cfg* - rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) - rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk + ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d + rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) \ + $(TOOLS_BUILD_DIR) + rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk \ + ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk cleantarget: @$(TRACE) cleantarget @@ -203,10 +206,10 @@ distclean: @$(TRACE) distclean @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ - ${TOPDIR}/.cfg* + ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) - rm -f .config* .defconfig .tmpconfig.h all.config \ - ${TOPDIR}/package/*/info.mk + rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ + ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk else # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) @@ -346,10 +349,10 @@ bulk: distclean: @$(MAKE) -C $(CONFIG) clean @rm -rf $(BUILD_DIR) $(TOOLS_BUILD_DIR) $(BIN_DIR) $(DISTDIR) \ - ${TOPDIR}/.cfg* + ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d @rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) $(TARGET_DIR) - @rm -f .config* .defconfig all.config .tmpconfig.h \ - ${TOPDIR}/package/*/info.mk + @rm -f .config* .defconfig all.config .tmpconfig.h ${TOPDIR}/prereq.mk \ + ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) -- cgit v1.2.3 From 95c40793aaa5faa69012ccb8c5c54cee13510d01 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 16:10:49 +0059 Subject: another round of 'make distclean' fixing Signed-off-by: Thorsten Glaser --- mk/build.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 3adea0d8c..9a399cc0c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -40,6 +40,7 @@ DEFCONFIG= ADK_DEVELSYSTEM=n \ noconfig_targets:= menuconfig \ _config \ _mconfig \ + distclean \ tags MAKECLEAN_SYMBOLS= ADK_TARGET_LIB_UCLIBC \ @@ -211,9 +212,11 @@ distclean: rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk -else # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) +else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) +ifneq ($(filter-out distclean,${MAKECMDGOALS}),) include $(TOPDIR)/prereq.mk +endif all: menuconfig @echo "Start the build with \"make\" or with \"make v\" to be verbose" -- cgit v1.2.3 From 3acd2e3be49ec10c298f7083e456d6d0ceed3b84 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 16:19:23 +0059 Subject: another round of BSD make fixes Signed-off-by: Thorsten Glaser --- mk/build.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 9a399cc0c..2e7850c6a 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -216,6 +216,7 @@ else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) ifneq ($(filter-out distclean,${MAKECMDGOALS}),) include $(TOPDIR)/prereq.mk +export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH endif all: menuconfig -- cgit v1.2.3 From a181172a71151f0806af90b49969457b240eebc5 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 16:21:36 +0059 Subject: another distclean fix Signed-off-by: Thorsten Glaser --- mk/build.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 2e7850c6a..01cdcce3c 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -214,7 +214,9 @@ distclean: else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) -ifneq ($(filter-out distclean,${MAKECMDGOALS}),) +ifeq ($(filter-out distclean,${MAKECMDGOALS}),) +include ${TOPDIR}/mk/vars.mk +else include $(TOPDIR)/prereq.mk export BASH HOSTCC HOSTCFLAGS MAKE LANGUAGE LC_ALL OStype PATH endif -- cgit v1.2.3 From 3aff112c5d1f0e359217f126af0bee60606fddb5 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 20 Dec 2009 18:16:38 +0100 Subject: be less verbose --- mk/build.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index 01cdcce3c..c01314407 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -206,10 +206,10 @@ cleantarget: distclean: @$(TRACE) distclean @$(MAKE) -C $(CONFIG) clean $(MAKE_TRACE) - rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ + @rm -rf $(BUILD_DIR_PFX) $(BIN_DIR_PFX) $(TARGET_DIR_PFX) $(DISTDIR) \ ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d - rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) - rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ + @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) + @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) -- cgit v1.2.3 From cdded347f6cf4d7bcc854831d4bffd3bd216eb29 Mon Sep 17 00:00:00 2001 From: Thorsten Glaser Date: Sun, 20 Dec 2009 18:30:35 +0059 Subject: =?UTF-8?q?call=20pkgmaker=20only=20once,=20after=20cleandir/distc?= =?UTF-8?q?lean,=20or=20on=20=E2=80=9Cmake=20menu=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit requested by wbx@ Signed-off-by: Thorsten Glaser --- mk/build.mk | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'mk/build.mk') diff --git a/mk/build.mk b/mk/build.mk index c01314407..87271f863 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -193,7 +193,7 @@ cleandir: ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) \ $(TOOLS_BUILD_DIR) - rm -f .tmpconfig.h ${TOPDIR}/package/*/info.mk \ + rm -f .menu .tmpconfig.h ${TOPDIR}/package/*/info.mk \ ${TOPDIR}/package/Depends.mk ${TOPDIR}/prereq.mk cleantarget: @@ -210,7 +210,7 @@ distclean: ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d @rm -rf $(TOOLCHAIN_BUILD_DIR_PFX) $(STAGING_PARENT_PFX) $(TOOLS_BUILD_DIR) @rm -f .config* .defconfig .tmpconfig.h all.config ${TOPDIR}/prereq.mk \ - ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk + .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk else # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) @@ -236,7 +236,7 @@ $(CONFIG)/conf: $(CONFIG)/mconf: @$(MAKE) -C $(CONFIG) -defconfig: _menu +defconfig: .menu ifeq (${OStype},Linux) @echo ADK_HOST_LINUX=y > $(TOPDIR)/.defconfig endif @@ -327,21 +327,21 @@ ifneq (,$(filter rb%,${TARGET})) @echo ADK_LINUX_MIKROTIK=y >> $(TOPDIR)/all.config endif -menuconfig: $(CONFIG)/mconf defconfig _menu +menuconfig: $(CONFIG)/mconf defconfig .menu @if [ ! -f .config ];then \ $(CONFIG)/conf -D .defconfig $(CONFIG_CONFIG_IN); \ fi @$(CONFIG)/mconf $(CONFIG_CONFIG_IN) ${POSTCONFIG} -_config: $(CONFIG)/conf _menu +_config: $(CONFIG)/conf .menu -@touch .config @$(CONFIG)/conf ${W} $(CONFIG_CONFIG_IN) >/dev/null ${POSTCONFIG} .NOTPARALLEL: _mconfig _mconfig: ${CONFIG}/conf _mconfig2 _config -_mconfig2: ${CONFIG}/conf modconfig _menu +_mconfig2: ${CONFIG}/conf modconfig .menu @${CONFIG}/conf -m ${RCONFIG} >/dev/null # build all targets and combinations @@ -358,9 +358,12 @@ distclean: ${TOPDIR}/.cfg* ${TOPDIR}/package/pkglist.d @rm -rf $(TOOLCHAIN_BUILD_DIR) $(STAGING_PARENT) $(TARGET_DIR) @rm -f .config* .defconfig all.config .tmpconfig.h ${TOPDIR}/prereq.mk \ - ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk + .menu ${TOPDIR}/package/*/info.mk ${TOPDIR}/package/Depends.mk endif # ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) -_menu: .PHONY +.menu menu: mksh $(TOPDIR)/package/pkgmaker + @:>.menu + +.PHONY: menu -- cgit v1.2.3