aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Rigby <john.rigby@linaro.org>2011-09-27 13:20:53 -0600
committerLinaro CI <john.rigby@linaro.org>2012-02-07 22:53:01 +0000
commit247950910f77bb2334b0bdfd3d4172f0a18df188 (patch)
treed6ab47cb83c2a23526994236d3034afce26e09cc
parent7daae74fb01f654dd606d3d7cec679119b267ce7 (diff)
LINARO: PACKAGING: 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.mk33
1 files changed, 19 insertions, 14 deletions
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
index a37bac3ce6e..1d4748448ed 100644
--- a/debian/rules.d/2-binary-arch.mk
+++ b/debian/rules.d/2-binary-arch.mk
@@ -367,6 +367,11 @@ ifneq ($(skipdbg),true)
dh_md5sums -p$(dbgpkg)
dh_builddeb -p$(dbgpkg)
+ # 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
@@ -375,20 +380,20 @@ ifneq ($(skipdbg),true)
#
# Only do this for PRIMARY archive for now
#
- set -e; \
- ( \
- $(lockme_cmd) 9 || exit 1; \
- 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)
+ #set -e; \
+ #( \
+ # $(lockme_cmd) 9 || exit 1; \
+ # 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
# into the debug system.
endif