[Buildroot] [PATCH/next 1/1] lxc: fix hash of patch

[Buildroot] [PATCH/next 1/1] lxc: fix hash of patch

[Fabrice Fontaine]

Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 package/lxc/lxc.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/lxc/lxc.hash b/package/lxc/lxc.hash
index 801759a..501f869 100644
--- a/package/lxc/lxc.hash
+++ b/package/lxc/lxc.hash
@@ -1,3 +1,3 @@
 # Locally calculated
 sha256	0d8e34b302cfe4c40c6c9ae5097096aa5cc2c1dfceea3f0f22e3e16c4a4e8494	lxc-2.0.8.tar.gz
-sha256	c79443c5db7e7defd53992d120cad2bc8afc2ff363b1e84ec31bc2b95ec5ca44	bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
+sha256	16cf466db42a45bd579bdb66efbeb63764cd93d049f05a6d8a659846cab9b47f	bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
-- 
2.5.0

[Buildroot] [PATCH/next 1/1] lxc: fix hash of patch

[Thomas Petazzoni]

Hello,

On Mon, 29 May 2017 09:48:12 +0200, Fabrice Fontaine wrote:
> Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>

Why did the hash changed?

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH/next 1/1] lxc: fix hash of patch

[Fabrice Fontaine]

Dear Thomas,

2017-05-29 12:12 GMT+02:00 Thomas Petazzoni <
thomas.petazzoni@free-electrons.com>:

> Hello,
>
> On Mon, 29 May 2017 09:48:12 +0200, Fabrice Fontaine wrote:
> > Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch
> >
> > Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
>
> Why did the hash changed?
>
I don't know, Bernd sent me an email about it so I fixed it. I don't think
I made a mistake in my first patch because I had to delete my local patch
file in dl repository to reproduce the issue. Can the hash on a github
commit change? Should I download 7e0ed7ffa0438a3d0e200a881f2166dc3632dcda
(merge commit) instead of bc5b27d6f6d166d2a6df47982cbe36041ce6b73?

>
> Thomas
> --
> Thomas Petazzoni, CTO, Free Electrons
> Embedded Linux and Kernel engineering
> http://free-electrons.com
>
Best Regards,

Fabrice
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20170529/0803049b/attachment.html>

[Buildroot] [PATCH/next 1/1] lxc: fix hash of patch

[Bernd Kuhls]

Am Mon, 29 May 2017 13:03:35 +0200 schrieb Fabrice Fontaine:

> Dear Thomas,
> 
> 2017-05-29 12:12 GMT+02:00 Thomas Petazzoni <
> thomas.petazzoni at free-electrons.com>:
> 
>> Hello,
>>
>> On Mon, 29 May 2017 09:48:12 +0200, Fabrice Fontaine wrote:
>> > Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch
>> >
>> > Signed-off-by: Fabrice Fontaine
>> > <fontaine.fabrice@gmail.com>
>>
>> Why did the hash changed?
>>
> I don't know, Bernd sent me an email about it so I fixed it. I don't
> think I made a mistake in my first patch because I had to delete my
> local patch file in dl repository to reproduce the issue. Can the hash
> on a github commit change? Should I download
> 7e0ed7ffa0438a3d0e200a881f2166dc3632dcda (merge commit) instead of
> bc5b27d6f6d166d2a6df47982cbe36041ce6b73?

Hi,

afaics there are two more hashes wrong for github patches:

In package/jack2/jack2.hash
ff1ed2c4524095055140370c1008a2d9cccc5645.patch

In package/qt/qt.hash the hash is wrong for
b8f98d956501dfa4ce03a137f15d404930a56066.patch

Regards, Bernd

[Buildroot] [PATCH/next 1/1] lxc: fix hash of patch

[Thomas Petazzoni]

Hello,

On Mon, 29 May 2017 18:43:48 +0200, Bernd Kuhls wrote:

> afaics there are two more hashes wrong for github patches:
> 
> In package/jack2/jack2.hash
> ff1ed2c4524095055140370c1008a2d9cccc5645.patch
> 
> In package/qt/qt.hash the hash is wrong for
> b8f98d956501dfa4ce03a137f15d404930a56066.patch

Then it would be nice to compare the old and new .patch files, and see
how they differ.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH/next 1/1] lxc: fix hash of patch

[Thomas Petazzoni]

Hello,

On Mon, 29 May 2017 21:52:23 +0200, Thomas Petazzoni wrote:

> Then it would be nice to compare the old and new .patch files, and see
> how they differ.

OK, so I've checked the difference between the old and the new patch,
and here it is:

--- /home/thomas/dl/bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch.old	2017-05-20 16:13:12.193576930 +0200
+++ bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch	2017-05-31 21:49:49.177157735 +0200
@@ -9,7 +9,7 @@
  1 file changed, 8 insertions(+)
 
 diff --git a/src/lxc/conf.c b/src/lxc/conf.c
-index 35bdb24..76a1901 100644
+index 35bdb249b..76a190120 100644
 --- a/src/lxc/conf.c
 +++ b/src/lxc/conf.c
 @@ -130,6 +130,14 @@ lxc_log_define(lxc_conf, lxc);

So, the patch change to use slightly longer commit hashes. Is this
because there was a conflicting commit in the repository added in the
mean time? Or Github changing to a different length in the commit
hashes?

Anyway, I've applied the patch.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [PATCH/next 1/1] lxc: fix hash of patch

[Thomas Petazzoni]

Hello,

On Mon, 29 May 2017 09:48:12 +0200, Fabrice Fontaine wrote:
> Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  package/lxc/lxc.hash | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied to next, thanks.

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com