Attachment 18165 Details for Bug 15497 – patch cherry-picked from master

[patch] patch cherry-picked from master

bug-15497.patchset (text/plain), 2.21 KB, created by Michael Adam on 2023-10-17 11:26:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Adam

Created: 2023-10-17 11:26:30 UTC

Size: 2.21 KB

patch

obsolete

>From 1dd1d4c3b2770ae4cd94d8fb31cf0bdab8d96dfb Mon Sep 17 00:00:00 2001
>From: Christof Schmitt <christof.schmitt@us.ibm.com>
>Date: Thu, 12 Sep 2013 16:11:34 -0700
>Subject: [PATCH 1/2]  build: Add 'make printversion' to provide version string
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15497
>
>Signed-off-by: Christof Schmitt <christof.schmitt@us.ibm.com>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>(cherry picked from commit e2ace2d613701f3d4a7c7c202f68d2f193c0a64a)
>---
> Makefile | 4 ++++
> wscript  | 5 +++++
> 2 files changed, 9 insertions(+)
>
>diff --git a/Makefile b/Makefile
>index 7f5960d5191..dbb9fcdf1c3 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -67,6 +67,10 @@ distcheck:
> 	touch .tmplock
> 	WAFLOCK=.tmplock $(WAF) distcheck
> 
>+printversion:
>+	touch .tmplock
>+	WAFLOCK=.tmplock $(WAF) printversion
>+
> clean:
> 	$(WAF) clean
> 
>diff --git a/wscript b/wscript
>index 08995fbe4ec..b87b043e12b 100644
>--- a/wscript
>+++ b/wscript
>@@ -542,6 +542,11 @@ def distcheck():
>     '''test that distribution tarball builds and installs'''
>     samba_version.load_version(env=None)
> 
>+def printversion(ctx):
>+    '''print version'''
>+    ver = samba_version.load_version(env=None)
>+    print('Samba Version: ' + ver.STRING_WITH_NICKNAME)
>+
> def wildcard_cmd(cmd):
>     '''called on a unknown command'''
>     from samba_wildcard import run_named_build_task
>-- 
>2.39.3 (Apple Git-145)
>
>
>From 22fd5af6ea33fad559d1a636e94c9c7220f12178 Mon Sep 17 00:00:00 2001
>From: Michael Adam <obnox@samba.org>
>Date: Mon, 16 Oct 2023 19:04:55 +0200
>Subject: [PATCH 2/2] gitignore: add WAF lockfile
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15497
>
>Signed-off-by: Michael Adam <obnox@samba.org>
>Reviewed-by: Christof Schmitt <christof.schmitt@us.ibm.com>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
>Autobuild-Date(master): Tue Oct 17 04:16:29 UTC 2023 on atb-devel-224
>
>(cherry picked from commit 310629508bfbedecfab9b653b7cba0282f5c0e8b)
>---
> .gitignore | 1 +
> 1 file changed, 1 insertion(+)
>
>diff --git a/.gitignore b/.gitignore
>index de3feaabf28..9a663e2a065 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -88,3 +88,4 @@ compile_commands.json
> .clangd/
> .cache/
> .ropeproject/
>+.tmplock
>-- 
>2.39.3 (Apple Git-145)
>

Flags:

gd: review+
gd: ci-passed+

Actions: View

Attachments on bug 15497: 18165