* [PATCH 0/5] Packages Upgrade
@ 2015-07-17 2:31 Robert Yang
2015-07-17 2:31 ` [PATCH 1/5] btrfs-tools: 4.0.1 -> 4.1.1 Robert Yang
` (4 more replies)
0 siblings, 5 replies; 10+ messages in thread
From: Robert Yang @ 2015-07-17 2:31 UTC (permalink / raw)
To: openembedded-core
The following changes since commit ff384c084678dab33bbd7eb82ece21a2baa13dfb:
qemu: upgrade to 2.4.0-rc0 (2015-07-16 20:40:00 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/PU
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/PU
Robert Yang (5):
btrfs-tools: 4.0.1 -> 4.1.1
lttng-modules: 2.6.1 -> 2.6.2
lttng-ust: 2.6.1 -> 2.6.2
git: 2.4.4 -> 2.4.5
file: 5.23 -> 5.24
.../btrfs-tools/btrfs-tools_git.bb | 4 +-
...h-long-options-and-explicitly-number-them.patch | 116 --------------------
.../file/0002-fix-bug-with-5.23-long-options.patch | 26 -----
.../file/{file_5.23.bb => file_git.bb} | 17 ++-
meta/recipes-devtools/git/git.inc | 14 +--
meta/recipes-devtools/git/git_2.4.4.bb | 11 --
meta/recipes-devtools/git/git_git.bb | 6 +
...lttng-modules_2.6.1.bb => lttng-modules_git.bb} | 3 +-
.../lttng/lttng-ust/add-aarch64.patch | 19 ----
.../lttng/{lttng-ust_2.6.1.bb => lttng-ust_git.bb} | 6 +-
10 files changed, 26 insertions(+), 196 deletions(-)
delete mode 100644 meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch
delete mode 100644 meta/recipes-devtools/file/file/0002-fix-bug-with-5.23-long-options.patch
rename meta/recipes-devtools/file/{file_5.23.bb => file_git.bb} (64%)
delete mode 100644 meta/recipes-devtools/git/git_2.4.4.bb
create mode 100644 meta/recipes-devtools/git/git_git.bb
rename meta/recipes-kernel/lttng/{lttng-modules_2.6.1.bb => lttng-modules_git.bb} (93%)
delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch
rename meta/recipes-kernel/lttng/{lttng-ust_2.6.1.bb => lttng-ust_git.bb} (91%)
--
1.7.9.5
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/5] btrfs-tools: 4.0.1 -> 4.1.1 2015-07-17 2:31 [PATCH 0/5] Packages Upgrade Robert Yang @ 2015-07-17 2:31 ` Robert Yang 2015-07-17 2:31 ` [PATCH 2/5] lttng-modules: 2.6.1 -> 2.6.2 Robert Yang ` (3 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Robert Yang @ 2015-07-17 2:31 UTC (permalink / raw) To: openembedded-core This upgrade fixes DEBUG_BUILD on qemuarm: [CC] btrfs-convert.o [CC] btrfs-corrupt-block.o [CC] btrfs-calc-size.o {standard input}: Assembler messages: {standard input}:3257: Error: invalid operands (.text and *UND* sections) for `-' {standard input}:3263: Error: invalid operands (.text and *UND* sections) for `-' make: *** [cmds-fi-usage.o] Error 1 Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- .../btrfs-tools/btrfs-tools_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb index 82403aa..4ad4b81 100644 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools_git.bb @@ -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" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/5] lttng-modules: 2.6.1 -> 2.6.2 2015-07-17 2:31 [PATCH 0/5] Packages Upgrade Robert Yang 2015-07-17 2:31 ` [PATCH 1/5] btrfs-tools: 4.0.1 -> 4.1.1 Robert Yang @ 2015-07-17 2:31 ` Robert Yang 2015-07-17 2:31 ` [PATCH 3/5] lttng-ust: " Robert Yang ` (2 subsequent siblings) 4 siblings, 0 replies; 10+ messages in thread From: Robert Yang @ 2015-07-17 2:31 UTC (permalink / raw) To: openembedded-core * Rename recipe name from lttng-modules_2.6.1.bb to lttng-modules_git.bb Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- ...lttng-modules_2.6.1.bb => lttng-modules_git.bb} | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) rename meta/recipes-kernel/lttng/{lttng-modules_2.6.1.bb => lttng-modules_git.bb} (93%) diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb b/meta/recipes-kernel/lttng/lttng-modules_git.bb 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 --- a/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_git.bb @@ -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' -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/5] lttng-ust: 2.6.1 -> 2.6.2 2015-07-17 2:31 [PATCH 0/5] Packages Upgrade Robert Yang 2015-07-17 2:31 ` [PATCH 1/5] btrfs-tools: 4.0.1 -> 4.1.1 Robert Yang 2015-07-17 2:31 ` [PATCH 2/5] lttng-modules: 2.6.1 -> 2.6.2 Robert Yang @ 2015-07-17 2:31 ` Robert Yang 2015-07-17 2:31 ` [PATCH 4/5] git: 2.4.4 -> 2.4.5 Robert Yang 2015-07-17 2:31 ` [PATCH 5/5] file: 5.23 -> 5.24 Robert Yang 4 siblings, 0 replies; 10+ messages in thread From: Robert Yang @ 2015-07-17 2:31 UTC (permalink / raw) To: openembedded-core * Remove add-aarch64.patch since it is already in the source. * Rename lttng-ust_2.6.1.bb -> lttng-ust_git.bb Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- .../lttng/lttng-ust/add-aarch64.patch | 19 ------------------- .../lttng/{lttng-ust_2.6.1.bb => lttng-ust_git.bb} | 6 +++--- 2 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch rename meta/recipes-kernel/lttng/{lttng-ust_2.6.1.bb => lttng-ust_git.bb} (91%) diff --git a/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch b/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch deleted file mode 100644 index cec5410..0000000 --- a/meta/recipes-kernel/lttng/lttng-ust/add-aarch64.patch +++ /dev/null @@ -1,19 +0,0 @@ -lttng-ust: add aarch64 recognition - -Treat the same as "arm". - -Upstream-Status: Pending - -Signed-off-by: joe.slater@windriver.com - - ---- 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)?)]) ;; diff --git a/meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb b/meta/recipes-kernel/lttng/lttng-ust_git.bb 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 --- a/meta/recipes-kernel/lttng/lttng-ust_2.6.1.bb +++ b/meta/recipes-kernel/lttng/lttng-ust_git.bb @@ -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" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/5] git: 2.4.4 -> 2.4.5 2015-07-17 2:31 [PATCH 0/5] Packages Upgrade Robert Yang ` (2 preceding siblings ...) 2015-07-17 2:31 ` [PATCH 3/5] lttng-ust: " Robert Yang @ 2015-07-17 2:31 ` Robert Yang 2015-07-17 11:34 ` Burton, Ross 2015-07-17 2:31 ` [PATCH 5/5] file: 5.23 -> 5.24 Robert Yang 4 siblings, 1 reply; 10+ messages in thread From: Robert Yang @ 2015-07-17 2:31 UTC (permalink / raw) To: openembedded-core * Use git repo rathar then tarball. * Rename git_2.4.4.bb -> git_git.bb. * Remove the commands for installing manual since they are already installed. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- meta/recipes-devtools/git/git.inc | 14 +++++--------- meta/recipes-devtools/git/git_2.4.4.bb | 11 ----------- meta/recipes-devtools/git/git_git.bb | 6 ++++++ 3 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-devtools/git/git_2.4.4.bb create mode 100644 meta/recipes-devtools/git/git_git.bb diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 4da4a27..39b4a79 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -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 } diff --git a/meta/recipes-devtools/git/git_2.4.4.bb b/meta/recipes-devtools/git/git_2.4.4.bb deleted file mode 100644 index f9c81ed..0000000 --- a/meta/recipes-devtools/git/git_2.4.4.bb +++ /dev/null @@ -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" diff --git a/meta/recipes-devtools/git/git_git.bb b/meta/recipes-devtools/git/git_git.bb new file mode 100644 index 0000000..7099b89 --- /dev/null +++ b/meta/recipes-devtools/git/git_git.bb @@ -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" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 4/5] git: 2.4.4 -> 2.4.5 2015-07-17 2:31 ` [PATCH 4/5] git: 2.4.4 -> 2.4.5 Robert Yang @ 2015-07-17 11:34 ` Burton, Ross 2015-07-27 1:47 ` Robert Yang 0 siblings, 1 reply; 10+ messages in thread From: Burton, Ross @ 2015-07-17 11:34 UTC (permalink / raw) To: Robert Yang; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 266 bytes --] On 17 July 2015 at 03:31, Robert Yang <liezhi.yang@windriver.com> wrote: > * Use git repo rathar then tarball. > For this and the file upgrade, why? Tarballs are easily cached, and can be checksummed. What's the reason to switch to a git clone? Ross [-- Attachment #2: Type: text/html, Size: 744 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 4/5] git: 2.4.4 -> 2.4.5 2015-07-17 11:34 ` Burton, Ross @ 2015-07-27 1:47 ` Robert Yang 0 siblings, 0 replies; 10+ messages in thread From: Robert Yang @ 2015-07-27 1:47 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core On 07/17/2015 07:34 PM, Burton, Ross wrote: > > On 17 July 2015 at 03:31, Robert Yang <liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com>> wrote: > > * Use git repo rathar then tarball. > > > For this and the file upgrade, why? > > Tarballs are easily cached, and can be checksummed. What's the reason to switch > to a git clone? Hi Ross, I just came back from vacation, I thought that git repo is preferred than tarball, but seems not, so let's drop the 2 upgrades. // Robert > > Ross ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 5/5] file: 5.23 -> 5.24 2015-07-17 2:31 [PATCH 0/5] Packages Upgrade Robert Yang ` (3 preceding siblings ...) 2015-07-17 2:31 ` [PATCH 4/5] git: 2.4.4 -> 2.4.5 Robert Yang @ 2015-07-17 2:31 ` Robert Yang 2015-07-21 11:05 ` Burton, Ross 4 siblings, 1 reply; 10+ messages in thread From: Robert Yang @ 2015-07-17 2:31 UTC (permalink / raw) To: openembedded-core * Remove backported patch: - 0001-Fix-bug-with-long-options-and-explicitly-number-them.patch \ - 0002-fix-bug-with-5.23-long-options.patch \ * Use git repo rather than tarball, rename file_5.23.bb -> file_git.bb Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- ...h-long-options-and-explicitly-number-them.patch | 116 -------------------- .../file/0002-fix-bug-with-5.23-long-options.patch | 26 ----- .../file/{file_5.23.bb => file_git.bb} | 17 ++- 3 files changed, 8 insertions(+), 151 deletions(-) delete mode 100644 meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch delete mode 100644 meta/recipes-devtools/file/file/0002-fix-bug-with-5.23-long-options.patch rename meta/recipes-devtools/file/{file_5.23.bb => file_git.bb} (64%) diff --git a/meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch b/meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch deleted file mode 100644 index 0a3e27a..0000000 --- a/meta/recipes-devtools/file/file/0001-Fix-bug-with-long-options-and-explicitly-number-them.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 21f9d5f0e0340ada998f7f9d316368c7167a4afa Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <christos@zoulas.com> -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 <liezhi.yang@windriver.com> - ---- - 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 - diff --git a/meta/recipes-devtools/file/file/0002-fix-bug-with-5.23-long-options.patch b/meta/recipes-devtools/file/file/0002-fix-bug-with-5.23-long-options.patch deleted file mode 100644 index a9f2eda..0000000 --- a/meta/recipes-devtools/file/file/0002-fix-bug-with-5.23-long-options.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5c40ae1728f08bb7e1229d3aa90e38d2c342fc53 Mon Sep 17 00:00:00 2001 -From: Christos Zoulas <christos@zoulas.com> -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 <liezhi.yang@windriver.com> ---- - 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 <christos@zoulas.com> -+ -+ * redo long option encoding to fix off-by-one in 5.23 - - 2015-06-10 13:50 Christos Zoulas <christos@zoulas.com> - --- -1.7.9.5 - diff --git a/meta/recipes-devtools/file/file_5.23.bb b/meta/recipes-devtools/file/file_git.bb 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 --- a/meta/recipes-devtools/file/file_5.23.bb +++ b/meta/recipes-devtools/file/file_git.bb @@ -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 -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 5/5] file: 5.23 -> 5.24 2015-07-17 2:31 ` [PATCH 5/5] file: 5.23 -> 5.24 Robert Yang @ 2015-07-21 11:05 ` Burton, Ross 2015-07-27 7:59 ` Robert Yang 0 siblings, 1 reply; 10+ messages in thread From: Burton, Ross @ 2015-07-21 11:05 UTC (permalink / raw) To: Robert Yang; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 169 bytes --] On 17 July 2015 at 03:31, Robert Yang <liezhi.yang@windriver.com> wrote: > * Use git repo rather than tarball, rename file_5.23.bb -> file_git.bb > Why? Ross [-- Attachment #2: Type: text/html, Size: 717 bytes --] ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 5/5] file: 5.23 -> 5.24 2015-07-21 11:05 ` Burton, Ross @ 2015-07-27 7:59 ` Robert Yang 0 siblings, 0 replies; 10+ messages in thread From: Robert Yang @ 2015-07-27 7:59 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core On 07/21/2015 07:05 PM, Burton, Ross wrote: > > On 17 July 2015 at 03:31, Robert Yang <liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com>> wrote: > > * Use git repo rather than tarball, rename file_5.23.bb > <http://file_5.23.bb> -> file_git.bb <http://file_git.bb> > > > Why? Hi Ross, The old SRC_URI ftp://ftp.astron.com/pub/file/ is down again atm, it is not stable as you met the same problems several days ago, I think that use git hub's repo is better. I will add more comments and resend the patch. // Robert > > Ross ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2015-07-27 7:59 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-07-17 2:31 [PATCH 0/5] Packages Upgrade Robert Yang 2015-07-17 2:31 ` [PATCH 1/5] btrfs-tools: 4.0.1 -> 4.1.1 Robert Yang 2015-07-17 2:31 ` [PATCH 2/5] lttng-modules: 2.6.1 -> 2.6.2 Robert Yang 2015-07-17 2:31 ` [PATCH 3/5] lttng-ust: " Robert Yang 2015-07-17 2:31 ` [PATCH 4/5] git: 2.4.4 -> 2.4.5 Robert Yang 2015-07-17 11:34 ` Burton, Ross 2015-07-27 1:47 ` Robert Yang 2015-07-17 2:31 ` [PATCH 5/5] file: 5.23 -> 5.24 Robert Yang 2015-07-21 11:05 ` Burton, Ross 2015-07-27 7:59 ` Robert Yang
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox