[Subtree] Removing import-layers directory

As part of the move to subtrees, need to bring all the import layers
content to the top level.

Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>

5 files changed, 0 insertions, 221 deletions

diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch b/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
deleted file mode 100644
index 06c938b7e..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/intltool-nowarn.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Inappropriate [embedded specific]
-
-Index: intltool-0.40.0/intltool-extract.in
-===================================================================
---- intltool-0.50.0.orig/intltool-extract.in	2011-10-08 22:24:57.000000000 +0300
-+++ intltool-0.50.0/intltool-extract.in	2011-12-07 16:04:07.000000000 +0200
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w 
-+#!@INTLTOOL_PERL@
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #
-Index: intltool-0.50.0/intltool-merge.in
-===================================================================
---- intltool-0.50.0.orig/intltool-merge.in	2011-10-08 17:52:01.000000000 +0300
-+++ intltool-0.50.0/intltool-merge.in	2011-12-07 16:05:55.000000000 +0200
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w
-+#!@INTLTOOL_PERL@
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #
-Index: intltool-0.50.0/intltool-prepare.in
-===================================================================
---- intltool-0.50.0.orig/intltool-prepare.in	2011-10-08 09:16:58.000000000 +0300
-+++ intltool-0.50.0/intltool-prepare.in	2011-12-07 16:06:13.000000000 +0200
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w
-+#!@INTLTOOL_PERL@
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #  Intltool .desktop, .directory Prepare Tool
-Index: intltool-0.50.0/intltool-update.in
-===================================================================
---- intltool-0.50.0.orig/intltool-update.in	2011-10-08 22:24:57.000000000 +0300
-+++ intltool-0.50.0/intltool-update.in	2011-12-07 16:06:39.000000000 +0200
-@@ -1,4 +1,4 @@
--#!@INTLTOOL_PERL@ -w
-+#!@INTLTOOL_PERL@
- # -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4  -*-
- 
- #
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/noperlcheck.patch b/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
deleted file mode 100644
index 853ee1a43..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/noperlcheck.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-In the target case, we can't check if perl exists or try running it. If we
-don't patch the code, the native perl location would be used, not the target
-which is also incorrect. We therefore disable this code and rely on the 
-correct value of PERL being passed in.
-
-RP 31/8/2011
-
-Upstream-Status: Inappropriate [OE specific]
-
-diff --git a/configure.ac b/configure.ac
-index 5338a76..e709a2b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -11,24 +11,10 @@ AC_SUBST(pkgdatadir) dnl automake does not need this, but libtoolize does
- aclocaldir='${datadir}'/aclocal
- AC_SUBST(aclocaldir)
- 
--AC_PATH_PROG(PERL, perl)
- if test -z "$PERL"; then
--   AC_MSG_ERROR([perl not found])
--fi
--AC_MSG_CHECKING([for perl >= 5.8.1])
--$PERL -e "use 5.8.1;" > /dev/null 2>&1
--if test $? -ne 0; then
--   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
--else
--   PERL_VERSION="`$PERL -e \"printf '%vd', $^V\"`"
--   AC_MSG_RESULT([$PERL_VERSION])
--fi
--AC_MSG_CHECKING([for XML::Parser])
--if `$PERL -e "require XML::Parser" 2>/dev/null`; then
--   AC_MSG_RESULT([ok])
--else
--   AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-+   AC_MSG_ERROR([PERL variable not set])
- fi
-+AC_SUBST(PERL)
- AC_PATH_PROG(BZR, bzr)
- 
- 
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch b/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
deleted file mode 100644
index f1049e433..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/perl-522-deprecations.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Perl 5.22 has deprecated some regex features, which causes warnings when
-intltool-update runs:
-
-Unescaped left brace in regex is deprecated, passed through in regex; marked by
-<-- HERE in m/^(.*)\${ <-- HERE ?([A-Z_]+)}?(.*)$/ at
-/data/poky-master/tmp/sysroots/x86_64-linux/usr/bin/intltool-update line 1065.
-
-Take a patch from Debian to solve this.
-
-Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1465010)
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-Index: intltool-0.51.0/intltool-update.in
-===================================================================
---- intltool-0.51.0.orig/intltool-update.in
-+++ intltool-0.51.0/intltool-update.in
-@@ -1062,7 +1062,7 @@ sub SubstituteVariable
- 	}
-     }
- 
--    if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
-+    if ($str =~ /^(.*)\$\{?([A-Z_]+)\}?(.*)$/)
-     {
- 	my $rest = $3;
- 	my $untouched = $1;
-@@ -1190,10 +1190,10 @@ sub FindPackageName
- 	$name    =~ s/\(+$//g;
- 	$version =~ s/\(+$//g;
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
-     }
- 
-     if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)[,]?([^,\)]+)?/m)
-@@ -1219,11 +1219,11 @@ sub FindPackageName
- 	$version =~ s/\(+$//g;
-         $bugurl  =~ s/\(+$//g if (defined $bugurl);
- 
--	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\${?AC_PACKAGE_NAME}?/);
--	$varhash{"PACKAGE"} = $name if (not $name =~ /\${?PACKAGE}?/);
--	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\${?AC_PACKAGE_VERSION}?/);
--	$varhash{"VERSION"} = $version if (not $name =~ /\${?VERSION}?/);
--        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\${?\w+}?/);
-+	$varhash{"PACKAGE_NAME"} = $name if (not $name =~ /\$\{?AC_PACKAGE_NAME\}?/);
-+	$varhash{"PACKAGE"} = $name if (not $name =~ /\$\{?PACKAGE\}?/);
-+	$varhash{"PACKAGE_VERSION"} = $version if (not $name =~ /\$\{?AC_PACKAGE_VERSION\}?/);
-+	$varhash{"VERSION"} = $version if (not $name =~ /\$\{?VERSION\}?/);
-+        $varhash{"PACKAGE_BUGREPORT"} = $bugurl if (defined $bugurl and not $bugurl =~ /\$\{?\w+\}?/);
-     }
- 
-     # \s makes this not work, why?
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch b/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch
deleted file mode 100644
index 5f57ea333..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool/remove-perl-check.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Remove the perl checks in intltool.m4.  This can find a different perl binary to
-the one that the intltool scripts will actually be using (as they hard-code a
-specific binary), for example in the intltool-native case they'll be using
-nativeperl yet this fragment can find and test the host perl.
-
-This can result in recipes failing in do_configure as intltool.m4 finds a host
-perl which doesn't have XML::Parser installed, despite the fact that intltool
-will work fine as nativeperl has XML::Parser.
-
-Upstream-Status: Submitted (https://bugs.launchpad.net/intltool/+bug/1197875)
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
---- a/intltool.m4.orig	2013-07-02 11:22:23.000000000 -0700
-+++ b/intltool.m4	2013-07-02 11:22:32.000000000 -0700
-@@ -26,1 +26,1 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
--# serial 42 IT_PROG_INTLTOOL
-+# serial 42.1 IT_PROG_INTLTOOL
-@@ -131,27 +131,6 @@ if test -z "$xgversion" -o -z "$mmversio
-     AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
- 
--AC_PATH_PROG(INTLTOOL_PERL, perl)
--if test -z "$INTLTOOL_PERL"; then
--   AC_MSG_ERROR([perl not found])
--fi
--AC_MSG_CHECKING([for perl >= 5.8.1])
--$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
--if test $? -ne 0; then
--   AC_MSG_ERROR([perl 5.8.1 is required for intltool])
--else
--   IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
--   AC_MSG_RESULT([$IT_PERL_VERSION])
--fi
--if test "x$2" != "xno-xml"; then
--   AC_MSG_CHECKING([for XML::Parser])
--   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
--       AC_MSG_RESULT([ok])
--   else
--       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
--   fi
--fi
--
- # Substitute ALL_LINGUAS so we can use it in po/Makefile
- AC_SUBST(ALL_LINGUAS)
- 
diff --git a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb b/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb
deleted file mode 100644
index ecff2faf2..000000000
--- a/import-layers/yocto-poky/meta/recipes-devtools/intltool/intltool_0.51.0.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Utility scripts for internationalizing XML"
-SECTION = "devel"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-
-SRC_URI = "http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz \
-           file://intltool-nowarn.patch \
-           file://perl-522-deprecations.patch \
-           file://remove-perl-check.patch \
-           file://noperlcheck.patch \
-           "
-SRC_URI[md5sum] = "12e517cac2b57a0121cda351570f1e63"
-SRC_URI[sha256sum] = "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
-
-UPSTREAM_CHECK_URI = "https://launchpad.net/intltool/trunk/"
-
-DEPENDS = "libxml-parser-perl-native"
-RDEPENDS_${PN} = "gettext-dev libxml-parser-perl"
-DEPENDS_class-native = "libxml-parser-perl-native gettext-native"
-
-inherit autotools pkgconfig perlnative
-
-export PERL = "${bindir}/env perl"
-PERL_class-native = "/usr/bin/env nativeperl"
-PERL_class-nativesdk = "/usr/bin/env perl"
-
-# gettext is assumed to exist on the host
-RDEPENDS_${PN}_class-native = "libxml-parser-perl-native"
-RRECOMMENDS_${PN} = "perl-modules"
-RRECOMMENDS_${PN}_class-native = ""
-
-FILES_${PN}-dev = ""
-FILES_${PN} += "${datadir}/aclocal"
-
-INSANE_SKIP_${PN} += "dev-deps"
-
-BBCLASSEXTEND = "native nativesdk"