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/network/services/authsae/Makefile | 8 +++----- package/network/services/hostapd/Makefile | 11 ++++------- package/network/services/ipset-dns/Makefile | 8 +++----- package/network/services/mdns/Makefile | 8 +++----- package/network/services/odhcpd/Makefile | 8 +++----- package/network/services/omcproxy/Makefile | 6 ++---- package/network/services/openvpn-easy-rsa/Makefile | 9 +++------ package/network/services/relayd/Makefile | 8 +++----- package/network/services/uhttpd/Makefile | 8 +++----- 9 files changed, 27 insertions(+), 47 deletions(-) (limited to 'package/network/services') diff --git a/package/network/services/authsae/Makefile b/package/network/services/authsae/Makefile index bcd5a78613..fd0e82ffd8 100644 --- a/package/network/services/authsae/Makefile +++ b/package/network/services/authsae/Makefile @@ -8,15 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=authsae -PKG_VERSION:=2014-06-09 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/cozybit/authsae.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2014-06-09 PKG_SOURCE_VERSION:=8531ab158910a525d4bcbb3ad02c08342f6987f2 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=aa208688570fc6b8b16d9b70e3644208e851dbd3a90f52843aa44c9043b4fbbb +PKG_MIRROR_HASH:=a8fbed9eada17c552c70d834ee8f7c1e0987df59839bc113b3ec000500696715 PKG_BUILD_PARALLEL:=1 CMAKE_INSTALL:=1 diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile index 0c5e73240f..207dfecebe 100644 --- a/package/network/services/hostapd/Makefile +++ b/package/network/services/hostapd/Makefile @@ -7,16 +7,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hostapd -PKG_VERSION:=2016-12-19 PKG_RELEASE:=1 -PKG_REV:=ad02e79d12fd70ed6bd5fbaf64001a2851e5bb7b -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://w1.fi/hostap.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=git -PKG_MIRROR_HASH:=f9d51709d199f37c07cc8023c4a7097cee30eb75cceff7de0dcc4ba8ac78b186 +PKG_SOURCE_DATE:=2016-12-19 +PKG_SOURCE_VERSION:=ad02e79d12fd70ed6bd5fbaf64001a2851e5bb7b +PKG_MIRROR_HASH:=7a0983f004b156d46911765c113754a4c00f56fb889430620bbd061b3b1fcf33 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=BSD-3-Clause @@ -53,7 +50,7 @@ ifneq ($(LOCAL_TYPE),hostapd) endif endif -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk diff --git a/package/network/services/ipset-dns/Makefile b/package/network/services/ipset-dns/Makefile index 519ea9aea2..2adc9fe031 100644 --- a/package/network/services/ipset-dns/Makefile +++ b/package/network/services/ipset-dns/Makefile @@ -8,15 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipset-dns -PKG_VERSION:=2013-05-03 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=http://git.zx2c4.com/ipset-dns -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2013-05-03 PKG_SOURCE_VERSION:=6be3afd819a86136b51c5ae722ab48266187155b -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=9deca25a4602936938611d21d891f06685e109626b9eda7f84aa2f0af7aba092 +PKG_MIRROR_HASH:=4e34943b547babe705c2fad295ee24a5ee0c93ca03e2a9cdeaf323150f97e60b PKG_MAINTAINER:=Jo-Philipp Wich PKG_LICENSE:=GPL-2.0 diff --git a/package/network/services/mdns/Makefile b/package/network/services/mdns/Makefile index 556b4b8245..b36176e1ae 100644 --- a/package/network/services/mdns/Makefile +++ b/package/network/services/mdns/Makefile @@ -8,15 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mdns -PKG_VERSION:=2016-12-19 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL=$(LEDE_GIT)/project/mdnsd.git PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2016-12-19 PKG_SOURCE_VERSION:=be8ae8d0b5f2e8651edf0cc8f35916fc4b71d1ac -PKG_MIRROR_HASH:=f40f67c68ee62bd1967a5d32c3eb5601a7927c7ebd52da27029019c2fe9307d3 +PKG_MIRROR_HASH:=fd6e8b17407b9e6dc96f485c62f54e02a0ab27b5878c271f95749495970dacc2 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=LGPL-2.1 diff --git a/package/network/services/odhcpd/Makefile b/package/network/services/odhcpd/Makefile index f491f1e820..f7a59c4665 100644 --- a/package/network/services/odhcpd/Makefile +++ b/package/network/services/odhcpd/Makefile @@ -8,15 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=odhcpd -PKG_VERSION:=2016-12-17 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=git://git.lede-project.org/project/odhcpd.git PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2016-12-17 PKG_SOURCE_VERSION:=e05553099c47b92420c21ff30b07709dfa40a84a -PKG_MIRROR_HASH:=a27269cd8d69b415e3450df96b817b8b84dee76eb29fac12e90589a465cb87f0 +PKG_MIRROR_HASH:=6bfe9fecef68c2c49f6632a88ce7adaac8e6b1cf3dae02567229a2e1efddbd83 PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=GPL-2.0 diff --git a/package/network/services/omcproxy/Makefile b/package/network/services/omcproxy/Makefile index d9d18521fa..d20c73d60c 100644 --- a/package/network/services/omcproxy/Makefile +++ b/package/network/services/omcproxy/Makefile @@ -8,15 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=omcproxy -PKG_VERSION:=2015-08-24 PKG_RELEASE:=3 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/sbyx/omcproxy.git PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2015-08-24 PKG_SOURCE_VERSION:=8de9fa84e018e152e45c342f10b5b5140b63e4b1 -PKG_MIRROR_HASH:=e79dacf493155ebf7e0d9954dd007bb485d48819907bef6be4cda21bab769443 +PKG_MIRROR_HASH:=2c9768170235f91a48252c83ef944e6ed925c167c8fe30c0dacf42c3daba86fc PKG_MAINTAINER:=Steven Barth PKG_LICENSE:=Apache-2.0 diff --git a/package/network/services/openvpn-easy-rsa/Makefile b/package/network/services/openvpn-easy-rsa/Makefile index c4ac7d37ba..5b7d9be213 100644 --- a/package/network/services/openvpn-easy-rsa/Makefile +++ b/package/network/services/openvpn-easy-rsa/Makefile @@ -9,16 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openvpn-easy-rsa -PKG_REV:=ff5bfd1dd8e548cb24d302742af3894f893ef92f -PKG_VERSION:=2013-01-30 PKG_RELEASE=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OpenVPN/easy-rsa.git -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_REV).tar.xz -PKG_MIRROR_HASH:=cdb0d3f1fb828e4026b6fb297303d5ccb9bc4e1faccbb6a7687518655b178875 -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2013-01-30 +PKG_SOURCE_VERSION:=ff5bfd1dd8e548cb24d302742af3894f893ef92f +PKG_MIRROR_HASH:=c87704b3906a0c14f51c6677151a9389f698523c7ec07f7c75489ca31786f128 PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk diff --git a/package/network/services/relayd/Makefile b/package/network/services/relayd/Makefile index b6141152fd..8c738fb329 100644 --- a/package/network/services/relayd/Makefile +++ b/package/network/services/relayd/Makefile @@ -8,15 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=relayd -PKG_VERSION:=2016-02-07 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_URL=$(LEDE_GIT)/project/relayd.git PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2016-02-07 PKG_SOURCE_VERSION:=ad0b25ad74345d367c62311e14b279f5ccb8ef13 -PKG_MIRROR_HASH:=fb387d5edfecdaf8902bff37d02cb50d92110ab5987758fb98fc25a02257aee1 +PKG_MIRROR_HASH:=8818e9da8cc056961f21f1569e06e63b840965d1453dfcef70a8d84ea76f84d7 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=GPL-2.0 diff --git a/package/network/services/uhttpd/Makefile b/package/network/services/uhttpd/Makefile index d1540312ca..6f9fac95fe 100644 --- a/package/network/services/uhttpd/Makefile +++ b/package/network/services/uhttpd/Makefile @@ -8,15 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uhttpd -PKG_VERSION:=2016-10-25 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/uhttpd.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-10-25 PKG_SOURCE_VERSION:=1628fa4b34aa143187353f81e8001b9a15286bda -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=9d7ceef6ce40cb12f4065b41d99cf584fcd971dce4a5a13b6a92b04d663e4301 +PKG_MIRROR_HASH:=2ac4ba8dc0b349d72174aac9ff693a73a214295a9890fe3d2a8eedcad54d06e3 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=ISC -- cgit v1.2.3