diff mbox

[v1] wiringpi: bump to version 2.44

Message ID 20170315210828.3784-1-ps.report@gmx.net
State Accepted
Headers show

Commit Message

Peter Seiderer March 15, 2017, 9:08 p.m. UTC 
- rebase 0001-Adjust-for-buildroot-build.patch
- delete 0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
  (all changes are incorporated into wiringpi-2.44)
- remove useless hash file (git download)

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
---
 .../wiringpi/0001-Adjust-for-buildroot-build.patch | 26 +++++-----
 ...de-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch | 60 ----------------------
 package/wiringpi/wiringpi.hash                     |  2 -
 package/wiringpi/wiringpi.mk                       |  2 +-
 4 files changed, 14 insertions(+), 76 deletions(-)
 delete mode 100644 package/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
 delete mode 100644 package/wiringpi/wiringpi.hash

Comments

Thomas Petazzoni March 18, 2017, 1:14 p.m. UTC | #1 
Hello,

On Wed, 15 Mar 2017 22:08:28 +0100, Peter Seiderer wrote:
> - rebase 0001-Adjust-for-buildroot-build.patch
> - delete 0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
>   (all changes are incorporated into wiringpi-2.44)
> - remove useless hash file (git download)

Git downloads now generate reproducible tarballs, so we in fact want to
add hashes for them as well. However, it is true that the hash is not
checked currently. This has been on the TODO-list for a while.

So I've kept the hash file (after updating it).

> Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> ---
>  .../wiringpi/0001-Adjust-for-buildroot-build.patch | 26 +++++-----
>  ...de-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch | 60 ----------------------
>  package/wiringpi/wiringpi.hash                     |  2 -
>  package/wiringpi/wiringpi.mk                       |  2 +-
>  4 files changed, 14 insertions(+), 76 deletions(-)
>  delete mode 100644 package/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
>  delete mode 100644 package/wiringpi/wiringpi.hash

Applied to master, thanks.

Thomas
Peter Seiderer March 19, 2017, 9:24 p.m. UTC | #2 
Hello Thomas,

On Sat, 18 Mar 2017 14:14:28 +0100, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> Hello,
> 
> On Wed, 15 Mar 2017 22:08:28 +0100, Peter Seiderer wrote:
> > - rebase 0001-Adjust-for-buildroot-build.patch
> > - delete 0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
> >   (all changes are incorporated into wiringpi-2.44)
> > - remove useless hash file (git download)
> 
> Git downloads now generate reproducible tarballs, so we in fact want to
> add hashes for them as well. However, it is true that the hash is not
> checked currently. This has been on the TODO-list for a while.

Mhhh, tried several times, every time I get a different checksum:

	$ sha256sum dl/wiringpi-2.44.tar.gz 
5324ed452b7adfb77d049ea49dfe8878605c6198cb5c706ae2b285a70fb9d096  dl/wiringpi-2.44.tar.gz

	$ sha256sum dl/wiringpi-2.44.tar.gz 
65e6b3a916b940eec085222a28a5859b09e79e0020de2f2b07563d910426180c  dl/wiringpi-2.44.tar.gz

Regards,
Peter


> 
> So I've kept the hash file (after updating it).
> 
> > Signed-off-by: Peter Seiderer <ps.report@gmx.net>
> > ---
> >  .../wiringpi/0001-Adjust-for-buildroot-build.patch | 26 +++++-----
> >  ...de-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch | 60 ----------------------
> >  package/wiringpi/wiringpi.hash                     |  2 -
> >  package/wiringpi/wiringpi.mk                       |  2 +-
> >  4 files changed, 14 insertions(+), 76 deletions(-)
> >  delete mode 100644 package/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
> >  delete mode 100644 package/wiringpi/wiringpi.hash
> 
> Applied to master, thanks.
> 
> Thomas
Yann E. MORIN March 19, 2017, 10:14 p.m. UTC | #3 
Peter, All,

On 2017-03-19 22:24 +0100, Peter Seiderer spake thusly:
> On Sat, 18 Mar 2017 14:14:28 +0100, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> > On Wed, 15 Mar 2017 22:08:28 +0100, Peter Seiderer wrote:
> > > - rebase 0001-Adjust-for-buildroot-build.patch
> > > - delete 0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
> > >   (all changes are incorporated into wiringpi-2.44)
> > > - remove useless hash file (git download)
> > 
> > Git downloads now generate reproducible tarballs, so we in fact want to
> > add hashes for them as well. However, it is true that the hash is not
> > checked currently. This has been on the TODO-list for a while.
> 
> Mhhh, tried several times, every time I get a different checksum:
> 
> 	$ sha256sum dl/wiringpi-2.44.tar.gz 
> 5324ed452b7adfb77d049ea49dfe8878605c6198cb5c706ae2b285a70fb9d096  dl/wiringpi-2.44.tar.gz
> 
> 	$ sha256sum dl/wiringpi-2.44.tar.gz 
> 65e6b3a916b940eec085222a28a5859b09e79e0020de2f2b07563d910426180c  dl/wiringpi-2.44.tar.gz

Weird. I tried several times in a row here, too, and I always get the
same hash (from a clean tree):

    $ make defconfig
    $ make wiringpi-source
    $ sha256sum dl/wiringpi-2.44.tar.gz
    464c98ed54f5c0ad6611e270be3491c4598a32b7e86b208255862a301c564955  dl/wiringpi-2.44.tar.gz
    $ rm -rf dl/ output/
    $ make wiringpi-source
    $ sha256sum dl/wiringpi-2.44.tar.gz
    464c98ed54f5c0ad6611e270be3491c4598a32b7e86b208255862a301c564955  dl/wiringpi-2.44.tar.gz

Regards,
Yann E. MORIN.
Arnout Vandecappelle March 19, 2017, 10:28 p.m. UTC | #4 
On 19-03-17 22:24, Peter Seiderer wrote:
> Hello Thomas,
> 
> On Sat, 18 Mar 2017 14:14:28 +0100, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> 
>> Hello,
>>
>> On Wed, 15 Mar 2017 22:08:28 +0100, Peter Seiderer wrote:
>>> - rebase 0001-Adjust-for-buildroot-build.patch
>>> - delete 0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
>>>   (all changes are incorporated into wiringpi-2.44)
>>> - remove useless hash file (git download)
>> Git downloads now generate reproducible tarballs, so we in fact want to
>> add hashes for them as well. However, it is true that the hash is not
>> checked currently. This has been on the TODO-list for a while.
> Mhhh, tried several times, every time I get a different checksum:
> 
> 	$ sha256sum dl/wiringpi-2.44.tar.gz 
> 5324ed452b7adfb77d049ea49dfe8878605c6198cb5c706ae2b285a70fb9d096  dl/wiringpi-2.44.tar.gz
> 
> 	$ sha256sum dl/wiringpi-2.44.tar.gz 
> 65e6b3a916b940eec085222a28a5859b09e79e0020de2f2b07563d910426180c  dl/wiringpi-2.44.tar.gz


 Really weird, both Yann and I tested and we got the same sha256sum as Thomas
put in wiringpi.hash... So we are clearly still doing something wrong in the
download helper.

 To help us nail down the problem, could you do:

tar -xf dl/wiringpi-2.44.tar.gz
tar -tf dl/wiringpi-2.44.tar.gz | xargs sha256sum

and compare the output with https://gitlab.com/snippets/1655089/raw ?


 Regards,
 Arnout
Arnout Vandecappelle March 19, 2017, 10:31 p.m. UTC | #5 
On 19-03-17 23:28, Arnout Vandecappelle wrote:
> 
> 
> On 19-03-17 22:24, Peter Seiderer wrote:
>> Hello Thomas,
>>
>> On Sat, 18 Mar 2017 14:14:28 +0100, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
>>
>>> Hello,
>>>
>>> On Wed, 15 Mar 2017 22:08:28 +0100, Peter Seiderer wrote:
>>>> - rebase 0001-Adjust-for-buildroot-build.patch
>>>> - delete 0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
>>>>   (all changes are incorporated into wiringpi-2.44)
>>>> - remove useless hash file (git download)
>>> Git downloads now generate reproducible tarballs, so we in fact want to
>>> add hashes for them as well. However, it is true that the hash is not
>>> checked currently. This has been on the TODO-list for a while.
>> Mhhh, tried several times, every time I get a different checksum:
>>
>> 	$ sha256sum dl/wiringpi-2.44.tar.gz 
>> 5324ed452b7adfb77d049ea49dfe8878605c6198cb5c706ae2b285a70fb9d096  dl/wiringpi-2.44.tar.gz
>>
>> 	$ sha256sum dl/wiringpi-2.44.tar.gz 
>> 65e6b3a916b940eec085222a28a5859b09e79e0020de2f2b07563d910426180c  dl/wiringpi-2.44.tar.gz
> 
> 
>  Really weird, both Yann and I tested and we got the same sha256sum as Thomas
> put in wiringpi.hash... So we are clearly still doing something wrong in the
> download helper.
> 
>  To help us nail down the problem, could you do:
> 
> tar -xf dl/wiringpi-2.44.tar.gz
> tar -tf dl/wiringpi-2.44.tar.gz | xargs sha256sum
> 
> and compare the output with https://gitlab.com/snippets/1655089/raw ?

 Oh, maybe it's in the timestamps, so also compare the output of

tar tvf ~/src/buildroot/dl/wiringpi-2.44.tar.gz

with https://gitlab.com/snippets/1655090/raw

 Regards,
 Arnout
Peter Seiderer March 20, 2017, 7:27 p.m. UTC | #6 
Hello Arnout, Yann, Thomas,

On Sun, 19 Mar 2017 23:31:36 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:

> 
> 
> On 19-03-17 23:28, Arnout Vandecappelle wrote:
> > 
> > 
> > On 19-03-17 22:24, Peter Seiderer wrote:
> >> Hello Thomas,
> >>
> >> On Sat, 18 Mar 2017 14:14:28 +0100, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:
> >>
> >>> Hello,
> >>>
> >>> On Wed, 15 Mar 2017 22:08:28 +0100, Peter Seiderer wrote:
> >>>> - rebase 0001-Adjust-for-buildroot-build.patch
> >>>> - delete 0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
> >>>>   (all changes are incorporated into wiringpi-2.44)
> >>>> - remove useless hash file (git download)
> >>> Git downloads now generate reproducible tarballs, so we in fact want to
> >>> add hashes for them as well. However, it is true that the hash is not
> >>> checked currently. This has been on the TODO-list for a while.
> >> Mhhh, tried several times, every time I get a different checksum:
> >>
> >> 	$ sha256sum dl/wiringpi-2.44.tar.gz 
> >> 5324ed452b7adfb77d049ea49dfe8878605c6198cb5c706ae2b285a70fb9d096  dl/wiringpi-2.44.tar.gz
> >>
> >> 	$ sha256sum dl/wiringpi-2.44.tar.gz 
> >> 65e6b3a916b940eec085222a28a5859b09e79e0020de2f2b07563d910426180c  dl/wiringpi-2.44.tar.gz
> > 
> > 
> >  Really weird, both Yann and I tested and we got the same sha256sum as Thomas
> > put in wiringpi.hash... So we are clearly still doing something wrong in the
> > download helper.
> > 
> >  To help us nail down the problem, could you do:
> > 
> > tar -xf dl/wiringpi-2.44.tar.gz
> > tar -tf dl/wiringpi-2.44.tar.gz | xargs sha256sum
> > 
> > and compare the output with https://gitlab.com/snippets/1655089/raw ?
> 
>  Oh, maybe it's in the timestamps, so also compare the output of
> 
> tar tvf ~/src/buildroot/dl/wiringpi-2.44.tar.gz
> 
> with https://gitlab.com/snippets/1655090/raw
> 

sha256sums and timestamps are all the same, the difference is in the atime and ctime,
comparing the output of two different downloads on my system

	$ tar -xf t001/wiringpi-2.44.tar --to-command='echo $TAR_FILENAME $TAR_ATIME $TAR_MTIME $TAR_CTIME' > t001/files_atime_mtime_ctime.txt
	$ tar -xf t002/wiringpi-2.44.tar --to-command='echo $TAR_FILENAME $TAR_ATIME $TAR_MTIME $TAR_CTIME' > t002/files_atime_mtime_ctime.txt

	$ head t001/files_atime_mtime_ctime.txt
wiringpi-2.44/.gitignore 1489958464.60118197 1488369319 1489958464.464182585
wiringpi-2.44/COPYING.LESSER 1489958464.60118197 1488369319 1489958464.464182585
wiringpi-2.44/INSTALL 1489958464.602181965 1488369319 1489958464.464182585
wiringpi-2.44/People 1489958464.602181965 1488369319 1489958464.464182585
wiringpi-2.44/README.TXT 1489958464.602181965 1488369319 1489958464.464182585
wiringpi-2.44/VERSION 1489958464.602181965 1488369319 1489958464.464182585
wiringpi-2.44/build 1489958464.602181965 1488369319 1489958464.464182585
wiringpi-2.44/debian-template/wiringPi/DEBIAN/control 1489958464.602181965 1488369319 1489958464.465182581
wiringpi-2.44/debian-template/wiringPi/DEBIAN/postinst 1489958464.602181965 1488369319 1489958464.465182581
wiringpi-2.44/debian-template/wiringPi/DEBIAN/postrm 1489958464.602181965 1488369319 1489958464.465182581

	$ head t002/files_atime_mtime_ctime.txt
wiringpi-2.44/.gitignore 1490036719.006803894 1488369319 1490036718.876804412
wiringpi-2.44/COPYING.LESSER 1490036719.006803894 1488369319 1490036718.876804412
wiringpi-2.44/INSTALL 1490036719.007803891 1488369319 1490036718.876804412
wiringpi-2.44/People 1490036719.007803891 1488369319 1490036718.877804408
wiringpi-2.44/README.TXT 1490036719.007803891 1488369319 1490036718.877804408
wiringpi-2.44/VERSION 1490036719.007803891 1488369319 1490036718.877804408
wiringpi-2.44/build 1490036719.007803891 1488369319 1490036718.877804408
wiringpi-2.44/debian-template/wiringPi/DEBIAN/control 1490036719.007803891 1488369319 1490036718.878804404
wiringpi-2.44/debian-template/wiringPi/DEBIAN/postinst 1490036719.007803891 1488369319 1490036718.878804404
wiringpi-2.44/debian-template/wiringPi/DEBIAN/postrm 1490036719.007803891 1488369319 1490036718.878804404

	
	$ git --version
git version 2.11.0

	$ tar --version
tar (GNU tar) 1.28

Regards,
Peter


>  Regards,
>  Arnout
Arnout Vandecappelle March 20, 2017, 8:39 p.m. UTC | #7 
On 20-03-17 20:27, Peter Seiderer wrote:
> Hello Arnout, Yann, Thomas,
> 
> On Sun, 19 Mar 2017 23:31:36 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:
> 
[snip]
>>  Oh, maybe it's in the timestamps, so also compare the output of
>>
>> tar tvf ~/src/buildroot/dl/wiringpi-2.44.tar.gz
>>
>> with https://gitlab.com/snippets/1655090/raw
>>
> 
> sha256sums and timestamps are all the same, the difference is in the atime and ctime,
> comparing the output of two different downloads on my system
> 
> 	$ tar -xf t001/wiringpi-2.44.tar --to-command='echo $TAR_FILENAME $TAR_ATIME $TAR_MTIME $TAR_CTIME' > t001/files_atime_mtime_ctime.txt
> 	$ tar -xf t002/wiringpi-2.44.tar --to-command='echo $TAR_FILENAME $TAR_ATIME $TAR_MTIME $TAR_CTIME' > t002/files_atime_mtime_ctime.txt

 atime and ctime are (as far as I know) not encoded in the tar file. Run the
command twice with the same tar file and you'll get different atime and ctime.

> 
> 	$ head t001/files_atime_mtime_ctime.txt
> wiringpi-2.44/.gitignore 1489958464.60118197 1488369319 1489958464.464182585

 This is a little weird, however:

 - atime is normally the current time, but these timestamps are from yesterday.
 - ctime is normally equal to atime.

 So maybe your tar *does* encode the atime and ctime?

 Checking the source code... Looks like atime and ctime are preserved when either:

1. gnu or oldgnu format is used, and the incremental (-G) option is used; or
2. posix format is used (even then there are a few exceptions).

 Since we don't add -G, I guess you create archives in posix format. Quoting the
info pages:


   The default format for GNU 'tar' is defined at compilation time.  You
may check it by running 'tar --help', and examining the last lines of
its output.  Usually, GNU 'tar' is configured to create archives in
'gnu' format, however, future version will switch to 'posix'.


 Since our hashes are currently based on GNU format, I guess we should add
--format=gnu to our tar commands.

 Patch follows.

 Regards,
 Arnout


> wiringpi-2.44/COPYING.LESSER 1489958464.60118197 1488369319 1489958464.464182585
> wiringpi-2.44/INSTALL 1489958464.602181965 1488369319 1489958464.464182585
> wiringpi-2.44/People 1489958464.602181965 1488369319 1489958464.464182585
> wiringpi-2.44/README.TXT 1489958464.602181965 1488369319 1489958464.464182585
> wiringpi-2.44/VERSION 1489958464.602181965 1488369319 1489958464.464182585
> wiringpi-2.44/build 1489958464.602181965 1488369319 1489958464.464182585
> wiringpi-2.44/debian-template/wiringPi/DEBIAN/control 1489958464.602181965 1488369319 1489958464.465182581
> wiringpi-2.44/debian-template/wiringPi/DEBIAN/postinst 1489958464.602181965 1488369319 1489958464.465182581
> wiringpi-2.44/debian-template/wiringPi/DEBIAN/postrm 1489958464.602181965 1488369319 1489958464.465182581
> 
> 	$ head t002/files_atime_mtime_ctime.txt
> wiringpi-2.44/.gitignore 1490036719.006803894 1488369319 1490036718.876804412
> wiringpi-2.44/COPYING.LESSER 1490036719.006803894 1488369319 1490036718.876804412
> wiringpi-2.44/INSTALL 1490036719.007803891 1488369319 1490036718.876804412
> wiringpi-2.44/People 1490036719.007803891 1488369319 1490036718.877804408
> wiringpi-2.44/README.TXT 1490036719.007803891 1488369319 1490036718.877804408
> wiringpi-2.44/VERSION 1490036719.007803891 1488369319 1490036718.877804408
> wiringpi-2.44/build 1490036719.007803891 1488369319 1490036718.877804408
> wiringpi-2.44/debian-template/wiringPi/DEBIAN/control 1490036719.007803891 1488369319 1490036718.878804404
> wiringpi-2.44/debian-template/wiringPi/DEBIAN/postinst 1490036719.007803891 1488369319 1490036718.878804404
> wiringpi-2.44/debian-template/wiringPi/DEBIAN/postrm 1490036719.007803891 1488369319 1490036718.878804404
> 
> 	
> 	$ git --version
> git version 2.11.0
> 
> 	$ tar --version
> tar (GNU tar) 1.28
> 
> Regards,
> Peter
> 
> 
>>  Regards,
>>  Arnout
>
Peter Seiderer March 20, 2017, 9:32 p.m. UTC | #8 
Hello Arnout,


On Mon, 20 Mar 2017 21:39:39 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:

> 
> 
> On 20-03-17 20:27, Peter Seiderer wrote:
> > Hello Arnout, Yann, Thomas,
> > 
> > On Sun, 19 Mar 2017 23:31:36 +0100, Arnout Vandecappelle <arnout@mind.be> wrote:
> > 
> [snip]
> >>  Oh, maybe it's in the timestamps, so also compare the output of
> >>
> >> tar tvf ~/src/buildroot/dl/wiringpi-2.44.tar.gz
> >>
> >> with https://gitlab.com/snippets/1655090/raw
> >>
> > 
> > sha256sums and timestamps are all the same, the difference is in the atime and ctime,
> > comparing the output of two different downloads on my system
> > 
> > 	$ tar -xf t001/wiringpi-2.44.tar --to-command='echo $TAR_FILENAME $TAR_ATIME $TAR_MTIME $TAR_CTIME' > t001/files_atime_mtime_ctime.txt
> > 	$ tar -xf t002/wiringpi-2.44.tar --to-command='echo $TAR_FILENAME $TAR_ATIME $TAR_MTIME $TAR_CTIME' > t002/files_atime_mtime_ctime.txt
> 
>  atime and ctime are (as far as I know) not encoded in the tar file. Run the
> command twice with the same tar file and you'll get different atime and ctime.
> 
> > 
> > 	$ head t001/files_atime_mtime_ctime.txt
> > wiringpi-2.44/.gitignore 1489958464.60118197 1488369319 1489958464.464182585
> 
>  This is a little weird, however:
> 
>  - atime is normally the current time, but these timestamps are from yesterday.
>  - ctime is normally equal to atime.
> 
>  So maybe your tar *does* encode the atime and ctime?
> 

Seems so, here a diff of the (uncompressed) tar file hexdump:

-00000200  32 39 20 61 74 69 6d 65  3d 31 34 38 39 39 35 38  |29 atime=1489958|
-00000210  34 36 34 2e 36 30 31 31  38 31 39 37 0a 33 30 20  |464.60118197.30 |
-00000220  63 74 69 6d 65 3d 31 34  38 39 39 35 38 34 36 34  |ctime=1489958464|
-00000230  2e 34 36 34 31 38 32 35  38 35 0a 00 00 00 00 00  |.464182585......|
+00000200  33 30 20 61 74 69 6d 65  3d 31 34 39 30 30 33 36  |30 atime=1490036|
+00000210  37 31 39 2e 30 30 36 38  30 33 38 39 34 0a 33 30  |719.006803894.30|
+00000220  20 63 74 69 6d 65 3d 31  34 39 30 30 33 36 37 31  | ctime=149003671|
+00000230  38 2e 38 37 36 38 30 34  34 31 32 0a 00 00 00 00  |8.876804412.....|
 00000240  00 00 00 00 00 00 00 00  00 00 00 00 00 00 00 00  |................|

>  Checking the source code... Looks like atime and ctime are preserved when either:
> 
> 1. gnu or oldgnu format is used, and the incremental (-G) option is used; or
> 2. posix format is used (even then there are a few exceptions).
> 
>  Since we don't add -G, I guess you create archives in posix format. Quoting the
> info pages:
> 
> 
>    The default format for GNU 'tar' is defined at compilation time.  You
> may check it by running 'tar --help', and examining the last lines of
> its output.  Usually, GNU 'tar' is configured to create archives in
> 'gnu' format, however, future version will switch to 'posix'.
> 

	$ tar --help | tail
  c-maybe
  escape
  locale
  clocale

*This* tar defaults to:
--format=posix -f- -b20 --quoting-style=escape --rmt-command=/usr/lib/rmt
--rsh-command=/usr/bin/rsh

Report bugs to <bug-tar@gnu.org>.

Host system is: openSUSE 13.2 (Harlequin) (x86_64)

> 
>  Since our hashes are currently based on GNU format, I guess we should add
> --format=gnu to our tar commands.
> 
>  Patch follows.
> 

O.k, will try...

Thanks for investigations.

Regards,
Peter


>  Regards,
>  Arnout
> 
> 
> > wiringpi-2.44/COPYING.LESSER 1489958464.60118197 1488369319 1489958464.464182585
> > wiringpi-2.44/INSTALL 1489958464.602181965 1488369319 1489958464.464182585
> > wiringpi-2.44/People 1489958464.602181965 1488369319 1489958464.464182585
> > wiringpi-2.44/README.TXT 1489958464.602181965 1488369319 1489958464.464182585
> > wiringpi-2.44/VERSION 1489958464.602181965 1488369319 1489958464.464182585
> > wiringpi-2.44/build 1489958464.602181965 1488369319 1489958464.464182585
> > wiringpi-2.44/debian-template/wiringPi/DEBIAN/control 1489958464.602181965 1488369319 1489958464.465182581
> > wiringpi-2.44/debian-template/wiringPi/DEBIAN/postinst 1489958464.602181965 1488369319 1489958464.465182581
> > wiringpi-2.44/debian-template/wiringPi/DEBIAN/postrm 1489958464.602181965 1488369319 1489958464.465182581
> > 
> > 	$ head t002/files_atime_mtime_ctime.txt
> > wiringpi-2.44/.gitignore 1490036719.006803894 1488369319 1490036718.876804412
> > wiringpi-2.44/COPYING.LESSER 1490036719.006803894 1488369319 1490036718.876804412
> > wiringpi-2.44/INSTALL 1490036719.007803891 1488369319 1490036718.876804412
> > wiringpi-2.44/People 1490036719.007803891 1488369319 1490036718.877804408
> > wiringpi-2.44/README.TXT 1490036719.007803891 1488369319 1490036718.877804408
> > wiringpi-2.44/VERSION 1490036719.007803891 1488369319 1490036718.877804408
> > wiringpi-2.44/build 1490036719.007803891 1488369319 1490036718.877804408
> > wiringpi-2.44/debian-template/wiringPi/DEBIAN/control 1490036719.007803891 1488369319 1490036718.878804404
> > wiringpi-2.44/debian-template/wiringPi/DEBIAN/postinst 1490036719.007803891 1488369319 1490036718.878804404
> > wiringpi-2.44/debian-template/wiringPi/DEBIAN/postrm 1490036719.007803891 1488369319 1490036718.878804404
> > 
> > 	
> > 	$ git --version
> > git version 2.11.0
> > 
> > 	$ tar --version
> > tar (GNU tar) 1.28
> > 
> > Regards,
> > Peter
> > 
> > 
> >>  Regards,
> >>  Arnout
> > 
>
diff mbox

Patch

diff --git a/package/wiringpi/0001-Adjust-for-buildroot-build.patch b/package/wiringpi/0001-Adjust-for-buildroot-build.patch
index 4fddc9951..520555c8e 100644
--- a/package/wiringpi/0001-Adjust-for-buildroot-build.patch
+++ b/package/wiringpi/0001-Adjust-for-buildroot-build.patch
@@ -1,4 +1,4 @@ 
-From 10d5bde8d628a93993dd7305dc9a406da69f65a9 Mon Sep 17 00:00:00 2001
+From 17ffb0cb301d4bf6ef900c8698d716f68cb77360 Mon Sep 17 00:00:00 2001
 From: Peter Seiderer <ps.report@gmx.net>
 Date: Wed, 2 Dec 2015 00:22:26 +0100
 Subject: [PATCH] Adjust for buildroot build.
@@ -19,7 +19,7 @@  Signed-off-by: Peter Seiderer <ps.report@gmx.net>
  3 files changed, 18 insertions(+), 12 deletions(-)
 
 diff --git a/devLib/Makefile b/devLib/Makefile
-index 1b1ebe0..84b4d2a 100644
+index cf665d6..3fb41e8 100644
 --- a/devLib/Makefile
 +++ b/devLib/Makefile
 @@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION)
@@ -54,7 +54,7 @@  index 1b1ebe0..84b4d2a 100644
  
  .PHONY:	install-static
 diff --git a/gpio/Makefile b/gpio/Makefile
-index 7dcd090..dc4be72 100644
+index f41a005..7095fa5 100644
 --- a/gpio/Makefile
 +++ b/gpio/Makefile
 @@ -32,11 +32,11 @@ endif
@@ -63,14 +63,14 @@  index 7dcd090..dc4be72 100644
  DEBUG	= -O2
 -CC	= gcc
 -INCLUDE	= -I$(DESTDIR)$(PREFIX)/include
--CFLAGS	= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
+-CFLAGS	= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
 +CC	?= gcc
 +INCLUDE	= -I../wiringPi -I../devLib
-+CFLAGS	+= $(DEBUG) -Wall $(INCLUDE) -Winline -pipe
++CFLAGS	+= $(DEBUG) -Wall -Wextra $(INCLUDE) -Winline -pipe
  
 -LDFLAGS	= -L$(DESTDIR)$(PREFIX)/lib
 +LDFLAGS	= -L../wiringPi -L../devLib
- LIBS    = -lwiringPi -lwiringPiDev -lpthread
+ LIBS    = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt
  
  # May not need to  alter anything below this line
 @@ -52,9 +52,13 @@ version.h:	../VERSION
@@ -89,7 +89,7 @@  index 7dcd090..dc4be72 100644
  	$Q echo [Compile] $<
  	$Q $(CC) -c $(CFLAGS) $< -o $@
 diff --git a/wiringPi/Makefile b/wiringPi/Makefile
-index acb6e58..8b84dc6 100644
+index e1868b9..68c950e 100644
 --- a/wiringPi/Makefile
 +++ b/wiringPi/Makefile
 @@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION)
@@ -100,20 +100,20 @@  index acb6e58..8b84dc6 100644
 +CC	?= gcc
  INCLUDE	= -I.
  DEFS	= -D_GNU_SOURCE
--CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
-+CFLAGS	+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC
+-CFLAGS	= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
++CFLAGS	+= $(DEBUG) $(DEFS) -Wformat=2 -Wall -Wextra -Winline $(INCLUDE) -pipe -fPIC
  
- LIBS    =
+ LIBS    = -lm -lpthread -lrt -lcrypt
  
-@@ -90,6 +90,7 @@ $(STATIC):	$(OBJ)
+@@ -79,6 +79,7 @@ $(STATIC):	$(OBJ)
  $(DYNAMIC):	$(OBJ)
  	$Q echo "[Link (Dynamic)]"
- 	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) -lpthread $(OBJ)
+ 	$Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) $(LIBS) $(OBJ)
 +	$Q ln -sf libwiringPi.so.$(VERSION) libwiringPi.so
  
  .c.o:
  	$Q echo [Compile] $<
-@@ -115,7 +116,7 @@ install:	$(DYNAMIC)
+@@ -104,7 +105,7 @@ install:	$(DYNAMIC)
  	$Q echo "[Install Dynamic Lib]"
  	$Q install -m 0755 -d						$(DESTDIR)$(PREFIX)/lib
  	$Q install -m 0755 libwiringPi.so.$(VERSION)			$(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION)
diff --git a/package/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch b/package/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
deleted file mode 100644
index 6480e3c44..000000000
--- a/package/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch
+++ /dev/null
@@ -1,60 +0,0 @@ 
-From 7f65eb37a82a6d9b095d9c8f262ad9dd205acd03 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sat, 30 Jan 2016 16:57:38 -0800
-Subject: [PATCH] include <asm/ioctl.h> directly for _IOC_SIZEBITS
-
-Fixes errors like
-| wiringPiSPI.c: In function 'wiringPiSPIDataRW':
-| wiringPiSPI.c:89:35: error: '_IOC_SIZEBITS' undeclared (first use in
-this function)
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-[Patch from https://raw.githubusercontent.com/agherzan/meta-raspberrypi/master/recipes-devtools/wiringPi/wiringpi/0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch]
-Signed-off-by: Peter Seiderere <ps.report@gmx.net>
----
-Upstream-Status: Submitted
-
- wiringPi/wiringPi.c    | 1 +
- wiringPi/wiringPiI2C.c | 1 +
- wiringPi/wiringPiSPI.c | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c
-index 32e5100..cb5db9d 100644
---- a/wiringPi/wiringPi.c
-+++ b/wiringPi/wiringPi.c
-@@ -64,6 +64,7 @@
- #include <time.h>
- #include <fcntl.h>
- #include <pthread.h>
-+#include <asm/ioctl.h>
- #include <sys/time.h>
- #include <sys/mman.h>
- #include <sys/stat.h>
-diff --git a/wiringPi/wiringPiI2C.c b/wiringPi/wiringPiI2C.c
-index c787bce..efdf53c 100644
---- a/wiringPi/wiringPiI2C.c
-+++ b/wiringPi/wiringPiI2C.c
-@@ -52,6 +52,7 @@
- #include <string.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <asm/ioctl.h>
- 
- #include "wiringPi.h"
- #include "wiringPiI2C.h"
-diff --git a/wiringPi/wiringPiSPI.c b/wiringPi/wiringPiSPI.c
-index 453df31..ae3c7d9 100644
---- a/wiringPi/wiringPiSPI.c
-+++ b/wiringPi/wiringPiSPI.c
-@@ -27,6 +27,7 @@
- #include <fcntl.h>
- #include <errno.h>
- #include <string.h>
-+#include <asm/ioctl.h>
- #include <sys/ioctl.h>
- #include <linux/spi/spidev.h>
- 
--- 
-2.7.0
-
diff --git a/package/wiringpi/wiringpi.hash b/package/wiringpi/wiringpi.hash
deleted file mode 100644
index abddaf9b2..000000000
--- a/package/wiringpi/wiringpi.hash
+++ /dev/null
@@ -1,2 +0,0 @@ 
-# locally computed
-sha256 0775e3bfa2df2131746c75d611ad354e5c884661be0d9de9fd786fc96f6ad918 wiringPi-2.32.tar.gz
diff --git a/package/wiringpi/wiringpi.mk b/package/wiringpi/wiringpi.mk
index ce0819dac..3227fb26d 100644
--- a/package/wiringpi/wiringpi.mk
+++ b/package/wiringpi/wiringpi.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-WIRINGPI_VERSION = 2.32
+WIRINGPI_VERSION = 2.44
 WIRINGPI_SITE = git://git.drogon.net/wiringPi
 
 WIRINGPI_LICENSE = LGPLv3+