Packages Upgrade

index 82403aa..4ad4b81 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fcb02dc552a041dee27e4b85c7396067"
 SECTION = "base"
 DEPENDS = "util-linux attr e2fsprogs lzo acl"
 
-SRCREV = "c061b303c08af7a58373908d0d77ef0f1161fd36"
+SRCREV = "20be329fdb569fefdf88ba0e4ca1a41488fcbc19"
 SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git \
            file://fix-parallel.patch \
 "

@@ -27,6 +27,6 @@ do_configure_prepend() {
 
 S = "${WORKDIR}/git"
 
-PV = "4.0.1+git${SRCPV}"
+PV = "4.1.1+git${SRCPV}"
 
 BBCLASSEXTEND = "native"

similarity index 93%
rename from meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb
rename to meta/recipes-kernel/lttng/lttng-modules_git.bb
index 5bde7ec..54544fe 100644
@@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=1412caf5a1aa90d6a48588a4794c0eac \
 
 inherit module
 
-SRCREV = "62080b2248fd8ec4111ffc379d0bc5eaf0a5c16d"
+SRCREV = "7a88f8b50696dd71e80c08661159caf8e119bf51"
+PV = "2.6.2+git${SRCPV}"
 
 COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux'
 

deleted file mode 100644
index cec5410..0000000
@@ -1,19 +0,0 @@
-lttng-ust: add aarch64 recognition
-
-Treat the same as "arm".
-
-Upstream-Status: Pending
-
-Signed-off-by: [email protected]
-
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -230,6 +230,7 @@ changequote([,])dnl
- 	s390) NO_UNALIGNED_ACCESS=1 ;;
- 	s390x) NO_UNALIGNED_ACCESS=1 ;;
-         arm*) NO_UNALIGNED_ACCESS=1 ;;
-+        aarch64) NO_UNALIGNED_ACCESS=1 ;;
- 	mips*) NO_UNALIGNED_ACCESS=1 ;;
- 	tile*) NO_UNALIGNED_ACCESS=1 ;;
- 	*) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;;

similarity index 91%
rename from meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb
rename to meta/recipes-kernel/lttng/lttng-ust_git.bb
index d083f86..ae4afd3 100644
@@ -18,14 +18,14 @@ RPROVIDES_${PN} = "lttng2-ust"
 RREPLACES_${PN} = "lttng2-ust"
 RCONFLICTS_${PN} = "lttng2-ust"
 
-SRCREV = "369ee1a1b12338e5158d24f9c879f5dd52f1aba2"
+SRCREV = "c49ee9040ada6984c880756614e8a6f7fd645bd6"
 PE = "2"
+PV = "2.6.2+git${SRCPV}"
 
 SRC_URI = "git://git.lttng.org/lttng-ust.git;branch=stable-2.6 \
            file://lttng-ust-doc-examples-disable.patch \
-           file://add-aarch64.patch \
            file://lttng-ust-Fix-live-timer-calculation-error.patch \
-	   "
+        "
 
 S = "${WORKDIR}/git"
 

index 4da4a27..39b4a79 100644
@@ -6,10 +6,12 @@ DEPENDS = "openssl curl zlib expat"
 
 PROVIDES_append_class-native = " git-replacement-native"
 
-SRC_URI = "${KERNELORG_MIRROR}/software/scm/git/git-${PV}.tar.gz;name=tarball \
-           ${KERNELORG_MIRROR}/software/scm/git/git-manpages-${PV}.tar.gz;name=manpages"
+SRC_URI = "git://github.com/git/git.git"
 
-S = "${WORKDIR}/git-${PV}"
+SRCREV = "0df0541bf13723658d31b8d1376b505b710e63c6"
+PV = "2.4.5+git${SRCPV}"
+
+S = "${WORKDIR}/git"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=7c0d7ef03a7eb04ce795b0f60e68e7e1"
 

@@ -33,12 +35,6 @@ do_install () {
 	oe_runmake install DESTDIR="${D}" bindir=${bindir} \
 		template_dir=${datadir}/git-core/templates \
 		GIT_PYTHON_DIR=${D}${datadir}/git-core/python
-	install -d ${D}/${mandir}/man1
-	install -d ${D}/${mandir}/man5
-	install -d ${D}/${mandir}/man7
-	install -t ${D}/${mandir}/man1 ${WORKDIR}/man1/*
-	install -t ${D}/${mandir}/man5 ${WORKDIR}/man5/*
-	install -t ${D}/${mandir}/man7 ${WORKDIR}/man7/*
 	install -d ${D}/${datadir}/bash-completion/completions/
 	install -m 644 ${S}/contrib/completion/git-completion.bash ${D}/${datadir}/bash-completion/completions/git
 }

deleted file mode 100644
index f9c81ed..0000000
@@ -1,11 +0,0 @@
-require git.inc
-
-SRC_URI[tarball.md5sum] = "f122606aee328de3e1019cde720cb0aa"
-SRC_URI[tarball.sha256sum] = "a5d9e3e340a3e5a297092430752f61a9ae5b8b5e4ac042b0341d17189e653456"
-SRC_URI[manpages.md5sum] = "285b126907d59647248577a7df01c44c"
-SRC_URI[manpages.sha256sum] = "15afc42909078909ca7a48d73b7cb358b37f734b81fc3a0c6438be183f05480f"
-
-EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
-                 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
-                 "
-EXTRA_OEMAKE += "NO_GETTEXT=1"

new file mode 100644
index 0000000..7099b89
@@ -0,0 +1,6 @@
+require git.inc
+
+EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \
+                 ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \
+                 "
+EXTRA_OEMAKE += "NO_GETTEXT=1"

deleted file mode 100644
index 0a3e27a..0000000
@@ -1,116 +0,0 @@
-From 21f9d5f0e0340ada998f7f9d316368c7167a4afa Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <[email protected]>
-Date: Thu, 11 Jun 2015 12:52:32 +0000
-Subject: [PATCH 1/2] Fix bug with long options and explicitly number them to
- avoid this in the future.
-
-Upstream-Status: Backport
-
-Signed-off-by: Robert Yang <[email protected]>
-
----
- src/file.c      |   44 +++++++++++++++++++++++----------------------
- src/file_opts.h |   10 +++++-----
- 2 files changed, 27 insertions(+), 26 deletions(-)
-
-diff --git a/src/file.c b/src/file.c
-index f60dde0..c700f66 100644
---- a/src/file.c
-+++ b/src/file.c
-@@ -89,10 +89,15 @@ private int 		/* Global command-line options 		*/
- 
- private const char *separator = ":";	/* Default field separator	*/
- private const struct option long_options[] = {
-+#define OPT_HELP		1
-+#define OPT_APPLE		2
-+#define OPT_EXTENSIONS		3
-+#define OPT_MIME_TYPE		4
-+#define OPT_MIME_ENCODING	5
- #define OPT(shortname, longname, opt, doc)      \
-     {longname, opt, NULL, shortname},
--#define OPT_LONGONLY(longname, opt, doc)        \
--    {longname, opt, NULL, 0},
-+#define OPT_LONGONLY(longname, opt, doc, id)        \
-+    {longname, opt, NULL, id},
- #include "file_opts.h"
- #undef OPT
- #undef OPT_LONGONLY
-@@ -182,24 +187,20 @@ main(int argc, char *argv[])
- 	while ((c = getopt_long(argc, argv, OPTSTRING, long_options,
- 	    &longindex)) != -1)
- 		switch (c) {
--		case 0 :
--			switch (longindex) {
--			case 0:
--				help();
--				break;
--			case 10:
--				flags |= MAGIC_APPLE;
--				break;
--			case 11:
--				flags |= MAGIC_EXTENSION;
--				break;
--			case 12:
--				flags |= MAGIC_MIME_TYPE;
--				break;
--			case 13:
--				flags |= MAGIC_MIME_ENCODING;
--				break;
--			}
-+		case OPT_HELP:
-+			help();
-+			break;
-+		case OPT_APPLE:
-+			flags |= MAGIC_APPLE;
-+			break;
-+		case OPT_EXTENSIONS:
-+			flags |= MAGIC_EXTENSION;
-+			break;
-+		case OPT_MIME_TYPE:
-+			flags |= MAGIC_MIME_TYPE;
-+			break;
-+		case OPT_MIME_ENCODING:
-+			flags |= MAGIC_MIME_ENCODING;
- 			break;
- 		case '0':
- 			nulsep = 1;
-@@ -595,7 +596,7 @@ help(void)
- #define OPT(shortname, longname, opt, doc)      \
- 	fprintf(stdout, "  -%c, --" longname, shortname), \
- 	docprint(doc);
--#define OPT_LONGONLY(longname, opt, doc)        \
-+#define OPT_LONGONLY(longname, opt, doc, id)        \
- 	fprintf(stdout, "      --" longname),	\
- 	docprint(doc);
- #include "file_opts.h"
-diff --git a/src/file_opts.h b/src/file_opts.h
-index 036505f..2e30d06 100644
---- a/src/file_opts.h
-+++ b/src/file_opts.h
-@@ -12,7 +12,7 @@
-  * switch statement!
-  */
- 
--OPT_LONGONLY("help", 0, "                 display this help and exit\n")
-+OPT_LONGONLY("help", 0, "                 display this help and exit\n", OPT_HELP)
- OPT('v', "version", 0, "              output version information and exit\n")
- OPT('m', "magic-file", 1, " LIST      use LIST as a colon-separated list of magic\n"
-     "                               number files\n")
-@@ -29,10 +29,10 @@ OPT('f', "files-from", 1, " FILE      read the filenames to be examined from FIL
- OPT('F', "separator", 1, " STRING     use string as separator instead of `:'\n")
- OPT('i', "mime", 0, "                 output MIME type strings (--mime-type and\n"
-     "                               --mime-encoding)\n")
--OPT_LONGONLY("apple", 0, "                output the Apple CREATOR/TYPE\n")
--OPT_LONGONLY("extension", 0, "            output a slash-separated list of extnsions\n")
--OPT_LONGONLY("mime-type", 0, "            output the MIME type\n")
--OPT_LONGONLY("mime-encoding", 0, "        output the MIME encoding\n")
-+OPT_LONGONLY("apple", 0, "                output the Apple CREATOR/TYPE\n", OPT_APPLE)
-+OPT_LONGONLY("extension", 0, "            output a slash-separated list of extensions\n", OPT_EXTENSIONS)
-+OPT_LONGONLY("mime-type", 0, "            output the MIME type\n", OPT_MIME_TYPE)
-+OPT_LONGONLY("mime-encoding", 0, "        output the MIME encoding\n", OPT_MIME_ENCODING)
- OPT('k', "keep-going", 0, "           don't stop at the first match\n")
- OPT('l', "list", 0, "                 list magic strength\n")
- #ifdef S_IFLNK
--- 
-1.7.9.5
-

deleted file mode 100644
index a9f2eda..0000000
@@ -1,26 +0,0 @@
-From 5c40ae1728f08bb7e1229d3aa90e38d2c342fc53 Mon Sep 17 00:00:00 2001
-From: Christos Zoulas <[email protected]>
-Date: Thu, 11 Jun 2015 12:53:26 +0000
-Subject: [PATCH 2/2] fix bug with 5.23 long options
-
-Upstream-Status: Backport
-
-Signed-off-by: Robert Yang <[email protected]>
----
- ChangeLog |    3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/ChangeLog b/ChangeLog
-index 1ac5ad2..0922fc7 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,6 @@
-+2015-06-11   8:52  Christos Zoulas <[email protected]>
-+
-+	* redo long option encoding to fix off-by-one in 5.23
- 
- 2015-06-10  13:50  Christos Zoulas <[email protected]>
- 
--- 
-1.7.9.5
-

similarity index 64%
rename from meta/recipes-devtools/file/file_5.23.bb
rename to meta/recipes-devtools/file/file_git.bb
index 04a1d7b..5cc6456 100644
@@ -11,15 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
 DEPENDS = "zlib file-native"
 DEPENDS_class-native = "zlib-native"
 
-SRC_URI = "ftp://ftp.astron.com/pub/file/${BP}.tar.gz \
-	   file://debian-742262.patch \
-	   file://0001-Add-P-prompt-into-Usage-info.patch \
-	   file://0001-Fix-bug-with-long-options-and-explicitly-number-them.patch \
-	   file://0002-fix-bug-with-5.23-long-options.patch \
-          "
-
-SRC_URI[md5sum] = "61db35209ce71a6d576392ce6e1d2f80"
-SRC_URI[sha256sum] = "2c8ab3ff143e2cdfb5ecee381752f80a79e0b4cfe9ca4cc6e1c3e5ec15e6157c"
+SRC_URI = "git://github.com/file/file.git \
+        file://debian-742262.patch \
+        file://0001-Add-P-prompt-into-Usage-info.patch \
+        "
+
+SRCREV = "3c0874be4d3232d672b20f513451a39cfd7c585a"
+PV = "5.24+git${SRCPV}"
+S = "${WORKDIR}/git"
 
 inherit autotools