From patchwork Mon Sep 24 12:30:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: xserver-xorg: merge version-specific .inc into .bb Date: Mon, 24 Sep 2012 12:30:02 -0000 From: Ross Burton X-Patchwork-Id: 37115 Message-Id: <1348489802-5044-1-git-send-email-ross.burton@intel.com> To: openembedded-core@lists.openembedded.org The version-specific .inc was shared with the xserver-xorg-lite package, but that doesn't exist anymore. Signed-off-by: Ross Burton --- .../recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 11 ----------- meta/recipes-graphics/xorg-xserver/xserver-xorg_1.11.2.bb | 13 ++++++++++++- 2 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc 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 35cb33a..0000000 --- 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 0f94fe2..c707567 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"