aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-09-26 16:26:56 -0600
committerJohn Rigby <john.rigby@linaro.org>2012-01-10 12:04:03 -0700
commitda5a8264fa5f198b1f5254b624358459e0a4afde (patch)
treec3c9eb24826a978e81fb8076dd7001dbfe18e271
parent7a826c05998cc1360e563902ec367d32e004d4e4 (diff)
LINARO: DEBUG: Only rename debug symbol deb for primary archive
Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian/rules.d/2-binary-arch.mk18
1 files changed, 11 insertions, 7 deletions
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 798ec1f4c19..a37bac3ce6e 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -373,16 +373,20 @@ ifneq ($(skipdbg),true)
# package from being mirrored. It is instead, through some
# archive admin hackery, copied to http://ddebs.ubuntu.com.
#
- mv ../$(dbgpkg)_$(release)-$(revision)_$(arch).deb \
- ../$(dbgpkg)_$(release)-$(revision)_$(arch).ddeb
+ # Only do this for PRIMARY archive for now
+ #
set -e; \
( \
$(lockme_cmd) 9 || exit 1; \
- if grep -qs '^Build-Debug-Symbols: yes$$' /CurrentlyBuilding; then \
- sed -i '/^$(dbgpkg)_/s/\.deb /.ddeb /' debian/files; \
- else \
- grep -v '^$(dbgpkg)_.*$$' debian/files > debian/files.new; \
- mv debian/files.new debian/files; \
+ if grep -qs '^Purpose: PRIMARY$$' /CurrentlyBuilding; then \
+ mv ../$(dbgpkg)_$(release)-$(revision)_$(arch).deb \
+ ../$(dbgpkg)_$(release)-$(revision)_$(arch).ddeb; \
+ if grep -qs '^Build-Debug-Symbols: yes$$' /CurrentlyBuilding; then \
+ sed -i '/^$(dbgpkg)_/s/\.deb /.ddeb /' debian/files; \
+ else \
+ grep -v '^$(dbgpkg)_.*$$' debian/files > debian/files.new; \
+ mv debian/files.new debian/files; \
+ fi; \
fi; \
) 9>$(lockme_file)
# Now, the package wont get into the archive, but it will get put