Skip to contentSkip to conversation

mariadb-native: fix dependencies

PATCH In review Martin Jansa 2 participants 3 messages Dec 30, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 mariadb-native: fix dependencies

* 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

---
 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(-)
meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb +1 -0
index e8382e2..15605d0 100644
@@ -2,6 +2,7 @@ require mariadb_${PV}.inc
 inherit native
 
 PROVIDES += "mysql5-native"
+DEPENDS = "ncurses-native zlib-native"
 
 RDEPENDS_${PN} = ""
 PACKAGES = ""
meta-oe/recipes-support/mysql/mariadb_5.1.67.bb +1 -1
index fc499d4..3b15c00 100644
@@ -1,6 +1,6 @@
 require ${PN}_${PV}.inc
 
-DEPENDS += "mariadb-native"
+DEPENDS += "mariadb-native ncurses-native zlib-native"
 
 PROVIDES += "mysql5"
 
meta-oe/recipes-support/mysql/mariadb_5.1.67.inc +0 -2
index e66f215..7cedd9e 100644
@@ -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 \
Signature · 1 line
1.8.4.3
#1 lore raw

Hi Martin,

Quoted 31 lines · 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

---
 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(-)
(quoted diff) +0 -0

b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb index e8382e2..15605d0 100644

meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb +1 -0
@@ -2,6 +2,7 @@ require mariadb_${PV}.inc
 inherit native
 
 PROVIDES += "mysql5-native"
+DEPENDS = "ncurses-native zlib-native"
 
 RDEPENDS_${PN} = ""
 PACKAGES = ""
(quoted diff) +0 -0

b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb index fc499d4..3b15c00 100644

meta-oe/recipes-support/mysql/mariadb_5.1.67.bb line 3

Quoted 4 lines
meta-oe/recipes-support/mysql/mariadb_5.1.67.bb +1 -1
@@ -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

Signature · 2 lines
Paul Eggleton
Intel Open Source Technology Centre
#2 lore raw
Quoted 36 lines · Paul Eggleton

Hi Martin,

Quoted 33 lines · 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

---
 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(-)
(quoted diff) +0 -0

b/meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb index e8382e2..15605d0 100644

meta-oe/recipes-support/mysql/mariadb-native_5.1.67.bb +1 -0
@@ -2,6 +2,7 @@ require mariadb_${PV}.inc
 inherit native
 
 PROVIDES += "mysql5-native"
+DEPENDS = "ncurses-native zlib-native"
 
 RDEPENDS_${PN} = ""
 PACKAGES = ""
(quoted diff) +0 -0

b/meta-oe/recipes-support/mysql/mariadb_5.1.67.bb index fc499d4..3b15c00 100644

meta-oe/recipes-support/mysql/mariadb_5.1.67.bb +0 -0
@@ -1,6 +1,6 @@
 require ${PN}_${PV}.inc
 
Quoted 5 lines

meta-oe/recipes-support/mysql/mariadb_5.1.67.bb line 3

Quoted 2 lines
meta-oe/recipes-support/mysql/mariadb_5.1.67.bb +1 -1
-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.

Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]