From d255847d416d3aeb0e0ceb48f54ac5771feb7096 Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Tue, 11 Jul 2006 13:53:20 +0000 Subject: [PATCH] Fix gcom downloading, normalize archive, use download target from pkg_template, definitively closes #333 SVN-Revision: 4128 --- openwrt/package/gcom/Makefile | 14 +++----------- openwrt/package/gcom/patches/001-Makefile.patch | 4 ++-- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/openwrt/package/gcom/Makefile b/openwrt/package/gcom/Makefile index cc739a4df6..688b8cd809 100644 --- a/openwrt/package/gcom/Makefile +++ b/openwrt/package/gcom/Makefile @@ -5,10 +5,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gcom PKG_VERSION:=0.3 PKG_RELEASE:=1 -PKG_MD5SUM:=cd32663025ed94a0ee623a689989f3c3 +PKG_MD5SUM:=f9bc8fde70278f1e990c705ccf2ae700 -PKG_SOURCE_URL:=http://www.pharscape.org/3G/gcom -PKG_SOURCE:=$(PKG_NAME)$(PKG_VERSION).tgz +PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_CAT:=zcat PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -18,14 +18,6 @@ include $(TOPDIR)/package/rules.mk $(eval $(call PKG_template,GCOM,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) -$(PKG_BUILD_DIR)/.prepared: - rm -rf $(PKG_BUILD_DIR) - mkdir -p $(PKG_BUILD_DIR) - # the .tgz is different - no subdirectory, so do this manually - zcat $(DL_DIR)/$(PKG_SOURCE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) - - if [ -d ./patches ]; then $(PATCH) $(PKG_BUILD_DIR) ./patches ; fi - touch $@ - $(PKG_BUILD_DIR)/.configured: touch $@ diff --git a/openwrt/package/gcom/patches/001-Makefile.patch b/openwrt/package/gcom/patches/001-Makefile.patch index 28ea2ecf27..bf0bb52eec 100644 --- a/openwrt/package/gcom/patches/001-Makefile.patch +++ b/openwrt/package/gcom/patches/001-Makefile.patch @@ -1,5 +1,5 @@ ---- gcom-0.3.x/Makefile 2006-01-04 17:05:28.000000000 +0200 -+++ gcom-0.3/Makefile 2006-02-26 13:02:07.000000000 +0200 +--- gcom-0.3/Makefile 2006-01-04 16:05:28.000000000 +0100 ++++ gcom-0.3.new/Makefile 2006-07-11 15:09:50.000000000 +0200 @@ -20,8 +20,6 @@ # # $Id$ -- 2.30.2