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-06-25 15:02:35 -0600
commit26afeacdf4d0a0f23b21b9652067c61152aa72d8 (patch)
tree6a10c15d76d995ffe649c30bbb850a823a86186f
parent167962c696186252777bca965a12f0a7b056e1ec (diff)
LINARO: Never rename dbgsym deb to ddeb
HACK: Must not upload this to primary archive as is. This is a hack until we find conditional way to do this. Signed-off-by: John Rigby <john.rigby@linaro.org>
-rw-r--r--debian/rules.d/2-binary-arch.mk43
1 files changed, 23 insertions, 20 deletions
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index 93e44b3cce6..02303fb0745 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -380,26 +380,29 @@ ifneq ($(skipdbg),true)
dh_md5sums -p$(dbgpkg)
dh_builddeb -p$(dbgpkg)
- # Hokay...here's where we do a little twiddling...
- # Renaming the debug package prevents it from getting into
- # the primary archive, and therefore prevents this very large
- # 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
- 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; \
- fi; \
- ) 9>$(lockme_file)
- # Now, the package wont get into the archive, but it will get put
- # into the debug system.
+ # Hack Alert! Commenting the section out for linaro ppa build only
+ # Must not upload this to primary archive as is.
+ # Turns out that Purpose: PRIMARY is in /CurrentlyBuilding
+ # and not PPA as was expected
+
+ ## Hokay...here's where we do a little twiddling...
+ ## Renaming the debug package prevents it from getting into
+ ## the primary archive, and therefore prevents this very large
+ ## package from being mirrored. It is instead, through some
+ ## archive admin hackery, copied to http://ddebs.ubuntu.com.
+ ##
+ ##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; \
+ ## fi; \
+ ##) 9>$(lockme_file)
+ ## Now, the package wont get into the archive, but it will get put
+ ## into the debug system.
endif
ifneq ($(full_build),false)
# Clean out this flavours build directory.