diff options
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/Makefile | 1 | ||||
| -rw-r--r-- | package/gmp/Config.in | 6 | ||||
| -rw-r--r-- | package/gmp/Makefile | 67 | ||||
| -rw-r--r-- | package/gmp/gmp.control | 8 | ||||
| -rw-r--r-- | package/openwrt/mtd.c | 4 |
6 files changed, 83 insertions, 4 deletions
diff --git a/package/Config.in b/package/Config.in index e62e93cf8..46d62ffaf 100644 --- a/package/Config.in +++ b/package/Config.in @@ -31,6 +31,7 @@ source "package/ez-ipupdate/Config.in" comment "Libraries" source "package/zlib/Config.in" +source "package/gmp/Config.in" source "package/libpcap/Config.in" source "package/libelf/Config.in" source "package/matrixssl/Config.in" diff --git a/package/Makefile b/package/Makefile index 2466911d9..8aab7f146 100644 --- a/package/Makefile +++ b/package/Makefile @@ -11,6 +11,7 @@ package-$(BR2_PACKAGE_DROPBEAR) += dropbear package-$(BR2_PACKAGE_DNSMASQ) += dnsmasq package-$(BR2_PACKAGE_EBTABLES) += ebtables package-$(BR2_PACKAGE_EZIPUPDATE) += ez-ipupdate +package-$(BR2_PACKAGE_GMP) += gmp package-$(BR2_PACKAGE_HASERL) += haserl package-$(BR2_PACKAGE_IPTABLES) += iptables package-$(BR2_PACKAGE_IPROUTE2) += iproute2 diff --git a/package/gmp/Config.in b/package/gmp/Config.in new file mode 100644 index 000000000..c70af8e3c --- /dev/null +++ b/package/gmp/Config.in @@ -0,0 +1,6 @@ +config BR2_PACKAGE_GMP + tristate "libgmp" + default m + help + libgmp + diff --git a/package/gmp/Makefile b/package/gmp/Makefile new file mode 100644 index 000000000..eb835c2f3 --- /dev/null +++ b/package/gmp/Makefile @@ -0,0 +1,67 @@ +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=gmp +PKG_VERSION:=4.1.4 +PKG_RELEASE:=1 +PKG_MD5SUM:=0aa7d3b3f5b5ec5951e7dddd6f65e891 + +PKG_SOURCE_URL:=ftp://ftp.gnu.org/gnu/gmp/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_CAT:=bzcat +PKG_IPK:=$(PACKAGE_DIR)/$(PKG_NAME)_$(PKG_VERSION)-$(PKG_RELEASE)_$(ARCH).ipk +PKG_IPK_DIR:=$(PKG_BUILD_DIR)/ipkg + +$(DL_DIR)/$(PKG_SOURCE): + $(SCRIPT_DIR)/download.pl $(DL_DIR) $(PKG_SOURCE) $(PKG_MD5SUM) $(PKG_SOURCE_URL) + +$(PKG_BUILD_DIR)/.unpacked: $(DL_DIR)/$(PKG_SOURCE) + $(PKG_CAT) $(DL_DIR)/$(PKG_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - + touch $(PKG_BUILD_DIR)/.unpacked + +$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.unpacked + (cd $(PKG_BUILD_DIR); 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 \ + --sbindir=/usr/sbin \ + --libexecdir=/usr/lib \ + --sysconfdir=/etc \ + --datadir=/usr/share \ + --localstatedir=/var \ + --mandir=/usr/man \ + --infodir=/usr/info \ + ); + touch $(PKG_BUILD_DIR)/.configured + +$(PKG_BUILD_DIR)/.libs/libgmp.so: $(PKG_BUILD_DIR)/.configured + $(MAKE) -C $(PKG_BUILD_DIR) + +$(PKG_IPK): $(PKG_BUILD_DIR)/.libs/libgmp.so + $(SCRIPT_DIR)/make-ipkg-dir.sh $(PKG_IPK_DIR) $(PKG_NAME).control $(PKG_VERSION)-$(PKG_RELEASE) $(ARCH) + $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_IPK_DIR)" install + rm $(PKG_IPK_DIR)/usr/lib/*.la + rm $(PKG_IPK_DIR)/usr/lib/*.a + $(STRIP) $(PKG_IPK_DIR)/usr/lib/*.so + mkdir -p $(PACKAGE_DIR) + $(IPKG_BUILD) $(PKG_IPK_DIR) $(PACKAGE_DIR) + +$(IPKG_STATE_DIR)/info/$(PKG_NAME).list: $(PKG_IPK) + $(IPKG) install $(PKG_IPK) + +source: $(DL_DIR)/$(PKG_SOURCE) +prepare: $(PKG_BUILD_DIR)/.unpacked +compile: $(PKG_IPK) +install: $(IPKG_STATE_DIR)/info/$(PKG_NAME).list + +clean: + rm -rf $(PKG_BUILD_DIR) + rm -f $(PKG_IPK) diff --git a/package/gmp/gmp.control b/package/gmp/gmp.control new file mode 100644 index 000000000..43b569fbc --- /dev/null +++ b/package/gmp/gmp.control @@ -0,0 +1,8 @@ +Package: gmp +Priority: optional +Section: net +Version: 4.1.4-1 +Architecture: mipsel +Maintainer: Waldemar Brodkorb <wbx@dass-it.de> +Source: buildroot internal +Description: GNU multiprecision library diff --git a/package/openwrt/mtd.c b/package/openwrt/mtd.c index 163dcc439..13f4bf195 100644 --- a/package/openwrt/mtd.c +++ b/package/openwrt/mtd.c @@ -232,10 +232,6 @@ mtd_write(const char *trxfile, const char *mtd) int mtd_update(const char *trxfile, const char *mtd) { - if (mtd_unlock(mtd) != 0) { - fprintf(stderr, "Could not unlock mtd device: %s\n", mtd); - exit(1); - } if (mtd_erase("rootfs") != 0) { fprintf(stderr, "Could not erase rootfs\n"); exit(1); |