From 3e96c851a7871f38c52c7be0e0f693b045fe0758 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Wed, 26 Apr 2023 11:40:36 +0200 Subject: [PATCH] treewide: remove AUTORELEASE OpenWrt/packages removed AUTORELEASE treewide. Remove it also in the routing feed. This is just copied from [0] with modification to the sed cmd because it was not working for the routing feed: 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: for i in $(cd feeds/routing; git grep -l PKG_RELEASE:=.*AUTORELEASE | \ sed 's/\/Makefile$//';); do make package/$i/download done [0] - https://github.com/openwrt/packages/commit/0c10c224be81f9221dabfab449855ab6718d2a0c Signed-off-by: Nick Hainke --- alfred/Makefile | 2 +- batctl/Makefile | 2 +- batman-adv/Makefile | 2 +- bmx6/Makefile | 2 +- mcproxy/Makefile | 2 +- mesh11sd/Makefile | 2 +- minimalist-pcproxy/Makefile | 2 +- naywatch/Makefile | 2 +- olsrd/Makefile | 2 +- pimbd/Makefile | 2 +- prince/Makefile | 2 +- vis/Makefile | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index c5fceab..f163908 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=alfred PKG_VERSION:=2023.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 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 8a81cbb..242f101 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batctl PKG_VERSION:=2023.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 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 e390670..0d22a1e 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -4,7 +4,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv PKG_VERSION:=2023.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 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/bmx6/Makefile b/bmx6/Makefile index 66542ef..b533196 100644 --- a/bmx6/Makefile +++ b/bmx6/Makefile @@ -26,7 +26,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bmx6 PKG_VERSION:=0.1-alpha -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/bmx-routing/bmx6.git diff --git a/mcproxy/Makefile b/mcproxy/Makefile index 082f3a8..97831f7 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/mesh11sd/Makefile b/mesh11sd/Makefile index 567e06d..cfa47dc 100644 --- a/mesh11sd/Makefile +++ b/mesh11sd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mesh11sd PKG_VERSION:=1.2.0 -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=3 PKG_MAINTAINER:=Rob White PKG_LICENSE:=GPL-2.0-or-later diff --git a/minimalist-pcproxy/Makefile b/minimalist-pcproxy/Makefile index fa4f31d..2fd3252 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 f79890f..c0e1867 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 5872d14..46b1202 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:=5 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/OLSR/olsrd.git diff --git a/pimbd/Makefile b/pimbd/Makefile index 4d6cb0b..6fe14b6 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 03ca478..ce13f43 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 2d69417..89a1bbe 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 -- 2.30.2