summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/packages/db/db-native_4.2.52.bb11
-rw-r--r--meta/packages/db/db/arm-thumb-mutex.patch (renamed from meta/packages/db/files/arm-thumb-mutex.patch)0
-rw-r--r--meta/packages/db/db/configure_fixes.patch (renamed from meta/packages/db/files/configure_fixes.patch)0
-rw-r--r--meta/packages/db/db_4.2.52.bb7
4 files changed, 6 insertions, 12 deletions
diff --git a/meta/packages/db/db-native_4.2.52.bb b/meta/packages/db/db-native_4.2.52.bb
deleted file mode 100644
index 9dfcd1e267..0000000000
--- a/meta/packages/db/db-native_4.2.52.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1# This wrapper builds a native version of the SleepyCat
2# Berkeley DB for those packages which need it (e.g.
3# perl).
4SECTION = "libs"
5VIRTUAL_NAME = "virtual/db-native"
6CONFLICTS = "db3-native"
7#PR tracks the non-native package
8
9require db_${PV}.bb
10
11inherit native
diff --git a/meta/packages/db/files/arm-thumb-mutex.patch b/meta/packages/db/db/arm-thumb-mutex.patch
index acd446fcd8..acd446fcd8 100644
--- a/meta/packages/db/files/arm-thumb-mutex.patch
+++ b/meta/packages/db/db/arm-thumb-mutex.patch
diff --git a/meta/packages/db/files/configure_fixes.patch b/meta/packages/db/db/configure_fixes.patch
index 80aa0e7c1c..80aa0e7c1c 100644
--- a/meta/packages/db/files/configure_fixes.patch
+++ b/meta/packages/db/db/configure_fixes.patch
diff --git a/meta/packages/db/db_4.2.52.bb b/meta/packages/db/db_4.2.52.bb
index 46dd0b815a..b3ca493a01 100644
--- a/meta/packages/db/db_4.2.52.bb
+++ b/meta/packages/db/db_4.2.52.bb
@@ -12,8 +12,11 @@ SECTION = "libs"
12DESCRIPTION = "Berkeley DB v4." 12DESCRIPTION = "Berkeley DB v4."
13HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html" 13HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
14LICENSE = "BSD Sleepycat" 14LICENSE = "BSD Sleepycat"
15VIRTUAL_NAME ?= "virtual/db" 15VIRTUAL_NAME = "virtual/db"
16VIRTUAL_NAME_virtclass-native = "virtual/db-native"
17
16CONFLICTS = "db3" 18CONFLICTS = "db3"
19CONFLICTS_virtclass-native = "db3-native"
17PR = "r8" 20PR = "r8"
18 21
19SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \ 22SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \
@@ -90,3 +93,5 @@ do_install_append() {
90 93
91# The db package contains symlinks that trip up insane 94# The db package contains symlinks that trip up insane
92INSANE_SKIP_db = "1" 95INSANE_SKIP_db = "1"
96
97BBCLASSEXTEND = "native"