From abafe559044ad3f64c44228b7b6f7f5d64fb0a28 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Sun, 22 Dec 2013 14:08:49 +0100 Subject: build*: stop after calling ptxdist for anything other than 'go' Signed-off-by: Michael Olbrich --- build_all_v2.mk | 7 +++++-- build_one.sh | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build_all_v2.mk b/build_all_v2.mk index a9ae86e..c8d464c 100755 --- a/build_all_v2.mk +++ b/build_all_v2.mk @@ -84,10 +84,10 @@ OLDCONFIGS := $(foreach config,$(CONFIGS_),$(addsuffix .oldconfig,$(config))) all: $(TBZ2S) $(DEBS) -$(DEB_PREFIX)%$(DEB_SUFFIX): $(STATEDIR)/%.build | mkdirs +$(DEB_PREFIX)%$(DEB_SUFFIX): $(STATEDIR)/%.strip | mkdirs @scripts/make_deb.sh -d "$(@)" -s "$(PTX_AUTOBUILD_DESTDIR)/$(2INSTDIR_$(*))" -$(TBZ2_PREFIX)%$(TBZ2_SUFFIX): $(STATEDIR)/%.build | mkdirs +$(TBZ2_PREFIX)%$(TBZ2_SUFFIX): $(STATEDIR)/%.strip | mkdirs @echo Creating $(notdir $@) ... @echo 'tar -C "$(PTX_AUTOBUILD_DESTDIR)/opt" --exclude=gcc-first -cjf "$(@)" "$(patsubst /opt/%,%,$(2INSTDIR_$(*)))"' | fakeroot @@ -95,6 +95,9 @@ $(foreach config,$(CONFIGS_),$(eval $(STATEDIR)/$(config).build: $(2CONFIGFILE_$ $(STATEDIR)/%.build: | mkdirs @echo "building ${*}" $(NICE) $(PTXDIST) $(ARG) --ptxconfig=$(2CONFIGFILE_$(*)) + @if [ "$(strip $(filter go,$(ARG)))" = "go" ]; then touch "$@"; fi + +$(STATEDIR)/%.strip: $(STATEDIR)/%.build @find "`source "$(2CONFIGFILE_$(*))" && echo "$${PTXCONF_SYSROOT_CROSS}"`" -depth -type d -print0 | xargs -r -0 -- rmdir --ignore-fail-on-non-empty -- find \ "`source "$(2CONFIGFILE_$(*))" && echo "$${PTXCONF_SYSROOT_CROSS}"`/libexec/" \ diff --git a/build_one.sh b/build_one.sh index 4d67b4e..c92e96f 100755 --- a/build_one.sh +++ b/build_one.sh @@ -18,11 +18,12 @@ fi target="$(basename "${config}")" target="${target%.ptxconfig}" -target="gstate/${target//_/-}.pkgs" if [ $# -gt 0 ]; then + target="gstate/${target//_/-}.build" exec "$(dirname $0)/build_all_v2.mk" "${target}" ARG="${*}" else + target="gstate/${target//_/-}.pkgs" exec "$(dirname $0)/build_all_v2.mk" "${target}" fi -- cgit v1.2.3