Skip to contentSkip to conversation

utils: Drop is_machine_specific()/machine_path()

PATCH In review Richard Purdie 3 participants 3 messages May 4, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 utils: Drop is_machine_specific()/machine_path()

There appear to be no users of these in OE-Core and their functionality is questionable at best too. Probably safest to remove that entirely at this point.

---
 meta/classes/utils.bbclass | 17 -----------------
 1 file changed, 17 deletions(-)
meta/classes/utils.bbclass +0 -17
index c32b868aa88..120bcc64a64 100644
@@ -1,20 +1,3 @@
-def machine_paths(d):
-    """List any existing machine specific filespath directories"""
-    machine = d.getVar("MACHINE")
-    for basepath in d.getVar("FILESPATHBASE").split(":"):
-        machinepath = os.path.join(basepath, machine)
-        if os.path.isdir(machinepath):
-            yield machinepath
-
-def is_machine_specific(d):
-    """Determine whether the current recipe is machine specific"""
-    machinepaths = set(machine_paths(d))
-    srcuri = d.getVar("SRC_URI").split()
-    for url in srcuri:
-        fetcher = bb.fetch2.Fetch([srcuri], d)
-        if url.startswith("file://"):
-            if any(fetcher.localpath(url).startswith(mp + "/") for mp in machinepaths):
-                return True
 
 oe_soinstall() {
 	# Purpose: Install shared library file and
Signature · 1 line
2.25.1
#1 lore raw

✗ patchtest: failure for utils: Drop is_machine_specific()/machine_path()

== Series Details ==

Series: utils: Drop is_machine_specific()/machine_path()
Revision: 1
URL : https://patchwork.openembedded.org/series/23939/
State : failure

== Summary ==

Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures:

* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at 26eb22191f)

If you believe any of these test results are incorrect, please reply to the mailing list ([email protected]) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...).

---

Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
#2 lore raw
In reply to Richard Purdie
Quoted 6 lines

-----Original Message-----
From: [email protected] <openembedded- [email protected]> On Behalf Of Richard Purdie
Sent: den 4 maj 2020 17:53
To: [email protected]
Subject: [OE-core] [PATCH] utils: Drop is_machine_specific()/machine_path()

machine_paths()

Quoted 2 lines

There appear to be no users of these in OE-Core and their functionality is questionable at best too. Probably safest to remove that entirely

that -> them

Quoted 3 lines

at this point.

//Peter

Quoted 31 lines
---
 meta/classes/utils.bbclass | 17 -----------------
 1 file changed, 17 deletions(-)
meta/classes/utils.bbclass +0 -18
index c32b868aa88..120bcc64a64 100644
@@ -1,20 +1,3 @@
-def machine_paths(d):
-    """List any existing machine specific filespath directories"""
-    machine = d.getVar("MACHINE")
-    for basepath in d.getVar("FILESPATHBASE").split(":"):
-        machinepath = os.path.join(basepath, machine)
-        if os.path.isdir(machinepath):
-            yield machinepath
-
-def is_machine_specific(d):
-    """Determine whether the current recipe is machine specific"""
-    machinepaths = set(machine_paths(d))
-    srcuri = d.getVar("SRC_URI").split()
-    for url in srcuri:
-        fetcher = bb.fetch2.Fetch([srcuri], d)
-        if url.startswith("file://"):
-            if any(fetcher.localpath(url).startswith(mp + "/") for mp in machinepaths):
-                return True
 
 oe_soinstall() {
 	# Purpose: Install shared library file and
--

2.25.1