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/system/fstools/Makefile | 9 +++------ package/system/lede-keyring/Makefile | 9 +++------ package/system/mountd/Makefile | 9 +++------ package/system/opkg/Makefile | 11 ++++------- package/system/procd/Makefile | 9 +++------ package/system/rpcd/Makefile | 9 +++------ package/system/ubox/Makefile | 8 +++----- package/system/ubus/Makefile | 8 +++----- package/system/uci/Makefile | 12 +++--------- package/system/usign/Makefile | 8 +++----- 10 files changed, 31 insertions(+), 61 deletions(-) (limited to 'package/system') diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 96bc26039e..e3ab017e66 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -8,16 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fstools -PKG_VERSION:=2016-09-31 - -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/fstools.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-09-31 PKG_SOURCE_VERSION:=94a5b0ad8d53f024f036c3526b48c34ebbd66a2f -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=f9fca74463187f2ef07c45154ae5dea296bd7e6fcb734bdc5f8d452e8d6b9fa2 +PKG_MIRROR_HASH:=e6c7f8a2a9bce6f399cd206c786c130087843581e148098366f941154eb0c482 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/system/lede-keyring/Makefile b/package/system/lede-keyring/Makefile index 5cfcd2008d..a84f84722f 100644 --- a/package/system/lede-keyring/Makefile +++ b/package/system/lede-keyring/Makefile @@ -3,16 +3,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lede-keyring -PKG_VERSION:=2016-04-30 - -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/keyring.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-04-30 PKG_SOURCE_VERSION:=5c7857eed3fa06a9005f96b9b029388c7f316e83 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=c5997bf1505042c857d5e19fec497c6516cc1d9e07fc19ff4c5b1a33da3cdf29 +PKG_MIRROR_HASH:=6119196dad6c92df22617c5f4a923728a657b591c6a6901dda21acadc63da51d PKG_MAINTAINER:=John Crispin PKG_LICENSE:=GPL-2.0 diff --git a/package/system/mountd/Makefile b/package/system/mountd/Makefile index 26e8722ef9..6922f2f5a0 100644 --- a/package/system/mountd/Makefile +++ b/package/system/mountd/Makefile @@ -4,16 +4,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mountd -PKG_VERSION:=2016-12-19 - -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/mountd.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-12-19 PKG_SOURCE_VERSION:=dd5799c9f8cc7a01c0572c067bf907b37cdd7d04 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=40baff09ee09ab7b80ec4786c1e7c9ec69726c776f435244d225b765bd5992b7 +PKG_MIRROR_HASH:=cdc9f61bf4ad4b5d02b7cad435de1566b53306ed532fe39d099ed91eec6c405c CMAKE_INSTALL:=1 PKG_MAINTAINER:=John Crispin diff --git a/package/system/opkg/Makefile b/package/system/opkg/Makefile index d97f229aeb..506677c6f1 100644 --- a/package/system/opkg/Makefile +++ b/package/system/opkg/Makefile @@ -11,17 +11,14 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=opkg -PKG_REV:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d -PKG_VERSION:=$(PKG_REV) PKG_RELEASE:=15 PKG_SOURCE_PROTO:=git -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=opkg-$(PKG_VERSION) PKG_SOURCE_URL:=http://git.yoctoproject.org/git/opkg -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR).tar.xz -PKG_MIRROR_HASH:=7accfabfb5cc1966b038b40130a50f3bbb4bdff4273150e9394c1ea8d7111d4e -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2011-04-08 +PKG_SOURCE_VERSION:=9c97d5ecd795709c8584e972bfdf3aee3a5b846d +PKG_MIRROR_HASH:=55e05270f3eb2f3aff5d3791463ce3d13b8197ca7b301cd58e731a249552c48f +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) PKG_FIXUP:=autoreconf PKG_REMOVE_FILES = autogen.sh aclocal.m4 diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile index 6ea302b501..03f9422f5d 100644 --- a/package/system/procd/Makefile +++ b/package/system/procd/Makefile @@ -8,16 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=procd -PKG_VERSION:=2016-12-13 - -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-12-13 PKG_SOURCE_VERSION:=f800ecf860addd4fc7f1acde76a9adbd4b1f50e7 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=0e47fd3bf141e8f12866d9ec79cb42c971b3f6691eb87ce1ef71dc7473ab5ee4 +PKG_MIRROR_HASH:=dcad0f8af095682e021e4a5425a5efd9879c9ed1d69d310ab1c35d81a0e11924 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 2dd8cd8363..2fc8180e18 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -8,21 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rpcd -PKG_VERSION:=2016-06-30 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/rpcd.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME) +PKG_SOURCE_DATE:=2016-06-30 PKG_SOURCE_VERSION:=23417e94d25570e6d62542bac46edd51e8e0243a -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz PKG_MAINTAINER:=Jo-Philipp Wich -PKG_MIRROR_HASH:=a52ce026105ff6d944896686399d97960f34246b4f7e0c464ff6631ed33325c9 +PKG_MIRROR_HASH:=67a12a8a367ff83cd7c16b905e22fee00b0c05ce744189aff1759b85453510bb PKG_LICENSE:=ISC PKG_LICENSE_FILES:= -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/package/system/ubox/Makefile b/package/system/ubox/Makefile index 537f380aad..8900c67803 100644 --- a/package/system/ubox/Makefile +++ b/package/system/ubox/Makefile @@ -1,15 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubox -PKG_VERSION:=2016-09-26 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/ubox.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-09-26 PKG_SOURCE_VERSION:=5649c028c426060616e2bd4e7ea83271cd333d21 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=44d45a90b55146479b8a949e5498de675054200e1f6c48459d73b0ea70fcdcff +PKG_MIRROR_HASH:=ae77504a4397f92173a7646fa3555e5b51abd7ff1dd1c419770223359e41937a CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/system/ubus/Makefile b/package/system/ubus/Makefile index de57006e42..fadb436863 100644 --- a/package/system/ubus/Makefile +++ b/package/system/ubus/Makefile @@ -1,15 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ubus -PKG_VERSION:=2016-10-12 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/ubus.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2016-10-12 PKG_SOURCE_VERSION:=312448a5b147c221836827a7a641e76a4514db44 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=0d572863d46c9d6e89a573ed5db671f4eaff311df6fa5e8fa83b8f07e7dc928d +PKG_MIRROR_HASH:=adeeae238deaac2b6af77c2e4473febdcbc0f1c256734b2ff019c76b2f3f2aa6 CMAKE_INSTALL:=1 PKG_LICENSE:=LGPL-2.1 diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile index 30d63d08fe..b4d019cf39 100644 --- a/package/system/uci/Makefile +++ b/package/system/uci/Makefile @@ -8,20 +8,14 @@ include $(TOPDIR)/rules.mk -UCI_VERSION=2016-07-04 -UCI_RELEASE=1 - PKG_NAME:=uci -PKG_VERSION:=$(UCI_VERSION)$(if $(UCI_RELEASE),.$(UCI_RELEASE)) PKG_RELEASE:=1 -PKG_REV:=e1bf4356e1b513e158e1b5049147087ed6342cfd -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL=$(LEDE_GIT)/project/uci.git -PKG_SOURCE_SUBDIR:=uci-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=git -PKG_MIRROR_HASH:=1206aff4b41bc4aa78205c7537bc75886244c293cb5f08dc7ba3dc4def93a81c +PKG_SOURCE_DATE=2016-07-04 +PKG_SOURCE_VERSION:=e1bf4356e1b513e158e1b5049147087ed6342cfd +PKG_MIRROR_HASH:=4994a10a9e15f71312502f8babf045da7cea18c64227b387fc2dcf64f2252f19 PKG_LICENSE:=LGPL-2.1 PKG_LICENSE_FILES:= diff --git a/package/system/usign/Makefile b/package/system/usign/Makefile index 75b9262c15..84adccb4a3 100644 --- a/package/system/usign/Makefile +++ b/package/system/usign/Makefile @@ -1,15 +1,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=usign -PKG_VERSION:=2015-07-04 -PKG_RELEASE=$(PKG_SOURCE_VERSION) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(LEDE_GIT)/project/usign.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_DATE:=2015-07-04 PKG_SOURCE_VERSION:=ef6419142a3b0fbcddcccf536e3c1880302c6f89 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz -PKG_MIRROR_HASH:=170f85fb49ec3e698fbeb57e9429de3b561c22a23106fc5484ba83010178550c +PKG_MIRROR_HASH:=9499ed7e40889b364e446a428e185c40986b75087888bd7e1496542457a6dbaa CMAKE_INSTALL:=1 PKG_CHECK_FORMAT_SECURITY:=1 PKG_USE_MIPS16:=0 -- cgit v1.2.3