From patchwork Mon Jul 8 23:46:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 168694 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp7774612ilk; Mon, 8 Jul 2019 16:46:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqx8aICq49nZqwQC/jFM7Kz58Ck6W+hbTCFO0xUID7nrZ3Vi2cMBLfbARb/ksHiw00RG3250 X-Received: by 2002:a17:902:fe14:: with SMTP id g20mr26713438plj.54.1562629615597; Mon, 08 Jul 2019 16:46:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562629615; cv=none; d=google.com; s=arc-20160816; b=V5s1TdR2bWzc/RQ8r3tQ+AUgUuEZcrEBGKttzQxXFEslYUf1Cdb81d4p71IsAh973o LVb1OAjH55hLqvBSp5ev+Ya4UElV9qN92G6ZLmeyZW5/Q5DKvIkrWQFKzlqoLnPBNUkn tWeRQ78CMqA7zhu2upiPEpYI/yMI8V+kR6zDhTNjcuJy+B7e2ezbcv6/hofLZZKYIhKg RuHU71yswxPP4asTssnluWwlEOWnVYOnbMSifiU3SX9nmre/jGfuDGMq6UqYfbeAMMLx UeGHlK6zHs0+DHPGMWZKMpyQ36pSLebyB+8ByXAIA/b89t3tHQUY6OC/MA6miAgxIK19 t8uw== 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=SCafQDwz8pQxaz0oYiyyu0f7X+2XMr0zDuMmcEU5Ssdjca8kpRGEfdcDGeVrDcGck2 k6Nf6y6idyUPfOMiL59cLGArdg02UQ5K9FJWSLXcTqMwFSX7tVhDqdYYOExmTeQ2o+aA 5Nf/1UwQ4KVxHPaDuC/t0JoX58pJPZOMLJXaUew7V+zPP/5RG2n5EKuXoxDBGoonytzl jbSj0/rv9YWqvwX167V1XpwQ9AZIV5oKqVTMxuww4o2KbkNGd5niG/rWwb8FO60CeuX9 tCK7xidgV1w7WADC9oQOGeSK4bJ0UNPEbnAwqqHF+38qTuJcOTIDTufxGP8TZ5WprRMy 7g2g== 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=IPltadOU; 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 v1si13386508plb.381.2019.07.08.16.46.55; Mon, 08 Jul 2019 16:46:55 -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=IPltadOU; 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 4E4077C37F; Mon, 8 Jul 2019 23:46:49 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mail.openembedded.org (Postfix) with ESMTP id 9F9277C37F for ; Mon, 8 Jul 2019 23:46:47 +0000 (UTC) Received: by mail-wr1-f50.google.com with SMTP id f9so18925247wre.12 for ; Mon, 08 Jul 2019 16:46:48 -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=IPltadOUCJWkBFZ9a5Ab8SnZo9+lBabkoxNQX1EmKO/gvwqOrBdIzqWb9FwKGSE6bA j9FrzJ6Toco6fcekxHtOYUPEoT6ykfF51yPf3Hr8eQLPyPv6x2LLQkXhCKYChB6Kf5hf 3GnFS1CYDC8yjTAvhBQhKglZfgMXLMqU/XC12Y+Ko1VnECQmIJg9jteIwMC2Z+wR95kO fKytzDSV/xjdb+bqfzC1eoDrwEwMaRMb5zGYxEhBzSTxgGuqx3BmphKZBTdrgkaGXGaV I/oZwWseDyK/agsatgTCwSIATTzkTMnb0SnF+DYz/PZb0cop/Kfh8F/JRz8tMqoZmoXN DasA== 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=RJvJ8ckxOWn1dVaKAUnWTBoyx84SiNGNQdRd+kKSRgxj+/kQCLaMjhQw4/ulA4sGg7 0Ks0w6UsTuXCl3GleuG1IhK9Hgj7oqPa8DqX9PJJCpmSp8WdwGbbt6uQB5OdagkPpHBn anwLR0JmwosFlCBPbG1bqoRck6vRd3mQILDmnnVeqViwV8DsQZXnAV3vTuxTAtc3zMzl es1cW5ZOppNvYfkJ44Z/OtyV4CIvcb4f0Ftg7dgqgdh7q8zfKvJnqodDMJSpJAcFksnP J13dEDrnlSKnI9JaF8souRUutLGGAD1eppa8U6f1TzZVCH+3Y2kH/35LAaP5nYw1iIUq ulQA== X-Gm-Message-State: APjAAAX7Nr1k2CYEsNsAT5RgHLYYyiAEgJRiOPnOameuno69h8OwQYJw W53Dw2WHSRJOmabJhiSV1daB7oxmiLY= X-Received: by 2002:a5d:6908:: with SMTP id t8mr21873526wru.147.1562629607962; Mon, 08 Jul 2019 16:46:47 -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 t13sm480827wrr.0.2019.07.08.16.46.46 for (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 08 Jul 2019 16:46:47 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 9 Jul 2019 00:46:43 +0100 Message-Id: <20190708234643.15636-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