[meta-intel] [PATCH] xserver-xf86-config: remove redundant files, clean up broken ones

Darren Hart dvhart at linux.intel.com
Wed Sep 18 16:31:25 PDT 2013


On Wed, 2013-09-18 at 23:23 +0100, Ross Burton wrote:
> Most BSPs appear to be derived from what appears to be a stale copy of the
> atom-pc xorg.conf which was either repeating defaults (the screen
> configuration), pointlessly hard-coding (specifying video driver when X can
> auto-probe), or actively harmful (disabling hotplugged input devices).  Delete
> the files which can be removed, and remove the bad hotplug disabling options
> from the others.
> 


This has been something I've wanted to see improved for a long time.
Typically we do changes like with one patch per BSP to help keep things
a bit more flexible in the face of regressions. Which of these BSPs did
you test and verify work after this patch?

Thanks,

Darren


> Signed-off-by: Ross Burton <ross.burton at intel.com>
> ---
>  .../xserver-xf86-config/chiefriver/xorg.conf       |   26 ----------------
>  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
>  .../xserver-xf86-config/crownbay-noemgd/xorg.conf  |   26 ----------------
>  .../xserver-xf86-config/crownbay/xorg.conf         |    5 ---
>  .../crystalforest-gladden/xorg.conf                |   26 ----------------
>  .../crystalforest-server/xorg.conf                 |   26 ----------------
>  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
>  .../xserver-xf86-config/emenlow-noemgd/xorg.conf   |    5 ---
>  .../xserver-xf86-config/emenlow/xorg.conf          |    5 ---
>  .../xserver-xf86-config/fri2-noemgd/xorg.conf      |   26 ----------------
>  .../xserver-xf86-config/fri2/xorg.conf             |    5 ---
>  .../xserver-xf86-config/jasperforest/xorg.conf     |   32 --------------------
>  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
>  .../xserver-xf86-config/n450/xorg.conf             |   26 ----------------
>  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
>  .../xorg-xserver/xserver-xf86-config/nuc/xorg.conf |   26 ----------------
>  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
>  .../xserver-xf86-config/romley-ivb/xorg.conf       |   26 ----------------
>  .../xserver-xf86-config/romley/xorg.conf           |   26 ----------------
>  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
>  .../xserver-xf86-config/sugarbay/xorg.conf         |   26 ----------------
>  .../xorg-xserver/xserver-xf86-config_0.1.bbappend  |    1 -
>  .../xserver-xf86-config/sys940x-noemgd/xorg.conf   |   26 ----------------
>  .../xserver-xf86-config/sys940x/xorg.conf          |    5 ---
>  24 files changed, 350 deletions(-)
>  delete mode 100644 meta-chiefriver/recipes-graphics/xorg-xserver/xserver-xf86-config/chiefriver/xorg.conf
>  delete mode 100644 meta-chiefriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>  delete mode 100644 meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/xorg.conf
>  delete mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf
>  delete mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf
>  delete mode 100644 meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>  delete mode 100644 meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
>  delete mode 100644 meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-config/jasperforest/xorg.conf
>  delete mode 100644 meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>  delete mode 100644 meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config/n450/xorg.conf
>  delete mode 100644 meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>  delete mode 100644 meta-nuc/recipes-graphics/xorg-xserver/xserver-xf86-config/nuc/xorg.conf
>  delete mode 100644 meta-nuc/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>  delete mode 100644 meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley-ivb/xorg.conf
>  delete mode 100644 meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley/xorg.conf
>  delete mode 100644 meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>  delete mode 100644 meta-sugarbay/recipes-graphics/xorg-xserver/xserver-xf86-config/sugarbay/xorg.conf
>  delete mode 100644 meta-sugarbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
>  delete mode 100644 meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf
> 
> diff --git a/meta-chiefriver/recipes-graphics/xorg-xserver/xserver-xf86-config/chiefriver/xorg.conf b/meta-chiefriver/recipes-graphics/xorg-xserver/xserver-xf86-config/chiefriver/xorg.conf
> deleted file mode 100644
> index 96b94b4..0000000
> --- a/meta-chiefriver/recipes-graphics/xorg-xserver/xserver-xf86-config/chiefriver/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Intel Graphics Driver"
> -    Driver	"intel"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Intel Graphics Driver"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-chiefriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-chiefriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> deleted file mode 100644
> index 72d991c..0000000
> --- a/meta-chiefriver/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> +++ /dev/null
> @@ -1 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/xorg.conf b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/xorg.conf
> deleted file mode 100644
> index da4fc3c..0000000
> --- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay-noemgd/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Generic VESA"
> -    Driver	"vesa"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Generic VESA"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
> index 662f60f..5217963 100644
> --- a/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
> +++ b/meta-crownbay/recipes-graphics/xorg-xserver/xserver-xf86-config/crownbay/xorg.conf
> @@ -41,8 +41,3 @@ Section "ServerLayout"
>     # InputDevice    "Keyboard0" "CoreKeyboard"
>     # InputDevice    "DevInputMice" "SendCoreEvents"
>  EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf
> deleted file mode 100644
> index 28ad0bf..0000000
> --- a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-gladden/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Matrox MGA"
> -    Driver	"mga"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Matrox MGA"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf
> deleted file mode 100644
> index 28ad0bf..0000000
> --- a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config/crystalforest-server/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Matrox MGA"
> -    Driver	"mga"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Matrox MGA"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> deleted file mode 100644
> index 72d991c..0000000
> --- a/meta-crystalforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> +++ /dev/null
> @@ -1 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
> index aa6f32b..3316e54 100644
> --- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
> +++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow-noemgd/xorg.conf
> @@ -20,8 +20,3 @@ Section "ServerLayout"
>      Identifier     "Default Layout"
>      Screen         "Default Screen"
>  EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
> index 662f60f..5217963 100644
> --- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
> +++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-xf86-config/emenlow/xorg.conf
> @@ -41,8 +41,3 @@ Section "ServerLayout"
>     # InputDevice    "Keyboard0" "CoreKeyboard"
>     # InputDevice    "DevInputMice" "SendCoreEvents"
>  EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
> deleted file mode 100644
> index bda3535..0000000
> --- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2-noemgd/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Generic VESA"
> -    Driver	"fbdev"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Generic VESA"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
> index 8c31565..a9211e7 100644
> --- a/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
> +++ b/meta-fri2/recipes-graphics/xorg-xserver/xserver-xf86-config/fri2/xorg.conf
> @@ -58,8 +58,3 @@ Section "ServerLayout"
>     # InputDevice    "Keyboard0" "CoreKeyboard"
>     # InputDevice    "DevInputMice" "SendCoreEvents"
>  EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-config/jasperforest/xorg.conf b/meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-config/jasperforest/xorg.conf
> deleted file mode 100644
> index ca14a0c..0000000
> --- a/meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-config/jasperforest/xorg.conf
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -#Section "Device"
> -#    Identifier	"Volari Z11"
> -#    Driver	"xgi"
> -#EndSection
> -
> -Section "Device"
> -    Identifier	"Generic VESA"
> -    Driver	"vesa"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -#    Device	  "Volari Z11"
> -    Device	  "Generic VESA"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> deleted file mode 100644
> index 72d991c..0000000
> --- a/meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> +++ /dev/null
> @@ -1 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> diff --git a/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config/n450/xorg.conf b/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config/n450/xorg.conf
> deleted file mode 100644
> index e18b911..0000000
> --- a/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config/n450/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier    "Intel Graphics Driver"
> -    Driver        "intel"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device        "Intel Graphics Driver"
> -    Monitor        "Generic Monitor"
> -    DefaultDepth    24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier    "Default Layout"
> -    Screen        "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option	  "AutoAddDevices" "False"
> -EndSection
> diff --git a/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> deleted file mode 100644
> index 72d991c..0000000
> --- a/meta-n450/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> +++ /dev/null
> @@ -1 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> diff --git a/meta-nuc/recipes-graphics/xorg-xserver/xserver-xf86-config/nuc/xorg.conf b/meta-nuc/recipes-graphics/xorg-xserver/xserver-xf86-config/nuc/xorg.conf
> deleted file mode 100644
> index 96b94b4..0000000
> --- a/meta-nuc/recipes-graphics/xorg-xserver/xserver-xf86-config/nuc/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Intel Graphics Driver"
> -    Driver	"intel"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Intel Graphics Driver"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-nuc/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-nuc/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> deleted file mode 100644
> index 72d991c..0000000
> --- a/meta-nuc/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> +++ /dev/null
> @@ -1 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> diff --git a/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley-ivb/xorg.conf b/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley-ivb/xorg.conf
> deleted file mode 100644
> index 28ad0bf..0000000
> --- a/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley-ivb/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Matrox MGA"
> -    Driver	"mga"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Matrox MGA"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley/xorg.conf b/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley/xorg.conf
> deleted file mode 100644
> index 28ad0bf..0000000
> --- a/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config/romley/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Matrox MGA"
> -    Driver	"mga"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Matrox MGA"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> deleted file mode 100644
> index 72d991c..0000000
> --- a/meta-romley/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> +++ /dev/null
> @@ -1 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> diff --git a/meta-sugarbay/recipes-graphics/xorg-xserver/xserver-xf86-config/sugarbay/xorg.conf b/meta-sugarbay/recipes-graphics/xorg-xserver/xserver-xf86-config/sugarbay/xorg.conf
> deleted file mode 100644
> index 96b94b4..0000000
> --- a/meta-sugarbay/recipes-graphics/xorg-xserver/xserver-xf86-config/sugarbay/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Intel Graphics Driver"
> -    Driver	"intel"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Intel Graphics Driver"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-sugarbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/meta-sugarbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> deleted file mode 100644
> index 72d991c..0000000
> --- a/meta-sugarbay/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend
> +++ /dev/null
> @@ -1 +0,0 @@
> -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
> diff --git a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf
> deleted file mode 100644
> index da4fc3c..0000000
> --- a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x-noemgd/xorg.conf
> +++ /dev/null
> @@ -1,26 +0,0 @@
> -Section "Device"
> -    Identifier	"Generic VESA"
> -    Driver	"vesa"
> -EndSection
> -
> -Section "Monitor"
> -    Identifier    "Generic Monitor"
> -    Option        "DPMS"
> -EndSection
> -
> -Section "Screen"
> -    Identifier    "Default Screen"
> -    Device	  "Generic VESA"
> -    Monitor       "Generic Monitor"
> -    DefaultDepth  24
> -EndSection
> -
> -Section "ServerLayout"
> -    Identifier     "Default Layout"
> -    Screen         "Default Screen"
> -EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection
> diff --git a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
> index 73736ac..5266117 100644
> --- a/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
> +++ b/meta-sys940x/recipes-graphics/xorg-xserver/xserver-xf86-config/sys940x/xorg.conf
> @@ -41,8 +41,3 @@ Section "ServerLayout"
>     # InputDevice    "Keyboard0" "CoreKeyboard"
>     # InputDevice    "DevInputMice" "SendCoreEvents"
>  EndSection
> -
> -Section "ServerFlags"
> -    Option        "DontZap"  "0"
> -    Option        "AutoAddDevices"  "False"
> -EndSection

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel





More information about the meta-intel mailing list