From b694678b7489c300252cb2dc4572ddb83f1d90a3 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Mon, 18 Apr 2005 06:34:57 +0000 Subject: [PATCH] Uniformize package Makefile, move ipkg related files to ./ipkg SVN-Revision: 665 --- openwrt/package/haserl/Makefile | 4 +- .../package/haserl/{ => ipkg}/haserl.control | 0 openwrt/package/libelf/Makefile | 4 +- .../package/libelf/{ => ipkg}/libelf.control | 0 openwrt/package/libgcc/Makefile | 4 +- .../package/libgcc/{ => ipkg}/libgcc.control | 0 openwrt/package/libnet/Config.in | 4 +- openwrt/package/libnet/Makefile | 4 +- .../libnet/ipkg/libnet-dev/CONTROL/control | 8 - .../package/libnet/{ => ipkg}/libnet.control | 0 .../libnet/ipkg/libnet/CONTROL/control | 9 -- openwrt/package/libnet/ipkg/rules | 147 ----------------- openwrt/package/libnet/ipkg/version | 1 - openwrt/package/libpthread/Makefile | 6 +- .../libpthread/{ => ipkg}/libpthread.control | 0 openwrt/package/mysql/Makefile | 4 +- .../mysql/{ => ipkg}/libmysqlclient.control | 0 openwrt/package/ncurses/Makefile | 4 +- .../ncurses/{ => ipkg}/libncurses.control | 0 openwrt/package/postgresql/Makefile | 4 +- .../postgresql/ipkg/libpq-dev/CONTROL/control | 8 - .../postgresql/{ => ipkg}/libpq.control | 0 .../postgresql/ipkg/libpq/CONTROL/control | 8 - .../ipkg/pgsql-utils/CONTROL/control | 9 -- openwrt/package/postgresql/ipkg/rules | 150 ------------------ openwrt/package/postgresql/ipkg/version | 1 - 26 files changed, 20 insertions(+), 359 deletions(-) rename openwrt/package/haserl/{ => ipkg}/haserl.control (100%) rename openwrt/package/libelf/{ => ipkg}/libelf.control (100%) rename openwrt/package/libgcc/{ => ipkg}/libgcc.control (100%) delete mode 100644 openwrt/package/libnet/ipkg/libnet-dev/CONTROL/control rename openwrt/package/libnet/{ => ipkg}/libnet.control (100%) delete mode 100644 openwrt/package/libnet/ipkg/libnet/CONTROL/control delete mode 100644 openwrt/package/libnet/ipkg/rules delete mode 100644 openwrt/package/libnet/ipkg/version rename openwrt/package/libpthread/{ => ipkg}/libpthread.control (100%) rename openwrt/package/mysql/{ => ipkg}/libmysqlclient.control (100%) rename openwrt/package/ncurses/{ => ipkg}/libncurses.control (100%) delete mode 100644 openwrt/package/postgresql/ipkg/libpq-dev/CONTROL/control rename openwrt/package/postgresql/{ => ipkg}/libpq.control (100%) delete mode 100644 openwrt/package/postgresql/ipkg/libpq/CONTROL/control delete mode 100644 openwrt/package/postgresql/ipkg/pgsql-utils/CONTROL/control delete mode 100644 openwrt/package/postgresql/ipkg/rules delete mode 100644 openwrt/package/postgresql/ipkg/version diff --git a/openwrt/package/haserl/Makefile b/openwrt/package/haserl/Makefile index a5c9a98264..e361d4504c 100644 --- a/openwrt/package/haserl/Makefile +++ b/openwrt/package/haserl/Makefile @@ -60,9 +60,9 @@ $(PKG_INSTALL_DIR)/usr/bin/haserl: $(PKG_BUILD_DIR)/.built install $(PKG_IPK): $(PKG_INSTALL_DIR)/usr/bin/haserl - $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(PKG_IPK_DIR)/usr/bin - cp -fp $(PKG_INSTALL_DIR)/usr/bin/haserl $(PKG_IPK_DIR)/usr/bin/ + cp -fpR $(PKG_INSTALL_DIR)/usr/bin/haserl $(PKG_IPK_DIR)/usr/bin/ $(STRIP) $(PKG_IPK_DIR)/usr/bin/* $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) diff --git a/openwrt/package/haserl/haserl.control b/openwrt/package/haserl/ipkg/haserl.control similarity index 100% rename from openwrt/package/haserl/haserl.control rename to openwrt/package/haserl/ipkg/haserl.control diff --git a/openwrt/package/libelf/Makefile b/openwrt/package/libelf/Makefile index c176db5ff2..135796682e 100644 --- a/openwrt/package/libelf/Makefile +++ b/openwrt/package/libelf/Makefile @@ -72,9 +72,9 @@ $(STAGING_DIR)/usr/lib/libelf.so: $(PKG_BUILD_DIR)/.built install $(IPKG_LIBELF): $(STAGING_DIR)/usr/lib/libelf.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBELF) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBELF) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_LIBELF)/usr/lib - cp -fp $(PKG_BUILD_DIR)/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/ + cp -fpR $(PKG_BUILD_DIR)/lib/libelf.so.* $(IDIR_LIBELF)/usr/lib/ $(STRIP) $(IDIR_LIBELF)/usr/lib/lib*.so* mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LIBELF) $(PACKAGE_DIR) diff --git a/openwrt/package/libelf/libelf.control b/openwrt/package/libelf/ipkg/libelf.control similarity index 100% rename from openwrt/package/libelf/libelf.control rename to openwrt/package/libelf/ipkg/libelf.control diff --git a/openwrt/package/libgcc/Makefile b/openwrt/package/libgcc/Makefile index b62f4ab40e..e1d4e8677f 100644 --- a/openwrt/package/libgcc/Makefile +++ b/openwrt/package/libgcc/Makefile @@ -16,9 +16,9 @@ INFO_LIBGCC:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list $(IPKG_LIBGCC): $(STAGING_DIR)/lib/libgcc_s.so rm -rf $(PKG_BUILD_DIR) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBGCC) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBGCC) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_LIBGCC)/lib - cp -fp $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/ + cp -fpR $(STAGING_DIR)/lib/libgcc_s.so.* $(IDIR_LIBGCC)/lib/ $(STRIP) $(IDIR_LIBGCC)/lib/lib*.so* mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LIBGCC) $(PACKAGE_DIR) diff --git a/openwrt/package/libgcc/libgcc.control b/openwrt/package/libgcc/ipkg/libgcc.control similarity index 100% rename from openwrt/package/libgcc/libgcc.control rename to openwrt/package/libgcc/ipkg/libgcc.control diff --git a/openwrt/package/libnet/Config.in b/openwrt/package/libnet/Config.in index bcfdc62025..8f8b75957d 100644 --- a/openwrt/package/libnet/Config.in +++ b/openwrt/package/libnet/Config.in @@ -1,10 +1,12 @@ config BR2_PACKAGE_LIBNET select BR2_PACKAGE_LIBPCAP - tristate "libnet (a low-level packet creation library)" + tristate "libnet" default m help A low-level packet creation library. http://www.packetfactory.net/libnet/ + Depends: libpcap + diff --git a/openwrt/package/libnet/Makefile b/openwrt/package/libnet/Makefile index ba5e777314..79b8960926 100644 --- a/openwrt/package/libnet/Makefile +++ b/openwrt/package/libnet/Makefile @@ -80,9 +80,9 @@ $(STAGING_DIR)/usr/lib/libnet.so: $(PKG_BUILD_DIR)/.built rm -rf $(STAGING_DIR)/usr/lib/libnet.la $(IPKG_LIBNET): $(STAGING_DIR)/usr/lib/libnet.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBNET) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBNET) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_LIBNET)/usr/lib - cp -fp $(STAGING_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/ + cp -fpR $(STAGING_DIR)/usr/lib/libnet.so.* $(IDIR_LIBNET)/usr/lib/ $(STRIP) $(IDIR_LIBNET)/usr/lib/lib*.so* mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LIBNET) $(PACKAGE_DIR) diff --git a/openwrt/package/libnet/ipkg/libnet-dev/CONTROL/control b/openwrt/package/libnet/ipkg/libnet-dev/CONTROL/control deleted file mode 100644 index 06b23865b3..0000000000 --- a/openwrt/package/libnet/ipkg/libnet-dev/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: libnet-dev -Priority: optional -Section: devel -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/libnet/ -Description: a low-level packet creation library (development) diff --git a/openwrt/package/libnet/libnet.control b/openwrt/package/libnet/ipkg/libnet.control similarity index 100% rename from openwrt/package/libnet/libnet.control rename to openwrt/package/libnet/ipkg/libnet.control diff --git a/openwrt/package/libnet/ipkg/libnet/CONTROL/control b/openwrt/package/libnet/ipkg/libnet/CONTROL/control deleted file mode 100644 index 9b2e53973e..0000000000 --- a/openwrt/package/libnet/ipkg/libnet/CONTROL/control +++ /dev/null @@ -1,9 +0,0 @@ -Package: libnet -Priority: optional -Section: libs -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/libnet/ -Description: a low-level packet creation library -Depends: libpcap diff --git a/openwrt/package/libnet/ipkg/rules b/openwrt/package/libnet/ipkg/rules deleted file mode 100644 index 6bc215c1bd..0000000000 --- a/openwrt/package/libnet/ipkg/rules +++ /dev/null @@ -1,147 +0,0 @@ -#!/usr/bin/make -f - -ifneq ($(strip ${IPKG_RULES_INC}),) - include $(IPKG_RULES_INC) -endif - -## - -PKG_VERSION := $(shell cat ./ipkg/version) -CURRENT_DIR := $(shell pwd) -INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install - -unexport INSTALL_DIR - -I_LIBNET := ipkg/libnet -I_LIBNET_DEV := ipkg/libnet-dev - -BUILD_DEPS := \ - $(STAGING_DIR)/usr/include/pcap.h \ - -CONFIGURE_OPTS = \ - --enable-shared \ - --enable-static \ - --with-pf_packet=yes \ - -## - -all: package - - -.stamp-configured: $(BUILD_DEPS) - - touch configure.in - touch include.m4 - touch aclocal.m4 - touch Makefile.in - touch configure - - rm -rf config.cache - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \ - LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ - ac_libnet_have_pf_packet=yes \ - ac_cv_lbl_unaligned_fail=no \ - ac_cv_libnet_endianess=lil \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - $(CONFIGURE_OPTS) \ - - touch config.guess - touch config.sub - - touch .stamp-configured - - -.stamp-built: .stamp-configured - - $(MAKE) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - - touch .stamp-built - - -$(INSTALL_DIR)/usr/include/libnet.h: .stamp-built - - mkdir -p $(INSTALL_DIR) - - $(MAKE) \ - DESTDIR="$(INSTALL_DIR)" \ - install - - -configure: .stamp-configured - - -build: .stamp-built - - -install: $(INSTALL_DIR)/usr/include/libnet.h - - -package: $(INSTALL_DIR)/usr/include/libnet.h - - mkdir -p $(I_LIBNET)/usr/lib - cp -fpR $(INSTALL_DIR)/usr/lib/libnet.so.* $(I_LIBNET)/usr/lib/ - $(STRIP) $(I_LIBNET)/usr/lib/libnet.so.* - - mkdir -p $(I_LIBNET_DEV)/usr/bin - cp -fpR $(INSTALL_DIR)/usr/bin/libnet-config $(I_LIBNET_DEV)/usr/bin/ - mkdir -p $(I_LIBNET_DEV)/usr/include - cp -fpR $(INSTALL_DIR)/usr/include/libnet.h $(I_LIBNET_DEV)/usr/include/ - cp -fpR $(INSTALL_DIR)/usr/include/libnet $(I_LIBNET_DEV)/usr/include/ - mkdir -p $(I_LIBNET_DEV)/usr/lib - cp -fpR $(INSTALL_DIR)/usr/lib/libnet.a $(I_LIBNET_DEV)/usr/lib/ - cp -fpR $(INSTALL_DIR)/usr/lib/libnet.so* $(I_LIBNET_DEV)/usr/lib/ - - chmod 0755 ipkg/*/CONTROL/ - chmod 0644 ipkg/*/CONTROL/control - - perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control -ifneq ($(strip $(PKG_VERSION)),) - perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control -endif - - $(IPKG_BUILD) $(I_LIBNET) $(IPKG_TARGET_DIR) - $(IPKG_BUILD) $(I_LIBNET_DEV) $(IPKG_TARGET_DIR) - - -clean: - - -$(MAKE) \ - DESTDIR="$(INSTALL_DIR)" \ - uninstall clean - - rm -rf .stamp-* \ - $(I_LIBNET)/usr \ - $(I_LIBNET_DEV)/usr \ - - -control: - - @cat $(I_LIBNET)/CONTROL/control - @echo - @cat $(I_LIBNET_DEV)/CONTROL/control - @echo - - -.PHONY: configure build install package clean control diff --git a/openwrt/package/libnet/ipkg/version b/openwrt/package/libnet/ipkg/version deleted file mode 100644 index afe6924cdb..0000000000 --- a/openwrt/package/libnet/ipkg/version +++ /dev/null @@ -1 +0,0 @@ -1.0.2a-7 diff --git a/openwrt/package/libpthread/Makefile b/openwrt/package/libpthread/Makefile index c334692f5b..7215a450fa 100644 --- a/openwrt/package/libpthread/Makefile +++ b/openwrt/package/libpthread/Makefile @@ -16,10 +16,10 @@ INFO_LIBPTHREAD:=$(IPKG_STATE_DIR)/info/$(PKG_NAME).list $(IPKG_LIBPTHREAD): $(STAGING_DIR)/lib/libpthread.so rm -rf $(PKG_BUILD_DIR) - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPTHREAD) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPTHREAD) ./ipkg/$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_LIBPTHREAD)/lib - cp -fp $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/ - cp -fp $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/ + cp -fpR $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/ + cp -fpR $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/ $(STRIP) $(IDIR_LIBPTHREAD)/lib/lib*.so* mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LIBPTHREAD) $(PACKAGE_DIR) diff --git a/openwrt/package/libpthread/libpthread.control b/openwrt/package/libpthread/ipkg/libpthread.control similarity index 100% rename from openwrt/package/libpthread/libpthread.control rename to openwrt/package/libpthread/ipkg/libpthread.control diff --git a/openwrt/package/mysql/Makefile b/openwrt/package/mysql/Makefile index 5cca041a07..dfe332f211 100644 --- a/openwrt/package/mysql/Makefile +++ b/openwrt/package/mysql/Makefile @@ -109,9 +109,9 @@ $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so: $(PKG_BUILD_DIR)/.built rm -rf $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.la $(IPKG_LIBMYSQLCLIENT): $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBMYSQLCLIENT) libmysqlclient.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBMYSQLCLIENT) ./ipkg/libmysqlclient.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_LIBMYSQLCLIENT)/usr/lib - cp -fp $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/ + cp -fpR $(STAGING_DIR)/usr/lib/mysql/libmysqlclient.so.* $(IDIR_LIBMYSQLCLIENT)/usr/lib/ $(STRIP) $(IDIR_LIBMYSQLCLIENT)/usr/lib/*.so* mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LIBMYSQLCLIENT) $(PACKAGE_DIR) diff --git a/openwrt/package/mysql/libmysqlclient.control b/openwrt/package/mysql/ipkg/libmysqlclient.control similarity index 100% rename from openwrt/package/mysql/libmysqlclient.control rename to openwrt/package/mysql/ipkg/libmysqlclient.control diff --git a/openwrt/package/ncurses/Makefile b/openwrt/package/ncurses/Makefile index b15152634c..3591fa0c7b 100644 --- a/openwrt/package/ncurses/Makefile +++ b/openwrt/package/ncurses/Makefile @@ -94,9 +94,9 @@ $(STAGING_DIR)/usr/lib/libncurses.so: $(PKG_BUILD_DIR)/.built install $(IPKG_LIBNCURSES): $(STAGING_DIR)/usr/lib/libncurses.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBNCURSES) lib$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBNCURSES) ./ipkg/lib$(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_LIBNCURSES)/usr/lib - cp -fp $(STAGING_DIR)/usr/lib/lib{ncurses,panel}*.so.* $(IDIR_LIBNCURSES)/usr/lib/ + cp -fpR $(STAGING_DIR)/usr/lib/lib{ncurses,panel}*.so.* $(IDIR_LIBNCURSES)/usr/lib/ $(STRIP) $(IDIR_LIBNCURSES)/usr/lib/*.so* mkdir -p $(IDIR_LIBNCURSES)/usr/share/terminfo for f in a/ansi d/dumb l/linux s/screen v/vt100 x/xterm x/xterm-color; do \ diff --git a/openwrt/package/ncurses/libncurses.control b/openwrt/package/ncurses/ipkg/libncurses.control similarity index 100% rename from openwrt/package/ncurses/libncurses.control rename to openwrt/package/ncurses/ipkg/libncurses.control diff --git a/openwrt/package/postgresql/Makefile b/openwrt/package/postgresql/Makefile index 3582a89169..12fbde5001 100644 --- a/openwrt/package/postgresql/Makefile +++ b/openwrt/package/postgresql/Makefile @@ -87,9 +87,9 @@ $(STAGING_DIR)/usr/lib/libpq.so: $(PKG_BUILD_DIR)/.built install $(IPKG_LIBPQ): $(STAGING_DIR)/usr/lib/libpq.so - $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPQ) libpq.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(SCRIPT_DIR)/make-ipkg-dir.sh $(IDIR_LIBPQ) ./ipkg/libpq.control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) mkdir -p $(IDIR_LIBPQ)/usr/lib - cp -fp $(STAGING_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/ + cp -fpR $(STAGING_DIR)/usr/lib/libpq.so.* $(IDIR_LIBPQ)/usr/lib/ $(STRIP) $(IDIR_LIBPQ)/usr/lib/*.so* mkdir -p $(PACKAGE_DIR) $(IPKG_BUILD) $(IDIR_LIBPQ) $(PACKAGE_DIR) diff --git a/openwrt/package/postgresql/ipkg/libpq-dev/CONTROL/control b/openwrt/package/postgresql/ipkg/libpq-dev/CONTROL/control deleted file mode 100644 index 0e0d622cd8..0000000000 --- a/openwrt/package/postgresql/ipkg/libpq-dev/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: libpq-dev -Priority: optional -Section: devel -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/postgresql/ -Description: PostgreSQL development package diff --git a/openwrt/package/postgresql/libpq.control b/openwrt/package/postgresql/ipkg/libpq.control similarity index 100% rename from openwrt/package/postgresql/libpq.control rename to openwrt/package/postgresql/ipkg/libpq.control diff --git a/openwrt/package/postgresql/ipkg/libpq/CONTROL/control b/openwrt/package/postgresql/ipkg/libpq/CONTROL/control deleted file mode 100644 index 56bdf2e728..0000000000 --- a/openwrt/package/postgresql/ipkg/libpq/CONTROL/control +++ /dev/null @@ -1,8 +0,0 @@ -Package: libpq -Priority: optional -Section: libs -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/postgresql/ -Description: PostgreSQL client library diff --git a/openwrt/package/postgresql/ipkg/pgsql-utils/CONTROL/control b/openwrt/package/postgresql/ipkg/pgsql-utils/CONTROL/control deleted file mode 100644 index 6bda983e37..0000000000 --- a/openwrt/package/postgresql/ipkg/pgsql-utils/CONTROL/control +++ /dev/null @@ -1,9 +0,0 @@ -Package: pgsql-utils -Priority: optional -Section: libs -Version: [TBDL] -Architecture: [TBDL] -Maintainer: Nico -Source: http://nthill.free.fr/openwrt/sources/postgresql/ -Description: some PostgreSQL client utilities -Depends: libpq diff --git a/openwrt/package/postgresql/ipkg/rules b/openwrt/package/postgresql/ipkg/rules deleted file mode 100644 index ed5b3ee0ec..0000000000 --- a/openwrt/package/postgresql/ipkg/rules +++ /dev/null @@ -1,150 +0,0 @@ -#!/usr/bin/make -f - -ifneq ($(strip ${IPKG_RULES_INC}),) - include $(IPKG_RULES_INC) -endif - -## - -PKG_VERSION := $(shell cat ./ipkg/version) -CURRENT_DIR := $(shell pwd) -INSTALL_DIR ?= $(CURRENT_DIR)/ipkg-install - -unexport INSTALL_DIR - -I_LIBPQ := ipkg/libpq -I_LIBPQ_DEV := ipkg/libpq-dev -I_PGSQL_UTILS := ipkg/pgsql-utils - -BUILD_DEPS := \ -# $(STAGING_DIR)/usr/include/zlib.h \ - -CONFIGURE_OPTS = \ - --enable-shared \ - --enable-static \ - --disable-integer-datetimes \ - --disable-rpath \ - --without-tcl \ - --without-tk \ - --without-perl \ - --without-python \ - --without-java \ - --without-krb4 \ - --without-krb5 \ - --without-pam \ - --without-openssl \ - --without-rendezvous \ - --without-readline \ - --with-zlib \ - -## - -all: package - - -.stamp-configured: $(BUILD_DEPS) - - rm -rf config.cache - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - $(CONFIGURE_OPTS) \ - - touch .stamp-configured - - -.stamp-built: .stamp-configured - - $(MAKE) - - touch .stamp-built - - -$(INSTALL_DIR)/usr/bin/psql: .stamp-built - - mkdir -p $(INSTALL_DIR) - - $(MAKE) \ - DESTDIR="$(INSTALL_DIR)" \ - install - - -configure: .stamp-configured - - -build: .stamp-built - - -install: $(INSTALL_DIR)/usr/bin/psql - - -package: $(INSTALL_DIR)/usr/bin/psql - - mkdir -p $(I_LIBPQ)/usr/lib/ - cp -fpR $(INSTALL_DIR)/usr/lib/libpq*.so.* $(I_LIBPQ)/usr/lib/ - $(STRIP) $(I_LIBPQ)/usr/lib/lib*.so.* - - mkdir -p $(I_LIBPQ_DEV)/usr/bin - cp -fpR $(INSTALL_DIR)/usr/bin/pg_config $(I_LIBPQ_DEV)/usr/bin/ - mkdir -p $(I_LIBPQ_DEV)/usr/include - cp -fpR $(INSTALL_DIR)/usr/include/* $(I_LIBPQ_DEV)/usr/include/ - mkdir -p $(I_LIBPQ_DEV)/usr/lib/ - cp -fpR $(INSTALL_DIR)/usr/lib/lib*.a $(I_LIBPQ_DEV)/usr/lib/ - cp -fpR $(INSTALL_DIR)/usr/lib/lib*.so* $(I_LIBPQ_DEV)/usr/lib/ - - mkdir -p $(I_PGSQL_UTILS)/usr/bin - cp -fpR $(INSTALL_DIR)/usr/bin/psql $(I_PGSQL_UTILS)/usr/bin/ - $(STRIP) $(I_PGSQL_UTILS)/usr/bin/* - - chmod 0755 ipkg/*/CONTROL/ - chmod 0644 ipkg/*/CONTROL/control - - perl -pi -e "s/^Arch.*:.*/Architecture: $(ARCH)/g" ipkg/*/CONTROL/control -ifneq ($(strip $(PKG_VERSION)),) - perl -pi -e "s/^Vers.*:.*/Version: $(PKG_VERSION)/g" ipkg/*/CONTROL/control -endif - - $(IPKG_BUILD) $(I_LIBPQ) $(IPKG_TARGET_DIR) - $(IPKG_BUILD) $(I_LIBPQ_DEV) $(IPKG_TARGET_DIR) - $(IPKG_BUILD) $(I_PGSQL_UTILS) $(IPKG_TARGET_DIR) - - -clean: - - $(MAKE) \ - DESTDIR="$(INSTALL_DIR)" \ - uninstall clean - - rm -rf .stamp-* \ - $(I_LIBPQ)/usr \ - $(I_LIBPQ_DEV)/usr \ - $(I_PGSQL_UTILS)/usr \ - - -control: - - @cat $(I_LIBPQ)/CONTROL/control - @echo - @cat $(I_LIBPQ_DEV)/CONTROL/control - @echo - @cat $(I_PGSQL_UTILS)/CONTROL/control - @echo - - -.PHONY: configure build install package clean control diff --git a/openwrt/package/postgresql/ipkg/version b/openwrt/package/postgresql/ipkg/version deleted file mode 100644 index dfa12552d8..0000000000 --- a/openwrt/package/postgresql/ipkg/version +++ /dev/null @@ -1 +0,0 @@ -7.4.6-3