From patchwork Wed Sep 18 12:16:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 173963 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2379978ill; Wed, 18 Sep 2019 05:16:50 -0700 (PDT) X-Google-Smtp-Source: APXvYqxz8IyeCHdTfFPOmWtf/jokREK+olpjjOY+gSbg1hlzfx71POVu77DwS1WVbY+qmK7sxs0J X-Received: by 2002:a17:902:758a:: with SMTP id j10mr3849274pll.233.1568809010856; Wed, 18 Sep 2019 05:16:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568809010; cv=none; d=google.com; s=arc-20160816; b=OqJc0EROxesP2Q7hj6Xh/9XG3F+Aaw8iX+NfZBdK2LYzl1rvtdRVgDT7oNnlQ0Iuit /AfZMz3psNGABXO0TuiI2lV5A9LUlabhSD3YitchSXmDs64NcO56LkI92vylbL3ZQW7/ AVy6HQrLby/ZS7rWuAd+A7kjhN5QUqAKvKDkJYAW7zf63IfEu/PEupPT5OW1OTQgsLU3 CvVZxajc0jWWLxoiSgE1uYZYeIs8aYQ4Dv9RwhCklB22miUA69+0mU0Z4uedBPtuOxZb aVmKV/DNCMfa/xH8pqxqwLiezfPh1UZnHdKE+nPExlFrY9u9itHhmi5nRoUWJU9LiIHU il+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=gfYRctGcRbsWj0hVR2toztrKxczAv2/c1b0LZVi2ozs=; b=u65arW2y6X38UgiMv/yu5mV49CB/y3xkeOhl+KSLdFDyirXZwSJxtfl6SjO8J4svR1 mjDnC+GWApY/4bqi9NkjgnJtdMQYkr5gDnH08HbDUrmHlMYQYOC7eIP6rxheG1gxZ7ec iVWJXg7+jVfXwjhL1+qZZg8NaqK5Y5KvgwQyzW71s6N9CMznvJJCfxQ6rcI1ZbVCE6ua ynxOug2gV9TZZRC1tZ7rn7nG0PNvDfuG1lCH6BKZ4ADeKWVgcz6Pehua4YdakGk5Fqyy uPOCChaPwymg7UVTTNNo8ZIII2tEASGM88Z5wm5qer1KwnJV4YyrjrJLtAZMNGI66+/1 zT0A== 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=q76CM4FS; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id x19si4044970pgi.515.2019.09.18.05.16.50; Wed, 18 Sep 2019 05:16:50 -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=q76CM4FS; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 187027F811; Wed, 18 Sep 2019 12:16:45 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by mail.openembedded.org (Postfix) with ESMTP id 2DD1190185 for ; Wed, 18 Sep 2019 12:16:43 +0000 (UTC) Received: by mail-wr1-f65.google.com with SMTP id h7so6645836wrw.8 for ; Wed, 18 Sep 2019 05:16:44 -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:mime-version :content-transfer-encoding; bh=SWlc3FnISzzqhwPiPVVosUp4Ez4erz+PRjv3m7flv6w=; b=q76CM4FSl8BAs3lBEns/tW/h9p2rNI+Rhn1skr5/dWTx4X+WlAYOwjDUGMTpCUusY3 2BbrFe5kbHPMgAQetNOqYeXyquUN6Y6xcJuVcc7eYZBgE96zAPtR4yEYP4Kb7p1Xr8E0 Hx8LQPnsaQSDC0cqfYY9jBNQuTtX+LGWMcXgIbkJNBg7TUjlzqXsuaFPwtDJ10X91Hri MfRPZt9Do+JpfhdlSxs81C6JdgN4+pcfNCCg7YN2cDf3kZaEyNZbm1ej1J/7IPRShFjv pbqRzXAZqteo35uTbFQjxB4EL3SI5WCpQujiyQt4gKeRwnqiKuTUlt6/z5iOUsJgv6Oy F0Xw== 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:mime-version :content-transfer-encoding; bh=SWlc3FnISzzqhwPiPVVosUp4Ez4erz+PRjv3m7flv6w=; b=rrwSiQgDENKzscaEDvwRunSXoWpOcl6URcXdkcPUfJkm7FkY8rDf7seXTL3qoQG6Gc qPNDbm8KuYhQPcWYL6Uy5vxHrVCrY3K7xZti1cc+LTzQMdGdowRYDNNx5s1af7GPyEPd 6UqyxRPUQPU4RUejF5gGO9qDMCGDI+T24PNG+TULlIiAaIc/ysdaVPsRrOqMmx4zxlDM GxjVC5yl/NkqHd6dl5g47ct9LYcV+UVeW4/7Ud75AP3ApibnmOdDnaHfAm56kiyygJh1 66b8JEbt6MR95EgEiTa/h7TPb2ZAE+lvfhxhINtV6TG7TGrJvKTvOKM5TF2YGxzrkAud xU8g== X-Gm-Message-State: APjAAAXinWtfaXMzs9f5F4bez5aIT4g+Mq2QgNv8ykpYtXNwv3PTKBm0 k6l6/b/cxUp9AEZMMoCsybRFkRPZpDA= X-Received: by 2002:adf:f303:: with SMTP id i3mr3005027wro.242.1568809003510; Wed, 18 Sep 2019 05:16:43 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id d78sm3344254wmd.47.2019.09.18.05.16.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2019 05:16:42 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 18 Sep 2019 13:16:40 +0100 Message-Id: <20190918121640.31682-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH] rootfs-postcommands: check /etc/gconf exists before working on it 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: , Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Check that /etc/gconf exists before trying to find files under it, to avoid writing find error messages to the rootfs log. Also use ${sysconfdir}/gconf instead of hardcoding /etc/gconf. Signed-off-by: Ross Burton --- meta/classes/rootfs-postcommands.bbclass | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.20.1 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index fc338161c4d..88f75d0f442 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass @@ -361,7 +361,9 @@ rootfs_reproducible () { echo $sformatted > ${IMAGE_ROOTFS}/etc/version bbnote "rootfs_reproducible: set /etc/version to $sformatted" - find ${IMAGE_ROOTFS}/etc/gconf -name '%gconf.xml' -print0 | xargs -0r \ - sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g' + if [ -d ${IMAGE_ROOTFS}${sysconfdir}/gconf ]; then + find ${IMAGE_ROOTFS}${sysconfdir}/gconf -name '%gconf.xml' -print0 | xargs -0r \ + sed -i -e 's@\bmtime="[0-9][0-9]*"@mtime="'${REPRODUCIBLE_TIMESTAMP_ROOTFS}'"@g' + fi fi }