On Wed, Nov 10, 2021 at 3:19 PM Peter Kjellerstedt
<peter.kjellerst...@axis.com> wrote:
>
> * Since commit ce0579dc in bitbake (fetch2: Revert the regexp removal
> for the type field and instead anchor regexp) the type regexp has
> been automatically anchored at the end.
> * Since commit 044fb04d in bitbake (fetch2: Allow whitespace only mirror
> entries) there is no need to separate the entries in MIRRORS with "\n".
>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerst...@axis.com>
> ---
> meta/classes/mirrors.bbclass | 134 +++++++++++++++++------------------
> 1 file changed, 67 insertions(+), 67 deletions(-)
>
> diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
> index 08abcce52c..dc95cc1174 100644
> --- a/meta/classes/mirrors.bbclass
> +++ b/meta/classes/mirrors.bbclass
> @@ -1,75 +1,75 @@
> MIRRORS += "\
> -${DEBIAN_MIRROR}
> http://snapshot.debian.org/archive/debian/20180310T215105Z/pool \n \
> -${DEBIAN_MIRROR}
> http://snapshot.debian.org/archive/debian-archive/20120328T092752Z/debian/pool
> \n \
> -${DEBIAN_MIRROR}
> http://snapshot.debian.org/archive/debian-archive/20110127T084257Z/debian/pool
> \n \
> -${DEBIAN_MIRROR}
> http://snapshot.debian.org/archive/debian-archive/20090802T004153Z/debian/pool
> \n \
> -${DEBIAN_MIRROR} http://ftp.de.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.au.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.cl.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.hr.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.fi.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.hk.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.hu.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.ie.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.it.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.jp.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.no.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.pl.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.ro.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.si.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.es.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.se.debian.org/debian/pool \n \
> -${DEBIAN_MIRROR} http://ftp.tr.debian.org/debian/pool \n \
> -${GNU_MIRROR} https://mirrors.kernel.org/gnu \n \
> -${KERNELORG_MIRROR} http://www.kernel.org/pub \n \
> -${GNUPG_MIRROR} ftp://ftp.gnupg.org/gcrypt \n \
> -${GNUPG_MIRROR}
> ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt \n \
> -${GNUPG_MIRROR} ftp://mirrors.dotsrc.org/gcrypt \n \
> -ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \n \
> -ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/
> \n \
> -ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \n \
> -ftp://ftp.gnutls.org/gcrypt/gnutls ${GNUPG_MIRROR}/gnutls \n \
> -http://ftp.info-zip.org/pub/infozip/src/
> ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ \n \
> -http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/
> http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/
> \n \
> -${APACHE_MIRROR} http://www.us.apache.org/dist \n \
> -${APACHE_MIRROR} http://archive.apache.org/dist \n \
> -http://downloads.sourceforge.net/watchdog/ http://fossies.org/linux/misc/ \n
> \
> -${SAVANNAH_GNU_MIRROR} http://download-mirror.savannah.gnu.org/releases \n \
> -${SAVANNAH_NONGNU_MIRROR}
> http://download-mirror.savannah.nongnu.org/releases \n \
> -ftp://sourceware.org/pub http://mirrors.kernel.org/sourceware \n \
> -ftp://sourceware.org/pub http://gd.tuwien.ac.at/gnu/sourceware \n \
> -ftp://sourceware.org/pub
> http://ftp.gwdg.de/pub/linux/sources.redhat.com/sourceware \n \
> -cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -https?$://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -npm://.*/?.* http://downloads.yoctoproject.org/mirror/sources/ \n \
> -cvs://.*/.* http://sources.openembedded.org/ \n \
> -svn://.*/.* http://sources.openembedded.org/ \n \
> -git://.*/.* http://sources.openembedded.org/ \n \
> -hg://.*/.* http://sources.openembedded.org/ \n \
> -bzr://.*/.* http://sources.openembedded.org/ \n \
> -p4://.*/.* http://sources.openembedded.org/ \n \
> -osc://.*/.* http://sources.openembedded.org/ \n \
> -https?$://.*/.* http://sources.openembedded.org/ \n \
> -ftp://.*/.* http://sources.openembedded.org/ \n \
> -npm://.*/?.* http://sources.openembedded.org/ \n \
> -${CPAN_MIRROR} http://cpan.metacpan.org/ \n \
> -${CPAN_MIRROR} http://search.cpan.org/CPAN/ \n \
> -https?$://downloads.yoctoproject.org/releases/uninative/
> https://mirrors.kernel.org/yocto/uninative/ \n \
> +${DEBIAN_MIRROR}
> http://snapshot.debian.org/archive/debian/20180310T215105Z/pool \
> +${DEBIAN_MIRROR}
> http://snapshot.debian.org/archive/debian-archive/20120328T092752Z/debian/pool
> \
> +${DEBIAN_MIRROR}
> http://snapshot.debian.org/archive/debian-archive/20110127T084257Z/debian/pool
> \
> +${DEBIAN_MIRROR}
> http://snapshot.debian.org/archive/debian-archive/20090802T004153Z/debian/pool
> \
> +${DEBIAN_MIRROR} http://ftp.de.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.au.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.cl.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.hr.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.fi.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.hk.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.hu.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.ie.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.it.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.jp.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.no.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.pl.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.ro.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.si.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.es.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.se.debian.org/debian/pool \
> +${DEBIAN_MIRROR} http://ftp.tr.debian.org/debian/pool \
> +${GNU_MIRROR} https://mirrors.kernel.org/gnu \
> +${KERNELORG_MIRROR} http://www.kernel.org/pub \
> +${GNUPG_MIRROR} ftp://ftp.gnupg.org/gcrypt \
> +${GNUPG_MIRROR}
> ftp://ftp.franken.de/pub/crypt/mirror/ftp.gnupg.org/gcrypt \
> +${GNUPG_MIRROR} ftp://mirrors.dotsrc.org/gcrypt \
> +ftp://dante.ctan.org/tex-archive ftp://ftp.fu-berlin.de/tex/CTAN \
> +ftp://dante.ctan.org/tex-archive http://sunsite.sut.ac.jp/pub/archives/ctan/
> \
> +ftp://dante.ctan.org/tex-archive http://ctan.unsw.edu.au/ \
> +ftp://ftp.gnutls.org/gcrypt/gnutls ${GNUPG_MIRROR}/gnutls \
> +http://ftp.info-zip.org/pub/infozip/src/
> ftp://sunsite.icm.edu.pl/pub/unix/archiving/info-zip/src/ \
> +http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/
> http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof/OLD/
> \
> +${APACHE_MIRROR} http://www.us.apache.org/dist \
> +${APACHE_MIRROR} http://archive.apache.org/dist \
> +http://downloads.sourceforge.net/watchdog/ http://fossies.org/linux/misc/ \
> +${SAVANNAH_GNU_MIRROR} http://download-mirror.savannah.gnu.org/releases \
> +${SAVANNAH_NONGNU_MIRROR}
> http://download-mirror.savannah.nongnu.org/releases \
> +ftp://sourceware.org/pub http://mirrors.kernel.org/sourceware \
> +ftp://sourceware.org/pub http://gd.tuwien.ac.at/gnu/sourceware \
> +ftp://sourceware.org/pub
> http://ftp.gwdg.de/pub/linux/sources.redhat.com/sourceware \
> +cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
> +svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
> +git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
> +hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
> +bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
> +p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
> +osc://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
> +https?://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
> +ftp://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \
> +npm://.*/?.* http://downloads.yoctoproject.org/mirror/sources/ \
> +cvs://.*/.* http://sources.openembedded.org/ \
> +svn://.*/.* http://sources.openembedded.org/ \
> +git://.*/.* http://sources.openembedded.org/ \
> +hg://.*/.* http://sources.openembedded.org/ \
> +bzr://.*/.* http://sources.openembedded.org/ \
> +p4://.*/.* http://sources.openembedded.org/ \
> +osc://.*/.* http://sources.openembedded.org/ \
> +https?://.*/.* http://sources.openembedded.org/ \
> +ftp://.*/.* http://sources.openembedded.org/ \
> +npm://.*/?.* http://sources.openembedded.org/ \
> +${CPAN_MIRROR} http://cpan.metacpan.org/ \
> +${CPAN_MIRROR} http://search.cpan.org/CPAN/ \
> +https?://downloads.yoctoproject.org/releases/uninative/
> https://mirrors.kernel.org/yocto/uninative/ \
> "
>
> # Use MIRRORS to provide git repo fallbacks using the https protocol, for
> cases
> # where git native protocol fetches may fail due to local firewall rules,
> etc.
>
> MIRRORS += "\
> -git://salsa.debian.org/.* git://salsa.debian.org/PATH;protocol=https \n \
> -git://git.gnome.org/.*
> git://gitlab.gnome.org/GNOME/PATH;protocol=https \n \
> -git://.*/.* git://HOST/PATH;protocol=https \n \
> -git://.*/.* git://HOST/git/PATH;protocol=https \n \
> +git://salsa.debian.org/.* git://salsa.debian.org/PATH;protocol=https \Not related to your cleanup, but this is redundant as it's covered by the generic mapping below. > +git://git.gnome.org/.* > git://gitlab.gnome.org/GNOME/PATH;protocol=https \ > +git://.*/.* git://HOST/PATH;protocol=https \ > +git://.*/.* git://HOST/git/PATH;protocol=https \ > " > > >
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#158128): https://lists.openembedded.org/g/openembedded-core/message/158128 Mute This Topic: https://lists.openembedded.org/mt/86970462/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
