From 021b76a856bafc7e09c0e6fec0e8a88353cbe7bd Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 11 Nov 2021 00:18:53 +0100 Subject: own-mirrors.bbclass: Clean up the additions to PREMIRRORS * 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 PREMIRRORS with "\n". (From OE-Core rev: 1edc5e689d54b788c35ece14e0dbd76ec545f3ee) Signed-off-by: Peter Kjellerstedt Signed-off-by: Richard Purdie --- meta/classes/own-mirrors.bbclass | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/classes/own-mirrors.bbclass b/meta/classes/own-mirrors.bbclass index e244de592d..ef972740ce 100644 --- a/meta/classes/own-mirrors.bbclass +++ b/meta/classes/own-mirrors.bbclass @@ -1,14 +1,14 @@ PREMIRRORS:prepend = " \ -cvs://.*/.* ${SOURCE_MIRROR_URL} \n \ -svn://.*/.* ${SOURCE_MIRROR_URL} \n \ -git://.*/.* ${SOURCE_MIRROR_URL} \n \ -gitsm://.*/.* ${SOURCE_MIRROR_URL} \n \ -hg://.*/.* ${SOURCE_MIRROR_URL} \n \ -bzr://.*/.* ${SOURCE_MIRROR_URL} \n \ -p4://.*/.* ${SOURCE_MIRROR_URL} \n \ -osc://.*/.* ${SOURCE_MIRROR_URL} \n \ -https?$://.*/.* ${SOURCE_MIRROR_URL} \n \ -ftp://.*/.* ${SOURCE_MIRROR_URL} \n \ -npm://.*/?.* ${SOURCE_MIRROR_URL} \n \ -s3://.*/.* ${SOURCE_MIRROR_URL} \n \ +cvs://.*/.* ${SOURCE_MIRROR_URL} \ +svn://.*/.* ${SOURCE_MIRROR_URL} \ +git://.*/.* ${SOURCE_MIRROR_URL} \ +gitsm://.*/.* ${SOURCE_MIRROR_URL} \ +hg://.*/.* ${SOURCE_MIRROR_URL} \ +bzr://.*/.* ${SOURCE_MIRROR_URL} \ +p4://.*/.* ${SOURCE_MIRROR_URL} \ +osc://.*/.* ${SOURCE_MIRROR_URL} \ +https?://.*/.* ${SOURCE_MIRROR_URL} \ +ftp://.*/.* ${SOURCE_MIRROR_URL} \ +npm://.*/?.* ${SOURCE_MIRROR_URL} \ +s3://.*/.* ${SOURCE_MIRROR_URL} \ " -- cgit v1.2.3-54-g00ecf