[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5076/8267] db: remove the 6.x recipe

[Emmanuele Bassi <ebassi src gnome org>]

commit f033bba14a221c1e815dffa27c6bda1193a0f119
Author: Alexander Kanavin <alexander kanavin linux intel com>
Date:   Mon Jan 2 15:15:55 2017 +0200

    db: remove the 6.x recipe
    
    Version 6.x of Berkeley DB has been rejected by open source community due to its hostile
    AGPLv3 license; both Fedora and Debian are sticking with db 5.x - and by extension,
    all the open source projects are still developed and tested with db 5.x
    
    In oe-core the only thing that was requiring db 6.x was rpm 5.x, and so there's no reason
    to continue carrying db 6.x in oe-core. If someone needs API features that are only available in
    db 6.x, it can be re-added to meta-oe.
    
    (From OE-Core rev: 2694de76542840f79e3953c546d07b8ae479b8a1)
    
    Signed-off-by: Alexander Kanavin <alexander kanavin linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/conf/distro/include/default-versions.inc      |    3 -
 ...Makefile-let-libdb-6.0.la-depend-os_map.l.patch |   29 -----
 ...akefile-let-libso_target-depend-on-bt_rec.patch |   30 ------
 meta/recipes-support/db/db_5.3.28.bb               |    1 +
 meta/recipes-support/db/db_6.0.35.bb               |  111 --------------------
 5 files changed, 1 insertions(+), 173 deletions(-)
---
diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index cc8c533..d976508 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -5,6 +5,3 @@
 # Force the older version of liberation-fonts until we fix the fontforge issue
 PREFERRED_VERSION_liberation-fonts ?= "1.04"
 
-# Force db-native's version to keep sync with db while
-# 'AGPL-3.0' in ${INCOMPATIBLE_LICENSE} blacklist
-PREFERRED_VERSION_db-native = "${@incompatible_license_contains('AGPL-3.0', '5.%', '6.%', d)}"
diff --git a/meta/recipes-support/db/db_5.3.28.bb b/meta/recipes-support/db/db_5.3.28.bb
index 1b25fd4..b7232fc 100644
--- a/meta/recipes-support/db/db_5.3.28.bb
+++ b/meta/recipes-support/db/db_5.3.28.bb
@@ -16,6 +16,7 @@ VIRTUAL_NAME ?= "virtual/db"
 RCONFLICTS_${PN} = "db3"
 
 PR = "r1"
+PE = "1"
 
 SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz";
 SRC_URI += "file://arm-thumb-mutex_db5.patch \