package: get rid of database subdir

Not much point in a seperate subdir for only two packages.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

6 files changed, 0 insertions, 111 deletions

diff --git a/package/database/Config.in b/package/database/Config.in
deleted file mode 100644
index 029b7cd58..000000000
--- a/package/database/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-menu "Database"
-source "package/database/mysql_client/Config.in"
-source "package/database/sqlite/Config.in"
-endmenu
diff --git a/package/database/database.mk b/package/database/database.mk
deleted file mode 100644
index 955384788..000000000
--- a/package/database/database.mk
+++ /dev/null
@@ -1 +0,0 @@
-include package/database/*/*.mk
diff --git a/package/database/mysql_client/Config.in b/package/database/mysql_client/Config.in
deleted file mode 100644
index 92b349af9..000000000
--- a/package/database/mysql_client/Config.in
+++ /dev/null
@@ -1,10 +0,0 @@
-config BR2_PACKAGE_MYSQL_CLIENT
-	bool "MySQL 5.1 client"
-	depends on BR2_INSTALL_LIBSTDCPP
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
-	help
-	  MySQL client
-
-comment "Mysql client requires a toolchain with C++ support enabled"
-	depends on !BR2_INSTALL_LIBSTDCPP
diff --git a/package/database/mysql_client/mysql_client.mk b/package/database/mysql_client/mysql_client.mk
deleted file mode 100644
index 7f3b09186..000000000
--- a/package/database/mysql_client/mysql_client.mk
+++ /dev/null
@@ -1,31 +0,0 @@
-#############################################################
-#
-# MySQL 5.1 Client
-#
-#############################################################
-MYSQL_CLIENT_VERSION = 5.1.23-rc
-MYSQL_CLIENT_SOURCE = mysql-$(MYSQL_CLIENT_VERSION).tar.gz
-MYSQL_CLIENT_SITE = http://mirrors.24-7-solutions.net/pub/mysql/Downloads/MySQL-5.1
-MYSQL_CLIENT_INSTALL_TARGET = YES
-MYSQL_CLIENT_INSTALL_STAGING = YES
-MYSQL_CLIENT_DEPENDENCIES = readline ncurses
-
-MYSQL_CLIENT_CONF_ENV = ac_cv_sys_restartable_syscalls=yes
-MYSQL_CLIENT_CONF_OPT = \
-	--program-prefix="" \
-	--without-ndb-binlog \
-	--without-server \
-	--without-docs \
-	--without-man \
-	--without-readline \
-	--without-libedit \
-	--with-readline=$(STAGING_DIR)/usr \
-	--with-low-memory \
-	--enable-thread-safe-client \
-	$(ENABLE_DEBUG)
-
-$(eval $(call AUTOTARGETS,package/database,mysql_client))
-
-$(MYSQL_CLIENT_HOOK_POST_INSTALL):
-	rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench
-	touch $@
diff --git a/package/database/sqlite/Config.in b/package/database/sqlite/Config.in
deleted file mode 100644
index f9b12ae9f..000000000
--- a/package/database/sqlite/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_SQLITE
-	bool "sqlite"
-	help
-	  SQLite is a small C library that implements a self-contained,
-	  embeddable, zero-configuration SQL database engine.
-
-	  http://www.sqlite.org/
-
-config BR2_PACKAGE_SQLITE_READLINE
-	bool "Command-line editing"
-	depends on BR2_PACKAGE_SQLITE
-	select BR2_PACKAGE_NCURSES
-	select BR2_PACKAGE_READLINE
-	help
-	  Enable command-line editing. This requires ncurses and readline.
-
diff --git a/package/database/sqlite/sqlite.mk b/package/database/sqlite/sqlite.mk
deleted file mode 100644
index 375ab42ef..000000000
--- a/package/database/sqlite/sqlite.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#############################################################
-#
-# sqlite
-#
-#############################################################
-
-SQLITE_VERSION = 3.6.22
-SQLITE_SOURCE = sqlite-amalgamation-$(SQLITE_VERSION).tar.gz
-SQLITE_SITE = http://www.sqlite.org
-SQLITE_INSTALL_STAGING = YES
-SQLITE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
-SQLITE_LIBTOOL_PATCH = NO
-
-ifneq ($(BR2_LARGEFILE),y)
-# the sqlite configure script fails to define SQLITE_DISABLE_LFS when
-# --disable-largefile is passed, breaking the build. Work around it by
-# simply adding it to CFLAGS for configure instead
-SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DSQLITE_DISABLE_LFS"
-# changing CFLAGS doesn't work with config.cache
-SQLITE_USE_CONFIG_CACHE = NO
-endif
-
-SQLITE_CONF_OPT =	--enable-shared \
-			--enable-static \
-			--enable-tempstore=yes \
-			--enable-threadsafe \
-			--enable-releasemode \
-			--disable-tcl \
-			--localstatedir=/var
-
-ifeq ($(BR2_PACKAGE_SQLITE_READLINE),y)
-SQLITE_DEPENDENCIES += ncurses readline
-SQLITE_CONF_OPT += --with-readline-inc="-I$(STAGING_DIR)/usr/include"
-else
-SQLITE_CONF_OPT += --disable-readline
-endif
-
-$(eval $(call AUTOTARGETS,package,sqlite))
-
-$(SQLITE_TARGET_UNINSTALL):
-	$(call MESSAGE,"Uninstalling")
-	rm -f $(TARGET_DIR)/usr/bin/sqlite3
-	rm -f $(TARGET_DIR)/usr/lib/libsqlite3*
-	rm -f $(STAGING_DIR)/usr/bin/sqlite3
-	rm -f $(STAGING_DIR)/usr/lib/libsqlite3*
-	rm -f $(STAGING_DIR)/usr/lib/pkgconfig/sqlite3.pc
-	rm -f $(STAGING_DIR)/usr/include/sqlite3*.h
-	rm -f $(SQLITE_TARGET_INSTALL_TARGET) $(SQLITE_HOOK_POST_INSTALL)
-