From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6517147827419742208 X-Received: by 10.223.184.42 with SMTP id h39mr3332652wrf.4.1517391723405; Wed, 31 Jan 2018 01:42:03 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 10.223.154.77 with SMTP id z71ls1446861wrb.7.gmail; Wed, 31 Jan 2018 01:42:03 -0800 (PST) X-Google-Smtp-Source: AH8x224vCrXeKJPqNN0lLhnE9DwMcf6F5M1NZDwtxhbIMSZ03MM+bjhOAL/FwBRxcaAkdrq0L4/i X-Received: by 10.28.237.21 with SMTP id l21mr3308845wmh.32.1517391722990; Wed, 31 Jan 2018 01:42:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517391722; cv=none; d=google.com; s=arc-20160816; b=FaKNBql2IqDnBpEgkfrodLKo6KDxMu/LVaZXqiJtAH4vJbhFgZBKe2Sl03KhOyeEJ4 KBPWlGTeOUGQ+o/nIiHEBOm18jHoA7epepxlQavYBrB8t7zpPgmCxaeYej5y55APUFEf AD/J3apRea7Z0LH1sYXRBtQ9PKgkSjgfJKtfPKA+sTehkhRYEP38F48VGMKD4e3frSyp xX2QZPQF3Uz8S7Lnkw0BFX44neH4zujSJN5fsMMwK6hfKT/t3E+uH2ZDdZ1hsGwCuc0o knNSoGiuBxK4Q0wU1DIDUnlp2UJgDzafnxFHMtVPXyzuE7m+XO/wGWsB/eUXiozJ6Fk4 ouPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=keHLv3z1vPJHnrNCUwul6LnLlRoWue4KHbWxzALL/Pg=; b=HJoNPuyA3tLJumYdBxRD65AaHO3fAMvjn53a5dCCwsQZRJSS8feEIAXKAbDXQ742v8 /8BI/S+kH/wCOHEywvp+Yc/Ou6CARokjf6MjqdXeFZ+x0AruSfojnEJOlq17lfdhjZz1 kM2KzlasBWIBX1t0ZZ+PIoSlvJHvdZn8PE0sIIpeENW+3mGH6UsWwkNBqwRIlqjjROhK m5PugQF1iyJbkpxK/vfmE4to/RE1g+yVDTC6nXi1dBXHmQY6kC0GX0L3fwgHJblEgmmc OmrhIKLGD19GVtMJ86jTGGl4+cLYiuHGkYgadp9snUP0x9rfLuAzx8PGvPFXQw1bV06E OAZg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Return-Path: Received: from david.siemens.de (david.siemens.de. [192.35.17.14]) by gmr-mx.google.com with ESMTPS id a12si522793wmg.4.2018.01.31.01.42.02 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 31 Jan 2018 01:42:02 -0800 (PST) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) client-ip=192.35.17.14; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.14 as permitted sender) smtp.mailfrom=henning.schild@siemens.com Received: from mail3.siemens.de (mail3.siemens.de [139.25.208.14]) by david.siemens.de (8.15.2/8.15.2) with ESMTPS id w0V9g2sU029661 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 31 Jan 2018 10:42:02 +0100 Received: from md1pvb1c.ad001.siemens.net (md1pvb1c.ad001.siemens.net [139.25.68.40] (may be forged)) by mail3.siemens.de (8.15.2/8.15.2) with ESMTP id w0V9g1ab008484; Wed, 31 Jan 2018 10:42:02 +0100 From: Henning Schild To: isar-users@googlegroups.com Cc: Henning Schild Subject: [PATCH 7/9] Revert "wic: Use sudo instead of pseudo" Date: Wed, 31 Jan 2018 10:41:58 +0100 Message-Id: X-Mailer: git-send-email 2.13.6 In-Reply-To: References: In-Reply-To: References: X-TUID: 9ip2QZqhu3dh This reverts commit bf873d3b089474d9061df4c1f0985abfac038ff6. --- scripts/lib/wic/partition.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/scripts/lib/wic/partition.py b/scripts/lib/wic/partition.py index 34130d8..20bc4a2 100644 --- a/scripts/lib/wic/partition.py +++ b/scripts/lib/wic/partition.py @@ -201,6 +201,17 @@ class Partition(): Currently handles ext2/3/4, btrfs and vfat. """ + p_prefix = os.environ.get("PSEUDO_PREFIX", "%s/usr" % native_sysroot) + p_localstatedir = os.environ.get("PSEUDO_LOCALSTATEDIR", + "%s/../pseudo" % rootfs_dir) + p_passwd = os.environ.get("PSEUDO_PASSWD", rootfs_dir) + p_nosymlinkexp = os.environ.get("PSEUDO_NOSYMLINKEXP", "1") + pseudo = "export PSEUDO_PREFIX=%s;" % p_prefix + pseudo += "export PSEUDO_LOCALSTATEDIR=%s;" % p_localstatedir + pseudo += "export PSEUDO_PASSWD=%s;" % p_passwd + pseudo += "export PSEUDO_NOSYMLINKEXP=%s;" % p_nosymlinkexp + pseudo += "%s " % get_bitbake_var("FAKEROOTCMD") + rootfs = "%s/rootfs_%s.%s.%s" % (cr_workdir, self.label, self.lineno, self.fstype) if os.path.isfile(rootfs): @@ -226,7 +237,7 @@ class Partition(): self.source_file = rootfs # get the rootfs size in the right units for kickstart (kB) - du_cmd = "sudo du -Lbks %s" % rootfs + du_cmd = "du -Lbks %s" % rootfs out = exec_cmd(du_cmd) self.size = int(out.split()[0]) @@ -234,7 +245,7 @@ class Partition(): """ Prepare content for an ext2/3/4 rootfs partition. """ - du_cmd = "sudo du -ks %s" % rootfs_dir + du_cmd = "du -ks %s" % rootfs_dir out = exec_cmd(du_cmd) actual_rootfs_size = int(out.split()[0]) @@ -249,7 +260,7 @@ class Partition(): if self.label: label_str = "-L %s" % self.label - mkfs_cmd = "sudo mkfs.%s -F %s %s %s -d %s" % \ + mkfs_cmd = "mkfs.%s -F %s %s %s -d %s" % \ (self.fstype, extra_imagecmd, rootfs, label_str, rootfs_dir) exec_cmd(mkfs_cmd) @@ -262,7 +273,7 @@ class Partition(): Currently handles ext2/3/4 and btrfs. """ - du_cmd = "sudo du -ks %s" % rootfs_dir + du_cmd = "du -ks %s" % rootfs_dir out = exec_cmd(du_cmd) actual_rootfs_size = int(out.split()[0]) @@ -275,7 +286,7 @@ class Partition(): if self.label: label_str = "-L %s" % self.label - mkfs_cmd = "sudo mkfs.%s -b %d -r %s %s %s" % \ + mkfs_cmd = "mkfs.%s -b %d -r %s %s %s" % \ (self.fstype, rootfs_size * 1024, rootfs_dir, label_str, rootfs) exec_cmd(mkfs_cmd) @@ -283,7 +294,7 @@ class Partition(): """ Prepare content for a msdos/vfat rootfs partition. """ - du_cmd = "sudo du -bks %s" % rootfs_dir + du_cmd = "du -bks %s" % rootfs_dir out = exec_cmd(du_cmd) blocks = int(out.split()[0]) @@ -331,7 +342,7 @@ class Partition(): if self.label: label_str = "-L %s" % self.label - mkfs_cmd = "sudo mkfs.%s -F %s %s %s" % \ + mkfs_cmd = "mkfs.%s -F %s %s %s" % \ (self.fstype, extra_imagecmd, label_str, rootfs) exec_cmd(mkfs_cmd) @@ -347,7 +358,7 @@ class Partition(): if self.label: label_str = "-L %s" % self.label - mkfs_cmd = "sudo mkfs.%s -b %d %s %s" % \ + mkfs_cmd = "mkfs.%s -b %d %s %s" % \ (self.fstype, self.size * 1024, label_str, rootfs) exec_cmd(mkfs_cmd) -- 2.13.6