From a073a3e2d3c9d3ee64ef9b64ee13f386123568d9 Mon Sep 17 00:00:00 2001 From: jan Date: Thu, 7 May 2020 15:25:36 +0200 Subject: scripts/tiny/ksize: Fix for more recent kernels In the past kernel built object files were named 'built-in.o'. Nowadays it is 'built-in.a'. The script is modified to work with both. I expect it will not happen that there are built-in.a and built-in.o files in the same kernel. (From OE-Core rev: facc8a5859d95c416aff8313bec3f3a6d5ef5fec) Signed-off-by: Jan Vermaete Signed-off-by: Richard Purdie --- scripts/tiny/ksize.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/tiny/ksize.py b/scripts/tiny/ksize.py index 8316b85cb1..db2b9ec39f 100755 --- a/scripts/tiny/ksize.py +++ b/scripts/tiny/ksize.py @@ -4,7 +4,7 @@ # # SPDX-License-Identifier: GPL-2.0-or-later # -# Display details of the kernel build size, broken up by built-in.o. Sort +# Display details of the kernel build size, broken up by built-in.[o,a]. Sort # the objects by size. Run from the top level kernel build directory. # # Author: Darren Hart @@ -59,7 +59,7 @@ class Report: p = Popen("ls " + subglob, shell=True, stdout=PIPE, stderr=PIPE, universal_newlines=True) for f in p.communicate()[0].splitlines(): path = os.path.dirname(f) - r.parts.append(Report.create(f, path, str(path) + "/*/built-in.o")) + r.parts.append(Report.create(f, path, str(path) + "/*/built-in.[o,a]")) r.parts.sort(reverse=True) for b in r.parts: @@ -139,7 +139,7 @@ def main(): else: assert False, "unhandled option" - glob = "arch/*/built-in.o */built-in.o" + glob = "arch/*/built-in.[o,a] */built-in.[o,a]" vmlinux = Report.create("vmlinux", "Linux Kernel", glob) vmlinux.show() -- cgit v1.2.3-54-g00ecf