[PATCH] babeld: Revise version string

[Christian Dresel]

Reviewed-by: Christian Dresel <fff at chrisi01.de>

Gruß

Christian

On 16.11.19 01:31, Fabian Bläse wrote:
> As the originally used version string did not include
> the daemons name, it is changed to versions like:
> 
> babeld-1.9.1+fff2
> 
> Signed-off-by: Fabian Bläse <fabian at blaese.de>
> ---
>  ...-babeld-Include-PKG_RELEASE-in-babeld-version.patch | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/feed_patches/routing/0011-babeld-Include-PKG_RELEASE-in-babeld-version.patch b/feed_patches/routing/0011-babeld-Include-PKG_RELEASE-in-babeld-version.patch
> index e85acf0..4fee16c 100644
> --- a/feed_patches/routing/0011-babeld-Include-PKG_RELEASE-in-babeld-version.patch
> +++ b/feed_patches/routing/0011-babeld-Include-PKG_RELEASE-in-babeld-version.patch
> @@ -1,4 +1,4 @@
> -From a5e29f8520ba2dc65af47153980ec3401e18757b Mon Sep 17 00:00:00 2001
> +From 6cc7f682ee04c6dab34e706b7fc2fbc701a257fb Mon Sep 17 00:00:00 2001
>  From: Adrian Schmutzler <freifunk at adrianschmutzler.de>
>  Date: Mon, 30 Sep 2019 17:09:10 +0200
>  Subject: [PATCH 1/2] babeld: Include PKG_RELEASE in babeld version
> @@ -7,12 +7,14 @@ This will account for custom patches added, as otherwise version
>  would stay the same.
>  
>  Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
> +[fabian at blaese.de: revise version string]
> +Signed-off-by: Fabian Bläse <fabian at blaese.de>
>  ---
>   babeld/Makefile | 5 +++++
>   1 file changed, 5 insertions(+)
>  
>  diff --git a/babeld/Makefile b/babeld/Makefile
> -index 022d0b8..cc266ce 100644
> +index d113d54..bd9cdb0 100644
>  --- a/babeld/Makefile
>  +++ b/babeld/Makefile
>  @@ -48,6 +48,11 @@ MAKE_FLAGS+= \
> @@ -20,7 +22,7 @@ index 022d0b8..cc266ce 100644
>   	LDLIBS="" \
>   
>  +define Build/Configure
> -+	echo "openwrt-$(PKG_VERSION)-$(PKG_RELEASE)" > $(PKG_BUILD_DIR)/version
> ++	echo "babeld-$(PKG_VERSION)+fff$(PKG_RELEASE)" > $(PKG_BUILD_DIR)/version
>  +	$(Build/Configure/Default)
>  +endef
>  +
> @@ -28,5 +30,5 @@ index 022d0b8..cc266ce 100644
>   	$(INSTALL_DIR) $(1)/usr/sbin
>   	$(INSTALL_BIN) $(PKG_BUILD_DIR)/babeld $(1)/usr/sbin/
>  -- 
> -2.20.1
> +2.24.0
>  
> 

-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 833 bytes
Beschreibung: OpenPGP digital signature
URL         : <https://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20191116/0cae1a9b/attachment.sig>