From 6f5a624c71b763189516925c0af5319bddfac28c Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 13 Jun 2009 16:47:22 +0000 Subject: [PATCH] [packages] Various Makefile cleanup. Thanks to swalker. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16437 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/apex/Makefile | 1 - package/fconfig/Makefile | 1 - package/fuse24/Makefile | 4 ---- package/ixp4xx-microcode/Makefile | 2 -- package/kexec-tools/Makefile | 2 +- package/libtool/Makefile | 2 -- package/madwifi/Makefile | 6 +++--- package/ps3-utils/Makefile | 2 +- package/uboot-ifxmips/Makefile | 1 - 9 files changed, 5 insertions(+), 16 deletions(-) diff --git a/package/apex/Makefile b/package/apex/Makefile index 8936e54e7..e582c5623 100644 --- a/package/apex/Makefile +++ b/package/apex/Makefile @@ -11,7 +11,6 @@ PKG_NAME:=apex PKG_VERSION:=1.5.14 PKG_RELEASE:=3 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.buici.com/pub/apex/ \ ftp://metalab.unc.edu/pub/Linux/system/boot/apex/ diff --git a/package/fconfig/Makefile b/package/fconfig/Makefile index 3cc84998b..14bbec57b 100644 --- a/package/fconfig/Makefile +++ b/package/fconfig/Makefile @@ -16,7 +16,6 @@ PKG_SOURCE_URL:=http://andrzejekiert.ovh.org/software/fconfig/ PKG_MD5SUM:=dac355e9f2a0f48c414c52e2034b6346 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/fuse24/Makefile b/package/fuse24/Makefile index ce3a9a01f..ca2076dde 100644 --- a/package/fuse24/Makefile +++ b/package/fuse24/Makefile @@ -16,10 +16,6 @@ PKG_MD5SUM:=9c7e8b6606b9f158ae20b8521ba2867c PKG_SOURCE_URL:=@SF/$(PKG_NAME) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_CAT:=zcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install include $(INCLUDE_DIR)/package.mk diff --git a/package/ixp4xx-microcode/Makefile b/package/ixp4xx-microcode/Makefile index 449b8952c..9ed912758 100644 --- a/package/ixp4xx-microcode/Makefile +++ b/package/ixp4xx-microcode/Makefile @@ -15,8 +15,6 @@ PKG_SOURCE:=IPL_ixp400NpeLibraryWithCrypto-2_4.zip PKG_SOURCE_URL:=http://downloads.openwrt.org/sources PKG_MD5SUM:=dd5f6482e625ecb334469958bcd54b37 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - include $(INCLUDE_DIR)/package.mk define Package/ixp4xx-microcode diff --git a/package/kexec-tools/Makefile b/package/kexec-tools/Makefile index c4ce1f3a5..910b6a25a 100644 --- a/package/kexec-tools/Makefile +++ b/package/kexec-tools/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=2.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://kernel.org/pub/linux/kernel/people/horms/kexec-tools/ +PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/horms/kexec-tools PKG_MD5SUM:=d9f2ecd3c3307905f24130a25816e6cc include $(INCLUDE_DIR)/package.mk diff --git a/package/libtool/Makefile b/package/libtool/Makefile index 8d50a7ada..7c5e431ea 100644 --- a/package/libtool/Makefile +++ b/package/libtool/Makefile @@ -15,8 +15,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/libtool PKG_MD5SUM:=d0071c890101fcf4f2be8934a37841b0 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - HOST_PATCH_DIR=/dev/null PKG_BUILD_DEPENDS:=libtool/host diff --git a/package/madwifi/Makefile b/package/madwifi/Makefile index b24602822..93f695db9 100644 --- a/package/madwifi/Makefile +++ b/package/madwifi/Makefile @@ -15,7 +15,7 @@ ifneq ($(CONFIG_MADWIFI_UPSTREAM),) PKG_RELEASE:=2 PKG_SOURCE:=madwifi-$(PKG_VERSION).tar.gz - PKG_SOURCE_URL:=http://downloads.sourceforge.net/madwifi/ + PKG_SOURCE_URL:=@SF/madwifi PKG_MD5SUM:=399d20de8d855a59f20058857c2178ad PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/madwifi-$(PKG_VERSION) @@ -30,7 +30,7 @@ else PKG_SOURCE_PROTO:=svn PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_SUBDIR:=$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) - PKG_SOURCE_URL:=http://svn.madwifi.org/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) + PKG_SOURCE_URL:=http://madwifi-project.org/svn/madwifi/$(if $(PKG_BRANCH),branches/$(PKG_BRANCH),trunk) PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.gz PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(if $(PKG_BRANCH),$(PKG_BRANCH),madwifi-trunk)-$(PKG_VERSION) @@ -164,7 +164,7 @@ endif define KernelPackage/madwifi SUBMENU:=Wireless Drivers TITLE:=Driver for Atheros wireless chipsets - URL:=http://madwifi.org/ + URL:=http://madwifi-project.org/ DEPENDS:=+wireless-tools @PCI_SUPPORT||TARGET_atheros @!TARGET_avr32 @!TARGET_etrax @LINUX_2_6 FILES:=$(MADWIFI_FILES) AUTOLOAD:=$(call AutoLoad,50,$(MADWIFI_AUTOLOAD)) diff --git a/package/ps3-utils/Makefile b/package/ps3-utils/Makefile index a63e03da1..72d2cc6a2 100644 --- a/package/ps3-utils/Makefile +++ b/package/ps3-utils/Makefile @@ -12,7 +12,7 @@ PKG_VERSION:=2.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.kernel.org/pub/linux/kernel/people/geoff/cell/ps3-utils/ +PKG_SOURCE_URL:=@KERNEL/linux/kernel/people/geoff/cell/ps3-utils PKG_MD5SUM:=d0b24527a8582c9ff5be02c62bb2161d include $(INCLUDE_DIR)/package.mk diff --git a/package/uboot-ifxmips/Makefile b/package/uboot-ifxmips/Makefile index 10e9080e8..8cc8b601c 100644 --- a/package/uboot-ifxmips/Makefile +++ b/package/uboot-ifxmips/Makefile @@ -16,7 +16,6 @@ PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.denx.de/pub/u-boot PKG_MD5SUM:=579707c8ecbf1ab4127285d2aac2a9ee -PKG_CAT:=bzcat PKG_TARGETS:=bin include $(INCLUDE_DIR)/package.mk