Patchwork [meta-oe] mariadb-native: fix dependencies

login
register
mail settings
Submitter Martin Jansa
Date Dec. 30, 2013, 2:54 p.m.
Message ID <1388415259-6360-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/63903/
State Accepted, archived
Headers show

Comments

Martin Jansa - Dec. 30, 2013, 2:54 p.m.
* unlike BBCLASSEXTENDed native support, dependencies in mariadb-native don't get
  automatic -native suffix, so mariadb-native was depending on target ncurses and zlib.
* move the dependency from .inc and apply it with right suffix

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb | 1 +
 meta-oe/recipes-support/mysql/mariadb_5.1.67.bb        | 2 +-
 meta-oe/recipes-support/mysql/mariadb_5.1.67.inc       | 2 --
 3 files changed, 2 insertions(+), 3 deletions(-)
Paul Eggleton - Dec. 30, 2013, 6:26 p.m.
Hi Martin,

On Monday 30 December 2013 15:54:19 Martin Jansa wrote:
> * unlike BBCLASSEXTENDed native support, dependencies in mariadb-native
> don't get automatic -native suffix, so mariadb-native was depending on
> target ncurses and zlib. * move the dependency from .inc and apply it with
> right suffix
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb | 1 +
>  meta-oe/recipes-support/mysql/mariadb_5.1.67.bb        | 2 +-
>  meta-oe/recipes-support/mysql/mariadb_5.1.67.inc       | 2 --
>  3 files changed, 2 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
> b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb index
> e8382e2..15605d0 100644
> --- a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
> +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
> @@ -2,6 +2,7 @@ require mariadb_${PV}.inc
>  inherit native
> 
>  PROVIDES += "mysql5-native"
> +DEPENDS = "ncurses-native zlib-native"
> 
>  RDEPENDS_${PN} = ""
>  PACKAGES = ""
> diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
> b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb index fc499d4..3b15c00
> 100644
> --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
> +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
> @@ -1,6 +1,6 @@
>  require ${PN}_${PV}.inc
> 
> -DEPENDS += "mariadb-native"
> +DEPENDS += "mariadb-native ncurses-native zlib-native"

I'm not following this - does the target version really need ncurses-native 
and zlib-native?

Cheers,
Paul
Martin Jansa - Dec. 30, 2013, 11:03 p.m.
On Mon, Dec 30, 2013 at 06:26:20PM +0000, Paul Eggleton wrote:
> Hi Martin,
> 
> On Monday 30 December 2013 15:54:19 Martin Jansa wrote:
> > * unlike BBCLASSEXTENDed native support, dependencies in mariadb-native
> > don't get automatic -native suffix, so mariadb-native was depending on
> > target ncurses and zlib. * move the dependency from .inc and apply it with
> > right suffix
> > 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> >  meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb | 1 +
> >  meta-oe/recipes-support/mysql/mariadb_5.1.67.bb        | 2 +-
> >  meta-oe/recipes-support/mysql/mariadb_5.1.67.inc       | 2 --
> >  3 files changed, 2 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
> > b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb index
> > e8382e2..15605d0 100644
> > --- a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
> > +++ b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
> > @@ -2,6 +2,7 @@ require mariadb_${PV}.inc
> >  inherit native
> > 
> >  PROVIDES += "mysql5-native"
> > +DEPENDS = "ncurses-native zlib-native"
> > 
> >  RDEPENDS_${PN} = ""
> >  PACKAGES = ""
> > diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
> > b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb index fc499d4..3b15c00
> > 100644
> > --- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
> > +++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
> > @@ -1,6 +1,6 @@
> >  require ${PN}_${PV}.inc
> > 
> > -DEPENDS += "mariadb-native"
> > +DEPENDS += "mariadb-native ncurses-native zlib-native"
> 
> I'm not following this - does the target version really need ncurses-native 
> and zlib-native?

My fault, target version should have only ncurses and zlib, I've sent
older version of this patch, v2 coming soon.

Patch

diff --git a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
index e8382e2..15605d0 100644
--- a/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
+++ b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb
@@ -2,6 +2,7 @@  require mariadb_${PV}.inc
 inherit native
 
 PROVIDES += "mysql5-native"
+DEPENDS = "ncurses-native zlib-native"
 
 RDEPENDS_${PN} = ""
 PACKAGES = ""
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
index fc499d4..3b15c00 100644
--- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
+++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb
@@ -1,6 +1,6 @@ 
 require ${PN}_${PV}.inc
 
-DEPENDS += "mariadb-native"
+DEPENDS += "mariadb-native ncurses-native zlib-native"
 
 PROVIDES += "mysql5"
 
diff --git a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
index e66f215..7cedd9e 100644
--- a/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
+++ b/meta-oe/recipes-support/mysql/mariadb_5.1.67.inc
@@ -4,8 +4,6 @@  SECTION = "libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
-DEPENDS = "ncurses zlib"
-
 SRC_URI = "http://mirrors.coreix.net/mariadb/mariadb-${PV}/kvm-tarbake-jaunty-x86/mariadb-${PV}.tar.gz \
            file://configure.in.patch \
            file://plug.in.patch \