[OE-core] [PATCH] (PRE)MIRRORS: add pattern for npm:// without slash
Olaf Mandel
o.mandel at menlosystems.com
Thu Aug 24 18:19:46 UTC 2017
For URLs with the npm:// transport but with no other slash in it, the
common MIRRORS and PREMIRRORS pattern of npm://.*/.* fails to match.
Add a new pattern in the mirros.bbclass and own-mirrors.bbclass classes
for these URLs.
Many URLs with the npm:// transport have no slash after the host part:
npm://registry.npmjs.org;name=foo;version=0.1.2
This means that MIRRORS and PREMIRRORS containing entries like the
first one will not match these URLs:
npm://.*/.* # fails to match
npm://.* # matches, but not those URLs with a slash
Because the npm:// URLs without a slash seem to be more ubiquitous (they
are generated by recipetool), place the new pattern first.
Signed-off-by: Olaf Mandel <o.mandel at menlosystems.com>
---
meta/classes/mirrors.bbclass | 2 ++
meta/classes/own-mirrors.bbclass | 1 +
2 files changed, 3 insertions(+)
diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index b98684f5c6..710df3c7bf 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -48,6 +48,7 @@ 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 \
npm://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \n \
cvs://.*/.* http://sources.openembedded.org/ \n \
svn://.*/.* http://sources.openembedded.org/ \n \
@@ -58,6 +59,7 @@ 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 \
npm://.*/.* http://sources.openembedded.org/ \n \
${CPAN_MIRROR} http://cpan.metacpan.org/ \n \
${CPAN_MIRROR} http://search.cpan.org/CPAN/ \n \
diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass
index 12b42675bc..253ed9cb7e 100644
--- a/meta/classes/own-mirrors.bbclass
+++ b/meta/classes/own-mirrors.bbclass
@@ -9,5 +9,6 @@ p4://.*/.* ${SOURCE_MIRROR_URL}
osc://.*/.* ${SOURCE_MIRROR_URL}
https?$://.*/.* ${SOURCE_MIRROR_URL}
ftp://.*/.* ${SOURCE_MIRROR_URL}
+npm://.* ${SOURCE_MIRROR_URL}
npm://.*/.* ${SOURCE_MIRROR_URL}
}
--
2.11.0
More information about the Openembedded-core
mailing list