From 05d0076d97ed69a531df1aa5cde3a1e6ed17f922 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 14 Sep 2010 19:04:46 +0200 Subject: replace mksh scripts with faster C programs depmaker and pkgmaker is replaced by C programs. scan-pkgs.sh will be replaced by another mechanism. scan-pkgs.sh is needed to recognize package flavour changes, so that a package is rebuild. Generation of meta-data is a lot faster now. Fix or add new PKG variables to fulfill the needs of the new programs. Documentation will follow as soon as it is stable. --- mk/package.mk | 1 - 1 file changed, 1 deletion(-) (limited to 'mk/package.mk') diff --git a/mk/package.mk b/mk/package.mk index 30965e17b..1f582b3d1 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -108,7 +108,6 @@ _IPKGS_COOKIE= ${PACKAGE_DIR}/.stamps/${PKG_NAME}${PKG_VERSION}-${PKG_RELEASE} _IN_PACKAGE:= 1 include ${TOPDIR}/mk/buildhlp.mk --include info.mk # defined in buildhlp.mk ('extract' can fail, use 'patch' then) extract: ${_EXTRACT_COOKIE} -- cgit v1.2.3 From 4422cda575db22275b067e07ad4b585572d91756 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 15 Sep 2010 20:54:15 +0200 Subject: rebuild packages on flavour or choices change add new target rebuild. make cpio and pacch quiet. Use bin/tools for cpio and mkcrypt. --- mk/package.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'mk/package.mk') diff --git a/mk/package.mk b/mk/package.mk index 1f582b3d1..cd84e4c08 100644 --- a/mk/package.mk +++ b/mk/package.mk @@ -117,6 +117,11 @@ patch: ${_PATCH_COOKIE} configure: ${_CONFIGURE_COOKIE} build: ${_BUILD_COOKIE} fake: ${_FAKE_COOKIE} +rebuild: + @if [ -f ${TOPDIR}/.rebuild.${PKG_NAME} ];then \ + $(MAKE) clean; \ + rm -f ${TOPDIR}/.rebuild.${PKG_NAME}; \ + fi # our recursive build entry point build-all-pkgs: ${_IPKGS_COOKIE} @@ -220,7 +225,7 @@ endif find usr ! -type d 2>/dev/null | \ grep -v -e '^usr/share' -e '^usr/man' -e '^usr/info' -e '^usr/lib/libc.so' | \ tee '$${STAGING_PARENT}/pkg/$(1)' | \ - cpio -padlmu '$${STAGING_DIR}' + $(TOPDIR)/bin/tools/cpio -padlmu '$${STAGING_DIR}' @cd '$${STAGING_DIR}'; grep 'usr/lib/.*\.la$$$$' \ '$${STAGING_PARENT}/pkg/$(1)' | while read fn; do \ chmod u+w $$$$fn; \ -- cgit v1.2.3