From c7c1cf5618b6ca983c20510814b762eeab4937e5 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 21 Dec 2016 22:25:41 +0100 Subject: treewide: clean up and unify PKG_VERSION for git based downloads Also use default defintions for PKG_SOURCE_SUBDIR, PKG_SOURCE Signed-off-by: Felix Fietkau --- tools/b43-tools/Makefile | 1 - tools/kernel2minor/Makefile | 4 ---- tools/make-ext4fs/Makefile | 8 ++------ tools/mtd-utils/Makefile | 4 ---- tools/sdimage/Makefile | 8 ++------ tools/sparse/Makefile | 7 ++----- tools/yaffs2/Makefile | 7 ++----- 7 files changed, 8 insertions(+), 31 deletions(-) (limited to 'tools') diff --git a/tools/b43-tools/Makefile b/tools/b43-tools/Makefile index 86a302b74a..b6d2704e9c 100644 --- a/tools/b43-tools/Makefile +++ b/tools/b43-tools/Makefile @@ -10,7 +10,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=b43-tools PKG_VERSION:=019 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://github.com/mbuesch/b43-tools.git PKG_SOURCE_PROTO:=git PKG_SOURCE_SUBDIR:=$(PKG_NAME) diff --git a/tools/kernel2minor/Makefile b/tools/kernel2minor/Makefile index 8c1695646d..90f21add45 100644 --- a/tools/kernel2minor/Makefile +++ b/tools/kernel2minor/Makefile @@ -10,15 +10,11 @@ PKG_NAME:=kernel2minor PKG_VERSION:=0.22 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_MIRROR_HASH:=8e509deb78e4eddc5f4d0798d3c5fbc99bf6dd151faaf0332a640607042d7f82 PKG_SOURCE_URL:=https://github.com/adron-s/kernel2minor.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=0587740de3e398dbe89d965334c492609cb9739d -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) - include $(INCLUDE_DIR)/host-build.mk define Host/Install diff --git a/tools/make-ext4fs/Makefile b/tools/make-ext4fs/Makefile index c9ea4eddab..a886dc0a71 100644 --- a/tools/make-ext4fs/Makefile +++ b/tools/make-ext4fs/Makefile @@ -8,16 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=make-ext4fs -PKG_VERSION:=2016-08-14 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL=$(LEDE_GIT)/project/make_ext4fs.git PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2016-08-14 PKG_SOURCE_VERSION:=484903e4332be6c317f531b008cb2a841a18c506 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_MIRROR_HASH:=5a4473e58dcaed1f41c2391d2326a67af356ca9a3a075fc3486d95276fb9a400 - -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) +PKG_MIRROR_HASH:=d7ccd5e426b1d15331ff000a37dc15161f6eef594453e970fd584fcde5a25075 include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile index 7109b874a5..9e920bcb43 100644 --- a/tools/mtd-utils/Makefile +++ b/tools/mtd-utils/Makefile @@ -10,14 +10,10 @@ PKG_NAME:=mtd-utils PKG_VERSION:=1.5.2 PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_MIRROR_HASH:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7 -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) - include $(INCLUDE_DIR)/host-build.mk HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs diff --git a/tools/sdimage/Makefile b/tools/sdimage/Makefile index b3faf80130..f2b82ca00a 100644 --- a/tools/sdimage/Makefile +++ b/tools/sdimage/Makefile @@ -7,21 +7,17 @@ include $(TOPDIR)/rules.mk PKG_NAME:=imx-uuc -PKG_VERSION=2015-09-13-$(PKG_SOURCE_VERSION) PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/mhei/fsl-imx-uuc.git +PKG_SOURCE_DATE:=2015-09-13 PKG_SOURCE_VERSION:=2b99403b6dc60a22b07eb7a5cc0cb184abb89bdd -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=6681103062f8720c07bcd7df3f72e9eb63a0b2f582c88c05d81d40386e9b2efc +PKG_MIRROR_HASH:=b0edd55674cd60268c9b293b47df17db319fd58bd78fdbf26e77039f1a6cf681 PKG_LICENSE:=GPL-2.0+ PKG_LICENSE_FILES:=LICENSE -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_SOURCE_SUBDIR) - include $(INCLUDE_DIR)/host-build.mk define Host/Configure diff --git a/tools/sparse/Makefile b/tools/sparse/Makefile index f365809041..cc75fdb7c7 100644 --- a/tools/sparse/Makefile +++ b/tools/sparse/Makefile @@ -5,15 +5,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sparse -PKG_VERSION:=0.5-git40791b94 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/devel/sparse/sparse.git +PKG_SOURCE_DATE:=2015-01-24 PKG_SOURCE_VERSION:=40791b94c56b1a6da2a0ddeb1f9d5c9d64de8f93 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_MIRROR_HASH:=95dc331f100847e619a3c9a2183439c5c89e6ea7b5e2ef73362b5c7a5ef1a3f5 +PKG_MIRROR_HASH:=ec232e48073488e5f7fc2168792932006cfc65240c266c9d395698d6ff15ba81 PKG_BUILD_PARALLEL:=1 diff --git a/tools/yaffs2/Makefile b/tools/yaffs2/Makefile index 16137ef488..788adbd6a6 100644 --- a/tools/yaffs2/Makefile +++ b/tools/yaffs2/Makefile @@ -8,15 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=yaffs2_android -PKG_VERSION:=2008-12-18 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://android.googlesource.com/platform/external/yaffs2 PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME) +PKG_SOURCE_DATE:=2008-12-18 PKG_SOURCE_VERSION:=d333fc232d7e5ae3370080d5d6f7d88ea9c6b3a1 -PKG_MIRROR_HASH:=8ba9beeda93681a5fc3ea79bdc8186d7ed8c73779e7e64302ce38ab1c1a0faf5 -HOST_BUILD_DIR=$(BUILD_DIR_HOST)/$(PKG_NAME) +PKG_MIRROR_HASH:=232ceeed180fb1b7c1c28d12e756c253246f2b5e8cd4c7efa6d884c5c18baf90 include $(INCLUDE_DIR)/host-build.mk -- cgit v1.2.3