frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xorg: Don't log "Build Operating System: Linux 4.9.0-5-amd64 x86_64 Debian" 

I don't think this is useful information to have in the log, and it's
a bunch of autotools and meson logic to produce it.

Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt 2018-09-19 13:12:40 -07:00
parent bfa6e84641
commit b8b64cd627
5 changed files with 0 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
configure.ac
View File

@ -410,12 +410,6 @@ AC_ARG_WITH(builder-addr, AS_HELP_STRING([--with-builder-addr=ADDRESS],
[Builder address (default: xorg@lists.freedesktop.org)]), [Builder address (default: xorg@lists.freedesktop.org)]),
[ BUILDERADDR="$withval" ], [ BUILDERADDR="$withval" ],
[ BUILDERADDR="xorg@lists.freedesktop.org" ]) [ BUILDERADDR="xorg@lists.freedesktop.org" ])
AC_ARG_WITH(os-name, AS_HELP_STRING([--with-os-name=OSNAME], [Name of OS (default: output of "uname -srm")]),
[ OSNAME="$withval" ],
[ OSNAME=`uname -srm` ])
AC_ARG_WITH(os-vendor, AS_HELP_STRING([--with-os-vendor=OSVENDOR], [Name of OS vendor]),
[ OSVENDOR="$withval" ],
[ OSVENDOR="" ])
AC_ARG_WITH(builderstring, AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]), AC_ARG_WITH(builderstring, AS_HELP_STRING([--with-builderstring=BUILDERSTRING], [Additional builder string]),
[ BUILDERSTRING="$withval" ] [ BUILDERSTRING="$withval" ]
[ ]) [ ])
@ -1502,12 +1496,6 @@ AC_DEFINE_UNQUOTED(XVENDORNAMESHORT, ["$VENDOR_NAME_SHORT"], [Short vendor name]
AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version]) AC_DEFINE_UNQUOTED(XORG_MAN_VERSION, ["$VENDOR_MAN_VERSION"], [Vendor man version])
AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address]) AC_DEFINE_UNQUOTED(BUILDERADDR, ["$BUILDERADDR"], [Builder address])
if test -z "$OSNAME"; then
OSNAME="UNKNOWN"
fi
AC_DEFINE_UNQUOTED(OSNAME, ["$OSNAME"], [Operating System Name])
AC_DEFINE_UNQUOTED(OSVENDOR, ["$OSVENDOR"], [Operating System Vendor])
AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string]) AC_DEFINE_UNQUOTED(BUILDERSTRING, ["$BUILDERSTRING"], [Builder string])
AC_SUBST([VENDOR_NAME_SHORT]) AC_SUBST([VENDOR_NAME_SHORT])

7
hw/xfree86/common/xf86Init.c
View File

@ -107,12 +107,6 @@ static PixmapFormatRec formats[MAXFORMATS] = {
static int numFormats = 7; static int numFormats = 7;
static Bool formatsDone = FALSE; static Bool formatsDone = FALSE;
#ifndef OSNAME
#define OSNAME " unknown"
#endif
#ifndef OSVENDOR
#define OSVENDOR ""
#endif
#ifndef PRE_RELEASE #ifndef PRE_RELEASE
#define PRE_RELEASE XORG_VERSION_SNAP #define PRE_RELEASE XORG_VERSION_SNAP
#endif #endif
@ -162,7 +156,6 @@ xf86PrintBanner(void)
#endif #endif
xf86ErrorFVerb(0, "\nX Protocol Version %d, Revision %d\n", xf86ErrorFVerb(0, "\nX Protocol Version %d, Revision %d\n",
X_PROTOCOL, X_PROTOCOL_REVISION); X_PROTOCOL, X_PROTOCOL_REVISION);
xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);
#ifdef HAS_UTSNAME #ifdef HAS_UTSNAME
{ {
struct utsname name; struct utsname name;

6
include/dix-config.h.in
View File

@ -9,12 +9,6 @@
/* Builder address */ /* Builder address */
#undef BUILDERADDR #undef BUILDERADDR
/* Operating System Name */
#undef OSNAME
/* Operating System Vendor */
#undef OSVENDOR
/* Builder string */ /* Builder string */
#undef BUILDERSTRING #undef BUILDERSTRING

2
include/meson.build
View File

@ -52,7 +52,6 @@ conf_data.set('_GNU_SOURCE', '1')
conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd') conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd')
# XXX: BUNDLE_ID_PREFIX # XXX: BUNDLE_ID_PREFIX
conf_data.set_quoted('OSNAME', 'Linux') # XXX
if get_option('input_thread') == 'false' if get_option('input_thread') == 'false'
enable_input_thread = false enable_input_thread = false
@ -241,7 +240,6 @@ conf_data.set('DEBUG', enable_debugging)
conf_data.set_quoted('XVENDORNAME', get_option('vendor_name')) conf_data.set_quoted('XVENDORNAME', get_option('vendor_name'))
conf_data.set_quoted('XVENDORNAMESHORT', get_option('vendor_name_short')) conf_data.set_quoted('XVENDORNAMESHORT', get_option('vendor_name_short'))
conf_data.set_quoted('__VENDORDWEBSUPPORT__', get_option('vendor_web')) conf_data.set_quoted('__VENDORDWEBSUPPORT__', get_option('vendor_web'))
conf_data.set_quoted('OSVENDOR', get_option('os_vendor'))
conf_data.set_quoted('BUILDERADDR', get_option('builder_addr')) conf_data.set_quoted('BUILDERADDR', get_option('builder_addr'))
conf_data.set_quoted('BUILDERSTRING', get_option('builder_string')) conf_data.set_quoted('BUILDERSTRING', get_option('builder_string'))

1
meson_options.txt
View File

@ -46,7 +46,6 @@ option('fallback_input_driver', type: 'string', value: 'auto')
option('vendor_name', type: 'string', value: 'The X.Org Foundation') option('vendor_name', type: 'string', value: 'The X.Org Foundation')
option('vendor_name_short', type: 'string', value: 'X.Org') option('vendor_name_short', type: 'string', value: 'X.Org')
option('vendor_web', type: 'string', value: 'http://wiki.x.org') option('vendor_web', type: 'string', value: 'http://wiki.x.org')
option('os_vendor', type: 'string', value: '')
option('listen_tcp', type: 'boolean', value: false, option('listen_tcp', type: 'boolean', value: false,
description: 'Listen on TCP by default') description: 'Listen on TCP by default')