From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6550602732015714304 X-Received: by 2002:a19:1f03:: with SMTP id f3-v6mr797743lff.32.1525181050197; Tue, 01 May 2018 06:24:10 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:868c:: with SMTP id l12-v6ls1012444lji.4.gmail; Tue, 01 May 2018 06:24:09 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpD0ieEr0S+rbl5ipUmyHUD3BXasYR6vi48pTRgpKWRcZutcFG2hJWU0OQTCw8OE1LkXxPf X-Received: by 2002:a2e:8447:: with SMTP id u7-v6mr875895ljh.7.1525181049188; Tue, 01 May 2018 06:24:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525181049; cv=none; d=google.com; s=arc-20160816; b=gkjM3oAdvsuUyGHUkoETnPuA3+B2wG0AvEtGFnqGZhFhLUwSjBcpRWH7eeE4OB4+gr 2Oa7EBKDWMcJuTM7GsgLeIQyG+26KTZZoF4mwXNeaDnNdUFIfkThGU6zzx3aH2oQOfgm UL912CBMZHFT0Z7W64ngyiuHH0IF7AsHwARrVY0pNAis7TKZoQLdhklKOZ3UMNjYL3Qt tMyzEGG+V+CdYpaZUhNF8AfOeDTdeHZITP+jmC8M3ymyMealljnDG+QrPgLxWFGfjq21 TRWUtOVu730p4qoMRy/2V4HoTGEMT/7hzdjXJQi6wARD0Ve3HUfioMSldSML/CWpJgGN QPRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:arc-authentication-results; bh=n+HwFCIN9KsbpgrRzfp3l7ba4/ZmrGC9ExsxCjuCmFc=; b=jr5cWxXc8shrsggI5mOWJFiAYKlk8TtEDp1vgpWc5H+9dbJYRKDEFkGIxfxYSVsd3s BLPw46escabOZclO1zv7MlVVf5kx4Ya+4BDxvEZajmooi+3Otjnp28W/uajtwodGooQX IUu0jGA1vSrD+qNyE4OVTkKUgKg2rs9nTeGlqvsfWDub0O8kBaUE2oG5qIoGtnxejvnQ +vXsd5Oyhlhj6iufsJ+6RIJZAwUUBPSEKmDOe0OMneatLICPgtoOwHXTA7qXRFIhSqOO jePZdsGFAfUlsMLJlteN+A4YUPv3kVIqm/osMDK+evX72mD6ACjETc4Rc9vMFgxGySto 95Vw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Return-Path: Received: from aqmola.ilbers.de (aqmola.ilbers.de. [85.214.62.211]) by gmr-mx.google.com with ESMTPS id e1-v6si320692ljk.0.2018.05.01.06.24.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 06:24:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) client-ip=85.214.62.211; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: best guess record for domain of asmirnov@ilbers.de designates 85.214.62.211 as permitted sender) smtp.mailfrom=asmirnov@ilbers.de Received: from localhost.localdomain ([188.227.110.165]) (authenticated bits=0) by aqmola.ilbers.de (8.14.4/8.14.4/Debian-4+deb7u1) with ESMTP id w41DNqxm018841 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 1 May 2018 15:23:58 +0200 From: Alexander Smirnov To: isar-users@googlegroups.com Cc: Alexander Smirnov Subject: [PATCH] isar-bootstrap: Drop arch identification Date: Tue, 1 May 2018 16:23:45 +0300 Message-Id: <20180501132345.25661-1-asmirnov@ilbers.de> X-Mailer: git-send-email 2.9.5 X-TUID: Xb24Q/JwmJ8A 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 --- 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