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/libs/libnetfilter-queue/Makefile | 6 ++---- package/libs/libnftnl/Makefile | 2 -- package/libs/librpc/Makefile | 8 +++----- package/libs/libubox/Makefile | 8 +++----- package/libs/uclient/Makefile | 8 +++----- package/libs/ustream-ssl/Makefile | 10 ++++------ 6 files changed, 15 insertions(+), 27 deletions(-) (limited to 'package/libs') diff --git a/package/libs/libnetfilter-queue/Makefile b/package/libs/libnetfilter-queue/Makefile index 1c94eb28dc..dd8fd9f09e 100644 --- a/package/libs/libnetfilter-queue/Makefile +++ b/package/libs/libnetfilter-queue/Makefile @@ -8,15 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnetfilter_queue -PKG_VERSION:=2016-07-03 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=http://git.netfilter.org/libnetfilter_queue -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-07-03 PKG_SOURCE_VERSION:=981025e103d887fb6a9c9bb49c74ec323108d098 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=b8f5ded5650b0b59428f51298de2a14f725f8bac28c5b742a6e4fded39c6cbe2 +PKG_MIRROR_HASH:=85c124be0e19162e1ebd1aba6e7e86bb4106e9dab4267baaf66d3ccb48d56e3f PKG_FIXUP:=autoreconf PKG_LICENSE:=GPL-2.0+ diff --git a/package/libs/libnftnl/Makefile b/package/libs/libnftnl/Makefile index 0b5ace6f61..5b541f4518 100644 --- a/package/libs/libnftnl/Makefile +++ b/package/libs/libnftnl/Makefile @@ -11,8 +11,6 @@ PKG_NAME:=libnftnl PKG_VERSION:=1.0.6 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=git://git.netfilter.org/libnftnl PKG_SOURCE_PROTO:=git PKG_SOURCE_VERSION:=libnftnl-1.0.6 diff --git a/package/libs/librpc/Makefile b/package/libs/librpc/Makefile index f4f3225bad..0330614c31 100644 --- a/package/libs/librpc/Makefile +++ b/package/libs/librpc/Makefile @@ -1,15 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=librpc -PKG_VERSION:=2015-11-04 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/librpc-uclibc.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2015-11-04 PKG_SOURCE_VERSION:=a921e3ded051746f9f7cd5e5a312fb6771716aac -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=d8da52536d34c6116ac8c261cbfc5999ae48b88e304ebf24a8cb14a43e53a3d9 +PKG_MIRROR_HASH:=22c8dc55e1c4e8e31635a37708a3ce622a6ca33ebd918a4321b0be6ffce89b21 CMAKE_INSTALL:=1 PKG_USE_MIPS16:=0 diff --git a/package/libs/libubox/Makefile b/package/libs/libubox/Makefile index 90d037339d..38dce1a714 100644 --- a/package/libs/libubox/Makefile +++ b/package/libs/libubox/Makefile @@ -1,15 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libubox -PKG_VERSION:=2016-11-29 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/libubox.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-11-29 PKG_SOURCE_VERSION:=77a629375d7387a33a59509d9d751a8798134cab -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=686a0078da3ada68fc9d39f62df07be52589afce79969ec4039f38f85ccedd3c +PKG_MIRROR_HASH:=b11c24d45cdf5a1909f0f97d185c3e1ba49602561a8cf3ad18f594ca0eaf4a64 CMAKE_INSTALL:=1 PKG_LICENSE:=ISC diff --git a/package/libs/uclient/Makefile b/package/libs/uclient/Makefile index 789b54ff2f..0b4a1c115e 100644 --- a/package/libs/uclient/Makefile +++ b/package/libs/uclient/Makefile @@ -1,15 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uclient -PKG_VERSION:=2016-07-30 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/uclient.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-07-30 PKG_SOURCE_VERSION:=ccb314db2e99463de15eed9d7626360d82aec4d2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=8cbe8e34bbbd849b46b18f41629b8b3548d1eb3d2517fb473b7068c7b1fbe6da +PKG_MIRROR_HASH:=76102eabb687fa34369b2216f6b379ff56fcc835e3e89cbd21dcc150ffbc9071 CMAKE_INSTALL:=1 PKG_BUILD_DEPENDS:=ustream-ssl diff --git a/package/libs/ustream-ssl/Makefile b/package/libs/ustream-ssl/Makefile index 7ea913533c..e76fd3b81c 100644 --- a/package/libs/ustream-ssl/Makefile +++ b/package/libs/ustream-ssl/Makefile @@ -1,18 +1,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ustream-ssl -PKG_VERSION:=2016-07-02 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/ustream-ssl.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-07-02 PKG_SOURCE_VERSION:=ec80adaa1b47f28d426fa19c692011ce60b992d6 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=701f8728b90d4fc141ca086bbd7802cfae42aaa64ace83debb8c27111b921a34 +PKG_MIRROR_HASH:=bfbad6b4e8c1e933f0bfaab43cbdd44a536c08128c3a779e6f2395a6a886aab7 CMAKE_INSTALL:=1 -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR) PKG_LICENSE:=ISC PKG_LICENSE_FILES:= -- cgit v1.2.3