From e701790e088665186f3466ee8fa234cc19d7d975 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 21 Dec 2011 18:16:26 +0000 Subject: xserver-xf86-config: move xorg.conf to being machine specific While on that we refactored the recipe to use PRINC and FILESEXTRAPATHS_prepend. Signed-off-by: Otavio Salvador --- .../xserver-xf86-config/imx53ard/xorg.conf | 45 ++++++++++++++++++++++ .../xserver-xf86-config/imx53qsb/xorg.conf | 45 ++++++++++++++++++++++ .../xorg-xserver/xserver-xf86-config/xorg.conf | 45 ---------------------- .../xorg-xserver/xserver-xf86-config_0.1.bbappend | 4 +- 4 files changed, 92 insertions(+), 47 deletions(-) create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf create mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf delete mode 100644 recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf new file mode 100644 index 0000000..bbb1f53 --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53ard/xorg.conf @@ -0,0 +1,45 @@ +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "kbd" + Option "XkbRules" "xorg" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" +EndSection + +Section "InputClass" + Identifier "eGalax" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection + +Section "Device" + Identifier "i.MX Accelerated Framebuffer Device" + Driver "imx" + Option "fbdev" "/dev/fb0" + # This option only recognized when "mxc_epdc_fb" frame buffer driver in + # use. Values are "RGB565" (default, 16-bit RGB), "Y8" (8-bit gray), + # and "Y8INV" (8-bit gray inverted). + Option "FormatEPDC" "Y8INV" +EndSection + +Section "Monitor" + Identifier "Configured Monitor" +EndSection + +Section "Screen" + Identifier "Default Screen" + Monitor "Configured Monitor" + Device "i.MX Accelerated Framebuffer Device" +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" +EndSection diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf new file mode 100644 index 0000000..bbb1f53 --- /dev/null +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config/imx53qsb/xorg.conf @@ -0,0 +1,45 @@ +Section "InputDevice" + Identifier "Generic Keyboard" + Driver "kbd" + Option "XkbRules" "xorg" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Configured Mouse" + Driver "mouse" + Option "CorePointer" +EndSection + +Section "InputClass" + Identifier "eGalax" + MatchIsTouchscreen "on" + MatchDevicePath "/dev/input/event*" + Driver "evdev" +EndSection + +Section "Device" + Identifier "i.MX Accelerated Framebuffer Device" + Driver "imx" + Option "fbdev" "/dev/fb0" + # This option only recognized when "mxc_epdc_fb" frame buffer driver in + # use. Values are "RGB565" (default, 16-bit RGB), "Y8" (8-bit gray), + # and "Y8INV" (8-bit gray inverted). + Option "FormatEPDC" "Y8INV" +EndSection + +Section "Monitor" + Identifier "Configured Monitor" +EndSection + +Section "Screen" + Identifier "Default Screen" + Monitor "Configured Monitor" + Device "i.MX Accelerated Framebuffer Device" +EndSection + +Section "ServerLayout" + Identifier "Default Layout" + Screen "Default Screen" +EndSection diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf b/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf deleted file mode 100644 index bbb1f53..0000000 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config/xorg.conf +++ /dev/null @@ -1,45 +0,0 @@ -Section "InputDevice" - Identifier "Generic Keyboard" - Driver "kbd" - Option "XkbRules" "xorg" - Option "XkbModel" "pc105" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Configured Mouse" - Driver "mouse" - Option "CorePointer" -EndSection - -Section "InputClass" - Identifier "eGalax" - MatchIsTouchscreen "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -Section "Device" - Identifier "i.MX Accelerated Framebuffer Device" - Driver "imx" - Option "fbdev" "/dev/fb0" - # This option only recognized when "mxc_epdc_fb" frame buffer driver in - # use. Values are "RGB565" (default, 16-bit RGB), "Y8" (8-bit gray), - # and "Y8INV" (8-bit gray inverted). - Option "FormatEPDC" "Y8INV" -EndSection - -Section "Monitor" - Identifier "Configured Monitor" -EndSection - -Section "Screen" - Identifier "Default Screen" - Monitor "Configured Monitor" - Device "i.MX Accelerated Framebuffer Device" -EndSection - -Section "ServerLayout" - Identifier "Default Layout" - Screen "Default Screen" -EndSection diff --git a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend index e6c5a53..56cb294 100644 --- a/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bbappend @@ -1,4 +1,4 @@ # Append path for freescale layer to include bsp xorg.conf -THISDIR := "${@os.path.dirname(bb.data.getVar('FILE', d, True))}" -FILESPATH =. "${@base_set_filespath(["${THISDIR}/${PN}"], d)}:" +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PRINC := "${@int(PRINC) + 1}" -- cgit v1.2.3-54-g00ecf