db: version bump 4.1.25.NC/4.4.20.NC -> 5.3.28

Remove the option for different versions. It's not needed.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

4 files changed, 40 insertions, 161 deletions

diff --git a/patches/db-4.1.25.NC/db-4.1.25.NC-destdir.diff b/patches/db-4.1.25.NC/db-4.1.25.NC-destdir.diff
deleted file mode 100644
index c42e0f936..000000000
--- a/patches/db-4.1.25.NC/db-4.1.25.NC-destdir.diff
+++ /dev/null
@@ -1,116 +0,0 @@
-Subject: [patch] make install stage destdir-aware
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-
-This patch makes the install stage DESTDIR aware. The DESTDIR variable
-is used to specify where the result of the installation shall go to and
-is usually used for distribution building.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-
----
-
-Index: db-4.1.25.NC/dist/Makefile.in
-===================================================================
---- db-4.1.25.NC.orig/dist/Makefile.in
-+++ db-4.1.25.NC/dist/Makefile.in
-@@ -541,30 +541,30 @@ library_install: install_include install
- uninstall: uninstall_include uninstall_lib uninstall_utilities uninstall_docs
- 
- install_setup:
--	@test -d $(prefix) || \
--	    ($(mkdir) -p $(prefix) && $(chmod) $(dmode) $(prefix))
-+	@test -d $(DESTDIR)/$(prefix) || \
-+	    ($(mkdir) -p $(DESTDIR)/$(prefix) && $(chmod) $(dmode) $(DESTDIR)/$(prefix))
- 
- INCDOT=	db.h db_cxx.h @ADDITIONAL_INCS@
- INCINC=	cxx_common.h cxx_except.h
- install_include:
- 	@echo "Installing DB include files: $(includedir) ..."
--	@test -d $(includedir) || \
--	    ($(mkdir) -p $(includedir) && $(chmod) $(dmode) $(includedir))
--	@cd $(includedir) && $(rm) -f $(INCDOT) $(INCINC)
--	@$(cp) -p $(INCDOT) $(includedir)
--	@cd $(srcdir)/dbinc/ && $(cp) -p $(INCINC) $(includedir)
--	@cd $(includedir) && $(chmod) $(fmode) $(INCDOT) $(INCINC)
-+	@test -d $(DESTDIR)/$(includedir) || \
-+	    ($(mkdir) -p $(DESTDIR)/$(includedir) && $(chmod) $(dmode) $(DESTDIR)/$(includedir))
-+	@cd $(DESTDIR)/$(includedir) && $(rm) -f $(INCDOT) $(INCINC)
-+	@$(cp) -p $(INCDOT) $(DESTDIR)/$(includedir)
-+	@cd $(srcdir)/dbinc/ && $(cp) -p $(INCINC) $(DESTDIR)/$(includedir)
-+	@cd $(DESTDIR)/$(includedir) && $(chmod) $(fmode) $(INCDOT) $(INCINC)
- 
- uninstall_include:
--	@cd $(includedir) && $(rm) -f $(INCDOT) $(INCINC)
-+	@cd $(DESTDIR)/$(includedir) && $(rm) -f $(INCDOT) $(INCINC)
- 
- install_lib:
- 	@echo "Installing DB library: $(libdir) ..."
--	@test -d $(libdir) || \
--	    ($(mkdir) -p $(libdir) && $(chmod) $(dmode) $(libdir))
--	@cd $(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
--	@$(INSTALLER) @INSTALL_LIBS@ $(libdir)
--	@(cd $(libdir) && \
-+	@test -d $(DESTDIR)/$(libdir) || \
-+	    ($(mkdir) -p $(DESTDIR)/$(libdir) && $(chmod) $(dmode) $(DESTDIR)/$(libdir))
-+	@cd $(DESTDIR)/$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
-+	@$(INSTALLER) @INSTALL_LIBS@ $(DESTDIR)/$(libdir)
-+	@(cd $(DESTDIR)/$(libdir) && \
- 	    test -f $(libso) && $(ln) -s $(libso) $(libso_default); \
- 	    test -f $(libso) && $(ln) -s $(libso) $(libso_major); \
- 	    test -f $(libso_static) && $(ln) -s $(libso_static) $(libdb); \
-@@ -577,26 +577,26 @@ install_lib:
- 	    test -f $(libjso) && $(ln) -s $(libjso) $(libjso_major); \
- 	    test -f $(libjso) && $(ln) -s $(libjso) $(libjso_g)) || true
- 	@(test -f $(libj_jarfile) && \
--	    $(cp) $(libj_jarfile) $(libdir) && \
--	    $(chmod) $(fmode) $(libdir)/$(libj_jarfile)) || true
-+	    $(cp) $(libj_jarfile) $(DESTDIR)/$(libdir) && \
-+	    $(chmod) $(fmode) $(DESTDIR)/$(libdir)/$(libj_jarfile)) || true
- 
- uninstall_lib:
--	@cd $(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
-+	@cd $(DESTDIR)/$(libdir) && $(rm) -f $(LIB_INSTALL_FILE_LIST)
- 
- install_utilities:
- 	echo "Installing DB utilities: $(bindir) ..."
--	@test -d $(bindir) || \
--	    ($(mkdir) -p $(bindir) && $(chmod) $(dmode) $(bindir))
-+	@test -d $(DESTDIR)/$(bindir) || \
-+	    ($(mkdir) -p $(DESTDIR)/$(bindir) && $(chmod) $(dmode) $(DESTDIR)/$(bindir))
- 	@for i in $(UTIL_PROGS); do \
--		$(rm) -f $(bindir)/$$i $(bindir)/$$i.exe; \
-+		$(rm) -f $(DESTDIR)/$(bindir)/$$i $(bindir)/$$i.exe; \
- 		test -f $$i.exe && i=$$i.exe || true; \
--		$(INSTALLER) $$i $(bindir)/$$i; \
--		test -f $(strip) && $(strip) $(bindir)/$$i || true; \
--		$(chmod) $(emode) $(bindir)/$$i; \
-+		$(INSTALLER) $$i $(DESTDIR)/$(bindir)/$$i; \
-+		test -f $(strip) && $(strip) $(DESTDIR)/$(bindir)/$$i || true; \
-+		$(chmod) $(emode) $(DESTDIR)/$(bindir)/$$i; \
- 	done
- 
- uninstall_utilities:
--	@(cd $(bindir); for i in $(UTIL_PROGS); do \
-+	@(cd $(DESTDIR)/$(bindir); for i in $(UTIL_PROGS); do \
- 		$(rm) -f $$i $$i.exe; \
- 	done)
- 
-@@ -605,13 +605,13 @@ DOCLIST=\
- 	sleepycat utility
- install_docs:
- 	@echo "Installing documentation: $(docdir) ..."
--	@test -d $(docdir) || \
--	    ($(mkdir) -p $(docdir) && $(chmod) $(dmode) $(docdir))
--	@cd $(docdir) && $(rm) -rf $(DOCLIST)
--	@cd $(srcdir)/docs && $(cp) -pr $(DOCLIST) $(docdir)/
-+	@test -d $(DESTDIR)/$(docdir) || \
-+	    ($(mkdir) -p $(DESTDIR)/$(docdir) && $(chmod) $(dmode) $(DESTDIR)/$(docdir))
-+	@cd $(DESTDIR)/$(docdir) && $(rm) -rf $(DOCLIST)
-+	@cd $(srcdir)/docs && $(cp) -pr $(DOCLIST) $(DESTDIR)/$(docdir)/
- 
- uninstall_docs:
--	@cd $(docdir) && $(rm) -rf $(DOCLIST)
-+	@cd $(DESTDIR)/$(docdir) && $(rm) -rf $(DOCLIST)
- 
- ##################################################
- # RPM, Embedix build and install.
diff --git a/patches/db-4.1.25.NC/series b/patches/db-4.1.25.NC/series
deleted file mode 100644
index 4e2e1b714..000000000
--- a/patches/db-4.1.25.NC/series
+++ /dev/null
@@ -1 +0,0 @@
-db-4.1.25.NC-destdir.diff
diff --git a/rules/db.in b/rules/db.in
index c9562aa69..1c4cf3da5 100644
--- a/rules/db.in
+++ b/rules/db.in
@@ -11,16 +11,6 @@ menuconfig DB
 
 if DB
 
-choice
-	prompt "db version"
-
-	config DB_41
-		bool "4.1.x"
-
-	config DB_44
-		bool "4.4.x"
-endchoice
-
 config DB_UTIL
 	bool
 	prompt "install db_* tools on target"
diff --git a/rules/db.make b/rules/db.make
index 138dd2277..75224c84c 100644
--- a/rules/db.make
+++ b/rules/db.make
@@ -18,15 +18,9 @@ PACKAGES-$(PTXCONF_DB) += db
 # Paths and names
 #
 
-ifdef PTXCONF_DB_41
-DB_VERSION	:= 4.1.25.NC
-DB_MD5		:= b0c31a1db087741a7947c88824043560
-endif
-ifdef PTXCONF_DB_44
-DB_VERSION	:= 4.4.20.NC
-DB_MD5		:= afd9243ea353bbaa04421488d3b37900
-endif
-DB_MINOR	:= $(word 2,$(subst ., ,$(DB_VERSION)))
+DB_VERSION	:= 5.3.28
+DB_MD5		:= b99454564d5b4479750567031d66fe24
+DB_LIBVERSION	:= $(basename $(DB_VERSION))
 DB		:= db-$(DB_VERSION)
 DB_SUFFIX	:= tar.gz
 DB_URL		:= http://download.oracle.com/berkeley-db/$(DB).$(DB_SUFFIX)
@@ -34,6 +28,7 @@ DB_SOURCE	:= $(SRCDIR)/$(DB).$(DB_SUFFIX)
 DB_DIR		:= $(BUILDDIR)/$(DB)
 DB_SUBDIR	:= dist
 DB_BUILDDIR	:= $(DB_DIR)/build_unix
+DB_LICENCE	:= Sleepycat
 
 # ----------------------------------------------------------------------------
 # Prepare
@@ -45,8 +40,20 @@ DB_BUILDDIR	:= $(DB_DIR)/build_unix
 DB_CONF_TOOL := autoconf
 DB_CONF_OPT	:= \
 	$(CROSS_AUTOCONF_USR) \
-	$(GLOBAL_LARGE_FILE_OPTION) \
-	--disable-cryptography \
+	--disable-smallbuild \
+	--enable-atomicsupport \
+	--enable-compression \
+	--enable-hash \
+	--enable-heap \
+	--enable-mutexsupport \
+	--enable-log_checksum \
+	--enable-partition \
+	--disable-queue \
+	--disable-replication \
+	--disable-statistics \
+	--disable-verify \
+	--enable-compat185 \
+	--disable-cxx \
 	--disable-debug \
 	--disable-debug_rop \
 	--disable-debug_wop \
@@ -54,24 +61,30 @@ DB_CONF_OPT	:= \
 	--disable-dump185 \
 	--disable-java \
 	--disable-mingw \
-	--disable-queue \
-	--disable-replication \
-	--disable-rpc \
-	--disable-static \
-	--disable-statistics \
+	--enable-o_direct \
+	--disable-posixmutexes \
+	--disable-sql \
+	--disable-sql_compat \
+	--disable-jdbc \
+	--disable-amalgamation \
+	--disable-sql_codegen \
+	--disable-stl \
 	--disable-tcl \
 	--disable-test \
+	--disable-localization \
+	--disable-stripped_messages \
+	--enable-dbm \
+	--disable-dtrace \
+	--disable-systemtap \
+	--disable-perfmon-statistics \
 	--disable-uimutexes \
 	--disable-umrw \
-	--disable-verify \
-	--enable-compat185 \
-	--enable-cxx \
-	--enable-hash \
-	--enable-o_direct \
-	--enable-pthread_self \
-	--enable-shared
-
-DB_MAKE_PAR	:= NO
+	--disable-atomicfileread \
+	--enable-shared \
+	--disable-static \
+	$(GLOBAL_LARGE_FILE_OPTION) \
+	--disable-cryptography \
+	--with-mutex=POSIX/pthreads/private
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -86,17 +99,10 @@ $(STATEDIR)/db.targetinstall:
 	@$(call install_fixup, db,AUTHOR,"Marc Kleine-Budde <mkl@pengutronix.de>")
 	@$(call install_fixup, db,DESCRIPTION,missing)
 
-	@$(call install_copy, db, 0, 0, 0644, -, \
-		/usr/lib/libdb-4.$(DB_MINOR).so)
-	@$(call install_link, db, libdb-4.$(DB_MINOR).so, /usr/lib/libdb-4.so)
-	@$(call install_link, db, libdb-4.$(DB_MINOR).so, /usr/lib/libdb.so)
+	@$(call install_lib, db, 0, 0, 0644, libdb-$(DB_LIBVERSION))
 
 ifdef PTXCONF_DB_UTIL
-	@cd "$(PKGDIR)/$(DB)" && \
-		find ./usr/bin -type f | \
-		 while read file; do \
-		$(call install_copy, db, 0, 0, 0755, -, $${file##.}); \
-	done
+	@$(call install_tree, db, 0, 0, -, /usr/bin)
 endif
 
 	@$(call install_finish, db)