diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-09-24 13:30:02 +0100 |
|---|---|---|
| committer | Saul Wold <sgw@linux.intel.com> | 2012-09-28 01:14:01 -0700 |
| commit | 09b1bf350384722127ac9f098a72371cf27c3822 (patch) | |
| tree | 2a39a77694fce0096f794b6423447842c7cb7e20 /meta/recipes-graphics/xorg-xserver | |
| parent | 33ec4222c05c985b737e88850259218cf8336d46 (diff) | |
| download | openembedded-core-09b1bf350384722127ac9f098a72371cf27c3822.tar.gz openembedded-core-09b1bf350384722127ac9f098a72371cf27c3822.tar.bz2 openembedded-core-09b1bf350384722127ac9f098a72371cf27c3822.zip | |
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.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 11 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | 13 |
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 @@ -# Misc build failure for master HEAD -SRC_URI += "file://crosscompile.patch \ - file://fix_open_max_preprocessor_error.patch \ - file://gcc-47-warning.patch \ - file://mips64-compiler.patch \ - " - -SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" -SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" - -PR = "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 @@ require xserver-xorg.inc -require xserver-xorg-${PV}.inc + +# Misc build failure for master HEAD +SRC_URI += "file://crosscompile.patch \ + file://fix_open_max_preprocessor_error.patch \ + file://gcc-47-warning.patch \ + file://mips64-compiler.patch \ + " + +SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" +SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" + +PR = "r8" |