From patchwork Fri Sep 15 11:58:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 112725 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp527398qgf; Fri, 15 Sep 2017 04:58:54 -0700 (PDT) X-Received: by 10.84.176.100 with SMTP id u91mr13465741plb.10.1505476734744; Fri, 15 Sep 2017 04:58:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505476734; cv=none; d=google.com; s=arc-20160816; b=ln4UDdYxWhNL7wgWpGCly1u1OKL9XI9XzoSYbW2x5lj7xEHZwiKC/3ZPv3VHXQmhok W7HS1F7+JudPNuFtKM4W+J6PbhfcEwHaEg/KqB48KpMNyxauCtBMvjPjv+0xIp/uFYfi DTKlnSwda4iCEeXsIO9IpbgRJiSqVjqIGRKW1/0wkz+lb+Wf6ml9NASE5Rdbglv9coBQ urr4rkiH/pneAPbwMROk+l6BW8Qjem0uIvs73CVUyYjEl1oYhrbLCINMZUICoIJc+2K0 05Rs2n+KKFuFHnmoB53pq0dlqmff/5eGkn84DcA7nBUpCLc/6zg05kFAprEiTpOqTju4 X98Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=d46gHgoxNKbxYcPINUmCHftbBEL0cJaCJq1q5Nw5rOI=; b=ZRqOY+A9Yo2n3iN8M8gqRyYuT86mnGvMym4BXoWhwMRNp7ZTEYjkjxVXOTWeaMKHUm F9hh7yDJB/Uw19znsI8DKfXE8hXD2Ox6mn5ziflFoxYt4b5f8T1DZuQAPa4ybI0l/PK4 h/PpAbu9nHwGJf53ILUu5WY730CFzYX8KGffPyCyaERYcZt+gurMDsP2J6s4ASv1uO2F CAcpQCtlvI0WcruyClT0uFDpjwr9tUpd+IKPsgkzopJ6e4+pPpaYdF0BxaNxBBSaPeQP vCHl6pTRYyyxPvaKUYAfBf48r/DL+1amjYArHP/SckctU9/+yQpizw1qzNeCh4KzvkAj rwDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=R5ye83P+; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id j1si530510pgn.726.2017.09.15.04.58.54; Fri, 15 Sep 2017 04:58:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=R5ye83P+; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 64A787864D; Fri, 15 Sep 2017 11:58:52 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by mail.openembedded.org (Postfix) with ESMTP id C62737864D for ; Fri, 15 Sep 2017 11:58:50 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id i189so7697710wmf.1 for ; Fri, 15 Sep 2017 04:58:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id; bh=HMsMLUxASOMLOlWrEzUgrJ4OuYeUf5KZ6fmvfOtgrTQ=; b=R5ye83P+a1JCJ6oT3tRX24UcqUsRN2+x4yV76Nwmzig4FHC0o4lu3m3y3E1gRP19cZ 8yJTvvb8nHuaLmZTk3bB9FyxIX3gI6dLDDU+7XaFv2LoaKO+mv8w3/k/LFEk/jRiM/hN K7QrHqerjDTkymVKxYMVvN3jtUlBirPRt42tPLd3sEIJ+X+fThadylCh9XuOx4F8A3lM Nfv394wiV4ct38QVCjsR1IxZjWsuNEiNTE9pqJMuhjsZnUzs1/v031621w07gA1hcoao d3n5W0N5Ay/UuGD3hHgpxRV2BvcnoXYYTZHXf25ORAr3MwfAA0dzj8WWijOLEc53201B zkww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=HMsMLUxASOMLOlWrEzUgrJ4OuYeUf5KZ6fmvfOtgrTQ=; b=mVER/vkJA1DMp/x/AUZ+QXiP2yLvHOtetbLOU8xLq2KQwiv9asXxR9s93i/VW5LMUd B6Pxk5CIEpzVa3/KqRBxqy1TyhOPcTK1NLEutHNPSGrT45aLzp6o50ia3b+SJxcgefO8 CNrBbwxj2u6qdutHuls5YhtHvVICicDIwQVLRLlmv9DThtzQM9w7APu9HzKbVGxRy5tl rkH1FhVaJTxJ1icjU3EUs0NFnZsMFFXj//xyRbcXbpa74JH4fujjRYfIuhCgNGHUtJld g0aXJWIjDrEI0FLsTwkkJS5LoFbUKvSpdQGW0W5OjCNipSZwxPGSUDsgbL32leyM3HXa WLsg== X-Gm-Message-State: AHPjjUjSWYuoHLgnZ+CtFJEYEorvGV7jjW6wpVwuwtbuZT+z6a2004Iy nnJAd1ZuZLM3f6Y19+8= X-Google-Smtp-Source: AOwi7QARD8ZJr1PCy/ryMJH5hO9qLPmXJXoYjKk9ulYGK3iMenoP76XLxYK2B8E72Q7WVx6HyyJ/sQ== X-Received: by 10.28.226.84 with SMTP id z81mr2483032wmg.108.1505476731222; Fri, 15 Sep 2017 04:58:51 -0700 (PDT) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id b58sm743981wrg.86.2017.09.15.04.58.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Sep 2017 04:58:50 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 15 Sep 2017 12:58:48 +0100 Message-Id: <20170915115848.4939-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] useradd: don't override pseudo environment X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Back in the dark days before recipe-specific-sysroots the paths being passed in this manual construction of the pseudo environment made sense, but now they're incorrect and result in pseudo writing to two different databases during a single build. The result is that pseudo doesn't follow changes to /etc/passwd in the sysroot, and warns in the logs. Remove the PSEUDO_LOCALSTATEDIR assignment and inherit the correct assignment in FAKEROOTENV. Signed-off-by: Ross Burton --- meta/classes/useradd.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core Acked-by: Martin Jansa Signed-off-by: Ross Burton <ross.burton@intel.com>
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 6017ded8601..0f51e5522b1 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -100,7 +100,7 @@ useradd_sysroot () { # Pseudo may (do_prepare_recipe_sysroot) or may not (do_populate_sysroot_setscene) be running # at this point so we're explicit about the environment so pseudo can load if # not already present. - export PSEUDO="${FAKEROOTENV} PSEUDO_LOCALSTATEDIR=${STAGING_DIR_TARGET}${localstatedir}/pseudo ${PSEUDO_SYSROOT}${bindir_native}/pseudo" + export PSEUDO="${FAKEROOTENV} ${PSEUDO_SYSROOT}${bindir_native}/pseudo" # Explicitly set $D since it isn't set to anything # before do_prepare_recipe_sysroot