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 @@
-# This wrapper builds a native version of the SleepyCat
-# Berkeley DB for those packages which need it (e.g.
-# perl).
-SECTION = "libs"
-VIRTUAL_NAME = "virtual/db-native"
-CONFLICTS = "db3-native"
-#PR tracks the non-native package
-
-require db_${PV}.bb
-
-inherit 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"
 DESCRIPTION = "Berkeley DB v4."
 HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
 LICENSE = "BSD Sleepycat"
-VIRTUAL_NAME ?= "virtual/db"
+VIRTUAL_NAME = "virtual/db"
+VIRTUAL_NAME_virtclass-native = "virtual/db-native"
+
 CONFLICTS = "db3"
+CONFLICTS_virtclass-native = "db3-native"
 PR = "r8"
 
 SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz \
@@ -90,3 +93,5 @@ do_install_append() {
 
 # The db package contains symlinks that trip up insane
 INSANE_SKIP_db = "1"
+
+BBCLASSEXTEND = "native"