From patchwork Mon Jul 8 12:32:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 168619 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7103893ilk; Mon, 8 Jul 2019 05:33:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqzlgF5O7EwsBjSOwx/UXltYgSthTAECI8e0CUQVXNfmlspQbSMeQ19gJItraLFZ/rDmxl6i X-Received: by 2002:a17:902:2aa9:: with SMTP id j38mr23504612plb.206.1562589188370; Mon, 08 Jul 2019 05:33:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562589188; cv=none; d=google.com; s=arc-20160816; b=fJzSVLPnzgyr4mXvzSZzv2wNpUPjOM1AH9Sl8BzG6PlFyue90IapI4QWuSUgoG94JV mc0IKyve+joNVhhUj2MDuxbs8xETn/AAwlmaOR7YM7ap7TWVaqE/nlJEoO7zNn+B3Dft OxAsnDure+lugRbT4VuFKNfyvdvX/Wo0kpeLXTNP3xWUTo599pdgHUcq6MWFsqEHwMtZ sXVdukD+12MxbGP6uUiXwICUjXoEr9ripqbUFlOkwwIZ6rbJGMAvzaeOVLHZDtvg/iF8 SlrqEb0FqPk7wHUaMS5yJNIr01NhV8rA40D6KidXjPJAbncp8evUvdy1tFfFfD46nzCs 6BHQ== 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=aMKbedkU4bpeoGqnry2AT/dlg80OAb/LIKEOAAQqjC8=; b=NHm51HzWu5zdv7FkiL44tRHqEb5TKfmryh6yOWq3x1y/O2bendxp9Rf5oSeSCfnzQq +6/qvJ1EkKRukk3G559e/CsteNjG9JZ069FmNMhW+iT7lxyj9a7G5/zfFicEF8sk4EzJ yc8Inh4fFPhFfwLjyjElvXWAw5eJJVRJlpGAzsPUjX1gW0kw04CeOln0gb6DdZOQ1DMf yK7xcUzNX+mDnzIWMOBU8ruK4FiG2idiSuaZGEQbU2zJ+WZIUjoWEHAzho6+3KpBE+iT a9Y02ZhFO9+j8KcPd0lBQvXOFBtvwqhGl81AwDph3EuZOcbFpOcJE+c9CFFEvC5ZjhVO /V8w== 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=dvHSdDsR; 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 f3si17937029plf.261.2019.07.08.05.33.07; Mon, 08 Jul 2019 05:33:08 -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=dvHSdDsR; 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 DC8417D5B7; Mon, 8 Jul 2019 12:33:04 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mail.openembedded.org (Postfix) with ESMTP id CFE597D1E9 for ; Mon, 8 Jul 2019 12:33:03 +0000 (UTC) Received: by mail-wm1-f51.google.com with SMTP id x15so15606601wmj.3 for ; Mon, 08 Jul 2019 05:33:05 -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=G3iG+VWdm0QGnsa+RGlicccsDsIGQUVn35p7L3vJadQ=; b=dvHSdDsRUhv/B6G9oRg/fLN709xQVhJ/aoJms+3iEA01uYNC8TowXg2QsqMv8KbrUG LOVUE4D1YEUsJAk6R7GCXk2H62GN3hgYorivOQfUAV1EsHeseTKxeS+YynhzloObCgKp +JabdZaGPCy8aroQEBqtxlvNCrYzznxvGb7erwzTp1YkHsPIJztI9lNtfjQcFQZc4xiB 7bRHBTCFZHVq6O/hl84Kx9IzsrqhA+pw4tohzCgtJ1S5RYdtTLYr8NgDGBhXCm5gZ2ye l6xfZLUC9xPKheop7uvQKT2As8Kn640pcv1zs97r4eyDGLTLtHnihikh7bXLkyDkMg+N i9Ww== 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=G3iG+VWdm0QGnsa+RGlicccsDsIGQUVn35p7L3vJadQ=; b=ts/VTyzFpWfM8bcxq/v7USyn0huAOL97IUutUixNN3bAvLnYowLQ4LJ4vVlW7Jxxwg IIUHJb/mnh5KdLJOYaL4qZSn+bCwtdVKA/49hxTAqwp4qz9qFIbKSA9PAyV547b+b3f2 5srA7IYEO+FFIRW2X8aMmU3/pTkaLwliRACDBmZOSpaLGqdsrrvZkPrTxX369RFAjksP x6N17XVrQjMfhc9EKfktaH3wibDFo+n0kvdS6fVa4CVPDW8udHsY3WBRd8ofDtsZP7PU P3fjYRJol4R7jqkNGu3qm2yIb93aT2PioNNCJdgIw21s22oAjm5yQrwivry86dYRwUsz J2ow== X-Gm-Message-State: APjAAAUna68UqAQHmRr8BJ33CGlsf6GCgtW7EwJPskr0tTd1rYTRBFi3 1OovifQeeLVq2Q4jdC5aUtNKZzFkVIE= X-Received: by 2002:a1c:c2d5:: with SMTP id s204mr17250072wmf.174.1562589184247; Mon, 08 Jul 2019 05:33:04 -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 u186sm16756635wmu.26.2019.07.08.05.33.02 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 05:33:03 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 8 Jul 2019 13:32:58 +0100 Message-Id: <20190708123258.9862-1-ross.burton@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [OE-core] [PATCH] buildhistory: don't output ownership for the sysroot 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 As the sysroot isn't ran inside pseudo the ownership is whoever is running the builds. In a setup where multiple builders all contribute to a shared buildhistory writing the ownership data isn't useful, so just replace it with "- -". Signed-off-by: Ross Burton --- meta/classes/buildhistory.bbclass | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) -- 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/buildhistory.bbclass b/meta/classes/buildhistory.bbclass index baa7c8e2799..5bf27268107 100644 --- a/meta/classes/buildhistory.bbclass +++ b/meta/classes/buildhistory.bbclass @@ -67,7 +67,7 @@ PATCH_GIT_USER_NAME ?= "OpenEmbedded" buildhistory_emit_sysroot() { mkdir --parents ${BUILDHISTORY_DIR_PACKAGE} - buildhistory_list_files ${SYSROOT_DESTDIR} ${BUILDHISTORY_DIR_PACKAGE}/sysroot + buildhistory_list_files_no_owners ${SYSROOT_DESTDIR} ${BUILDHISTORY_DIR_PACKAGE}/sysroot } # @@ -537,6 +537,20 @@ buildhistory_list_files() { fi | sort -k5 | sed 's/ * -> $//' > $2 ) } +buildhistory_list_files_no_owners() { + # List the files in the specified directory, but exclude date/time etc. + # Also don't output the ownership data, but instead output just - - so + # that the same parsing code as for _list_files works. + # This is somewhat messy, but handles where the size is not printed for device files under pseudo + ( cd $1 + find_cmd='find . ! -path . -printf "%M - - %10s %p -> %l\n"' + if [ "$3" = "fakeroot" ] ; then + eval ${FAKEROOTENV} ${FAKEROOTCMD} "$find_cmd" + else + eval "$find_cmd" + fi | sort -k5 | sed 's/ * -> $//' > $2 ) +} + buildhistory_list_pkg_files() { # Create individual files-in-package for each recipe's package for pkgdir in $(find ${PKGDEST}/* -maxdepth 0 -type d); do