2006-10-19 20:14:26 +02:00
|
|
|
|
2005-07-14 05:32:09 +02:00
|
|
|
if DRI
|
|
|
|
|
DRI_SUBDIR = dri
|
2012-07-10 03:03:15 +02:00
|
|
|
DRI_LIB = dri/libdri.la
|
2005-07-14 05:32:09 +02:00
|
|
|
endif
|
|
|
|
|
|
2008-10-15 13:00:16 +02:00
|
|
|
if DRI2
|
|
|
|
|
DRI2_SUBDIR = dri2
|
2012-07-10 03:03:18 +02:00
|
|
|
DRI2_LIB = dri2/libdri2.la
|
2008-10-15 13:00:16 +02:00
|
|
|
endif
|
2008-02-04 17:58:24 +01:00
|
|
|
|
2013-11-05 04:01:26 +01:00
|
|
|
if DRI3
|
|
|
|
|
DRI3_BUILDDIR = $(top_builddir)/dri3
|
|
|
|
|
DRI3_LIB = $(DRI3_BUILDDIR)/libdri3.la
|
|
|
|
|
endif
|
|
|
|
|
|
2018-01-10 19:05:45 +01:00
|
|
|
if GLX
|
|
|
|
|
GLXVND_LIB = $(top_builddir)/glx/libglxvnd.la
|
|
|
|
|
endif
|
|
|
|
|
|
2013-12-28 01:44:15 +01:00
|
|
|
if GLAMOR_EGL
|
|
|
|
|
GLAMOR_EGL_SUBDIR = glamor_egl
|
|
|
|
|
endif
|
|
|
|
|
|
2006-09-22 05:58:32 +02:00
|
|
|
if XF86UTILS
|
|
|
|
|
XF86UTILS_SUBDIR = utils
|
|
|
|
|
endif
|
|
|
|
|
|
2009-07-10 14:38:51 +02:00
|
|
|
if VGAHW
|
|
|
|
|
VGAHW_SUBDIR = vgahw
|
|
|
|
|
endif
|
|
|
|
|
|
2009-07-10 15:09:08 +02:00
|
|
|
if INT10MODULE
|
|
|
|
|
INT10_SUBDIR = int10
|
|
|
|
|
endif
|
|
|
|
|
|
2012-03-29 09:26:41 +02:00
|
|
|
SUBDIRS = common ddc x86emu $(INT10_SUBDIR) os-support parser \
|
2012-07-10 03:03:18 +02:00
|
|
|
ramdac $(VGAHW_SUBDIR) loader modes $(DRI_SUBDIR) \
|
2019-07-23 20:33:45 +02:00
|
|
|
$(DRI2_SUBDIR) . i2c dixmods xkb \
|
2013-12-28 01:44:15 +01:00
|
|
|
fbdevhw shadowfb exa $(XF86UTILS_SUBDIR) doc man \
|
2014-08-26 20:06:23 +02:00
|
|
|
$(GLAMOR_EGL_SUBDIR) drivers
|
2005-07-01 22:29:53 +02:00
|
|
|
|
2008-12-04 04:57:46 +01:00
|
|
|
DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
|
2019-07-23 20:33:45 +02:00
|
|
|
parser ramdac shadowfb vgahw \
|
2017-06-26 15:54:04 +02:00
|
|
|
loader dixmods xkb dri dri2 exa modes \
|
2014-10-29 05:31:40 +01:00
|
|
|
utils doc man glamor_egl drivers
|
2005-07-29 01:28:34 +02:00
|
|
|
|
2005-07-01 22:29:53 +02:00
|
|
|
bin_PROGRAMS = Xorg
|
2011-06-15 04:47:02 +02:00
|
|
|
nodist_Xorg_SOURCES = sdksyms.c
|
2005-07-01 22:29:53 +02:00
|
|
|
|
2006-11-07 21:49:28 +01:00
|
|
|
AM_CFLAGS = $(DIX_CFLAGS) @XORG_CFLAGS@
|
2015-10-27 18:28:37 +01:00
|
|
|
AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/parser \
|
2012-07-10 03:03:15 +02:00
|
|
|
-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
|
2013-04-10 04:59:39 +02:00
|
|
|
-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(top_srcdir)/dri3
|
2005-08-15 20:59:16 +02:00
|
|
|
|
2011-06-15 05:03:06 +02:00
|
|
|
LOCAL_LIBS = \
|
|
|
|
|
$(MAIN_LIB) \
|
Use libtool convenience libraries and better "symbol" table.
All .a libraries were converted to .la, and instead of linking the
Xorg binary with a mix of .a and .la, and adding some libraries more
then once in the command line, etc, now it generates a single libxorg.la
from all the required convenience libraries, and links with a dummy
xorg.c (that should usually be the file with the main function...).
This removes the requirement of some things like libosandcommon and
libinit, that existed to circumvent problems when linking multiple
.a and .la in the final Xorg binary.
The "symbol table" is now generated dynamically, by a shell script,
with an embedded gawk parser that parses cpp output. The new file
sdksyms.sh is generated by hand by analyzing all Makefile.am's and
making it create a sdksyms.c file, that includes all sdk headers that
will add symbols for the Xorg binary. Module headers aren't read, and
a in 2 files it was required to add a "<hash>ifndef XorgLoader" around
declarations shared between the Xorg binary and libextmod. A few
other changes were added to other sdk headers, like preventing
multiple inclusion, or including other headers to satisfy dependencies.
This should be a lot more portable, and better (hopefully properly)
using libtool to generate convenience libraries.
2008-12-07 05:22:19 +01:00
|
|
|
$(XSERVER_LIBS) \
|
|
|
|
|
loader/libloader.la \
|
|
|
|
|
common/libcommon.la \
|
2011-06-15 05:03:06 +02:00
|
|
|
os-support/libxorgos.la \
|
2014-02-07 16:21:48 +01:00
|
|
|
parser/libxf86config.la \
|
Use libtool convenience libraries and better "symbol" table.
All .a libraries were converted to .la, and instead of linking the
Xorg binary with a mix of .a and .la, and adding some libraries more
then once in the command line, etc, now it generates a single libxorg.la
from all the required convenience libraries, and links with a dummy
xorg.c (that should usually be the file with the main function...).
This removes the requirement of some things like libosandcommon and
libinit, that existed to circumvent problems when linking multiple
.a and .la in the final Xorg binary.
The "symbol table" is now generated dynamically, by a shell script,
with an embedded gawk parser that parses cpp output. The new file
sdksyms.sh is generated by hand by analyzing all Makefile.am's and
making it create a sdksyms.c file, that includes all sdk headers that
will add symbols for the Xorg binary. Module headers aren't read, and
a in 2 files it was required to add a "<hash>ifndef XorgLoader" around
declarations shared between the Xorg binary and libextmod. A few
other changes were added to other sdk headers, like preventing
multiple inclusion, or including other headers to satisfy dependencies.
This should be a lot more portable, and better (hopefully properly)
using libtool to generate convenience libraries.
2008-12-07 05:22:19 +01:00
|
|
|
dixmods/libdixmods.la \
|
|
|
|
|
modes/libxf86modes.la \
|
|
|
|
|
ramdac/libramdac.la \
|
|
|
|
|
ddc/libddc.la \
|
|
|
|
|
i2c/libi2c.la \
|
2011-06-15 05:03:06 +02:00
|
|
|
$(XORG_LIBS) \
|
2017-06-26 15:54:04 +02:00
|
|
|
xkb/libxorgxkb.la \
|
2012-07-10 03:03:15 +02:00
|
|
|
$(DRI_LIB) \
|
2012-07-10 03:03:18 +02:00
|
|
|
$(DRI2_LIB) \
|
2013-11-05 04:01:26 +01:00
|
|
|
$(DRI3_LIB) \
|
2018-01-10 19:05:45 +01:00
|
|
|
$(GLXVND_LIB) \
|
2019-07-23 17:54:15 +02:00
|
|
|
$(top_builddir)/fb/libfb.la \
|
2013-04-10 04:59:39 +02:00
|
|
|
$(top_builddir)/miext/sync/libsync.la \
|
Use libtool convenience libraries and better "symbol" table.
All .a libraries were converted to .la, and instead of linking the
Xorg binary with a mix of .a and .la, and adding some libraries more
then once in the command line, etc, now it generates a single libxorg.la
from all the required convenience libraries, and links with a dummy
xorg.c (that should usually be the file with the main function...).
This removes the requirement of some things like libosandcommon and
libinit, that existed to circumvent problems when linking multiple
.a and .la in the final Xorg binary.
The "symbol table" is now generated dynamically, by a shell script,
with an embedded gawk parser that parses cpp output. The new file
sdksyms.sh is generated by hand by analyzing all Makefile.am's and
making it create a sdksyms.c file, that includes all sdk headers that
will add symbols for the Xorg binary. Module headers aren't read, and
a in 2 files it was required to add a "<hash>ifndef XorgLoader" around
declarations shared between the Xorg binary and libextmod. A few
other changes were added to other sdk headers, like preventing
multiple inclusion, or including other headers to satisfy dependencies.
This should be a lot more portable, and better (hopefully properly)
using libtool to generate convenience libraries.
2008-12-07 05:22:19 +01:00
|
|
|
$(top_builddir)/mi/libmi.la \
|
2016-02-10 09:34:34 +01:00
|
|
|
$(top_builddir)/os/libos.la \
|
|
|
|
|
$(top_builddir)/Xext/libXvidmode.la
|
|
|
|
|
|
2011-06-15 05:03:06 +02:00
|
|
|
Xorg_LDADD = \
|
|
|
|
|
$(LOCAL_LIBS) \
|
|
|
|
|
$(XORG_SYS_LIBS) \
|
|
|
|
|
$(XSERVER_SYS_LIBS)
|
|
|
|
|
Xorg_DEPENDENCIES = $(LOCAL_LIBS)
|
2005-07-01 22:29:53 +02:00
|
|
|
|
2005-07-16 09:39:48 +02:00
|
|
|
Xorg_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
|
2005-08-04 04:39:56 +02:00
|
|
|
|
Xorg: Add a suid root wrapper
With the recent systemd-logind changes it is possible to install the Xorg
binary without suid root rights and still have everything working as it
should *if* the user only has cards which are supported by kms.
This commit adds a little suid root wrapper, which is a bit weird, first we
strip the suid-root bit of the Xorg binary, and then we add a wrapper ?
The function of this wrapper is to see if a system still needs root-rights,
if it does not (it supports kms and the kms drivers are properly loaded),
then it will immediately drop all elevated rights before executing the real
Xorg binary. If it finds (some) cards which don't support kms, or no cards
at all, then it will execute the Xorg server with elevated rights so that
ie the nvidia binary driver and the vesa driver can keep working normally.
To make it possible for security concious users who don't need the root
rights to completely remove the wrapper, Xorg is started in a 3 step process
when the wrapper is enabled during build time:
1) A simple shell script which checks if the wrapper is there, if it is
it executes the wrapper, if not it directly executes the real Xorg binary
2) The wrapper gets executed, does its checks, normally drops all elevated
rights and then executes the real Xorg binary
3) The real Xorg binary does its thing
This allows distributions to put the wrapper binary in a separate package, and
will allow users to remove this package. IE the plan with Fedora is to make
"legacy" drivers depend on the wrapper pkg, and since our default install
contains some legacy drivers it will be part of the default install, but
users can later yum remove it (which will also automatically remove the
legacy driver packages as those won't work without it anyways).
The wrapper is loosely modelled after the existing Debian Xwrapper, it
uses the same config-file + config-file format, and also allows restricting
Xserver execution (through the wrapper) to console users only.
There also is a new needs_root_rights config file directive, which can
be used to override the auto-detection the wrapper does.
Hopefully this will allow Debian to replace their own wrapper with this
upstream one.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-03-05 16:41:14 +01:00
|
|
|
if SUID_WRAPPER
|
2017-12-30 23:46:45 +01:00
|
|
|
wrapexecdir = $(SUID_WRAPPER_DIR)
|
|
|
|
|
wrapexec_PROGRAMS = Xorg.wrap
|
Xorg: Add a suid root wrapper
With the recent systemd-logind changes it is possible to install the Xorg
binary without suid root rights and still have everything working as it
should *if* the user only has cards which are supported by kms.
This commit adds a little suid root wrapper, which is a bit weird, first we
strip the suid-root bit of the Xorg binary, and then we add a wrapper ?
The function of this wrapper is to see if a system still needs root-rights,
if it does not (it supports kms and the kms drivers are properly loaded),
then it will immediately drop all elevated rights before executing the real
Xorg binary. If it finds (some) cards which don't support kms, or no cards
at all, then it will execute the Xorg server with elevated rights so that
ie the nvidia binary driver and the vesa driver can keep working normally.
To make it possible for security concious users who don't need the root
rights to completely remove the wrapper, Xorg is started in a 3 step process
when the wrapper is enabled during build time:
1) A simple shell script which checks if the wrapper is there, if it is
it executes the wrapper, if not it directly executes the real Xorg binary
2) The wrapper gets executed, does its checks, normally drops all elevated
rights and then executes the real Xorg binary
3) The real Xorg binary does its thing
This allows distributions to put the wrapper binary in a separate package, and
will allow users to remove this package. IE the plan with Fedora is to make
"legacy" drivers depend on the wrapper pkg, and since our default install
contains some legacy drivers it will be part of the default install, but
users can later yum remove it (which will also automatically remove the
legacy driver packages as those won't work without it anyways).
The wrapper is loosely modelled after the existing Debian Xwrapper, it
uses the same config-file + config-file format, and also allows restricting
Xserver execution (through the wrapper) to console users only.
There also is a new needs_root_rights config file directive, which can
be used to override the auto-detection the wrapper does.
Hopefully this will allow Debian to replace their own wrapper with this
upstream one.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-03-05 16:41:14 +01:00
|
|
|
Xorg_wrap_SOURCES = xorg-wrapper.c
|
|
|
|
|
endif
|
|
|
|
|
|
2006-11-01 01:05:48 +01:00
|
|
|
BUILT_SOURCES = xorg.conf.example
|
2011-06-15 02:21:48 +02:00
|
|
|
DISTCLEANFILES = xorg.conf.example
|
2014-03-25 19:00:13 +01:00
|
|
|
EXTRA_DIST = xorgconf.cpp
|
2005-08-04 04:39:56 +02:00
|
|
|
|
2013-09-28 21:26:38 +02:00
|
|
|
# Without logdir, X will post an error on the terminal and will not start
|
2005-09-15 07:06:54 +02:00
|
|
|
install-data-local:
|
2013-09-28 21:26:37 +02:00
|
|
|
$(AM_V_GEN)$(MKDIR_P) $(DESTDIR)$(logdir)
|
Xorg binary: use install-exec-hook rather than install-exec-local
The former was explicitly designed to execute additional code after the binary
has been installed. The latter can be executed in any order, hence it's
current dependency on install-binPROGRAMS as a workaround.
The CYGWIN libXorg.exe.a target is an installation target rather than
a post-installation one, so it should not be done as a hook. It does not depend
on the Xorg executable being installed.
Automake:
"These hooks are run after all other install rules of the appropriate type,
exec or data, have completed. So, for instance, it is possible to perform
post-installation modifications using an install hook".
"With the -local targets, there is no particular guarantee of execution order;
typically, they are run early, but with parallel make, there is no way
to be sure of that".
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2013-09-28 21:26:35 +02:00
|
|
|
if CYGWIN
|
|
|
|
|
$(INSTALL_DATA) libXorg.exe.a $(DESTDIR)$(libdir)/libXorg.exe.a
|
|
|
|
|
endif
|
2005-09-15 07:55:21 +02:00
|
|
|
|
Xorg binary: use install-exec-hook rather than install-exec-local
The former was explicitly designed to execute additional code after the binary
has been installed. The latter can be executed in any order, hence it's
current dependency on install-binPROGRAMS as a workaround.
The CYGWIN libXorg.exe.a target is an installation target rather than
a post-installation one, so it should not be done as a hook. It does not depend
on the Xorg executable being installed.
Automake:
"These hooks are run after all other install rules of the appropriate type,
exec or data, have completed. So, for instance, it is possible to perform
post-installation modifications using an install hook".
"With the -local targets, there is no particular guarantee of execution order;
typically, they are run early, but with parallel make, there is no way
to be sure of that".
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Keith Packard <keithp@keithp.com>
2013-09-28 21:26:35 +02:00
|
|
|
install-exec-hook:
|
2013-09-28 21:26:34 +02:00
|
|
|
(cd $(DESTDIR)$(bindir) && rm -f X && $(LN_S) Xorg$(EXEEXT) X)
|
2005-09-20 17:50:31 +02:00
|
|
|
if INSTALL_SETUID
|
2018-06-11 23:17:31 +02:00
|
|
|
chown 0 $(DESTDIR)$(bindir)/Xorg
|
2005-09-15 07:55:21 +02:00
|
|
|
chmod u+s $(DESTDIR)$(bindir)/Xorg
|
2005-09-20 17:50:31 +02:00
|
|
|
endif
|
Xorg: Add a suid root wrapper
With the recent systemd-logind changes it is possible to install the Xorg
binary without suid root rights and still have everything working as it
should *if* the user only has cards which are supported by kms.
This commit adds a little suid root wrapper, which is a bit weird, first we
strip the suid-root bit of the Xorg binary, and then we add a wrapper ?
The function of this wrapper is to see if a system still needs root-rights,
if it does not (it supports kms and the kms drivers are properly loaded),
then it will immediately drop all elevated rights before executing the real
Xorg binary. If it finds (some) cards which don't support kms, or no cards
at all, then it will execute the Xorg server with elevated rights so that
ie the nvidia binary driver and the vesa driver can keep working normally.
To make it possible for security concious users who don't need the root
rights to completely remove the wrapper, Xorg is started in a 3 step process
when the wrapper is enabled during build time:
1) A simple shell script which checks if the wrapper is there, if it is
it executes the wrapper, if not it directly executes the real Xorg binary
2) The wrapper gets executed, does its checks, normally drops all elevated
rights and then executes the real Xorg binary
3) The real Xorg binary does its thing
This allows distributions to put the wrapper binary in a separate package, and
will allow users to remove this package. IE the plan with Fedora is to make
"legacy" drivers depend on the wrapper pkg, and since our default install
contains some legacy drivers it will be part of the default install, but
users can later yum remove it (which will also automatically remove the
legacy driver packages as those won't work without it anyways).
The wrapper is loosely modelled after the existing Debian Xwrapper, it
uses the same config-file + config-file format, and also allows restricting
Xserver execution (through the wrapper) to console users only.
There also is a new needs_root_rights config file directive, which can
be used to override the auto-detection the wrapper does.
Hopefully this will allow Debian to replace their own wrapper with this
upstream one.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-03-05 16:41:14 +01:00
|
|
|
if SUID_WRAPPER
|
2014-03-24 16:31:59 +01:00
|
|
|
$(MKDIR_P) $(DESTDIR)$(SUID_WRAPPER_DIR)
|
2014-12-16 04:59:45 +01:00
|
|
|
mv $(DESTDIR)$(bindir)/Xorg $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg
|
Xorg: Add a suid root wrapper
With the recent systemd-logind changes it is possible to install the Xorg
binary without suid root rights and still have everything working as it
should *if* the user only has cards which are supported by kms.
This commit adds a little suid root wrapper, which is a bit weird, first we
strip the suid-root bit of the Xorg binary, and then we add a wrapper ?
The function of this wrapper is to see if a system still needs root-rights,
if it does not (it supports kms and the kms drivers are properly loaded),
then it will immediately drop all elevated rights before executing the real
Xorg binary. If it finds (some) cards which don't support kms, or no cards
at all, then it will execute the Xorg server with elevated rights so that
ie the nvidia binary driver and the vesa driver can keep working normally.
To make it possible for security concious users who don't need the root
rights to completely remove the wrapper, Xorg is started in a 3 step process
when the wrapper is enabled during build time:
1) A simple shell script which checks if the wrapper is there, if it is
it executes the wrapper, if not it directly executes the real Xorg binary
2) The wrapper gets executed, does its checks, normally drops all elevated
rights and then executes the real Xorg binary
3) The real Xorg binary does its thing
This allows distributions to put the wrapper binary in a separate package, and
will allow users to remove this package. IE the plan with Fedora is to make
"legacy" drivers depend on the wrapper pkg, and since our default install
contains some legacy drivers it will be part of the default install, but
users can later yum remove it (which will also automatically remove the
legacy driver packages as those won't work without it anyways).
The wrapper is loosely modelled after the existing Debian Xwrapper, it
uses the same config-file + config-file format, and also allows restricting
Xserver execution (through the wrapper) to console users only.
There also is a new needs_root_rights config file directive, which can
be used to override the auto-detection the wrapper does.
Hopefully this will allow Debian to replace their own wrapper with this
upstream one.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-03-05 16:41:14 +01:00
|
|
|
${INSTALL} -m 755 Xorg.sh $(DESTDIR)$(bindir)/Xorg
|
2018-06-11 23:17:31 +02:00
|
|
|
-chown 0 $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap && chmod u+s $(DESTDIR)$(SUID_WRAPPER_DIR)/Xorg.wrap
|
Xorg: Add a suid root wrapper
With the recent systemd-logind changes it is possible to install the Xorg
binary without suid root rights and still have everything working as it
should *if* the user only has cards which are supported by kms.
This commit adds a little suid root wrapper, which is a bit weird, first we
strip the suid-root bit of the Xorg binary, and then we add a wrapper ?
The function of this wrapper is to see if a system still needs root-rights,
if it does not (it supports kms and the kms drivers are properly loaded),
then it will immediately drop all elevated rights before executing the real
Xorg binary. If it finds (some) cards which don't support kms, or no cards
at all, then it will execute the Xorg server with elevated rights so that
ie the nvidia binary driver and the vesa driver can keep working normally.
To make it possible for security concious users who don't need the root
rights to completely remove the wrapper, Xorg is started in a 3 step process
when the wrapper is enabled during build time:
1) A simple shell script which checks if the wrapper is there, if it is
it executes the wrapper, if not it directly executes the real Xorg binary
2) The wrapper gets executed, does its checks, normally drops all elevated
rights and then executes the real Xorg binary
3) The real Xorg binary does its thing
This allows distributions to put the wrapper binary in a separate package, and
will allow users to remove this package. IE the plan with Fedora is to make
"legacy" drivers depend on the wrapper pkg, and since our default install
contains some legacy drivers it will be part of the default install, but
users can later yum remove it (which will also automatically remove the
legacy driver packages as those won't work without it anyways).
The wrapper is loosely modelled after the existing Debian Xwrapper, it
uses the same config-file + config-file format, and also allows restricting
Xserver execution (through the wrapper) to console users only.
There also is a new needs_root_rights config file directive, which can
be used to override the auto-detection the wrapper does.
Hopefully this will allow Debian to replace their own wrapper with this
upstream one.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-03-05 16:41:14 +01:00
|
|
|
endif
|
2005-09-20 17:50:31 +02:00
|
|
|
|
2013-09-28 21:26:36 +02:00
|
|
|
uninstall-local:
|
|
|
|
|
if CYGWIN
|
|
|
|
|
$(AM_V_at)rm -f $(DESTDIR)$(libdir)/libXorg.exe.a
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
uninstall-hook:
|
|
|
|
|
$(AM_V_at)rm -f $(DESTDIR)$(bindir)/X
|
|
|
|
|
|
2011-01-10 02:28:30 +01:00
|
|
|
# Use variables from XORG_MANPAGE_SECTIONS and X Server configuration
|
|
|
|
|
# Do not include manpages.am as values are not appropriate for rc files
|
|
|
|
|
CONF_SUBSTS = -e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g' \
|
|
|
|
|
-e 's|MODULEPATH|$(DEFAULT_MODULE_PATH)|g' \
|
|
|
|
|
-e 's|DEFAULTFONTPATH|$(COMPILEDDEFAULTFONTPATH)|g'
|
|
|
|
|
|
|
|
|
|
xorg.conf.example: xorgconf.cpp
|
2011-03-12 00:43:14 +01:00
|
|
|
$(AM_V_GEN)$(SED) $(CONF_SUBSTS) < $(srcdir)/xorgconf.cpp > $@
|
2006-10-19 20:14:26 +02:00
|
|
|
|
2005-12-26 20:13:52 +01:00
|
|
|
relink:
|
2012-04-30 03:45:17 +02:00
|
|
|
$(AM_V_at)rm -f Xorg$(EXEEXT) && $(MAKE) Xorg$(EXEEXT)
|
2011-06-15 04:47:02 +02:00
|
|
|
|
Xorg: Add a suid root wrapper
With the recent systemd-logind changes it is possible to install the Xorg
binary without suid root rights and still have everything working as it
should *if* the user only has cards which are supported by kms.
This commit adds a little suid root wrapper, which is a bit weird, first we
strip the suid-root bit of the Xorg binary, and then we add a wrapper ?
The function of this wrapper is to see if a system still needs root-rights,
if it does not (it supports kms and the kms drivers are properly loaded),
then it will immediately drop all elevated rights before executing the real
Xorg binary. If it finds (some) cards which don't support kms, or no cards
at all, then it will execute the Xorg server with elevated rights so that
ie the nvidia binary driver and the vesa driver can keep working normally.
To make it possible for security concious users who don't need the root
rights to completely remove the wrapper, Xorg is started in a 3 step process
when the wrapper is enabled during build time:
1) A simple shell script which checks if the wrapper is there, if it is
it executes the wrapper, if not it directly executes the real Xorg binary
2) The wrapper gets executed, does its checks, normally drops all elevated
rights and then executes the real Xorg binary
3) The real Xorg binary does its thing
This allows distributions to put the wrapper binary in a separate package, and
will allow users to remove this package. IE the plan with Fedora is to make
"legacy" drivers depend on the wrapper pkg, and since our default install
contains some legacy drivers it will be part of the default install, but
users can later yum remove it (which will also automatically remove the
legacy driver packages as those won't work without it anyways).
The wrapper is loosely modelled after the existing Debian Xwrapper, it
uses the same config-file + config-file format, and also allows restricting
Xserver execution (through the wrapper) to console users only.
There also is a new needs_root_rights config file directive, which can
be used to override the auto-detection the wrapper does.
Hopefully this will allow Debian to replace their own wrapper with this
upstream one.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-03-05 16:41:14 +01:00
|
|
|
CLEANFILES = sdksyms.c sdksyms.dep Xorg.sh
|
2011-06-15 04:47:02 +02:00
|
|
|
EXTRA_DIST += sdksyms.sh
|
|
|
|
|
|
|
|
|
|
sdksyms.dep sdksyms.c: sdksyms.sh
|
2013-08-06 05:08:13 +02:00
|
|
|
$(AM_V_GEN)CPP='$(CPP)' AWK='$(AWK)' $(SHELL) $(srcdir)/sdksyms.sh $(top_srcdir) $(CFLAGS) $(AM_CFLAGS) $(AM_CPPFLAGS)
|
2011-06-15 04:47:02 +02:00
|
|
|
|
|
|
|
|
SDKSYMS_DEP = sdksyms.dep
|
2013-12-11 20:31:46 +01:00
|
|
|
-include $(SDKSYMS_DEP)
|
2012-03-29 09:26:41 +02:00
|
|
|
|
|
|
|
|
i2c/libi2c.la:
|
|
|
|
|
$(AM_V_at)cd i2c && $(MAKE) libi2c.la
|
|
|
|
|
|
|
|
|
|
dixmods/libdixmods.la:
|
|
|
|
|
$(AM_V_at)cd dixmods && $(MAKE) libdixmods.la
|
|
|
|
|
|
2017-06-26 15:54:04 +02:00
|
|
|
xkb/libxorgxkb.la:
|
|
|
|
|
$(AM_V_at)cd xkb && $(MAKE) libxorgxkb.la
|
