stx-ha: fix the sqlite related dependencies

sqlite3 is required by stx 3.0 instead of sqlite, so
fix the related dependencies to avoid installing
sqlite and python-pysqlite.

Issue-ID: INF-63
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I191d505dd7797d835d78197006308346375d1039

diff --git a/meta-stx/recipes-core/stx-ha/sm-common.inc b/meta-stx/recipes-core/stx-ha/sm-common.inc
index bdbcf76..67f24f8 100644 (file)
--- a/meta-stx/recipes-core/stx-ha/sm-common.inc
+++ b/meta-stx/recipes-core/stx-ha/sm-common.inc
@@ -19,7 +19,7 @@ PACKAGES += " sm-eru"
 
 RDEPENDS_sm-common-libs += " \
        bash \
-       sqlite \
+       sqlite3 \
        util-linux \
        systemd \
        "

diff --git a/meta-stx/recipes-core/stx-ha/stx-ha.bb b/meta-stx/recipes-core/stx-ha/stx-ha.bb
index ae5b0b0..b5c070c 100644 (file)
--- a/meta-stx/recipes-core/stx-ha/stx-ha.bb
+++ b/meta-stx/recipes-core/stx-ha/stx-ha.bb
@@ -54,8 +54,7 @@ DEPENDS += " \
        sqlite3 \
        python \
        python-pbr-native \
-        glib-2.0 \
-       sqlite3 \
+       glib-2.0 \
        "
 
 require sm-common.inc

diff --git a/meta-stx/recipes-devtools/python/python-barbican_git.bb b/meta-stx/recipes-devtools/python/python-barbican_git.bb
index 80f3fdf..93b79ef 100644 (file)
--- a/meta-stx/recipes-devtools/python/python-barbican_git.bb
+++ b/meta-stx/recipes-devtools/python/python-barbican_git.bb
@@ -146,7 +146,6 @@ RDEPENDS_${PN} += " \
         python-pastedeploy \
         python-paste \
         python-pycrypto \
-        python-pysqlite \
         python-keystoneclient \
         python-sqlalchemy \
         python-stevedore \