bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@10223 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
pavlov 2008-01-18 19:21:07 +00:00
parent 0e74f10bb8
commit 027b15866e
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/postgresql/Makefile
View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=postgresql PKG_NAME:=postgresql
PKG_VERSION:=8.2.6 PKG_VERSION:=8.2.6
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 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@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 $(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 endef
define Build/Compile define Build/Compile
@ -185,19 +187,28 @@ define Package/pgsql-server/install
$(INSTALL_BIN) \ $(INSTALL_BIN) \
$(PKG_INSTALL_DIR)/usr/bin/postgres \ $(PKG_INSTALL_DIR)/usr/bin/postgres \
$(PKG_INSTALL_DIR)/usr/bin/dropdb \ $(PKG_INSTALL_DIR)/usr/bin/dropdb \
$(PKG_INSTALL_DIR)/usr/bin/clusterdb \
$(PKG_INSTALL_DIR)/usr/bin/createdb \ $(PKG_INSTALL_DIR)/usr/bin/createdb \
$(PKG_INSTALL_DIR)/usr/bin/createlang \
$(PKG_INSTALL_DIR)/usr/bin/createuser \ $(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/dropuser \
$(PKG_INSTALL_DIR)/usr/bin/initdb \ $(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_config \
$(PKG_INSTALL_DIR)/usr/bin/pg_controldata \ $(PKG_INSTALL_DIR)/usr/bin/pg_controldata \
$(PKG_INSTALL_DIR)/usr/bin/pg_ctl \ $(PKG_INSTALL_DIR)/usr/bin/pg_ctl \
$(PKG_INSTALL_DIR)/usr/bin/pg_dump \ $(PKG_INSTALL_DIR)/usr/bin/pg_dump \
$(PKG_INSTALL_DIR)/usr/bin/pg_dumpall \ $(PKG_INSTALL_DIR)/usr/bin/pg_dumpall \
$(PKG_INSTALL_DIR)/usr/bin/pg_restore \ $(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 \ $(PKG_INSTALL_DIR)/usr/bin/vacuumdb \
$(1)/usr/bin $(1)/usr/bin
$(LN) -s postgres $(1)/usr/bin/postmaster
$(INSTALL_BIN) ./files/postgresql.init $(1)/etc/init.d/postgresql $(INSTALL_BIN) ./files/postgresql.init $(1)/etc/init.d/postgresql
$(INSTALL_DATA) \ $(INSTALL_DATA) \

4
libs/postgresql/files/postgresql.init
View File

@ -36,7 +36,7 @@ start() {
if [ -n "${pgopts}" ]; then if [ -n "${pgopts}" ]; then
pgopts="-o ${pgopts}" pgopts="-o ${pgopts}"
fi 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 : while :
do do
@ -75,7 +75,7 @@ restart() {
if [ -f ${pgdata}/postmaster.pid ]; then if [ -f ${pgdata}/postmaster.pid ]; then
rm ${pgdata}/postmaster.pid rm ${pgdata}/postmaster.pid
fi 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" echo "ok"
return $? return $?
} }