diff mbox

[PATCHv2,07/11] dbg/debian: add libodphelper-linux* packages

Message ID 1458761983-18738-1-git-send-email-anders.roxell@linaro.org
State Accepted
Commit 392666e851578eebae7e7649da6bba66000dff9d
Headers show

Commit Message

Anders Roxell March 23, 2016, 7:39 p.m. UTC
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
---
 pkg/debian/control | 28 +++++++++++++++++++++++++++-
 pkg/debian/rules   |  3 ++-
 scripts/builddeb   |  4 ++--
 3 files changed, 31 insertions(+), 4 deletions(-)

Comments

Ricardo Salveti March 23, 2016, 7:51 p.m. UTC | #1
On Wed, Mar 23, 2016 at 4:39 PM, Anders Roxell <anders.roxell@linaro.org> wrote:
>
> Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
> ---
>  pkg/debian/control | 28 +++++++++++++++++++++++++++-
>  pkg/debian/rules   |  3 ++-
>  scripts/builddeb   |  4 ++--
>  3 files changed, 31 insertions(+), 4 deletions(-)
>
> diff --git a/pkg/debian/control b/pkg/debian/control
> index 8a1f679..e0bbee0 100644
> --- a/pkg/debian/control
> +++ b/pkg/debian/control
> @@ -14,7 +14,7 @@ Package: odp-linux-bin
>  Section: libdevel
>  Architecture: any
>  Multi-Arch: allowed
> -Depends: libodp-linux (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
> +Depends: ${misc:Depends}, ${shlibs:Depends}
>  Description: Example binaries for OpenDataPlane
>   These are the executable examples from the reference implementation.
>
> @@ -42,3 +42,29 @@ Multi-Arch: same
>  Depends: ${misc:Depends}, ${shlibs:Depends}
>  Description: Library for OpenDataPlane
>   This is the OpenDataPlane library from the reference implementation.
> +
> +Package: libodphelper-linux-dbg
> +Priority: extra
> +Section: debug
> +Architecture: any
> +Multi-Arch: same
> +Depends: libodphelper-linux (= ${binary:Version}), ${misc:Depends}
> +Description: Debug symbols for OpenDataPlane
> + This is the OpenDataPlane helper library from the reference implementation
> + with debug turned on.
> +
> +Package: libodphelper-linux-dev
> +Section: libdevel
> +Architecture: any
> +Multi-Arch: same
> +Depends: libodphelper-linux (= ${binary:Version}), libodp-linux-dev,
> +    ${misc:Depends}, ${shlibs:Depends}, libssl-dev
> +Description: Helper development files for OpenDataPlane
> + These are the helper source file for the OpenDataPlane reference implementation.
> +
> +Package: libodphelper-linux
> +Architecture: any
> +Multi-Arch: same
> +Depends: ${misc:Depends}, ${shlibs:Depends}
> +Description: Helper library for OpenDataPlane
> + This is the OpenDataPlane helper library from the reference implementation.
> diff --git a/pkg/debian/rules b/pkg/debian/rules
> index be8a2ae..4f7a057 100755
> --- a/pkg/debian/rules
> +++ b/pkg/debian/rules
> @@ -18,4 +18,5 @@ override_dh_auto_configure:
>
>  .PHONY: override_dh_strip
>  override_dh_strip:
> -       dh_strip --dbg-package=libodp-linux-dbg
> +       dh_strip -p libodp-linux --dbg-package=libodp-linux-dbg
> +       dh_strip -p libodphelper-linux --dbg-package=libodphelper-linux-dbg
> diff --git a/scripts/builddeb b/scripts/builddeb
> index 988cb5d..8bde7cf 100755
> --- a/scripts/builddeb
> +++ b/scripts/builddeb
> @@ -23,8 +23,8 @@ cp -r ${ROOT_DIR}/pkg/debian .
>  current=$(echo ${version} | awk -F . '{printf("%d\n", (($1 * 100) + $2))}')
>  rename 's,(.*linux)(.*),${1}'"${current}"'${2},' debian/*odp*-linux.install
>
> -sed -i "s:\(.*odp-linux\)\(-dbg\|$\| \):\1${current}\2:g" debian/control
> -sed -i "s:\(.*odp-linux\)\(.*\):\1${current}\2:g" debian/rules
> +sed -i "s:\(libodp[a-zA-Z\-]\+linux\)\(-dbg\|$\| \):\1${current}\2:g" debian/control
> +sed -i "s:\(libodp[a-zA-Z\-]\+linux\)\(-dbg\| \):\1${current}\2:g" debian/rules
>
>  if [ $(egrep "\.([a-z0-9]{8}\>|dirty)" .scmversion |wc -l) -gt 0 ]; then
>         export DEBFULLNAME="Donald Duck"
> --
> 2.1.4

Thanks for the fix.

Reviewed-by: Ricardo Salveti <ricardo.salveti@linaro.org>
diff mbox

Patch

diff --git a/pkg/debian/control b/pkg/debian/control
index 8a1f679..e0bbee0 100644
--- a/pkg/debian/control
+++ b/pkg/debian/control
@@ -14,7 +14,7 @@  Package: odp-linux-bin
 Section: libdevel
 Architecture: any
 Multi-Arch: allowed
-Depends: libodp-linux (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Example binaries for OpenDataPlane
  These are the executable examples from the reference implementation.
 
@@ -42,3 +42,29 @@  Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Library for OpenDataPlane
  This is the OpenDataPlane library from the reference implementation.
+
+Package: libodphelper-linux-dbg
+Priority: extra
+Section: debug
+Architecture: any
+Multi-Arch: same
+Depends: libodphelper-linux (= ${binary:Version}), ${misc:Depends}
+Description: Debug symbols for OpenDataPlane
+ This is the OpenDataPlane helper library from the reference implementation
+ with debug turned on.
+
+Package: libodphelper-linux-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
+Depends: libodphelper-linux (= ${binary:Version}), libodp-linux-dev,
+    ${misc:Depends}, ${shlibs:Depends}, libssl-dev
+Description: Helper development files for OpenDataPlane
+ These are the helper source file for the OpenDataPlane reference implementation.
+
+Package: libodphelper-linux
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Description: Helper library for OpenDataPlane
+ This is the OpenDataPlane helper library from the reference implementation.
diff --git a/pkg/debian/rules b/pkg/debian/rules
index be8a2ae..4f7a057 100755
--- a/pkg/debian/rules
+++ b/pkg/debian/rules
@@ -18,4 +18,5 @@  override_dh_auto_configure:
 
 .PHONY: override_dh_strip
 override_dh_strip:
-	dh_strip --dbg-package=libodp-linux-dbg
+	dh_strip -p libodp-linux --dbg-package=libodp-linux-dbg
+	dh_strip -p libodphelper-linux --dbg-package=libodphelper-linux-dbg
diff --git a/scripts/builddeb b/scripts/builddeb
index 988cb5d..8bde7cf 100755
--- a/scripts/builddeb
+++ b/scripts/builddeb
@@ -23,8 +23,8 @@  cp -r ${ROOT_DIR}/pkg/debian .
 current=$(echo ${version} | awk -F . '{printf("%d\n", (($1 * 100) + $2))}')
 rename 's,(.*linux)(.*),${1}'"${current}"'${2},' debian/*odp*-linux.install
 
-sed -i "s:\(.*odp-linux\)\(-dbg\|$\| \):\1${current}\2:g" debian/control
-sed -i "s:\(.*odp-linux\)\(.*\):\1${current}\2:g" debian/rules
+sed -i "s:\(libodp[a-zA-Z\-]\+linux\)\(-dbg\|$\| \):\1${current}\2:g" debian/control
+sed -i "s:\(libodp[a-zA-Z\-]\+linux\)\(-dbg\| \):\1${current}\2:g" debian/rules
 
 if [ $(egrep "\.([a-z0-9]{8}\>|dirty)" .scmversion |wc -l) -gt 0 ]; then
 	export DEBFULLNAME="Donald Duck"