[Buildroot] [PATCH] package/avrdude: Switch to upstream

[Buildroot] [PATCH] package/avrdude: Switch to upstream

[Alexander Sverdlin]

In the meanwhile "linuxspi" programmer was merged upstream, therefore it's
possible to switch to latest upstream tree instead of the old fork without
losing any functionality.

Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
---
 package/avrdude/avrdude.hash | 2 +-
 package/avrdude/avrdude.mk   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash
index 888668ae44..9c56dacd60 100644
--- a/package/avrdude/avrdude.hash
+++ b/package/avrdude/avrdude.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  cfa97af7badc713c62306ab85d0e7a288b064bf72e698494f73cb16c5b2c659e  avrdude-f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa.tar.gz
+sha256  39d77cec4064b03bfc0ff942d36c41df7eea9b56b89a3f991078b68caddd3c77  avrdude-r1450.tar.gz
 sha256  201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2  avrdude/COPYING
diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk
index ae378dfbac..b6754684e1 100644
--- a/package/avrdude/avrdude.mk
+++ b/package/avrdude/avrdude.mk
@@ -4,15 +4,16 @@
 #
 ################################################################################
 
-AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa
-AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
+AVRDUDE_VERSION = r1450
+AVRDUDE_SITE_METHOD = svn
+AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk
 AVRDUDE_LICENSE = GPL-2.0+
 AVRDUDE_LICENSE_FILES = avrdude/COPYING
 AVRDUDE_SUBDIR = avrdude
-# Sources coming from git, without generated configure and Makefile.in
+# Sources coming from svn, without generated configure and Makefile.in
 # files.
 AVRDUDE_AUTORECONF = YES
-AVRDUDE_CONF_OPTS = --enable-linuxgpio
+AVRDUDE_CONF_OPTS = --enable-linuxgpio --enable-linuxspi
 AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \
 	host-flex host-bison
 
-- 
2.29.2

[Buildroot] [PATCH] package/avrdude: Switch to upstream

[Yann E. MORIN]

Alexander, All,

On 2021-02-22 03:26 +0100, Alexander Sverdlin spake thusly:
> In the meanwhile "linuxspi" programmer was merged upstream, therefore it's
> possible to switch to latest upstream tree instead of the old fork without
> losing any functionality.
> 
> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> ---
>  package/avrdude/avrdude.hash | 2 +-
>  package/avrdude/avrdude.mk   | 9 +++++----
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash
> index 888668ae44..9c56dacd60 100644
> --- a/package/avrdude/avrdude.hash
> +++ b/package/avrdude/avrdude.hash
> @@ -1,3 +1,3 @@
>  # Locally computed
> -sha256  cfa97af7badc713c62306ab85d0e7a288b064bf72e698494f73cb16c5b2c659e  avrdude-f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa.tar.gz
> +sha256  39d77cec4064b03bfc0ff942d36c41df7eea9b56b89a3f991078b68caddd3c77  avrdude-r1450.tar.gz

Since 2021-01-10, we changed the format of tarballs generated from
subversion, and the tarballs now include a '-br1' suffix after the
version, e.g.: avrdude-r1450-br1.tar.gz

Also, see below...

>  sha256  201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2  avrdude/COPYING
> diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk
> index ae378dfbac..b6754684e1 100644
> --- a/package/avrdude/avrdude.mk
> +++ b/package/avrdude/avrdude.mk
> @@ -4,15 +4,16 @@
>  #
>  ################################################################################
>  
> -AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa
> -AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
> +AVRDUDE_VERSION = r1450
> +AVRDUDE_SITE_METHOD = svn
> +AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk

I am wondering what version of Buildroot you've been testing this with,
because downloading via svn is currently broken in master.

No need to reend for now, until we fix the svn download (imminent,
anytime soon, almost done, etc...)

Regards,
Yann E. MORIN.

>  AVRDUDE_LICENSE = GPL-2.0+
>  AVRDUDE_LICENSE_FILES = avrdude/COPYING
>  AVRDUDE_SUBDIR = avrdude
> -# Sources coming from git, without generated configure and Makefile.in
> +# Sources coming from svn, without generated configure and Makefile.in
>  # files.
>  AVRDUDE_AUTORECONF = YES
> -AVRDUDE_CONF_OPTS = --enable-linuxgpio
> +AVRDUDE_CONF_OPTS = --enable-linuxgpio --enable-linuxspi
>  AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \
>  	host-flex host-bison
>  
> -- 
> 2.29.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH] package/avrdude: Switch to upstream

[Yann E. MORIN]

Alexander, All,

My previous review focused on the download part, here is a bit more...

On 2021-02-22 03:26 +0100, Alexander Sverdlin spake thusly:
> In the meanwhile "linuxspi" programmer was merged upstream, therefore it's
> possible to switch to latest upstream tree instead of the old fork without
> losing any functionality.
> 
> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>
> ---
>  package/avrdude/avrdude.hash | 2 +-
>  package/avrdude/avrdude.mk   | 9 +++++----
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash
> index 888668ae44..9c56dacd60 100644
> --- a/package/avrdude/avrdude.hash
> +++ b/package/avrdude/avrdude.hash
> @@ -1,3 +1,3 @@
>  # Locally computed
> -sha256  cfa97af7badc713c62306ab85d0e7a288b064bf72e698494f73cb16c5b2c659e  avrdude-f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa.tar.gz
> +sha256  39d77cec4064b03bfc0ff942d36c41df7eea9b56b89a3f991078b68caddd3c77  avrdude-r1450.tar.gz
>  sha256  201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2  avrdude/COPYING
> diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk
> index ae378dfbac..b6754684e1 100644
> --- a/package/avrdude/avrdude.mk
> +++ b/package/avrdude/avrdude.mk
> @@ -4,15 +4,16 @@
>  #
>  ################################################################################
>  
> -AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa
> -AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
> +AVRDUDE_VERSION = r1450
> +AVRDUDE_SITE_METHOD = svn
> +AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk
>  AVRDUDE_LICENSE = GPL-2.0+
>  AVRDUDE_LICENSE_FILES = avrdude/COPYING
>  AVRDUDE_SUBDIR = avrdude
> -# Sources coming from git, without generated configure and Makefile.in
> +# Sources coming from svn, without generated configure and Makefile.in
>  # files.
>  AVRDUDE_AUTORECONF = YES
> -AVRDUDE_CONF_OPTS = --enable-linuxgpio
> +AVRDUDE_CONF_OPTS = --enable-linuxgpio --enable-linuxspi

So I was wondering why we would enable a new feature at the same time we
do the bump.

So the fork we were using did auto-detection of kernel headers to detect
whether spidev.h was present or not, and thuse whether to enable or
disable its linuxspi 'driver'.

But upstream went a slightly diffferent route, and added a configure
option (and they do no validity check). Since spidev.h has been present
since linux-2.6.22, we can quite easily conclude that spidev support was
always enabled in the fork, and thus that we should keep it enabled now
that we switch back to the upstream.

That would have been good to have this explanations (or at least a
trimmed-down vesion) in the commit log, because it is a bit ambiguous as
it is now...

No need to respin, I can fix when applying...

Regards,
Yann E. MORIN.

>  AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \
>  	host-flex host-bison
>  
> -- 
> 2.29.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH] package/avrdude: Switch to upstream

[Alexander Sverdlin]

Hi!

On Mon, 2021-02-22 at 22:15 +0100, Yann E. MORIN wrote:
> > -AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa
> > -AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
> > +AVRDUDE_VERSION = r1450
> > +AVRDUDE_SITE_METHOD = svn
> > +AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk
> 
> I am wondering what version of Buildroot you've been testing this with,
> because downloading via svn is currently broken in master.
> 
> No need to reend for now, until we fix the svn download (imminent,
> anytime soon, almost done, etc...)

You've cought me :)
Tested with 2020.11.x, rebased onto master.

-- 
Alexander Sverdlin.

[Buildroot] [PATCH] package/avrdude: Switch to upstream

[Alexander Sverdlin]

Hi!

On Mon, 2021-02-22 at 22:38 +0100, Yann E. MORIN wrote:
> > -AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa
> > -AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
> > +AVRDUDE_VERSION = r1450
> > +AVRDUDE_SITE_METHOD = svn
> > +AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk
> > ? AVRDUDE_LICENSE = GPL-2.0+
> > ? AVRDUDE_LICENSE_FILES = avrdude/COPYING
> > ? AVRDUDE_SUBDIR = avrdude
> > -# Sources coming from git, without generated configure and Makefile.in
> > +# Sources coming from svn, without generated configure and Makefile.in
> > ? # files.
> > ? AVRDUDE_AUTORECONF = YES
> > -AVRDUDE_CONF_OPTS = --enable-linuxgpio
> > +AVRDUDE_CONF_OPTS = --enable-linuxgpio --enable-linuxspi
> 
> So I was wondering why we would enable a new feature at the same time we
> do the bump.
> 
> So the fork we were using did auto-detection of kernel headers to detect
> whether spidev.h was present or not, and thuse whether to enable or
> disable its linuxspi 'driver'.
> 
> But upstream went a slightly diffferent route, and added a configure
> option (and they do no validity check). Since spidev.h has been present
> since linux-2.6.22, we can quite easily conclude that spidev support was
> always enabled in the fork, and thus that we should keep it enabled now
> that we switch back to the upstream.
> 
> That would have been good to have this explanations (or at least a
> trimmed-down vesion) in the commit log, because it is a bit ambiguous as
> it is now...
> 
> No need to respin, I can fix when applying...

This old fork from kcuzner was focused on "linuxspi", that's why I thought,
whoever has chosen non-upstream version of the programmer wanted this
programmer explicitly.

-- 
Alexander Sverdlin.

[Buildroot] [PATCH] package/avrdude: Switch to upstream

[Yann E. MORIN]

Alexnder, All,

On 2021-02-23 09:25 +0100, Alexander Sverdlin spake thusly:
> On Mon, 2021-02-22 at 22:15 +0100, Yann E. MORIN wrote:
> > > -AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa
> > > -AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
> > > +AVRDUDE_VERSION = r1450
> > > +AVRDUDE_SITE_METHOD = svn
> > > +AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk
> > I am wondering what version of Buildroot you've been testing this with,
> > because downloading via svn is currently broken in master.
> > No need to reend for now, until we fix the svn download (imminent,
> > anytime soon, almost done, etc...)
> You've cought me :)
> Tested with 2020.11.x, rebased onto master.

Hehe. ;-)

The download via svn has been fixed in master, but the fix is still not
in -next, and since this is a version bump, it will then have to wait
for either master being merged into next (will most probably not
happen), or next being merged ijnto master after the release.

Regards,
Yann E. MORIN.

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

[Buildroot] [PATCH] package/avrdude: Switch to upstream

[Yann E. MORIN]

Alexander,All,

On 2021-02-22 03:26 +0100, Alexander Sverdlin spake thusly:
> In the meanwhile "linuxspi" programmer was merged upstream, therefore it's
> possible to switch to latest upstream tree instead of the old fork without
> losing any functionality.
> 
> Signed-off-by: Alexander Sverdlin <alexander.sverdlin@gmail.com>

Applied to master, with the folowing changes;

  - clarify why we forcibly use --enable-linuxspi
  - fix the hash to adapt to the new svn tarball format (c043ecb20ce6)

Thanks!

Regards,
Yann E. MORIN.

> ---
>  package/avrdude/avrdude.hash | 2 +-
>  package/avrdude/avrdude.mk   | 9 +++++----
>  2 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/package/avrdude/avrdude.hash b/package/avrdude/avrdude.hash
> index 888668ae44..9c56dacd60 100644
> --- a/package/avrdude/avrdude.hash
> +++ b/package/avrdude/avrdude.hash
> @@ -1,3 +1,3 @@
>  # Locally computed
> -sha256  cfa97af7badc713c62306ab85d0e7a288b064bf72e698494f73cb16c5b2c659e  avrdude-f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa.tar.gz
> +sha256  39d77cec4064b03bfc0ff942d36c41df7eea9b56b89a3f991078b68caddd3c77  avrdude-r1450.tar.gz
>  sha256  201babc7da198873304a77a30dbfc7ca449c9bba52df2dffa4cca0009dbdfcb2  avrdude/COPYING
> diff --git a/package/avrdude/avrdude.mk b/package/avrdude/avrdude.mk
> index ae378dfbac..b6754684e1 100644
> --- a/package/avrdude/avrdude.mk
> +++ b/package/avrdude/avrdude.mk
> @@ -4,15 +4,16 @@
>  #
>  ################################################################################
>  
> -AVRDUDE_VERSION = f8893ccf0aceeff67c45f95ae4e86bc7fbe342aa
> -AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION))
> +AVRDUDE_VERSION = r1450
> +AVRDUDE_SITE_METHOD = svn
> +AVRDUDE_SITE = http://svn.savannah.nongnu.org/svn/avrdude/trunk
>  AVRDUDE_LICENSE = GPL-2.0+
>  AVRDUDE_LICENSE_FILES = avrdude/COPYING
>  AVRDUDE_SUBDIR = avrdude
> -# Sources coming from git, without generated configure and Makefile.in
> +# Sources coming from svn, without generated configure and Makefile.in
>  # files.
>  AVRDUDE_AUTORECONF = YES
> -AVRDUDE_CONF_OPTS = --enable-linuxgpio
> +AVRDUDE_CONF_OPTS = --enable-linuxgpio --enable-linuxspi
>  AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \
>  	host-flex host-bison
>  
> -- 
> 2.29.2
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'