poky-tiny improvements

From: Tom Zanussi <[email protected]>

Rather than create an actual image, just put the image artifacts in an 'artifacts' directory that can then be picked up by wic.

Signed-off-by Tom Zanussi <[email protected]>

From: Tom Zanussi <[email protected]>

'ksum.py' generates a combined summary of vmlinux and module sizes for a built kernel, as a quick tool for comparing the overall effects of systemic tinification changes. Execute from the base directory of the kernel build you want to summarize. Setting the 'verbose' flag will display the sizes for each file included in the summary.

Signed-off-by Tom Zanussi <[email protected]>

---
 scripts/tiny/ksum.py | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100755 scripts/tiny/ksum.py

scripts/tiny/ksum.py new file +168 -1

new file mode 100755
index 0000000..d4f3892
@@ -0,0 +1,168 @@
+#!/usr/bin/env python
+# ex:ts=4:sw=4:sts=4:et
+# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
+#
+# Copyright (c) 2016, Intel Corporation.
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# DESCRIPTION 'ksum.py' generates a combined summary of vmlinux and
+# module sizes for a built kernel, as a quick tool for comparing the
+# overall effects of systemic tinification changes.  Execute from the
+# base directory of the kernel build you want to summarize.  Setting
+# the 'verbose' flag will display the sizes for each file included in
+# the summary.
+#
+# AUTHORS
+# Tom Zanussi <tom.zanussi (at] linux.intel.com>
+#
+
+__version__ = "0.1.0"
+
+# Python Standard Library modules
+import os
+import sys
+import getopt
+from subprocess import *
+
+def usage():
+    prog = os.path.basename(sys.argv[0])
+    print('Usage: %s [OPTION]...' % prog)
+    print('  -v,                 display sizes for each file')
+    print('  -h, --help          display this help and exit')
+    print('')
+    print('Run %s from the top-level Linux kernel build directory.' % prog)
+
+verbose = False
+
+n_ko_files = 0
+ko_file_list = []
+
+ko_text = 0
+ko_data = 0
+ko_bss = 0
+ko_total = 0
+
+vmlinux_file = ""
+vmlinux_level = 0
+
+vmlinux_text = 0
+vmlinux_data = 0
+vmlinux_bss = 0
+vmlinux_total = 0
+
+def is_vmlinux_file(filename):
+    global vmlinux_level
+    if filename == ("vmlinux") and vmlinux_level == 0:
+        vmlinux_level += 1
+        return True
+    return False
+
+def is_ko_file(filename):
+    if filename.endswith(".ko"):
+        return True
+    return False
+
+def collect_object_files():
+    print "Collecting object files recursively from %s..." % os.getcwd()
+    for dirpath, dirs, files in os.walk(os.getcwd()):
+        for filename in files:
+            if is_ko_file(filename):
+                ko_file_list.append(os.path.join(dirpath, filename))
+            elif is_vmlinux_file(filename):
+                global vmlinux_file
+                vmlinux_file = os.path.join(dirpath, filename)
+    print "Collecting object files [DONE]"
+
+def add_ko_file(filename):
+        p = Popen("size -t " + filename, shell=True, stdout=PIPE, stderr=PIPE)
+        output = p.communicate()[0].splitlines()
+        if len(output) > 2:
+            sizes = output[-1].split()[0:4]
+            if verbose:
+                print "     %10d %10d %10d %10d\t" % \
+                    (int(sizes[0]), int(sizes[1]), int(sizes[2]), int(sizes[3])),
+                print "%s" % filename[len(os.getcwd()) + 1:]
+            global n_ko_files, ko_text, ko_data, ko_bss, ko_total
+            ko_text += int(sizes[0])
+            ko_data += int(sizes[1])
+            ko_bss += int(sizes[2])
+            ko_total += int(sizes[3])
+            n_ko_files += 1
+
+def get_vmlinux_totals():
+        p = Popen("size -t " + vmlinux_file, shell=True, stdout=PIPE, stderr=PIPE)
+        output = p.communicate()[0].splitlines()
+        if len(output) > 2:
+            sizes = output[-1].split()[0:4]
+            if verbose:
+                print "     %10d %10d %10d %10d\t" % \
+                    (int(sizes[0]), int(sizes[1]), int(sizes[2]), int(sizes[3])),
+                print "%s" % vmlinux_file[len(os.getcwd()) + 1:]
+            global vmlinux_text, vmlinux_data, vmlinux_bss, vmlinux_total
+            vmlinux_text += int(sizes[0])
+            vmlinux_data += int(sizes[1])
+            vmlinux_bss += int(sizes[2])
+            vmlinux_total += int(sizes[3])
+
+def sum_ko_files():
+    for ko_file in ko_file_list:
+        add_ko_file(ko_file)
+
+def main():
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "vh", ["help"])
+    except getopt.GetoptError as err:
+        print('%s' % str(err))
+        usage()
+        sys.exit(2)
+
+    for o, a in opts:
+        if o == '-v':
+            global verbose
+            verbose = True
+        elif o in ('-h', '--help'):
+            usage()
+            sys.exit(0)
+        else:
+            assert False, "unhandled option"
+
+    collect_object_files()
+    sum_ko_files()
+    get_vmlinux_totals()
+
+    print "\nTotals:"
+    print "\nvmlinux:"
+    print "    text\tdata\t\tbss\t\ttotal"
+    print "    %-10d\t%-10d\t%-10d\t%-10d" % \
+        (vmlinux_text, vmlinux_data, vmlinux_bss, vmlinux_total)
+    print "\nmodules (%d):" % n_ko_files
+    print "    text\tdata\t\tbss\t\ttotal"
+    print "    %-10d\t%-10d\t%-10d\t%-10d" % \
+        (ko_text, ko_data, ko_bss, ko_total)
+    print "\nvmlinux + modules:"
+    print "    text\tdata\t\tbss\t\ttotal"
+    print "    %-10d\t%-10d\t%-10d\t%-10d" % \
+        (vmlinux_text + ko_text, vmlinux_data + ko_data, \
+         vmlinux_bss + ko_bss, vmlinux_total + ko_total)
+
+if __name__ == "__main__":
+    try:
+        ret = main()
+    except Exception:
+        ret = 1
+        import traceback
+        traceback.print_exc(5)
+    sys.exit(ret)
--

2.6.6

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

From: Tom Zanussi <[email protected]>

String errors and partial __cmp__ fix.

Signed-off-by Tom Zanussi <[email protected]>

---
 scripts/tiny/ksize.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

scripts/tiny/ksize.py +12 -6

index b9d2b19..ea1ca7f 100755
@@ -41,7 +41,7 @@ def usage():
 class Sizes:
     def __init__(self, glob):
         self.title = glob
-        p = Popen("size -t " + glob, shell=True, stdout=PIPE, stderr=PIPE)
+        p = Popen("size -t " + str(glob), shell=True, stdout=PIPE, stderr=PIPE)
         output = p.communicate()[0].splitlines()
         if len(output) > 2:
             sizes = output[-1].split()[0:4]

@@ -62,18 +62,18 @@ class Report:
         r = Report(filename, title)
         path = os.path.dirname(filename)
 
-        p = Popen("ls " + path + "/*.o | grep -v built-in.o",
+        p = Popen("ls " + str(path) + "/*.o | grep -v built-in.o",
                   shell=True, stdout=PIPE, stderr=PIPE)
         glob = ' '.join(p.communicate()[0].splitlines())
-        oreport = Report(glob, path + "/*.o")
-        oreport.sizes.title = path + "/*.o"
+        oreport = Report(glob, str(path) + "/*.o")
+        oreport.sizes.title = str(path) + "/*.o"
         r.parts.append(oreport)
 
         if subglob:
             p = Popen("ls " + subglob, shell=True, stdout=PIPE, stderr=PIPE)
             for f in p.communicate()[0].splitlines():
                 path = os.path.dirname(f)
-                r.parts.append(Report.create(f, path, path + "/*/built-in.o"))
+                r.parts.append(Report.create(f, path, str(path) + "/*/built-in.o"))
             r.parts.sort(reverse=True)
 
         for b in r.parts:

@@ -116,6 +116,13 @@ class Report:
                self.deltas["data"], self.deltas["bss"]))
         print("\n")
 
+    def __lt__(this, that):
+        if that is None:
+            return 1
+        if not isinstance(that, Report):
+            raise TypeError
+        return this.sizes.total < that.sizes.total
+
     def __cmp__(this, that):
         if that is None:
             return 1
--

2.6.6

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Quoted 3 lines · Alejandro Hernandez

From: Tom Zanussi <[email protected]>

String errors and partial __cmp__ fix.

may be fold it into previous patch.

Quoted 63 lines

Signed-off-by Tom Zanussi <[email protected]>

---
  scripts/tiny/ksize.py | 17 ++++++++++++-----
  1 file changed, 12 insertions(+), 5 deletions(-)

scripts/tiny/ksize.py +12 -6

index b9d2b19..ea1ca7f 100755
@@ -41,7 +41,7 @@ def usage():
  class Sizes:
      def __init__(self, glob):
          self.title = glob
-        p = Popen("size -t " + glob, shell=True, stdout=PIPE, stderr=PIPE)
+        p = Popen("size -t " + str(glob), shell=True, stdout=PIPE, stderr=PIPE)
          output = p.communicate()[0].splitlines()
          if len(output) > 2:
              sizes = output[-1].split()[0:4]

@@ -62,18 +62,18 @@ class Report:
          r = Report(filename, title)
          path = os.path.dirname(filename)
 
-        p = Popen("ls " + path + "/*.o | grep -v built-in.o",
+        p = Popen("ls " + str(path) + "/*.o | grep -v built-in.o",
                    shell=True, stdout=PIPE, stderr=PIPE)
          glob = ' '.join(p.communicate()[0].splitlines())
-        oreport = Report(glob, path + "/*.o")
-        oreport.sizes.title = path + "/*.o"
+        oreport = Report(glob, str(path) + "/*.o")
+        oreport.sizes.title = str(path) + "/*.o"
          r.parts.append(oreport)
 
          if subglob:
              p = Popen("ls " + subglob, shell=True, stdout=PIPE, stderr=PIPE)
              for f in p.communicate()[0].splitlines():
                  path = os.path.dirname(f)
-                r.parts.append(Report.create(f, path, path + "/*/built-in.o"))
+                r.parts.append(Report.create(f, path, str(path) + "/*/built-in.o"))
              r.parts.sort(reverse=True)
 
          for b in r.parts:

@@ -116,6 +116,13 @@ class Report:
                 self.deltas["data"], self.deltas["bss"]))
          print("\n")
 
+    def __lt__(this, that):
+        if that is None:
+            return 1
+        if not isinstance(that, Report):
+            raise TypeError
+        return this.sizes.total < that.sizes.total
+
      def __cmp__(this, that):
          if that is None:
              return 1
--

2.6.6

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

From: Tom Zanussi <[email protected]>

Add an image that simply creates image artifacts using image-live-artifacts support instead of creating an actual image.

The image artifacts can then be subsequently assembled by an external tool such as wic to create an actual image.

This eliminates redundant image creation when using such tools.

---
  .../images/core-image-tiny-initramfs.bb            | 31 ++++++++++++++++++++++
  1 file changed, 31 insertions(+)

create mode 100644 meta/recipes-core/images/core-image-tiny-initramfs.bb

meta/recipes-core/images/core-image-tiny-initramfs.bb new file +31 -0

new file mode 100644
index 0000000..216f3e0
@@ -0,0 +1,31 @@
+# Simple initramfs image artifact generation for tiny images.
+DESCRIPTION = "Tiny image capable of booting a device. The kernel includes \
+the Minimal RAM-based Initial Root Filesystem (initramfs), which finds the \
+first 'init' program more efficiently.  core-image-tiny-initramfs doesn't \
+actually generate an image but rather generates boot and rootfs artifacts \
+into a common location that can subsequently be picked up by external image \
+generation tools such as wic."
+
+PACKAGE_INSTALL = "initramfs-live-boot packagegroup-core-boot dropbear ${VIRTUAL-RUNTIME_base-utils} udev base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
+
+# Do not pollute the initrd image with rootfs features
+IMAGE_FEATURES = ""
+
+export IMAGE_BASENAME = "core-image-tiny-initramfs"
+IMAGE_LINGUAS = ""
+
+LICENSE = "MIT"
+
+# don't actually generate an image, just the artifacts needed for one
+ARTIFACTS_ONLY ?= "1"
+
+IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
+inherit core-image
+
+IMAGE_ROOTFS_SIZE = "8192"
+IMAGE_ROOTFS_EXTRA_SPACE = "0"
+
+BAD_RECOMMENDATIONS += "busybox-syslog"
+
+# Use the same restriction as initramfs-live-install
+COMPATIBLE_HOST = "(i.86|x86_64).*-linux"

Hey Khem,

Its an old script fro Tom, but as far as I remember it worked fine on python3, although thanks for checking and sending the patch!

Cheers

Alejandro

Quoted 75 lines · Khem Raj

Quoted 3 lines · Alejandro Hernandez

From: Tom Zanussi <[email protected]>

String errors and partial __cmp__ fix.

may be fold it into previous patch.

Quoted 68 lines

Signed-off-by Tom Zanussi <[email protected]>

---
  scripts/tiny/ksize.py | 17 ++++++++++++-----
  1 file changed, 12 insertions(+), 5 deletions(-)

scripts/tiny/ksize.py +1 -1

index b9d2b19..ea1ca7f 100755
@@ -41,7 +41,7 @@ def usage():
  class Sizes:
      def __init__(self, glob):
          self.title = glob
-        p = Popen("size -t " + glob, shell=True, stdout=PIPE, 
 stderr=PIPE)
+        p = Popen("size -t " + str(glob), shell=True, stdout=PIPE, 
 stderr=PIPE)
          output = p.communicate()[0].splitlines()

          if len(output) > 2:
              sizes = output[-1].split()[0:4]

scripts/tiny/ksize.py +4 -4

@@ -62,18 +62,18 @@ class Report:
          r = Report(filename, title)
          path = os.path.dirname(filename)
 
-        p = Popen("ls " + path + "/*.o | grep -v built-in.o",
+        p = Popen("ls " + str(path) + "/*.o | grep -v built-in.o",
                    shell=True, stdout=PIPE, stderr=PIPE)
          glob = ' '.join(p.communicate()[0].splitlines())
-        oreport = Report(glob, path + "/*.o")
-        oreport.sizes.title = path + "/*.o"
+        oreport = Report(glob, str(path) + "/*.o")
+        oreport.sizes.title = str(path) + "/*.o"
          r.parts.append(oreport)
 
          if subglob:
              p = Popen("ls " + subglob, shell=True, stdout=PIPE, 
 stderr=PIPE)
              for f in p.communicate()[0].splitlines():
                  path = os.path.dirname(f)
-                r.parts.append(Report.create(f, path, path + 
 "/*/built-in.o"))
+                r.parts.append(Report.create(f, path, str(path) + 
 "/*/built-in.o"))

r.parts.sort(reverse=True)

for b in r.parts:

scripts/tiny/ksize.py +7 -0

@@ -116,6 +116,13 @@ class Report:
                 self.deltas["data"], self.deltas["bss"]))
          print("\n")
 
+    def __lt__(this, that):
+        if that is None:
+            return 1
+        if not isinstance(that, Report):
+            raise TypeError
+        return this.sizes.total < that.sizes.total
+
      def __cmp__(this, that):
          if that is None:
              return 1

Signature · 7 lines

2.6.6

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Hey Khem,

Ok, now I'm actually awake when reading this, are you saying these changes should go in the same patch as the one for ksum.py?

Quoted 93 lines

Hey Khem,

Its an old script fro Tom, but as far as I remember it worked fine on python3, although thanks for checking and sending the patch!

Cheers

Alejandro

Quoted 78 lines · Khem Raj

Quoted 4 lines · Alejandro Hernandez

From: Tom Zanussi <[email protected]>

String errors and partial __cmp__ fix.

may be fold it into previous patch.

Quoted 68 lines

Signed-off-by Tom Zanussi <[email protected]>

---
  scripts/tiny/ksize.py | 17 ++++++++++++-----
  1 file changed, 12 insertions(+), 5 deletions(-)

scripts/tiny/ksize.py +1 -1

index b9d2b19..ea1ca7f 100755
@@ -41,7 +41,7 @@ def usage():
  class Sizes:
      def __init__(self, glob):
          self.title = glob
-        p = Popen("size -t " + glob, shell=True, stdout=PIPE,
 stderr=PIPE)
+        p = Popen("size -t " + str(glob), shell=True, stdout=PIPE,
 stderr=PIPE)
          output = p.communicate()[0].splitlines()

          if len(output) > 2:
              sizes = output[-1].split()[0:4]

scripts/tiny/ksize.py +4 -4

@@ -62,18 +62,18 @@ class Report:
          r = Report(filename, title)
          path = os.path.dirname(filename)
 
-        p = Popen("ls " + path + "/*.o | grep -v built-in.o",
+        p = Popen("ls " + str(path) + "/*.o | grep -v built-in.o",
                    shell=True, stdout=PIPE, stderr=PIPE)
          glob = ' '.join(p.communicate()[0].splitlines())
-        oreport = Report(glob, path + "/*.o")
-        oreport.sizes.title = path + "/*.o"
+        oreport = Report(glob, str(path) + "/*.o")
+        oreport.sizes.title = str(path) + "/*.o"
          r.parts.append(oreport)
 
          if subglob:
              p = Popen("ls " + subglob, shell=True, stdout=PIPE,
 stderr=PIPE)
              for f in p.communicate()[0].splitlines():
                  path = os.path.dirname(f)
-                r.parts.append(Report.create(f, path, path +
 "/*/built-in.o"))
+                r.parts.append(Report.create(f, path, str(path) +
 "/*/built-in.o"))

r.parts.sort(reverse=True)

for b in r.parts:

scripts/tiny/ksize.py +7 -1

@@ -116,6 +116,13 @@ class Report:
                 self.deltas["data"], self.deltas["bss"]))
          print("\n")
 
+    def __lt__(this, that):
+        if that is None:
+            return 1
+        if not isinstance(that, Report):
+            raise TypeError
+        return this.sizes.total < that.sizes.total
+
      def __cmp__(this, that):
          if that is None:
              return 1
--

2.6.6

--
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core