Skip to contentSkip to conversation

lxc: fix hash of patch

PATCH New Fabrice Fontaine 3 participants 7 messages May 29, 2017 – May 31, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lxc: fix hash of patch

Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch

---
 package/lxc/lxc.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lxc/lxc.hash +1 -1
index 801759a..501f869 100644
@@ -1,3 +1,3 @@
 # Locally calculated
 sha256	0d8e34b302cfe4c40c6c9ae5097096aa5cc2c1dfceea3f0f22e3e16c4a4e8494	lxc-2.0.8.tar.gz
-sha256	c79443c5db7e7defd53992d120cad2bc8afc2ff363b1e84ec31bc2b95ec5ca44	bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
+sha256	16cf466db42a45bd579bdb66efbeb63764cd93d049f05a6d8a659846cab9b47f	bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch
Signature · 1 line
2.5.0
#1 lore raw

PATCH 1/1 lxc: fix hash of patch

Hello,

Quoted 3 lines · Fabrice Fontaine

Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch

Why did the hash changed?

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 lxc: fix hash of patch

Dear Thomas,

2017-05-29 12:12 GMT+02:00 Thomas Petazzoni <
[email protected]>:

Quoted 9 lines

Hello,

Quoted 3 lines · Fabrice Fontaine

Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch

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?

Quoted 7 lines

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>

#3 lore raw

PATCH 1/1 lxc: fix hash of patch

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

Quoted 13 lines

Dear Thomas,

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

Quoted 8 lines

Hello,

Quoted 4 lines · Fabrice Fontaine

Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch

Signed-off-by: Fabrice Fontaine
<[email protected]>

Quoted 8 lines
Quoted 2 lines

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

#4 lore raw

PATCH 1/1 lxc: fix hash of patch

Hello,

Quoted 7 lines · Bernd Kuhls

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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#5 lore raw

PATCH 1/1 lxc: fix hash of patch

Hello,

Quoted 2 lines · Thomas Petazzoni

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:

bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch renamed from home/thomas/dl/bc5b27d6f6d166d2a6df47982cbe36041ce6b735.patch.old +1 -1
@@ -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

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com
#6 lore raw

PATCH 1/1 lxc: fix hash of patch

In reply to Fabrice Fontaine

Hello,

Quoted 6 lines · Fabrice Fontaine

Fix hash of bc5b27d6f6d166d2a6df47982cbe36041ce6b73.patch

---
 package/lxc/lxc.hash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to next, thanks.

Thomas

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