From: Tim Yardley <lst@openwrt.org>
Date: Fri, 18 Jan 2008 19:21:07 +0000 (+0000)
Subject: add in a couple more of the helper files and link postmaster to postgres, changing... 
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;hb=f42997ea90490cfb53983562f1066df9e45b8389

add in a couple more of the helper files and link postmaster to postgres, changing the init script to call postmaster instead

SVN-Revision: 10223
---

diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile
index 49bbf47aa5..a9130dacb6 100644
--- a/libs/postgresql/Makefile
+++ b/libs/postgresql/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=postgresql
 PKG_VERSION:=8.2.6
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -158,6 +158,8 @@ define Build/Configure
 	);
 	$(SED) 's@ECPG = ../../preproc/ecpg@ECPG = ../../preproc/ecpg.host@' $(PKG_BUILD_DIR)/src/interfaces/ecpg/test/Makefile.regress
 	$(SED) 's@\./zic -d@./zic.host -d@' $(PKG_BUILD_DIR)/src/timezone/Makefile
+	# note: unclear if this is needed yet, commenting out for the moment
+	#$(SED) 's@US/Eastern@America/New_York@' $(PKG_BUILD_DIR)/src/timezone/Makefile
 endef
 
 define Build/Compile
@@ -185,19 +187,28 @@ define Package/pgsql-server/install
 	$(INSTALL_BIN) \
 		$(PKG_INSTALL_DIR)/usr/bin/postgres \
 		$(PKG_INSTALL_DIR)/usr/bin/dropdb \
+		$(PKG_INSTALL_DIR)/usr/bin/clusterdb \
 		$(PKG_INSTALL_DIR)/usr/bin/createdb \
+		$(PKG_INSTALL_DIR)/usr/bin/createlang \
 		$(PKG_INSTALL_DIR)/usr/bin/createuser \
+		$(PKG_INSTALL_DIR)/usr/bin/dropdb \
+		$(PKG_INSTALL_DIR)/usr/bin/droplang \
 		$(PKG_INSTALL_DIR)/usr/bin/dropuser \
 		$(PKG_INSTALL_DIR)/usr/bin/initdb \
+		$(PKG_INSTALL_DIR)/usr/bin/ipcclean \
 		$(PKG_INSTALL_DIR)/usr/bin/pg_config \
 		$(PKG_INSTALL_DIR)/usr/bin/pg_controldata \
 		$(PKG_INSTALL_DIR)/usr/bin/pg_ctl \
 		$(PKG_INSTALL_DIR)/usr/bin/pg_dump \
 		$(PKG_INSTALL_DIR)/usr/bin/pg_dumpall \
 		$(PKG_INSTALL_DIR)/usr/bin/pg_restore \
+		$(PKG_INSTALL_DIR)/usr/bin/pg_resetxlog \
+		$(PKG_INSTALL_DIR)/usr/bin/reindexdb \
 		$(PKG_INSTALL_DIR)/usr/bin/vacuumdb \
 		$(1)/usr/bin
 
+	$(LN) -s postgres $(1)/usr/bin/postmaster
+
 	$(INSTALL_BIN) ./files/postgresql.init $(1)/etc/init.d/postgresql
 
 	$(INSTALL_DATA) \
diff --git a/libs/postgresql/files/postgresql.init b/libs/postgresql/files/postgresql.init
index 112e500cda..e32a983321 100755
--- a/libs/postgresql/files/postgresql.init
+++ b/libs/postgresql/files/postgresql.init
@@ -36,7 +36,7 @@ start() {
     if [ -n "${pgopts}" ]; then
         pgopts="-o ${pgopts}"
     fi
-    /bin/su ${pguser} -c "/usr/bin/postgres -D '${pgdata}' &" >> ${pglog} 2>&1
+    /bin/su ${pguser} -c "/usr/bin/postmaster -D '${pgdata}' &" >> ${pglog} 2>&1
 
     while :
     do
@@ -75,7 +75,7 @@ restart() {
     if [ -f ${pgdata}/postmaster.pid ]; then
         rm ${pgdata}/postmaster.pid
     fi
-    /bin/su ${pguser} -c "/usr/bin/postgres -D '${pgdata}' &" >> ${pglog} 2>&1
+    /bin/su ${pguser} -c "/usr/bin/postmaster -D '${pgdata}' &" >> ${pglog} 2>&1
     echo "ok"
     return $?
 }