* [Buildroot] [git commit] qextserialport: fix line endings in patch 0002
@ 2016-11-25 21:40 Thomas Petazzoni
2016-11-26 10:48 ` Arnout Vandecappelle
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2016-11-25 21:40 UTC (permalink / raw)
To: buildroot
commit: https://git.buildroot.net/buildroot/commit/?id=72dcc7c252e7be65ff3e66bcf5dd20b49e2de915
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
Fixes:
http://autobuild.buildroot.net/results/074d379e4d491dd454726bed666a7e1028333ef7/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
...Create-a-main-include-file-QExtSerialPort.patch | 23 ++++++++++------------
1 file changed, 10 insertions(+), 13 deletions(-)
diff --git a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch b/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch
index 1f14304..e1d99f0 100644
--- a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch
+++ b/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch
@@ -28,16 +28,13 @@ diff --git a/src/qextserialport.pri b/src/qextserialport.pri
index 461d56f..f8a678d 100644
--- a/src/qextserialport.pri
+++ b/src/qextserialport.pri
-@@ -3,7 +3,8 @@ DEPENDPATH += $$PWD
-
- PUBLIC_HEADERS += $$PWD/qextserialport.h \
- $$PWD/qextserialenumerator.h \
-- $$PWD/qextserialport_global.h
-+ $$PWD/qextserialport_global.h \
-+ $$PWD/QExtSerialPort
-
- HEADERS += $$PUBLIC_HEADERS \
- $$PWD/qextserialport_p.h \
---
-2.10.2
-
+@@ -3,7 +3,8 @@
+
+ PUBLIC_HEADERS += $$PWD/qextserialport.h \
+ $$PWD/qextserialenumerator.h \
+- $$PWD/qextserialport_global.h
++ $$PWD/qextserialport_global.h \
++ $$PWD/QExtSerialPort
+
+ HEADERS += $$PUBLIC_HEADERS \
+ $$PWD/qextserialport_p.h \
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [git commit] qextserialport: fix line endings in patch 0002
2016-11-25 21:40 [Buildroot] [git commit] qextserialport: fix line endings in patch 0002 Thomas Petazzoni
@ 2016-11-26 10:48 ` Arnout Vandecappelle
2016-11-26 14:04 ` Thomas Petazzoni
0 siblings, 1 reply; 4+ messages in thread
From: Arnout Vandecappelle @ 2016-11-26 10:48 UTC (permalink / raw)
To: buildroot
Didn't I warn about this in the commit message?
To avoid this kind of problem in the future, perhaps we should add
--ignore-whitespace to our patch calls?
Regards,
Arnout
On 25-11-16 22:40, Thomas Petazzoni wrote:
> commit: https://git.buildroot.net/buildroot/commit/?id=72dcc7c252e7be65ff3e66bcf5dd20b49e2de915
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
>
> Fixes:
>
> http://autobuild.buildroot.net/results/074d379e4d491dd454726bed666a7e1028333ef7/
>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
> ...Create-a-main-include-file-QExtSerialPort.patch | 23 ++++++++++------------
> 1 file changed, 10 insertions(+), 13 deletions(-)
>
> diff --git a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch b/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch
> index 1f14304..e1d99f0 100644
> --- a/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch
> +++ b/package/qextserialport/0002-Create-a-main-include-file-QExtSerialPort.patch
> @@ -28,16 +28,13 @@ diff --git a/src/qextserialport.pri b/src/qextserialport.pri
> index 461d56f..f8a678d 100644
> --- a/src/qextserialport.pri
> +++ b/src/qextserialport.pri
> -@@ -3,7 +3,8 @@ DEPENDPATH += $$PWD
> -
> - PUBLIC_HEADERS += $$PWD/qextserialport.h \
> - $$PWD/qextserialenumerator.h \
> -- $$PWD/qextserialport_global.h
> -+ $$PWD/qextserialport_global.h \
> -+ $$PWD/QExtSerialPort
> -
> - HEADERS += $$PUBLIC_HEADERS \
> - $$PWD/qextserialport_p.h \
> ---
> -2.10.2
> -
> +@@ -3,7 +3,8 @@
> +
> + PUBLIC_HEADERS += $$PWD/qextserialport.h \
> + $$PWD/qextserialenumerator.h \
> +- $$PWD/qextserialport_global.h
> ++ $$PWD/qextserialport_global.h \
> ++ $$PWD/QExtSerialPort
> +
> + HEADERS += $$PUBLIC_HEADERS \
> + $$PWD/qextserialport_p.h \
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [git commit] qextserialport: fix line endings in patch 0002
2016-11-26 10:48 ` Arnout Vandecappelle
@ 2016-11-26 14:04 ` Thomas Petazzoni
2016-11-26 15:12 ` Arnout Vandecappelle
0 siblings, 1 reply; 4+ messages in thread
From: Thomas Petazzoni @ 2016-11-26 14:04 UTC (permalink / raw)
To: buildroot
Hello,
On Sat, 26 Nov 2016 11:48:57 +0100, Arnout Vandecappelle wrote:
> Didn't I warn about this in the commit message?
Yes, you did. I saw it the first time I looked at the patch, but then
forgot when actually applying later in the day. Which is why I fixed it
afterwards.
> To avoid this kind of problem in the future, perhaps we should add
> --ignore-whitespace to our patch calls?
You mean when applying the patches? Apparently, git am takes a
--ignore-space-change option, could be worth trying next time.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [git commit] qextserialport: fix line endings in patch 0002
2016-11-26 14:04 ` Thomas Petazzoni
@ 2016-11-26 15:12 ` Arnout Vandecappelle
0 siblings, 0 replies; 4+ messages in thread
From: Arnout Vandecappelle @ 2016-11-26 15:12 UTC (permalink / raw)
To: buildroot
On 26-11-16 15:04, Thomas Petazzoni wrote:
> Hello,
>
> On Sat, 26 Nov 2016 11:48:57 +0100, Arnout Vandecappelle wrote:
>
>> Didn't I warn about this in the commit message?
>
> Yes, you did. I saw it the first time I looked at the patch, but then
> forgot when actually applying later in the day. Which is why I fixed it
> afterwards.
>
>> To avoid this kind of problem in the future, perhaps we should add
>> --ignore-whitespace to our patch calls?
>
> You mean when applying the patches? Apparently, git am takes a
> --ignore-space-change option, could be worth trying next time.
No, I mean in apply-patches. This particular case didn't cause an error in
git-am because the patch file didn't exist before.
Regards,
Arnout
--
Arnout Vandecappelle arnout at mind be
Senior Embedded Software Architect +32-16-286500
Essensium/Mind http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-11-26 15:12 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-11-25 21:40 [Buildroot] [git commit] qextserialport: fix line endings in patch 0002 Thomas Petazzoni
2016-11-26 10:48 ` Arnout Vandecappelle
2016-11-26 14:04 ` Thomas Petazzoni
2016-11-26 15:12 ` Arnout Vandecappelle
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.