New patch to review for coreboot: fd5b73f build.h: remove variable for the builduser, -hostname and -domain
Alexander Couzens (lynxis@fe80.eu) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8616
-gerrit
commit fd5b73f319beacd86fa98eea37b61fc564ce4e21 Author: Alexander Couzens lynxis@fe80.eu Date: Sat Mar 7 00:49:21 2015 +0100
build.h: remove variable for the builduser, -hostname and -domain
They doesn't contain any usefull information and also block us from having reproducible builds.
Change-Id: Ib03887f6a548230de9f75fb308c73a800e180c48 Signed-off-by: Alexander Couzens lynxis@fe80.eu --- src/include/version.h | 3 --- src/lib/coreboot_table.c | 3 --- src/lib/version.c | 10 ---------- util/genbuild_h/genbuild_h.sh | 40 ---------------------------------------- 4 files changed, 56 deletions(-)
diff --git a/src/include/version.h b/src/include/version.h index 2a70842..f24b893 100644 --- a/src/include/version.h +++ b/src/include/version.h @@ -13,9 +13,6 @@ extern const unsigned int coreboot_version_timestamp;
/* When coreboot was compiled */ extern const char coreboot_compile_time[]; -extern const char coreboot_compile_by[]; -extern const char coreboot_compile_host[]; -extern const char coreboot_compile_domain[]; extern const char coreboot_dmi_date[];
struct bcd_date { diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index 12090dc..abcb0ed 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -281,9 +281,6 @@ static void lb_strings(struct lb_header *header) { LB_TAG_EXTRA_VERSION, coreboot_extra_version, }, { LB_TAG_BUILD, coreboot_build, }, { LB_TAG_COMPILE_TIME, coreboot_compile_time, }, - { LB_TAG_COMPILE_BY, coreboot_compile_by, }, - { LB_TAG_COMPILE_HOST, coreboot_compile_host, }, - { LB_TAG_COMPILE_DOMAIN, coreboot_compile_domain, }, }; unsigned int i; for(i = 0; i < ARRAY_SIZE(strings); i++) { diff --git a/src/lib/version.c b/src/lib/version.c index 19c14c6..b707e8c 100644 --- a/src/lib/version.c +++ b/src/lib/version.c @@ -18,12 +18,6 @@ #ifndef COREBOOT_COMPILE_TIME #error COREBOOT_COMPILE_TIME not defined #endif -#ifndef COREBOOT_COMPILE_BY -#error COREBOOT_COMPILE_BY not defined -#endif -#ifndef COREBOOT_COMPILE_HOST -#error COREBOOT_COMPILE_HOST not defined -#endif
#ifndef COREBOOT_EXTRA_VERSION #define COREBOOT_EXTRA_VERSION "" @@ -38,10 +32,6 @@ const char coreboot_build[] = COREBOOT_BUILD; const unsigned int coreboot_version_timestamp = COREBOOT_VERSION_TIMESTAMP;
const char coreboot_compile_time[] = COREBOOT_COMPILE_TIME; -const char coreboot_compile_by[] = COREBOOT_COMPILE_BY; -const char coreboot_compile_host[] = COREBOOT_COMPILE_HOST; -const char coreboot_compile_domain[] = COREBOOT_COMPILE_DOMAIN; - const char coreboot_dmi_date[] = COREBOOT_DMI_DATE;
const struct bcd_date coreboot_build_date = { diff --git a/util/genbuild_h/genbuild_h.sh b/util/genbuild_h/genbuild_h.sh index e79e41b..d500d25 100755 --- a/util/genbuild_h/genbuild_h.sh +++ b/util/genbuild_h/genbuild_h.sh @@ -18,41 +18,6 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #
-#get the domain name without hanging the build for an extended period if -#the build system doesn't return a domain name as can happen with the -#dnsdomainname or domainname commands by themselves. -get_domainname() { - MAX_DELAY=1 #maximum time to wait in seconds - TIMEOUT_HOSTNAME_TEXT=unknown.domain #text to return if domain name is not found - TEMPFILE_NAME=coreboot_hostname.txt #temp file to put the domain name into - - # Find the domain name - if [ "$(uname -s)" = "Linux" ] - then - dnsdomainname 2>/dev/null > "$TEMPFILE_NAME" & - else - domainname 2>/dev/null >"$TEMPFILE_NAME" & - fi - - # Get ready to kill the process if it's taking too long - PID=$! - sleep "$MAX_DELAY" && kill "$PID" 2>/dev/null & - wait "$PID" 2>/dev/null - - # See what was found, print our timeout text if the process was killed - # or the domain name if we found one. - HN=$(cat "$TEMPFILE_NAME") - if [ "$HN" = "" ] - then - printf "%s" "$TIMEOUT_HOSTNAME_TEXT" - else - printf "%s" "$HN" - fi - - # Clean up and exit. - rm -f "$TEMPFILE_NAME" -} - #Print out the information that goes into build.h printf "/* build system definitions (autogenerated) */\n" printf "#ifndef __BUILD_H\n" @@ -79,9 +44,4 @@ printf "#define COREBOOT_BUILD_WEEKDAY_BCD 0x%s\n" "$(date +%w)" printf "#define COREBOOT_DMI_DATE "%s"\n" "$(date +%m/%d/%Y)" printf "\n" printf "#define COREBOOT_COMPILE_TIME "%s"\n" "$(date +%T)" -printf "#define COREBOOT_COMPILE_BY "%s"\n" "$(whoami)" -printf "#define COREBOOT_COMPILE_HOST "%s"\n" "$(hostname -s 2>/dev/null)" -printf "#define COREBOOT_COMPILE_DOMAIN "" -get_domainname -printf ""\n" printf "#endif\n"
-
Alexander Couzens