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 --- package/utils/jsonfilter/Makefile | 8 +++----- package/utils/mtd-utils/Makefile | 5 +---- package/utils/ugps/Makefile | 8 +++----- package/utils/usbmode/Makefile | 8 +++----- 4 files changed, 10 insertions(+), 19 deletions(-) (limited to 'package/utils') diff --git a/package/utils/jsonfilter/Makefile b/package/utils/jsonfilter/Makefile index 78fc63982e..b70928ba53 100644 --- a/package/utils/jsonfilter/Makefile +++ b/package/utils/jsonfilter/Makefile @@ -1,15 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jsonfilter -PKG_VERSION:=2016-07-02 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/jsonpath.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-07-02 PKG_SOURCE_VERSION:=dea067ad67d977c247c300c06676a06adf21e0c7 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=44c6c1eeaf7adb5f08e6770d5f6c4dfd43b55e1590f90b972be64125a4ae5db0 +PKG_MIRROR_HASH:=6c0e30da3f0c82527f9b5285d7c6ae61406732f2b0543b93131fe115ffc2987a CMAKE_INSTALL:=1 PKG_MAINTAINER:=Jo-Philipp Wich diff --git a/package/utils/mtd-utils/Makefile b/package/utils/mtd-utils/Makefile index 4b6ba00511..b9cfe52b16 100644 --- a/package/utils/mtd-utils/Makefile +++ b/package/utils/mtd-utils/Makefile @@ -8,15 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mtd-utils -PKG_REV:=aea36417067dade75192bafa03af70b6eb2677b1 PKG_VERSION:=1.5.2 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_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_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1 PKG_MIRROR_HASH:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7 PKG_INSTALL:=1 diff --git a/package/utils/ugps/Makefile b/package/utils/ugps/Makefile index 34b1f75cfc..07769e1516 100644 --- a/package/utils/ugps/Makefile +++ b/package/utils/ugps/Makefile @@ -8,15 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ugps -PKG_VERSION:=2016-10-24 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL=$(LEDE_GIT)/project/ugps.git PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2016-10-24 PKG_SOURCE_VERSION:=32a6b2b702c3b9f8c425f3d9dc9f4273e276029c -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=43fc66422dc73ab6cc0af9586ecba2cc8bc465e1e43073c6c3d434a5049bf748 +PKG_MIRROR_HASH:=41d24ef335e9b2847895b04cee4d1c7efa56fc207798f5858e7a1f229a33c5eb PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0+ diff --git a/package/utils/usbmode/Makefile b/package/utils/usbmode/Makefile index b3a8c13820..d07b508647 100644 --- a/package/utils/usbmode/Makefile +++ b/package/utils/usbmode/Makefile @@ -1,15 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usbmode -PKG_VERSION:=2014-08-26 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/usbmode.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2014-08-26 PKG_SOURCE_VERSION:=993a9a542791953c4804f7ddbb3a07756738e37a -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=4ba4ed629ef4530fd5a60b84cf5bf7a7194f60b69068882d47c1d3c55e06fc8c +PKG_MIRROR_HASH:=dc4daa80a0d51524b41c6bf67cb368ca51fcfba1217adedd6823b24a68be5bf4 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 -- cgit v1.2.3