From 4b457916eaa4ab14f0f161ed92f1315753ab4e3e Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 Nov 2019 12:36:21 +0100 Subject: [PATCH 1/3] batman-adv: improve version string This changes the package version string so it does not start with "openwrt", but with the base version we are modifying: So far: openwrt-2019.4-1 Now: 2019.4-openwrt-1 Since it's us modifying version 2019.4 (in this case), this order is more convenient (and also closer to what the kernel version string does). Signed-off-by: Adrian Schmutzler --- batman-adv/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Makefile b/batman-adv/Makefile index c59ebce..dfebb03 100644 --- a/batman-adv/Makefile +++ b/batman-adv/Makefile @@ -76,7 +76,7 @@ NOSTDINC_FLAGS = \ -I$(PKG_BUILD_DIR)/include/ \ -include backport/backport.h \ -include $(PKG_BUILD_DIR)/compat-hacks.h \ - -DBATADV_SOURCE_VERSION=\\\"openwrt-$(PKG_VERSION)-$(PKG_RELEASE)\\\" + -DBATADV_SOURCE_VERSION=\\\"$(PKG_VERSION)-openwrt-$(PKG_RELEASE)\\\" COMPAT_SOURCES = \ $(if $(CONFIG_BATMAN_ADV_MCAST),../../compat-sources/net/core/skbuff.o,) \ From 612bd5e5f6357899c1fd9d88117c5071d9a309cf Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 Nov 2019 12:39:56 +0100 Subject: [PATCH 2/3] batctl: improve version string This changes the package version string so it does not start with "openwrt", but with the base version we are modifying: So far: openwrt-2019.4-1 Now: 2019.4-openwrt-1 Since it's us modifying version 2019.4 (in this case), this order is more convenient (and also closer to what the kernel version string does). Signed-off-by: Adrian Schmutzler --- batctl/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batctl/Makefile b/batctl/Makefile index 6aebebb..0a19592 100644 --- a/batctl/Makefile +++ b/batctl/Makefile @@ -94,7 +94,7 @@ MAKE_VARS += \ LIBNL_GENL_NAME="libnl-tiny" MAKE_FLAGS += \ - REVISION="openwrt-$(PKG_VERSION)-$(PKG_RELEASE)" + REVISION="$(PKG_VERSION)-openwrt-$(PKG_RELEASE)" config-n := \ aggregation \ From c5004988d364891d7690f622f21e6c5beb357fde Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Mon, 11 Nov 2019 12:40:35 +0100 Subject: [PATCH 3/3] alfred: improve version string This changes the package version string so it does not start with "openwrt", but with the base version we are modifying: So far: openwrt-2019.4-1 Now: 2019.4-openwrt-1 Since it's us modifying version 2019.4 (in this case), this order is more convenient (and also closer to what the kernel version string does). Signed-off-by: Adrian Schmutzler --- alfred/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alfred/Makefile b/alfred/Makefile index 0786b2b..f4e3e64 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -59,7 +59,7 @@ MAKE_FLAGS += \ CONFIG_ALFRED_CAPABILITIES=n \ LIBNL_NAME="libnl-tiny" \ LIBNL_GENL_NAME="libnl-tiny" \ - REVISION="openwrt-$(PKG_VERSION)-$(PKG_RELEASE)" + REVISION="$(PKG_VERSION)-openwrt-$(PKG_RELEASE)" TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto TARGET_LDFLAGS += -Wl,--gc-sections -fuse-linker-plugin