diff options
| author | John Rigby <john.rigby@linaro.org> | 2012-02-03 11:00:34 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-02-03 11:01:11 -0700 |
| commit | 45921c4e40f6ea2e853ea24bdaf58ca53ddde7bc (patch) | |
| tree | 2022663ae8721cf849fd65593d4ef6395de8c2dd | |
| parent | 100499765e237187cf56eecf275f6e156a7a6d9d (diff) | |
Revert "LINARO: PACKAGING: Never rename dbgsym deb to ddeb"
This reverts commit 4648fe001d459133e8175abb1a114f0701bcaf77
which is not appropriate for ubuntu archive.
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rw-r--r-- | debian/rules.d/2-binary-arch.mk | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 1d4748448ed..a37bac3ce6e 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -367,11 +367,6 @@ 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 @@ -380,20 +375,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 |