diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-03 09:46:25 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2007-01-03 09:46:25 +0000 |
| commit | 15eae1b54f0ba33c9e5116d0900364e70ec83cbf (patch) | |
| tree | 42907c0e894a4455405261510721fdc1c1b7a237 | |
| parent | 7a26f0acc67c95b0bad28e5880db859afafca8cd (diff) | |
| download | ptxdist-15eae1b54f0ba33c9e5116d0900364e70ec83cbf.tar.gz ptxdist-15eae1b54f0ba33c9e5116d0900364e70ec83cbf.tar.xz | |
* scripts/dgen.sh, rules/pre/Rules.make:
removed new .extract in packagedir rule
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@6702 33e552b5-05e3-0310-8538-816dae2090ed
| -rw-r--r-- | rules/pre/Rules.make | 8 | ||||
| -rwxr-xr-x | scripts/dgen.sh | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/rules/pre/Rules.make b/rules/pre/Rules.make index e4e08db86..132658f32 100644 --- a/rules/pre/Rules.make +++ b/rules/pre/Rules.make @@ -398,9 +398,6 @@ extract = \ URL="$($(strip $(1))_URL)"; \ DEST="$(strip $(2))"; \ DEST="$${DEST:-$(BUILDDIR)}"; \ - DOTEXTRACT="$(strip $(2))"; \ - DOTEXTRACT="$${DOTEXTRACT:+$${DEST}/$($(strip $(1)))/.ptx-extract}"; \ - DOTEXTRACT="$${DOTEXTRACT:-$${PACKETDIR}/.ptx-extract}";\ if [ "$$PACKET" = "" ]; then \ echo; \ echo Error: empty parameter to \"extract\(\)\"; \ @@ -415,7 +412,6 @@ extract = \ if [ -d "$$THING" ]; then \ echo "local directory instead of tar file, linking build dir"; \ ln -sf $$THING $$PACKETDIR; \ - touch $${DOTEXTRACT}; \ exit 0; \ else \ THING="$$(echo $$URL | sed s-file://-./-g)"; \ @@ -423,7 +419,6 @@ extract = \ THING="$$(echo $$URL | sed s-file://-../-g)"; \ echo "local project directory instead of tar file, linking build dir"; \ ln -sf $$THING $$PACKETDIR; \ - touch $${DOTEXTRACT}; \ exit 0; \ fi; \ fi; \ @@ -448,8 +443,7 @@ extract = \ esac; \ echo $$(basename $$PACKET) >> $(STATEDIR)/packetlist; \ $$EXTRACT -dc $$PACKET | $(TAR) -C $$DEST -xf -; \ - $(CHECK_PIPE_STATUS) \ - touch $${DOTEXTRACT} + $(CHECK_PIPE_STATUS) # diff --git a/scripts/dgen.sh b/scripts/dgen.sh index 0cc7525ce..971803fb3 100755 --- a/scripts/dgen.sh +++ b/scripts/dgen.sh @@ -88,7 +88,7 @@ do_package_dep() { label=${2} echo "\$(STATEDIR)/${package}.get: \$(${label}_SOURCE)" - echo "\$(STATEDIR)/${package}.extract: \$(STATEDIR)/${package}.get \$(${label}_DIR)/.ptx-extract" + echo "\$(STATEDIR)/${package}.extract: \$(STATEDIR)/${package}.get" echo "\$(STATEDIR)/${package}.compile: \$(STATEDIR)/${package}.prepare" echo "\$(STATEDIR)/${package}.install: \$(STATEDIR)/${package}.compile" |