From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0
Date: Mon, 31 Oct 2016 11:39:38 +0100 [thread overview]
Message-ID: <20161031103938.GH3389@free.fr> (raw)
In-Reply-To: <20161031074624.7576-1-eeppeliteloop@gmail.com>
Philippe, All,
On 2016-10-31 03:46 -0400, Philippe Proulx spake thusly:
> See individual patches for changes.
>
> Philippe Proulx (9):
> lttng-libust: bump to version 2.8.1
> lttng-libust: enable Python agent when Python is available
> lttng-tools: bump to version 2.8.2
> lttng-tools: remove dependency on host-lttng-babeltrace
> lttng-modules: bump to version 2.8.3
> lttng-babeltrace: bump to version 1.4.0
> lttng-babeltrace: add host Babeltrace as host utility
> lttng-babeltrace: add debug info support
> lttng-babeltrace: rename to babeltrace
Durng the review, I wanted to check something so I tried to apply th
series on top of master. Some of the patches do not apply, but I can't
see why:
Description: [v3,3/9] lttng-tools: bump to version 2.8.2
Applying: lttng-tools: bump to version 2.8.2
.git/rebase-apply/patch:117: space before tab in indent.
errno = 0;
.git/rebase-apply/patch:118: space before tab in indent.
id = strtol(argv[1], &name, 10);
.git/rebase-apply/patch:121: space before tab in indent.
ret = del_output(UINT32_MAX, name);
.git/rebase-apply/patch:122: space before tab in indent.
} else if (errno == 0 && *name == '\0') {
.git/rebase-apply/patch:123: space before tab in indent.
ret = del_output(id, NULL);
error: patch failed: package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch:1
error: package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch: patch does not apply
error: patch failed: package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch:1
error: package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch: patch does not apply
Patch failed at 0001 lttng-tools: bump to version 2.8.2
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
'git am' failed with exit status 128
So, those patches do not apply:
lttng-tools: bump to version 2.8.2
lttng-babeltrace: bump to version 1.4.0
The failures (in both cases) occur when trying to delete existing
patches, but not for all removals:
package/lttng-tools/0001-Fix-build-failure-when-__GLIBC_PREREQ-is-missing.patch
package/lttng-tools/0002-Fix-add-missing-sys-types.h-header.patch
package/lttng-babeltrace/0002-configure-fix-uuid-support-detection-on-static-build.patch
I've had a look at the patches, but they look correct. :-/
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2016-10-31 10:39 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-31 7:46 [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
2016-10-31 7:46 ` [Buildroot] [PATCH v3 1/9] lttng-libust: bump to version 2.8.1 Philippe Proulx
2016-10-31 9:42 ` Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 2/9] lttng-libust: enable Python agent when Python is available Philippe Proulx
2016-10-31 9:42 ` Yann E. MORIN
2016-11-01 14:25 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 3/9] lttng-tools: bump to version 2.8.2 Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:16 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 4/9] lttng-tools: remove dependency on host-lttng-babeltrace Philippe Proulx
2016-10-31 9:55 ` Yann E. MORIN
2016-11-01 14:26 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 5/9] lttng-modules: bump to version 2.8.3 Philippe Proulx
2016-10-31 9:57 ` Yann E. MORIN
2016-10-31 7:46 ` [Buildroot] [PATCH v3 6/9] lttng-babeltrace: bump to version 1.4.0 Philippe Proulx
2016-10-31 10:12 ` Yann E. MORIN
2016-11-01 14:30 ` Thomas Petazzoni
2016-10-31 7:46 ` [Buildroot] [PATCH v3 7/9] lttng-babeltrace: add host Babeltrace as host utility Philippe Proulx
2016-10-31 10:14 ` Yann E. MORIN
2016-10-31 16:39 ` Philippe Proulx
2016-10-31 7:46 ` [Buildroot] [PATCH v3 8/9] lttng-babeltrace: add debug info support Philippe Proulx
2016-10-31 11:24 ` Yann E. MORIN
2016-10-31 12:43 ` Yann E. MORIN
2016-10-31 7:46 ` [Buildroot] [PATCH v3 9/9] lttng-babeltrace: rename to babeltrace Philippe Proulx
2016-10-31 12:48 ` [Buildroot] [PATCH 1/2] package/elfutils: add host variant Yann E. MORIN
2016-12-13 23:02 ` Thomas Petazzoni
2016-10-31 12:48 ` [Buildroot] [PATCH 2/2] package/babeltrace: enable debug info support for the " Yann E. MORIN
2016-10-31 16:36 ` Philippe Proulx
2016-11-02 22:29 ` Thomas Petazzoni
2016-11-02 23:07 ` Philippe Proulx
2016-11-03 8:25 ` Thomas Petazzoni
2016-11-03 17:41 ` Philippe Proulx
2016-12-13 23:03 ` Thomas Petazzoni
2016-10-31 10:39 ` Yann E. MORIN [this message]
2016-10-31 16:42 ` [Buildroot] [PATCH v3 0/9] Update LTTng packages to 2.8.x and Babeltrace to 1.4.0 Philippe Proulx
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161031103938.GH3389@free.fr \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.