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>
This commit is contained in:
Alexander Kanavin
Richard Purdie
parent
372bcd3c97
commit
f033bba14a
|
|
@ -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)}"
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
From 2902dda6e3f7b2cd5796a96af20deece610e2eb9 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Mon, 16 Nov 2015 22:20:49 -0800
|
||||
Subject: [PATCH] build_unix/Makefile: let libdb-6.0.la depend os_map.lo
|
||||
|
||||
Fixed parallel issue:
|
||||
libtool: link: `os_map.lo' is not a valid libtool object
|
||||
Makefile:867: recipe for target 'libdb-6.0.la' failed
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
dist/Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: db-6.0.30/dist/Makefile.in
|
||||
===================================================================
|
||||
--- db-6.0.30.orig/dist/Makefile.in
|
||||
+++ db-6.0.30/dist/Makefile.in
|
||||
@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
|
||||
$(LN) -s $(libdb_version) $(libdb)
|
||||
|
||||
# Shared C library.
|
||||
-$(libso_target): $(C_OBJS) bt_rec@o@
|
||||
+$(libso_target): $(C_OBJS) bt_rec@o@ os_map@o@
|
||||
$(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
|
||||
$(LIBCSO_LIBS)
|
||||
$(RM) $(libdb)
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
From c640ff9340f358a00835816d0fea03d27a7be978 Mon Sep 17 00:00:00 2001
|
||||
From: Robert Yang <liezhi.yang@windriver.com>
|
||||
Date: Tue, 31 Mar 2015 00:56:44 -0700
|
||||
Subject: [PATCH] Makefile: let libso_target depend on bt_rec
|
||||
|
||||
Fixed parallel issue:
|
||||
libtool: link: `bt_rec.lo' is not a valid libtool object
|
||||
Makefile:867: recipe for target 'libdb-6.0.la' failed
|
||||
make: *** [libdb-6.0.la] Error 1
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||
---
|
||||
Makefile.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: db-6.0.30/dist/Makefile.in
|
||||
===================================================================
|
||||
--- db-6.0.30.orig/dist/Makefile.in
|
||||
+++ db-6.0.30/dist/Makefile.in
|
||||
@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
|
||||
$(LN) -s $(libdb_version) $(libdb)
|
||||
|
||||
# Shared C library.
|
||||
-$(libso_target): $(C_OBJS)
|
||||
+$(libso_target): $(C_OBJS) bt_rec@o@
|
||||
$(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
|
||||
$(LIBCSO_LIBS)
|
||||
$(RM) $(libdb)
|
||||
|
|
@ -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 \
|
||||
|
|
|
|||
|
|
@ -1,111 +0,0 @@
|
|||
# Version 6 of the Berkeley DB from Oracle (formerly Sleepycat)
|
||||
#
|
||||
# At present this package only installs the DB code
|
||||
# itself (shared libraries, .a in the dev package),
|
||||
# documentation and headers.
|
||||
#
|
||||
# The headers have the same names as those as v3
|
||||
# of the DB, only one version can be used *for dev*
|
||||
# at once - DB3 and DB6 can both be installed on the
|
||||
# same system at the same time if really necessary.
|
||||
SECTION = "libs"
|
||||
SUMMARY = "Berkeley Database v6"
|
||||
HOMEPAGE = "http://www.oracle.com/technetwork/database/database-technologies/berkeleydb/overview/index.html"
|
||||
LICENSE = "AGPL-3.0"
|
||||
VIRTUAL_NAME ?= "virtual/db"
|
||||
RCONFLICTS_${PN} = "db3"
|
||||
|
||||
PR = "r1"
|
||||
|
||||
# Note, when upgraded to 6.1.x, a patch in RPM will need to be removed to activate db 6.1 support.
|
||||
SRC_URI = "http://distfiles.gentoo.org/distfiles/db-${PV}.tar.gz \
|
||||
file://arm-thumb-mutex_db5.patch \
|
||||
file://fix-parallel-build.patch \
|
||||
file://Makefile-let-libso_target-depend-on-bt_rec.patch \
|
||||
file://Makefile-let-libdb-6.0.la-depend-os_map.l.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "c65a4d3e930a116abaaf69edfc697f25"
|
||||
SRC_URI[sha256sum] = "24421affa8ae436fe427ae4f5f2d1634da83d3d55a5ad6354a98eeedb825de55"
|
||||
|
||||
# Exclude NC versions which lack AES encryption
|
||||
UPSTREAM_CHECK_REGEX = "db-(?P<pver>\d+\.\d+(\.\d+)?).tar"
|
||||
UPSTREAM_CHECK_URI = "http://www.oracle.com/technetwork/products/berkeleydb/downloads/index-082944.html"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490"
|
||||
|
||||
# Put virtual/db in any appropriate provider of a
|
||||
# relational database, use it as a dependency in
|
||||
# place of a specific db and use:
|
||||
#
|
||||
# PREFERRED_PROVIDER_virtual/db
|
||||
#
|
||||
# to select the correct db in the build (distro) .conf
|
||||
PROVIDES += "${VIRTUAL_NAME}"
|
||||
|
||||
inherit autotools
|
||||
|
||||
# The executables go in a separate package - typically there
|
||||
# is no need to install these unless doing real database
|
||||
# management on the system.
|
||||
inherit lib_package
|
||||
|
||||
PACKAGES =+ "${PN}-cxx"
|
||||
FILES_${PN}-cxx = "${libdir}/*cxx*so"
|
||||
|
||||
# The dev package has the .so link (as in db3) and the .a's -
|
||||
# it is therefore incompatible (cannot be installed at the
|
||||
# same time) as the db3 package
|
||||
# sort out the .so since they do version prior to the .so
|
||||
SOLIBS = "-6*.so"
|
||||
FILES_SOLIBSDEV = "${libdir}/libdb.so ${libdir}/libdb_cxx.so"
|
||||
|
||||
#configuration - set in local.conf to override
|
||||
# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
|
||||
DB6_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql"
|
||||
|
||||
EXTRA_OECONF = "${DB6_CONFIG} --enable-shared --enable-cxx --with-sysroot"
|
||||
|
||||
# Cancel the site stuff - it's set for db3 and destroys the configure.
|
||||
CONFIG_SITE = ""
|
||||
|
||||
AUTOTOOLS_SCRIPT_PATH = "${S}/dist"
|
||||
|
||||
do_configure() {
|
||||
cd ${B}
|
||||
gnu-configize --force ${AUTOTOOLS_SCRIPT_PATH}
|
||||
oe_runconf
|
||||
}
|
||||
|
||||
EXTRA_OEMAKE_append_class-target = " LIBTOOL=${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool"
|
||||
EXTRA_OEMAKE += "STRIP=true docdir=${docdir}/db/"
|
||||
|
||||
do_compile_prepend() {
|
||||
# Stop libtool adding RPATHs
|
||||
sed -i -e 's|hardcode_into_libs=yes|hardcode_into_libs=no|' ${B}/libtool
|
||||
}
|
||||
|
||||
do_install_append() {
|
||||
mkdir -p ${D}/${includedir}/db60
|
||||
mv ${D}/${includedir}/db.h ${D}/${includedir}/db60/.
|
||||
mv ${D}/${includedir}/db_cxx.h ${D}/${includedir}/db60/.
|
||||
ln -s db60/db.h ${D}/${includedir}/db.h
|
||||
ln -s db60/db_cxx.h ${D}/${includedir}/db_cxx.h
|
||||
|
||||
# Prune the documentation to remove large (PDF) or pointless (Java) files.
|
||||
find ${D}${docdir} -name *.pdf -delete
|
||||
rm -rf ${D}${docdir}/db/java
|
||||
rm -rf ${D}${docdir}/db/csharp
|
||||
|
||||
# The makefiles use cp -p, so we need to chmod until that is fixed.
|
||||
chown -R root:root ${D}
|
||||
}
|
||||
|
||||
# libdb isn't versioned in the typical manner (libdb-6.0.so is the full library
|
||||
# name) so skip these checks.
|
||||
INSANE_SKIP_${PN} = "dev-so"
|
||||
INSANE_SKIP_${PN}-cxx = "dev-so"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
|
||||
RECIPE_NO_UPDATE_REASON = "latest db does not work with RPM-5.x due to changes in locking semantics"
|
||||
Loading…
Reference in New Issue