Remove all comments from multiline expressions (as mentioned in bug #704)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/gettext/gettext_0.14.1.bb b/meta/recipes-core/gettext/gettext_0.14.1.bb
index ad5121736ee46fe972dab21b29377daa29895495..90756bcb28838c7e59b4448c1649c78ad5282195 100644 (file)
--- a/meta/recipes-core/gettext/gettext_0.14.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.14.1.bb
@@ -17,7 +17,7 @@ SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
            file://getline.m4.patch \
            file://disable_java.patch"
 
-#         file://gettext-autoconf-lib-link-no-L.patch \
+#         file://gettext-autoconf-lib-link-no-L.patch
 
 SRC_URI_append_linux-uclibc = " file://gettext-error_print_progname.patch"
 SRC_URI_append_linux-uclibceabi = " file://gettext-error_print_progname.patch"

diff --git a/meta/recipes-core/glibc/glibc_2.10.1.bb b/meta/recipes-core/glibc/glibc_2.10.1.bb
index 364a0e5d12805de111a2327773366ee2d75e7a52..8cb97d5ccfc5c61cc29a136c7ced835e72260032 100644 (file)
--- a/meta/recipes-core/glibc/glibc_2.10.1.bb
+++ b/meta/recipes-core/glibc/glibc_2.10.1.bb
@@ -37,10 +37,9 @@ RDEPENDS_${PN}-dev = "linux-libc-headers-dev"
 
 #         file://noinfo.patch;patch=1
 #         file://ldconfig.patch;patch=1;pnum=0
-#         file://arm-machine-gmon.patch;patch=1;pnum=0 \
-#         \
-#         file://arm-ioperm.patch;patch=1;pnum=0 \
-#         file://ldd.patch;patch=1;pnum=0 \
+#         file://arm-machine-gmon.patch;patch=1;pnum=0
+#         file://arm-ioperm.patch;patch=1;pnum=0
+#         file://ldd.patch;patch=1;pnum=0
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
            ftp://ftp.gnu.org/pub/gnu/glibc/glibc-ports-${PV}.tar.bz2 \
            ftp://ftp.gnu.org/pub/gnu/glibc/glibc-libidn-${PV}.tar.bz2 \

diff --git a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
index 0d58445de236516315d198ce361d61d87f94aa9f..f7149289d7a3272f79329742249fc4da3c0aff60 100644 (file)
--- a/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
+++ b/meta/recipes-core/meta/external-csl-toolchain_2008q3-72.bb
@@ -20,7 +20,7 @@ RPROVIDES = "glibc-utils libsegfault glibc-thread-db"
 PACKAGES_DYNAMIC = "glibc-gconv-*"
 PR = "r1"
 
-#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2 \
+#SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-linux-gnueabi/arm-${PV}-arm-none-linux-gnueabi-i686-pc-linux-gnu.tar.bz2"
 
 SRC_URI = "file://SUPPORTED"
 

diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
index ffe6dce17d6578ad5c3dbb60a0729762cd38ff8f..1c0f893ca9ab31c9e9d55776f6f1080f5c314b25 100644 (file)
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.41.12.bb
@@ -7,7 +7,7 @@ SRC_URI += "file://quotefix.patch;patch=1 \
 
 SRC_URI[md5sum] = "1b24a21fc0c2381ef420961cbfec733f"
 SRC_URI[sha256sum] = "9c26d0dc20bfdafd0f27f3564791d6121d1c1876549d4f2ff1e41955c9bb9f20"
-#file://no-hardlinks.patch;patch=1 \
+#file://no-hardlinks.patch;patch=1
 
 PARALLEL_MAKE = ""
 

diff --git a/meta/recipes-devtools/gcc/gcc-4.3.3.inc b/meta/recipes-devtools/gcc/gcc-4.3.3.inc
index 9b600a0f1f0d6aee17c1f5e9a1b6b8b62e3a9495..55d66f5664301c7f037913926c93f598eface158 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-4.3.3.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.3.3.inc
@@ -43,10 +43,7 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
        file://arm-nolibfloat.patch;patch=1 \
        file://arm-softfloat.patch;patch=1 \
        file://cache-amnesia.patch;patch=1 \
-#      file://gfortran.patch;patch=1 \
        file://gcc-4.0.2-e300c2c3.patch;patch=1 \
-#      file://pr34130.patch;patch=1 \
-#      file://fortran-static-linking.patch;patch=1 \
        file://gcc-arm-frename-registers.patch;patch=1 \
        file://gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
        file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
@@ -58,6 +55,11 @@ SRC_URI = "${GNU_MIRROR}/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
        file://64bithack.patch;patch=1 \
 "
 
+#      file://gfortran.patch;patch=1
+#      file://pr34130.patch;patch=1
+#      file://fortran-static-linking.patch;patch=1
+
+
 SRC_URI_append_sh3  = " file://sh3-installfix-fixheaders.patch;patch=1 "
 
 # Language Overrides

diff --git a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
index e84bd835d2ff94756b38b26085ae3124bad346eb..cb5b087286a4668f819ba8e53a799b3244fb7c90 100644 (file)
--- a/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
+++ b/meta/recipes-devtools/gcc/gcc-csl-arm-2008q1.inc
@@ -6,31 +6,30 @@ PV = "4.2.3+csl-arm-2008q1-126"
 FILESDIR = "${FILE_DIRNAME}/gcc-csl-arm"
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm-none-eabi/arm-2008q1-126-arm-none-eabi.src.tar.bz2 \
-#           file://100-uclibc-conf.patch;patch=1 \
-#           file://103-uclibc-conf-noupstream.patch;patch=1 \
-#           file://200-uclibc-locale.patch;patch=1 \
-#           file://203-uclibc-locale-no__x.patch;patch=1 \
-#           file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-#           file://205-uclibc-locale-update.patch;patch=1 \
-#           file://300-libstdc++-pic.patch;patch=1 \
-#           file://302-c99-snprintf.patch;patch=1 \
-#           file://303-c99-complex-ugly-hack.patch;patch=1 \
-#           file://304-index_macro.patch;patch=1 \
-#           file://305-libmudflap-susv3-legacy.patch;patch=1 \
-#           file://306-libstdc++-namespace.patch;patch=1 \
-#           file://307-locale_facets.patch;patch=1 \
-#           file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
-#           file://602-sdk-libstdc++-includes.patch;patch=1 \
            file://gcc41-configure.in.patch;patch=1 \
            file://arm-nolibfloat.patch;patch=1 \
            file://arm-softfloat.patch;patch=1 \
            file://zecke-xgcc-cpp.patch;patch=1 \
-#           file://gfortran.patch;patch=1 \
-#           file://fortran-static-linking.patch;patch=1 \
-#           file://gcc-configure-no-fortran.patch;patch=1;pnum=1 \
-#           file://gcc-new-makeinfo.patch;patch=1 \
 "
-
+#           file://100-uclibc-conf.patch;patch=1
+#           file://103-uclibc-conf-noupstream.patch;patch=1
+#           file://200-uclibc-locale.patch;patch=1
+#           file://203-uclibc-locale-no__x.patch;patch=1
+#           file://204-uclibc-locale-wchar_fix.patch;patch=1
+#           file://205-uclibc-locale-update.patch;patch=1
+#           file://300-libstdc++-pic.patch;patch=1
+#           file://302-c99-snprintf.patch;patch=1
+#           file://303-c99-complex-ugly-hack.patch;patch=1
+#           file://304-index_macro.patch;patch=1
+#           file://305-libmudflap-susv3-legacy.patch;patch=1
+#           file://306-libstdc++-namespace.patch;patch=1
+#           file://307-locale_facets.patch;patch=1
+#           file://402-libbackend_dep_gcov-iov.h.patch;patch=1
+#           file://602-sdk-libstdc++-includes.patch;patch=1
+#           file://gfortran.patch;patch=1
+#           file://fortran-static-linking.patch;patch=1
+#           file://gcc-configure-no-fortran.patch;patch=1;pnum=1
+#           file://gcc-new-makeinfo.patch;patch=1
 
 S = "${WORKDIR}/gcc-4.2"
 

diff --git a/meta/recipes-devtools/perl/perl_5.12.2.bb b/meta/recipes-devtools/perl/perl_5.12.2.bb
index ce9998601d49e9a963735cac51b9b6feeb465087..e659152d4b0a25215a7c994094cefd00a0db0867 100644 (file)
--- a/meta/recipes-devtools/perl/perl_5.12.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.12.2.bb
@@ -37,7 +37,6 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
         file://debian/enc2xs_inc.diff \
         file://debian/errno_ver.diff \
         file://debian/extutils_hacks.diff \
-#        file://debian/fakeroot.diff \
         file://debian/instmodsh_doc.diff \
         file://debian/ld_run_path.diff \
         file://debian/libnet_config_path.diff \
@@ -69,6 +68,7 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
         file://config.sh-64 \
         file://config.sh-64-le \
         file://config.sh-64-be"
+#        file://debian/fakeroot.diff
 
 SRC_URI[md5sum] = "af2df531d46b77fdf0d97eecb03eddb2"
 SRC_URI[sha256sum] = "cf888340021d5a2d1238bbd9b8b55aaf420a848d46e4d317cb8567f86ceb1022"

diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index ac9df6fa8203ecf3fdaf82c277b35158853ae934..8bce395483eb9806e0cac629814bf403dfc93815 100644 (file)
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -186,12 +186,12 @@ FILES_${PN} = "${bindir}/rpm \
                ${libdir}/rpm/bin/wget \
                "
 
-#              ${libdir}/rpm/magic \
-#              ${libdir}/rpm/magic.mgc \
-#              ${libdir}/rpm/magic.mime \
-#              ${libdir}/rpm/magic.mime.mgc \
-#              ${libdir}/rpm/bin/db_* \
-#              ${libdir}/rpm/bin/grep \
+#              ${libdir}/rpm/magic
+#              ${libdir}/rpm/magic.mgc
+#              ${libdir}/rpm/magic.mime
+#              ${libdir}/rpm/magic.mime.mgc
+#              ${libdir}/rpm/bin/db_*
+#              ${libdir}/rpm/bin/grep
 
 FILES_${PN}-dbg = "${bindir}/.debug \
                ${libdir}/.debug \

diff --git a/meta/recipes-extended/minicom/minicom_2.4.bb b/meta/recipes-extended/minicom/minicom_2.4.bb
index fbe2d30cd8cddb0854520e60419b3aa2bd3f7529..8718a1fa92e47260b57d6694cacc3b8c1402a830 100644 (file)
--- a/meta/recipes-extended/minicom/minicom_2.4.bb
+++ b/meta/recipes-extended/minicom/minicom_2.4.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=420477abc567404debca0a2a1cb6b645 \
 SRC_URI = "http://alioth.debian.org/frs/download.php/3195/minicom-${PV}.tar.gz \
        file://rename-conflicting-functions.patch \
        "
-#      file://gcc4-scope.patch;patch=1 \
+#      file://gcc4-scope.patch;patch=1
 
 SRC_URI[md5sum] = "700976a3c2dcc8bbd50ab9bb1c08837b"
 SRC_URI[sha256sum] = "6b7af240b073ba847b091fd75aed4bf720eb94d30e188d23bb098d016bf40a48"

diff --git a/meta/recipes-extended/tasks/task-poky-basic.bb b/meta/recipes-extended/tasks/task-poky-basic.bb
index 145d4fc9e06e44f566ba83d4aabb1df3a34a3eb4..d7beafedd8653ccceabc4ba2abb45597dc85682d 100644 (file)
--- a/meta/recipes-extended/tasks/task-poky-basic.bb
+++ b/meta/recipes-extended/tasks/task-poky-basic.bb
@@ -98,9 +98,9 @@ RDEPENDS_task-poky-basic-extended = "\
     iputils \
     iptables \
     module-init-tools \
-#    openssh \
     openssl \
     "
+#    openssh
 
 RDEPENDS_task-poky-dev-utils = "\
     byacc \

diff --git a/meta/recipes-extended/time/time_1.7.bb b/meta/recipes-extended/time/time_1.7.bb
index e82077fa406cdbbfad0c299ed29d6cf032e729c3..ef2cb8a9d7b0aa967af5b563dc555b9e8187f517 100644 (file)
--- a/meta/recipes-extended/time/time_1.7.bb
+++ b/meta/recipes-extended/time/time_1.7.bb
@@ -5,8 +5,8 @@ SRC_URI = "${GNU_MIRROR}/time/time-${PV}.tar.gz \
 
 SRC_URI[md5sum] = "e38d2b8b34b1ca259cf7b053caac32b3"
 SRC_URI[sha256sum] = "e37ea79a253bf85a85ada2f7c632c14e481a5fd262a362f6f4fd58e68601496d"
-#         file://autofoo.patch;patch=1 \
-#         file://compile.patch;patch=1"
+#         file://autofoo.patch;patch=1
+#         file://compile.patch;patch=1
 S = "${WORKDIR}/time-${PV}"
 
 inherit autotools

diff --git a/meta/recipes-extended/tzdata/tzdata_2010o.bb b/meta/recipes-extended/tzdata/tzdata_2010o.bb
index 882d67ac81b8be60ea379f6492fb33069cc490ce..d250e5ca1b4c165790a080c62023dbc269fe6bd8 100644 (file)
--- a/meta/recipes-extended/tzdata/tzdata_2010o.bb
+++ b/meta/recipes-extended/tzdata/tzdata_2010o.bb
@@ -22,8 +22,8 @@ S = "${WORKDIR}"
 
 TZONES= "africa antarctica asia australasia europe northamerica southamerica  \
          factory solar87 solar88 solar89 etcetera backward systemv \
-#        pacificnew \
         "
+# pacificnew 
 
 do_compile () {
         for zone in ${TZONES}; do \

diff --git a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
index 7f242d94dfafabaa88f38ef8f9cb548b68603a3b..7c72a0925720ae6076ab4984ef54f7c3267de1d5 100644 (file)
--- a/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.12.7.bb
@@ -16,13 +16,14 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.12/gtk+-${PV}.tar.bz2 \
            file://filechooser-props.patch;patch=1 \
            file://filechooser-default.patch;patch=1 \
            file://filechooser-sizefix.patch;patch=1 \
+         "
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#        file://combo-arrow-size.patch;patch=1;pnum=0 \
+#           file://gtklabel-resize-patch;patch=1
+#           file://menu-deactivate.patch;patch=1
+#        file://combo-arrow-size.patch;patch=1;pnum=0
 # die die die
-#           file://pangoxft2.10.6.diff;patch=1 \
-         "
+#           file://pangoxft2.10.6.diff;patch=1
+
 
 EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-display-migration"
 

diff --git a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
index 5060829e4b112df2c0ea5ceddde11c5f4dbf4cc2..deea3d07cd72228c0f2deeca3a3bd82b556390e4 100644 (file)
--- a/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.16.6.bb
@@ -10,18 +10,20 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.16/gtk+-${PV}.tar.bz2 \
            file://cellrenderer-cairo.patch;patch=1;pnum=0 \
            file://toggle-font.diff;patch=1;pnum=0 \
           file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \
-# TO MERGE
-#           file://entry-cairo.patch;patch=1;pnum=0 \
-#           file://filesystem-volumes.patch;patch=1 \
-#           file://filechooser-props.patch;patch=1 \
-#           file://filechooser-default.patch;patch=1 \
-#           file://filechooser-sizefix.patch;patch=1 \
-# temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#        file://combo-arrow-size.patch;patch=1;pnum=0 \
             file://disable-gio-png-sniff-test.diff;patch=1 \
          "
+# TO MERGE
+#           file://entry-cairo.patch;patch=1;pnum=0
+#           file://filesystem-volumes.patch;patch=1
+#           file://filechooser-props.patch;patch=1
+#           file://filechooser-default.patch;patch=1
+#           file://filechooser-sizefix.patch;patch=1
+# temporary
+#           file://gtklabel-resize-patch;patch=1
+#           file://menu-deactivate.patch;patch=1
+#        file://combo-arrow-size.patch;patch=1;pnum=0
+
+
 
 EXTRA_OECONF = "--without-libtiff --without-libjasper --disable-xkb --disable-glibtest --disable-cups"
 

diff --git a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
index e311a8cc4485f1b5110aa3a4fbb7c4b59067b985..9ae762da35b932d62109c7f78902134ef327c156 100644 (file)
--- a/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
+++ b/meta/recipes-gnome/gtk+/gtk+_2.22.1.bb
@@ -15,18 +15,18 @@ SRC_URI = "http://download.gnome.org/sources/gtk+/2.22/gtk+-${PV}.tar.bz2 \
            file://toggle-font.diff;patch=1;pnum=0 \
            file://0001-bgo-584832-Duplicate-the-exec-string-returned-by-gtk.patch;patch=1 \
            file://doc-fixes.patch \
+         "
 # TO MERGE
-#           file://entry-cairo.patch;patch=1;pnum=0 \
-#           file://filesystem-volumes.patch;patch=1 \
-#           file://filechooser-props.patch;patch=1 \
-#           file://filechooser-default.patch;patch=1 \
-#           file://filechooser-sizefix.patch;patch=1 \
+#           file://entry-cairo.patch;patch=1;pnum=0
+#           file://filesystem-volumes.patch;patch=1
+#           file://filechooser-props.patch;patch=1
+#           file://filechooser-default.patch;patch=1
+#           file://filechooser-sizefix.patch;patch=1
 # temporary
-#           file://gtklabel-resize-patch;patch=1 \
-#           file://menu-deactivate.patch;patch=1 \
-#        file://combo-arrow-size.patch;patch=1;pnum=0 \
-#            file://configurefix.patch;patch=1 \
-         "
+#           file://gtklabel-resize-patch;patch=1
+#           file://menu-deactivate.patch;patch=1
+#        file://combo-arrow-size.patch;patch=1;pnum=0
+#            file://configurefix.patch;patch=1
 
 SRC_URI[md5sum] = "fdce46ba354c155230b7d4090b17f7d9"
 SRC_URI[sha256sum] = "965bc124f0d25087c4cb2a64cbfd7e4f896e05be8d560fbba68dd8685ba24d07"

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
index f6a0d83ccb9844208c34993de76fd979908e9fee..b7e5520f42eab3d22f73956507d89f9fbed28731 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-kdrive_1.7.99.2.bb
@@ -13,10 +13,6 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        file://extra-kmodes.patch;patch=1 \
        file://disable-apm.patch;patch=1 \
        file://no-serial-probing.patch;patch=1 \
-#      file://kdrive-evdev.patch;patch=1  \
-#      file://kdrive-use-evdev.patch;patch=1  \
-#      file://enable-builtin-fonts.patch;patch=1 \
-#      file://optional-xkb.patch;patch=1 \
        file://keyboard-resume-workaround.patch;patch=1 \
        file://enable-xcalibrate.patch;patch=1 \
        file://hide-cursor-and-ppm-root.patch;patch=1 \
@@ -24,5 +20,10 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        file://fix-newer-xorg-headers.patch;patch=1 \
        file://crosscompile.patch;patch=1 \
        file://nodolt.patch;patch=1"
+#      file://kdrive-evdev.patch;patch=1
+#      file://kdrive-use-evdev.patch;patch=1
+#      file://enable-builtin-fonts.patch;patch=1
+#      file://optional-xkb.patch;patch=1
+
 
 S = "${WORKDIR}/xorg-server-${PV}"

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
index 9ff85de6c3cd577a42178950d58abb90ec527a78..faa4f64159c7fbd6876eb0719932367438caa6ea 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
@@ -10,8 +10,8 @@ PR = "r0"
 
 SRC_URI += "file://nodolt.patch \
             file://crosscompile.patch"
-#           file://libdri-xinerama-symbol.patch;patch=1 \
-#           file://xserver-boottime.patch;patch=1"
+#           file://libdri-xinerama-symbol.patch;patch=1
+#           file://xserver-boottime.patch;patch=1
 
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch"

diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
index 4789f28f5fca66458a9c36fb778258778175678c..99804a21bdca81457dd4c3c199309141587449c2 100644 (file)
--- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_git.bb
@@ -10,18 +10,18 @@ DEPENDS += "font-util"
 
 RDEPENDS_${PN} += "xkeyboard-config"
 
-#           file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1 \
-#           file://xserver-1.5.0-bg-none-root.patch;patch=1 \
-#           file://xserver-no-root-2.patch;patch=1 \
-#           file://xserver-boottime.patch;patch=1"
-#           file://xserver-DRI2Swapbuffer.patch;patch=1"
+#           file://cache-xkbcomp-output-for-fast-start-up.patch;patch=1
+#           file://xserver-1.5.0-bg-none-root.patch;patch=1
+#           file://xserver-no-root-2.patch;patch=1
+#           file://xserver-boottime.patch;patch=1
+#           file://xserver-DRI2Swapbuffer.patch;patch=1
 
 
 SRC_URI = "git://anongit.freedesktop.org/git/xorg/xserver;protocol=git;branch=master \
            file://nodolt.patch;patch=1 \
            file://crosscompile.patch;patch=1 \
            file://fix_macros1.patch;patch=1"
-#           file://libdri-xinerama-symbol.patch;patch=1"
+#           file://libdri-xinerama-symbol.patch;patch=1
 
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch;patch=1"