From 20ce78efa896c687d69135ebf1a3646c89d1d585 Mon Sep 17 00:00:00 2001 From: Kevin Darbyshire-Bryant Date: Wed, 22 Jul 2020 15:56:08 +0100 Subject: [PATCH 1/6] kmod-sched-cake-oot: fix PKG_MIRROR_HASH Signed-off-by: Kevin Darbyshire-Bryant --- package/kernel/kmod-sched-cake-oot/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/kernel/kmod-sched-cake-oot/Makefile b/package/kernel/kmod-sched-cake-oot/Makefile index 65042ce1f2..e6d8d76e5f 100644 --- a/package/kernel/kmod-sched-cake-oot/Makefile +++ b/package/kernel/kmod-sched-cake-oot/Makefile @@ -15,7 +15,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/dtaht/sch_cake.git PKG_SOURCE_DATE:=2020-01-10 PKG_SOURCE_VERSION:=aeff7a3e61ffa3159a8a95384d33e47a006211f4 -PKG_MIRROR_HASH:=5bf06a804824db36ae393fc174aeec7b12633176e05a765c0931b39df5bd34df +PKG_MIRROR_HASH:=3f634fdc05d30988abb4cae2f7fcb4bd55ff10b0b354ac16b8577e85a4b74f6f PKG_MAINTAINER:=Kevin Darbyshire-Bryant include $(INCLUDE_DIR)/package.mk From bc64ff56c567f35626b67fd39eeea372958b2386 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Thu, 23 Jul 2020 01:04:35 +0200 Subject: [PATCH 2/6] tools: drop PKG_VERSION for purely local packages This applies to tools directory what has been done for package/ in commit 9c170cb92f4f ("package: drop PKG_VERSION for purely local packages"): In the package guidelines, PKG_VERSION is supposed to be used as "The upstream version number that we're downloading", while PKG_RELEASE is referred to as "The version of this package Makefile". Thus, the variables in a strict interpretation provide a clear distinction between "their" (upstream) version in PKG_VERSION and "our" (local OpenWrt trunk) version in PKG_RELEASE. For local (OpenWrt-only) packages, this implies that those will only need PKG_RELEASE defined, while PKG_VERSION does not apply following a strict interpretation. While the majority of "our" packages actually follow that scheme, there are also some that mix both variables or have one of them defined but keep them at "1". This is misleading and confusing, which can be observed by the fact that there typically either one of the variables is never bumped or the choice of the variable to increase depends on the person doing the change. Consequently, this patch aims at clarifying the situation by consistently using only PKG_RELEASE for "our" packages. For tools/, only three packages were affected. This fixes two of them, and leaves the remaining wrt350nv2-builder untouched, as the code there seems to have some versioning of its own that is treated as upstream version in PKG_VERSION. Signed-off-by: Adrian Schmutzler --- tools/missing-macros/Makefile | 2 +- tools/padjffs2/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/missing-macros/Makefile b/tools/missing-macros/Makefile index e4b69b3875..3d3ee4cbef 100644 --- a/tools/missing-macros/Makefile +++ b/tools/missing-macros/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=missing-macros -PKG_VERSION:=10 +PKG_RELEASE:=10 include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/padjffs2/Makefile b/tools/padjffs2/Makefile index 0a583b8e1a..422d14db30 100644 --- a/tools/padjffs2/Makefile +++ b/tools/padjffs2/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=padjffs2 -PKG_VERSION:=1 +PKG_RELEASE:=1 include $(INCLUDE_DIR)/host-build.mk From 5242ffe8222f720cf799683a824410103d944c08 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 22 Jul 2020 13:08:27 -1000 Subject: [PATCH 3/6] tools/patch-image: add PKG_RELEASE There is no versioning information in the patch-image code nor the Makefile. Consider it as first release by adding PKG_RELEASE. Motivation is the tracking of changes in the buildsystem, which requires versioning of packages. Also update copyright. Signed-off-by: Paul Spooren --- tools/patch-image/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/patch-image/Makefile b/tools/patch-image/Makefile index 6f2900b96c..89cd25e19d 100644 --- a/tools/patch-image/Makefile +++ b/tools/patch-image/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2012 OpenWrt.org +# Copyright (C) 2007-2020 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,6 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=patch-image +PKG_RELEASE:=1 include $(INCLUDE_DIR)/host-build.mk From 6430074631ce8b7be8a9cd223bb353b5a391f971 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 22 Jul 2020 13:10:06 -1000 Subject: [PATCH 4/6] tools/firmware-utils: add PKG_RELEASE There is no versioning information in the firmware-utils code nor the Makefile. Consider it as first release by adding PKG_RELEASE. Motivation is the tracking of changes in the buildsystem, which requires versioning of packages. Also update copyright. Signed-off-by: Paul Spooren --- tools/firmware-utils/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile index 3dd9ac5c2c..ee0ef3a6fd 100644 --- a/tools/firmware-utils/Makefile +++ b/tools/firmware-utils/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2020 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,6 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME := firmware-utils +PKG_RELEASE := 1 include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/kernel.mk From cfe8c10798bf77814cffd5c9269ce82945fa25ab Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 22 Jul 2020 13:46:21 -1000 Subject: [PATCH 5/6] tools/sstrip: add PKG_{VERSION,RELEASE} Comparing the in tree stored source file of sstrip suggests it's version 2.0[0], reflect that in the Makefile. Motivation is the tracking of changes in the buildsystem, which requires versioning of packages. [0]: https://github.com/BR903/ELFkickers/commit/df4426a0f0ada861064d75c08cbebaac7c16b3ae#diff-d3ba694d91432a068d5d3b36abf8cd0f Signed-off-by: Paul Spooren --- tools/sstrip/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/sstrip/Makefile b/tools/sstrip/Makefile index 180bd1743e..bab172a95a 100644 --- a/tools/sstrip/Makefile +++ b/tools/sstrip/Makefile @@ -7,6 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sstrip +PKG_VERSION:=2.0 +PKG_RELEASE:=1 include $(INCLUDE_DIR)/host-build.mk From cef6808d80798c94c457f807969a29a01cff9aeb Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Wed, 22 Jul 2020 13:49:37 -1000 Subject: [PATCH 6/6] tools/flock: add PKG_{VERSION,RELEASE} The stored source code of flock contains the version string of version 2.18, reflect that in the Makefile. Motivation is the tracking of changes in the buildsystem, which requires versioning of packages. Signed-off-by: Paul Spooren --- tools/flock/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/flock/Makefile b/tools/flock/Makefile index 9939d12116..cd3561bb69 100644 --- a/tools/flock/Makefile +++ b/tools/flock/Makefile @@ -7,6 +7,8 @@ include $(TOPDIR)/rules.mk PKG_NAME := flock +PKG_VERSION := 2.18 +PKG_RELEASE := 1 include $(INCLUDE_DIR)/host-build.mk