xserver: Branch 'master'

[GitLab Mirror]

 configure.ac                 |   12 ------------
 hw/xfree86/common/xf86Init.c |    7 -------
 include/dix-config.h.in      |    6 ------
 include/meson.build          |    2 --
 meson_options.txt            |    1 -
 5 files changed, 28 deletions(-)

New commits:
commit b8b64cd627232a1fed791b8baf562900144bf186
Author: Eric Anholt <eric at anholt.net>
Date:   Wed Sep 19 13:12:40 2018 -0700

    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 at anholt.net>

diff --git a/configure.ac b/configure.ac
index f547b1dc9..359b62cb5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -410,12 +410,6 @@ AC_ARG_WITH(builder-addr,    AS_HELP_STRING([--with-builder-addr=ADDRESS],
 				  [Builder address (default: xorg at lists.freedesktop.org)]),
 				[ BUILDERADDR="$withval" ],
 				[ BUILDERADDR="xorg at 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]),
 				[ 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(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_SUBST([VENDOR_NAME_SHORT])
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 8f50580fe..cc34a1952 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -107,12 +107,6 @@ static PixmapFormatRec formats[MAXFORMATS] = {
 static int numFormats = 7;
 static Bool formatsDone = FALSE;
 
-#ifndef OSNAME
-#define OSNAME " unknown"
-#endif
-#ifndef OSVENDOR
-#define OSVENDOR ""
-#endif
 #ifndef PRE_RELEASE
 #define PRE_RELEASE XORG_VERSION_SNAP
 #endif
@@ -162,7 +156,6 @@ xf86PrintBanner(void)
 #endif
     xf86ErrorFVerb(0, "\nX Protocol Version %d, Revision %d\n",
                    X_PROTOCOL, X_PROTOCOL_REVISION);
-    xf86ErrorFVerb(0, "Build Operating System: %s %s\n", OSNAME, OSVENDOR);
 #ifdef HAS_UTSNAME
     {
         struct utsname name;
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index c64321ef1..f8df86608 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -9,12 +9,6 @@
 /* Builder address */
 #undef BUILDERADDR
 
-/* Operating System Name */
-#undef OSNAME
-
-/* Operating System Vendor */
-#undef OSVENDOR
-
 /* Builder string */
 #undef BUILDERSTRING
 
diff --git a/include/meson.build b/include/meson.build
index 5864ced5c..4a0c12f5a 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -52,7 +52,6 @@ conf_data.set('_GNU_SOURCE', '1')
 conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd')
 
 # XXX: BUNDLE_ID_PREFIX
-conf_data.set_quoted('OSNAME', 'Linux') # XXX
 
 if get_option('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('XVENDORNAMESHORT', get_option('vendor_name_short'))
 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('BUILDERSTRING', get_option('builder_string'))
 
diff --git a/meson_options.txt b/meson_options.txt
index 6b9641756..7211f9ffa 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -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_short', type: 'string', value: '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,
        description: 'Listen on TCP by default')