[PATCH] isar-bootstrap: Drop arch identification

[PATCH] isar-bootstrap: Drop arch identification

[Alexander Smirnov]

There is no need to manualy check host and target architectures to
choose between native or qemu debootstraps. This is already implemented
in 'qemu-debootstrap' script. If it detects compatible architectures - it
disables QEMU usage.

Moreover, current function incorrectly identifies 32-bit hosts via 'uname'.
AFAIK there is no 'x86' architecture, it should be 'i686'.

Signed-off-by: Alexander Smirnov <asmirnov@ilbers.de>
---
 meta/recipes-core/isar-bootstrap/isar-bootstrap.bb | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb b/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb
index a38dd88..ac8c177 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.bb
@@ -14,7 +14,7 @@ SRC_URI = "file://isar-apt.conf"
 PV = "1.0"
 
 WORKDIR = "${TMPDIR}/work/${DISTRO}-${DISTRO_ARCH}/${PN}"
-DEBOOTSTRAP ?= ""
+DEBOOTSTRAP ?= "qemu-debootstrap"
 ROOTFSDIR = "${WORKDIR}/rootfs"
 APTPREFS = "${WORKDIR}/apt-preferences"
 APTSRCS = "${WORKDIR}/apt-sources"
@@ -24,21 +24,6 @@ DEBOOTSTRAP_KEYRING = ""
 
 python () {
     from urllib.parse import urlparse
-
-    debootstrap = d.getVar("DEBOOTSTRAP", True)
-    if not debootstrap:
-        target = d.getVar("DISTRO_ARCH", True)
-        machine = os.uname()[4]
-        m = {
-            "x86_64": ["i386", "amd64"],
-            "x86": ["i386"],
-            }
-        if machine not in m or target not in m[machine]:
-            debootstrap = "qemu-debootstrap"
-        else:
-            debootstrap = "debootstrap"
-        d.setVar("DEBOOTSTRAP", debootstrap)
-
     distro_apt_keys = d.getVar("DISTRO_APT_KEYS", False)
     if distro_apt_keys:
         d.setVar("DEBOOTSTRAP_KEYRING", "--keyring ${APTKEYRING}")
-- 
2.1.4

Re: [PATCH] isar-bootstrap: Drop arch identification

[Alexander Smirnov]

On 05/01/2018 04:23 PM, Alexander Smirnov wrote:
> There is no need to manualy check host and target architectures to
> choose between native or qemu debootstraps. This is already implemented
> in 'qemu-debootstrap' script. If it detects compatible architectures - it
> disables QEMU usage.
> 
> Moreover, current function incorrectly identifies 32-bit hosts via 'uname'.
> AFAIK there is no 'x86' architecture, it should be 'i686'.
> 

Applied to next.

Alex