summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2012-09-24 13:30:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-28 11:07:38 +0100
commit629282ecd02e336178d96e1656b16b9a20f0d92b (patch)
tree1e99efe18fa0505f810ecdbca271b95903e1b78d /meta
parente1913fbb01af52feee74bd6ab239678211c7ebb2 (diff)
downloadpoky-629282ecd02e336178d96e1656b16b9a20f0d92b.tar.gz
xserver-xorg: merge version-specific .inc into .bb
The version-specific .inc was shared with the xserver-xorg-lite package, but that doesn't exist anymore. (From OE-Core rev: 09b1bf350384722127ac9f098a72371cf27c3822) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc11
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb13
2 files changed, 12 insertions, 12 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
deleted file mode 100644
index 35cb33aa4e..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ /dev/null
@@ -1,11 +0,0 @@
1# Misc build failure for master HEAD
2SRC_URI += "file://crosscompile.patch \
3 file://fix_open_max_preprocessor_error.patch \
4 file://gcc-47-warning.patch \
5 file://mips64-compiler.patch \
6 "
7
8SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
9SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
10
11PR = "r8"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
index 0f94fe29c5..c707567b1e 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb
@@ -1,2 +1,13 @@
1require xserver-xorg.inc 1require xserver-xorg.inc
2require xserver-xorg-${PV}.inc 2
3# Misc build failure for master HEAD
4SRC_URI += "file://crosscompile.patch \
5 file://fix_open_max_preprocessor_error.patch \
6 file://gcc-47-warning.patch \
7 file://mips64-compiler.patch \
8 "
9
10SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
11SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
12
13PR = "r8"