Magellan Linux

Annotation of /trunk/mcore-tools/mcore-tools-1.0.0-honor-variable-hdmi-configuration-devicedir-fix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 3250 - (hide annotations) (download)
Wed Nov 21 10:56:01 2018 UTC (5 years, 5 months ago) by niro
File size: 1819 byte(s)
-added hdmi configuration devicedir fix
1 niro 3250 ------------------------------------------------------------------------
2     r2846 | niro | 2018-11-21 11:54:28 +0100 (Mi, 21. Nov 2018) | 1 Zeile
3    
4     -fixed configuration issues with auto config. if device config.d is not empty, a device xorg config will be written. hdmi config has broken this behavior
5    
6     Index: mcore-tools/src/modules/basic-video/graphic.client.class.in
7     ===================================================================
8     --- mcore-tools/src/modules/basic-video/graphic.client.class.in (Revision 2845)
9     +++ mcore-tools/src/modules/basic-video/graphic.client.class.in (Revision 2846)
10     @@ -87,9 +87,9 @@
11     write_zotac_quirk=1
12     fi
13    
14     - if [ -f ${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/hdmi ]
15     + if [ -f ${MROOT}/${MCORE_CONFIG_PATH}/xorg/hdmi/hdmi ]
16     then
17     - source ${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/hdmi
18     + source ${MROOT}/${MCORE_CONFIG_PATH}/xorg/hdmi/hdmi
19     case "${graphic_hdmi}" in
20     enable) write_zotac_quirk=0 ;;
21     disable) write_zotac_quirk=1 ;;
22     @@ -254,7 +254,7 @@
23    
24     case "${action}" in
25     enable|disable)
26     - CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/hdmi"
27     + CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/hdmi/hdmi"
28     clearconfig
29     addconfig "graphic_hdmi=\"${action}\""
30     ;;
31     @@ -270,7 +270,7 @@
32     local action="${CLASS_ARGV[0]}"
33     local driverdir="@@LIBDIR@@/xorg/modules/drivers"
34     local driver
35     - local config="${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"
36     + local config="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/25-device.conf"
37     local i
38    
39     case "${action}" in
40     @@ -296,7 +296,7 @@
41    
42     get_graphic_hdmi()
43     {
44     - local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/device/hdmi"
45     + local CONFIG="${MROOT}/${MCORE_CONFIG_PATH}/xorg/hdmi/hdmi"
46     if [ -f ${CONFIG} ]
47     then
48     rvecho "$(< ${CONFIG})"
49    
50     ------------------------------------------------------------------------