Skip to contentSkip to conversation

uninative: handle url in `PREMIRRORS` with parameter correctly

PATCH New [email protected] 2 participants 3 messages Sep 3, 2020 – Oct 14, 2020 2 messages not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

PATCH 1/1 uninative: handle url in `PREMIRRORS` with parameter correctly

This patch places url parameters correctly in a the uninative fetcher when mirrors are used.

The following changes since commit a6709152e9788418e6c9431851437eb8ec4c6b46:

bitbake: process/knotty: Improve early exception handling (2020-09-02 16:01:05 +0100)

are available in the Git repository at:

git://push.yoctoproject.org/poky-contrib niecore/fix-bug-in-uninative-mirror-handleing

Nico Müller (1):
uninative: handle url in PREMIRRORS with parameter correctly

 meta/classes/uninative.bbclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--
2.27.0

---
 meta/classes/uninative.bbclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
meta/classes/uninative.bbclass +8 -1
index 316c0f0616..8a78274144 100644
@@ -63,7 +63,14 @@ python uninative_event_fetchloader() {
                 except ValueError:
                     continue
                 if find.startswith("http"):
-                    localdata.appendVar("PREMIRRORS", " ${UNINATIVE_URL}${UNINATIVE_TARBALL} %s/uninative/%s/${UNINATIVE_TARBALL}" % (replace, chksum))
+                    # Check if PREMIRROR url is using parameters
+                    if ";" in replace:
+                        premirror_url, premirror_parameter = replace.split(";", 1)
+                        premirror = " %s/uninative/%s/${UNINATIVE_TARBALL};%s" % (premirror_url, chksum, premirror_parameter)
+                    else:
+                        premirror = " %s/uninative/%s/${UNINATIVE_TARBALL}" % (replace, chksum)
+
+                    localdata.appendVar("PREMIRRORS", " ${UNINATIVE_URL}${UNINATIVE_TARBALL} " + premirror)
 
             srcuri = d.expand("${UNINATIVE_URL}${UNINATIVE_TARBALL};sha256sum=%s" % chksum)
             bb.note("Fetching uninative binary shim %s (will check PREMIRRORS first)" % srcuri)

--
2.27.0

A message that is not in the archive (sent off-list or not yet received): [email protected]

#3 lore raw

Dear poky-Maintainers,

what further information is required in order to to get this patch merged?

Kind regards,

Nico Müller

________________________________
Von: [email protected] <[email protected]> im Auftrag von Mueller Nico (TT-RHC/EIS) via lists.yoctoproject.org <[email protected]>
Gesendet: Donnerstag, 3. September 2020 09:04:37
An: [email protected]
Betreff: [poky] [PATCH] uninative: handle url in PREMIRRORS with parameter correctly

This patch places url parameters correctly in a the uninative fetcher when mirrors are used.

The following changes since commit a6709152e9788418e6c9431851437eb8ec4c6b46:

bitbake: process/knotty: Improve early exception handling (2020-09-02 16:01:05 +0100)

are available in the Git repository at:

git://push.yoctoproject.org/poky-contrib niecore/fix-bug-in-uninative-mirror-handleing

Nico Müller (1):
uninative: handle url in PREMIRRORS with parameter correctly

 meta/classes/uninative.bbclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--
2.27.0

---
 meta/classes/uninative.bbclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
meta/classes/uninative.bbclass +8 -1
index 316c0f0616..8a78274144 100644
@@ -63,7 +63,14 @@ python uninative_event_fetchloader() {
                 except ValueError:
                     continue
                 if find.startswith("http"):
-                    localdata.appendVar("PREMIRRORS", " ${UNINATIVE_URL}${UNINATIVE_TARBALL} %s/uninative/%s/${UNINATIVE_TARBALL}" % (replace, chksum))
+                    # Check if PREMIRROR url is using parameters
+                    if ";" in replace:
+                        premirror_url, premirror_parameter = replace.split(";", 1)
+                        premirror = " %s/uninative/%s/${UNINATIVE_TARBALL};%s" % (premirror_url, chksum, premirror_parameter)
+                    else:
+                        premirror = " %s/uninative/%s/${UNINATIVE_TARBALL}" % (replace, chksum)
+
+                    localdata.appendVar("PREMIRRORS", " ${UNINATIVE_URL}${UNINATIVE_TARBALL} " + premirror)
 
             srcuri = d.expand("${UNINATIVE_URL}${UNINATIVE_TARBALL};sha256sum=%s" % chksum)
             bb.note("Fetching uninative binary shim %s (will check PREMIRRORS first)" % srcuri)

--
2.27.0

#4 lore raw
Quoted 5 lines · Mueller Nico (TT-RHC/EIS) via lists.yoctoproject.org

Dear poky-Maintainers,

what further information is required in order to to get this patch merged?

Hi Nico,

Please re-send the patch to [email protected]. The email you've sent seems to combine a pull request header with the diff - you'll need to send this as a patch with the commit message in the body of the email. I recommend using git format-patch and/or git send-email.

You can see more patch submission guidelines at
https://www.openembedded.org/wiki/How_to_submit_a_patch_to_OpenEmbedded.

Thanks,

Signature · 2 lines
Paul Barker
Konsulko Group