[PATCH 1/2] conf/bitbake.conf: fix GNU mirror URL

[PATCH 1/2] conf/bitbake.conf: fix GNU mirror URL

[Ross Burton]

Previously we moved GNU_MIRROR from ftp.gnu.org to ftpmirror.gnu.org[1],
however for reasons whilst ftp.gnu.org puts the content under a /gnu/
subdirectory, ftpmirror.gnu.org redirects to inside /gnu/.

This can be verified with curl. With /gnu/ included in the URL:

$ curl -vL https://ftpmirror.gnu.org/gnu/automake/automake-1.19.tar.gz
* Connected to ftpmirror.gnu.org (2001:470:142:5::200) port 443 (#0)
< HTTP/1.1 302 Moved Temporarily
< Location: https://mirror.cs.odu.edu/gnu//gnu/automake/automake-1.19.tar.gz
* Connected to mirror.cs.odu.edu (128.82.4.140) port 443 (#1)
> GET /gnu//gnu/automake/automake-1.19.tar.gz HTTP/1.1
< HTTP/1.1 404 Not Found

However, removing it:

$ curl -vL https://ftpmirror.gnu.org/automake/automake-1.19.tar.gz
* Connected to ftpmirror.gnu.org (2001:470:142:5::200) port 443 (#0)
< HTTP/1.1 302 Moved Temporarily
< Location: https://mirror.ibcp.fr/pub/gnu//automake/automake-1.19.tar.gz
* Connected to mirror.ibcp.fr (2001:660:500b:245::145) port 443 (#1)
> GET /pub/gnu//automake/automake-1.19.tar.gz HTTP/2
< HTTP/2 200
< content-length: 2517494
< content-type: application/x-gzip

This wasn't noticed as we have a default mirrors.bbclass which uses the
kernel.org mirror network.

It's also interesting that ftpmirror's attempt at providing local
mirrors is far from optimal: in testing this from the UK I was given
mirrors in the USA and China as often as Europe.

[1] oe-core d8c6f01d746 ("conf/bitbake.conf: use gnu mirror instead of main server")

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 meta/conf/bitbake.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index a21223e216a..8a102d5e8f1 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -709,7 +709,7 @@ DEBIAN_MIRROR = "http://deb.debian.org/debian/pool"
 GENTOO_MIRROR = "http://distfiles.gentoo.org/distfiles"
 GNOME_GIT = "git://gitlab.gnome.org/GNOME"
 GNOME_MIRROR = "https://download.gnome.org/sources/"
-GNU_MIRROR = "https://ftpmirror.gnu.org/gnu"
+GNU_MIRROR = "https://ftpmirror.gnu.org/"
 GNUPG_MIRROR = "https://www.gnupg.org/ftp/gcrypt"
 KERNELORG_MIRROR = "https://cdn.kernel.org/pub"
 SAMBA_MIRROR = "http://samba.org/samba/ftp"
-- 
2.43.0

[PATCH 2/2] automake: 1.18.1 -> 1.19

[Ross Burton]

Summary of the release notes:

* New features added

  - New autoconf macro AM_OPTIONAL_AUTOMAKE.

* Bugs fixed

  - Recognize COPYINGv2, COPYINGv3, COPYING.LESSERv2 and COPYING.LESSERv3
    as license files; distribute them automatically, similarly to COPYING.

  - `make dist' no longer propagates its internal distribution-directory
    cleanup override to recursive makes run while constructing distdir.

  - `make dist-bzip2 dist-xz' now succeeds.

  - Non-zero exit codes of compressors for the dist tarballs no longer abort
    the job in a state where the empty files are left behind.

  - Busybox tar no longer assumed to be GNU tar just because it
    supports --version.

  - `make dist' now fails when tar fails, instead of exiting
    successfully with a truncated archive.

  - The filename-length-max=N option no longer rejects file names of
    exactly N characters.

  - A file that is not currently present is still a part of the distribution
    if a `Makefile.am' rule can build it.

  - Objective C and Objective C++ sources built with Libtool are now
    compiled and linked with `--tag=OBJC' and `--tag=OBJCXX'.

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../automake/{automake_1.18.1.bb => automake_1.19.bb}          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename meta/recipes-devtools/automake/{automake_1.18.1.bb => automake_1.19.bb} (92%)

diff --git a/meta/recipes-devtools/automake/automake_1.18.1.bb b/meta/recipes-devtools/automake/automake_1.19.bb
similarity index 92%
rename from meta/recipes-devtools/automake/automake_1.18.1.bb
rename to meta/recipes-devtools/automake/automake_1.19.bb
index 4544f7d5395..0ee4d8facfa 100644
--- a/meta/recipes-devtools/automake/automake_1.18.1.bb
+++ b/meta/recipes-devtools/automake/automake_1.19.bb
@@ -1,4 +1,5 @@
 require automake.inc
+
 LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 DEPENDS:class-native = "autoconf-native"
@@ -24,7 +25,7 @@ SRC_URI += "\
            file://0006-automake-Remove-delays-in-configure-scripts-using-au.patch \
            "
 
-SRC_URI[sha256sum] = "63e585246d0fc8772dffdee0724f2f988146d1a3f1c756a3dc5cfbefa3c01915"
+SRC_URI[sha256sum] = "79e8b1f7a967e87ce8a9ded76bee7f793d0ce1886ab2002feb1b0510f578b75a"
 
 PERL = "${USRBINPATH}/perl"
 PERL:class-native = "${USRBINPATH}/env perl"
-- 
2.43.0