From 076a2750dd7758950400a20bbc9b9a09440bed4a Mon Sep 17 00:00:00 2001 From: Sven Eckelmann Date: Sat, 3 Feb 2024 08:56:13 +0100 Subject: [PATCH] treewide: remove AUTORELEASE Automatically compute and substitute current values for all $(AUTORELEASE) instances as this feature is deprecated and shouldn't be used. Since commit 2584b0cecae ("CI: deprecate $(AUTORELEASE) via comments"), this is even announced by the CI The following temporary change was made to the core: diff --git a/rules.mk b/rules.mk index 57d7995d4fa8..f16367de87a8 100644 --- a/rules.mk +++ b/rules.mk @@ -429,7 +429,7 @@ endef abi_version_str = $(subst -,,$(subst _,,$(subst .,,$(1)))) COMMITCOUNT = $(if $(DUMP),0,$(call commitcount)) -AUTORELEASE = $(if $(DUMP),0,$(call commitcount,1)) +AUTORELEASE = $(if $(DUMP),0,$(shell sed -i "s/\$$(AUTORELEASE)/$(call commitcount,1)/" $(CURDIR)/Makefile)) all: FORCE: ; And this command used to fix affected packages: ./scripts/feeds install -a routing for i in $(cd feeds/routing; git grep -l 'PKG_RELEASE:=.*AUTORELEASE' | \ sed 's^.*/\([^/]*\)/Makefile^\1^';); do make package/${i%/Makefile}/download done Signed-off-by: Sven Eckelmann --- alfred/Makefile | 2 +- batctl/Makefile | 2 +- batman-adv/Makefile | 2 +- mcproxy/Makefile | 2 +- minimalist-pcproxy/Makefile | 2 +- naywatch/Makefile | 2 +- olsrd/Makefile | 2 +- oonf-dlep-radio/Makefile | 2 +- pimbd/Makefile | 2 +- prince/Makefile | 2 +- vis/Makefile | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index 239f8ad98..0b71c18e1 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred PKG_VERSION:=2022.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) diff --git a/batctl/Makefile b/batctl/Makefile index 557290135..49ab0aa18 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl PKG_VERSION:=2022.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index 4c7ffb95f..f2cded6e7 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2022.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=8 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) diff --git a/mcproxy/Makefile b/mcproxy/Makefile index 082f3a875..97831f7ba 100644 --- a/mcproxy/Makefile +++ b/mcproxy/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mcproxy -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=9 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/mcproxy/mcproxy.git diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile index fa4f31d79..2fd325227 100644 --- a/minimalist-pcproxy/Makefile +++ b/minimalist-pcproxy/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minimalist-pcproxy -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=7 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/fingon/minimalist-pcproxy.git diff --git a/naywatch/Makefile b/naywatch/Makefile index f79890f01..c0e18673a 100644 --- a/naywatch/Makefile +++ b/naywatch/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=naywatch PKG_VERSION:=1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=7 PKG_MAINTAINER:=Nick Hainke PKG_LICENSE:=GPL-2.0-only diff --git a/olsrd/Makefile b/olsrd/Makefile index 7918be0fd..71c8fb470 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd PKG_SOURCE_DATE:=2022-03-18 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git diff --git a/oonf-dlep-radio/Makefile b/oonf-dlep-radio/Makefile index b195b887c..d3599e1a0 100644 --- a/oonf-dlep-radio/Makefile +++ b/oonf-dlep-radio/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=oonf-dlep-radio PKG_VERSION:=0.15.1 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=30 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OLSR/OONF.git diff --git a/pimbd/Makefile b/pimbd/Makefile index 4d6cb0bcd..6fe14b68f 100644 --- a/pimbd/Makefile +++ b/pimbd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pimbd -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=4 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/Oryon/pimbd.git diff --git a/prince/Makefile b/prince/Makefile index a88e41cf2..00f229d10 100644 --- a/prince/Makefile +++ b/prince/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=prince PKG_VERSION:=0.4 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/AdvancedNetworkingSystems/prince/archive/refs/tags/v$(PKG_VERSION).tar.gz? diff --git a/vis/Makefile b/vis/Makefile index 2d69417ce..89a1bbe26 100644 --- a/vis/Makefile +++ b/vis/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vis -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=9 PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2013-04-07