Attachment 13388 Details for Bug 12906 – fix for 4.7 cherry picked from master

[patch] fix for 4.7 cherry picked from master

0001-s3-drop-build_env.patch (text/plain), 4.30 KB, created by David Disseldorp on 2017-07-14 21:41:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Disseldorp

Created: 2017-07-14 21:41:05 UTC

Size: 4.30 KB

patch

obsolete

>From bba5dad2d626cbb6b24b6af821a902a8cfa1e0d8 Mon Sep 17 00:00:00 2001
>From: "Bernhard M. Wiedemann" <bwiedemann@suse.de>
>Date: Mon, 10 Jul 2017 18:29:41 +0200
>Subject: [PATCH] s3: drop build_env
>
>As a follow up to eedebe2ef1b ("docs-xml: Sort input file list"), this
>change enables reproducible builds, without the added complexity of
>https://lists.samba.org/archive/samba-technical/2017-June/121302.html
>
>Bug: https://bugzilla.samba.org/show_bug.cgi?id=12906
>
>Signed-off-by: Bernhard M. Wiedemann <bwiedemann@suse.de>
>Reviewed-by: David Disseldorp <ddiss@samba.org>
>Reviewed-by: Andrew Bartlett <abartlet@samba.org>
>
>Autobuild-User(master): David Disseldorp <ddiss@samba.org>
>Autobuild-Date(master): Fri Jul 14 18:48:08 CEST 2017 on sn-devel-144
>
>(cherry picked from commit 85b10a636e0eeeca0948c6b1d59d2df7b4507d45)
>---
> buildtools/wafsamba/samba_patterns.py | 14 ------------
> source3/script/build_env.sh           | 41 -----------------------------------
> source3/wscript_build                 |  8 -------
> 3 files changed, 63 deletions(-)
> delete mode 100755 source3/script/build_env.sh
>
>diff --git a/buildtools/wafsamba/samba_patterns.py b/buildtools/wafsamba/samba_patterns.py
>index 1baa6019065..e809f26a095 100644
>--- a/buildtools/wafsamba/samba_patterns.py
>+++ b/buildtools/wafsamba/samba_patterns.py
>@@ -51,7 +51,6 @@ def write_build_options_header(fp):
>     fp.write("*/\n")
>     fp.write("\n")
>     fp.write("#include \"includes.h\"\n")
>-    fp.write("#include \"build_env.h\"\n")
>     fp.write("#include \"dynconfig/dynconfig.h\"\n")
>     fp.write("#include \"lib/cluster_support.h\"\n")
> 
>@@ -92,19 +91,6 @@ def write_build_options_header(fp):
>     fp.write("              return;\n")
>     fp.write("       }\n")
>     fp.write("\n")
>-    fp.write("#ifdef _BUILD_ENV_H\n")
>-    fp.write("       /* Output information about the build environment */\n")
>-    fp.write("       output(screen,\"Build environment:\\n\");\n")
>-    fp.write("       output(screen,\"   Built by:    %s@%s\\n\",BUILD_ENV_USER,BUILD_ENV_HOST);\n")
>-    fp.write("       output(screen,\"   Built on:    %s\\n\",BUILD_ENV_DATE);\n")
>-    fp.write("\n")
>-    fp.write("       output(screen,\"   Built using: %s\\n\",BUILD_ENV_COMPILER);\n")
>-    fp.write("       output(screen,\"   Build host:  %s\\n\",BUILD_ENV_UNAME);\n")
>-    fp.write("       output(screen,\"   SRCDIR:      %s\\n\",BUILD_ENV_SRCDIR);\n")
>-    fp.write("       output(screen,\"   BUILDDIR:    %s\\n\",BUILD_ENV_BUILDDIR);\n")
>-    fp.write("\n")
>-    fp.write("\n")
>-    fp.write("#endif\n")
>     fp.write("\n")
>     fp.write("       /* Output various paths to files and directories */\n")
>     fp.write("       output(screen,\"\\nPaths:\\n\");\n")
>diff --git a/source3/script/build_env.sh b/source3/script/build_env.sh
>deleted file mode 100755
>index eb54f37aeda..00000000000
>--- a/source3/script/build_env.sh
>+++ /dev/null
>@@ -1,41 +0,0 @@
>-#!/bin/sh
>-
>-if [ $# -lt 3 ]
>-then
>-    echo "Usage: $0 srcdir builddir compiler"
>-    exit 1
>-fi
>-
>-uname=`uname -a`
>-date=`date`
>-srcdir=$1
>-builddir=$2
>-compiler=$3
>-
>-if [ ! "x$USER" = "x" ]; then
>-    whoami=$USER
>-else 
>-    if [ ! "x$LOGNAME" = "x" ]; then
>-	whoami=$LOGNAME
>-    else
>-	whoami=`whoami || id -un`
>-    fi
>-fi
>-
>-host=`hostname`
>-
>-cat <<EOF
>-/* This file is automatically generated with "make include/build_env.h". DO NOT EDIT */
>-
>-#ifndef _BUILD_ENV_H
>-#define _BUILD_ENV_H
>-
>-#define BUILD_ENV_UNAME "${uname}"
>-#define BUILD_ENV_DATE "${date}"
>-#define BUILD_ENV_SRCDIR "${srcdir}"
>-#define BUILD_ENV_BUILDDIR "${builddir}"
>-#define BUILD_ENV_USER "${whoami}"
>-#define BUILD_ENV_HOST "${host}"
>-#define BUILD_ENV_COMPILER "${compiler}"
>-#endif /* _BUILD_ENV_H */
>-EOF
>diff --git a/source3/wscript_build b/source3/wscript_build
>index a030b8ad177..1c5e4c80c0f 100644
>--- a/source3/wscript_build
>+++ b/source3/wscript_build
>@@ -9,14 +9,6 @@ config_h = "../include/config.h"
> 
> bld.SAMBA_BLDOPTIONS('smbd/build_options.c')
> 
>-t = bld.SAMBA_GENERATOR('build_env.h',
>-                        source='script/build_env.sh',
>-                        target='include/build_env.h',
>-                        rule='${SRC} ${SRCDIR} ${BUILDDIR} ${CC} > ${TGT}')
>-# todo: work out what is really wanted here
>-t.env.SRCDIR = bld.path.abspath()
>-t.env.BUILDDIR = bld.path.abspath()
>-
> bld.SETUP_BUILD_GROUPS()
> 
> ######################## SUBSYSTEMS #################################
>-- 
>2.12.3
>

Flags:

abartlet: review+

Actions: View

Attachments on bug 12906: 13388