[PATCH 1/2] package: Add INHIBIT_PACKAGE_STRIP_FILES to allow files to remain unstripped

[PATCH 1/2] package: Add INHIBIT_PACKAGE_STRIP_FILES to allow files to remain unstripped

[Richard Purdie]

There are cases where its useful to allow only a select few files
to be excluded from the package stripping mechanism. Currently
this isn't possible so add a variable to allow this.

This is to be used sparingly as in general the core code should be
doing the right thing. This is better than the alternative of leaving the whole
package unstripped.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/package.bbclass | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 6a7f35a..90e5236 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -946,6 +946,7 @@ python split_and_strip_files () {
     inodes = {}
     libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir"))
     baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir"))
+    skipfiles = (d.getVar("INHIBIT_PACKAGE_STRIP_FILES") or "").split()
     if (d.getVar('INHIBIT_PACKAGE_STRIP') != '1' or \
             d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT') != '1'):
         for root, dirs, files in cpath.walk(dvar):
@@ -961,6 +962,9 @@ python split_and_strip_files () {
                 if debugdir and debugdir in os.path.dirname(file[len(dvar):]):
                     continue
 
+                if file in skipfiles:
+                    continue
+
                 try:
                     ltarget = cpath.realpath(file, dvar, False)
                     s = cpath.lstat(ltarget)
-- 
2.7.4

[PATCH 2/2] ltp: Improve package stripping

[Richard Purdie]

Just exclude the specific tests which have an issue with being stripped
rather than the whole package. This reduces the disk footprint by around
400MB.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-extended/ltp/ltp_20180118.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/ltp/ltp_20180118.bb b/meta/recipes-extended/ltp/ltp_20180118.bb
index 369b98d..3ed7172 100644
--- a/meta/recipes-extended/ltp/ltp_20180118.bb
+++ b/meta/recipes-extended/ltp/ltp_20180118.bb
@@ -102,10 +102,8 @@ RDEPENDS_${PN} = "\
 
 FILES_${PN} += "/opt/ltp/* /opt/ltp/runtest/* /opt/ltp/scenario_groups/* /opt/ltp/testcases/bin/* /opt/ltp/testcases/bin/*/bin/* /opt/ltp/testscripts/* /opt/ltp/testcases/open_posix_testsuite/* /opt/ltp/testcases/open_posix_testsuite/conformance/* /opt/ltp/testcases/open_posix_testsuite/Documentation/* /opt/ltp/testcases/open_posix_testsuite/functional/* /opt/ltp/testcases/open_posix_testsuite/include/* /opt/ltp/testcases/open_posix_testsuite/scripts/* /opt/ltp/testcases/open_posix_testsuite/stress/* /opt/ltp/testcases/open_posix_testsuite/tools/* /opt/ltp/testcases/data/nm01/lib.a /opt/ltp/lib/libmem.a"
 
-# Avoid generated binaries stripping. Otherwise some of the ltp tests such as ldd01 & nm01 fails
-INHIBIT_PACKAGE_STRIP = "1"
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-# However, test_arch_stripped is already stripped, so...
+# Avoid stripping some generated binaries otherwise some of the ltp tests such as ldd01 & nm01 fail
+INHIBIT_PACKAGE_STRIP_FILES = "/opt/ltp/testcases/bin/nm01 /opt/ltp/testcases/bin/ldd01"
 INSANE_SKIP_${PN} += "already-stripped staticdev"
 
 # Avoid file dependency scans, as LTP checks for things that may or may not
-- 
2.7.4

Re: [PATCH 1/2] package: Add INHIBIT_PACKAGE_STRIP_FILES to allow files to remain unstripped

[Khem Raj]

On Wed, Feb 14, 2018 at 7:07 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> There are cases where its useful to allow only a select few files
> to be excluded from the package stripping mechanism. Currently
> this isn't possible so add a variable to allow this.
>
> This is to be used sparingly as in general the core code should be
> doing the right thing. This is better than the alternative of leaving the whole
> package unstripped.

This variable should be documented in manual as well IMO

>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/classes/package.bbclass | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index 6a7f35a..90e5236 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -946,6 +946,7 @@ python split_and_strip_files () {
>      inodes = {}
>      libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir"))
>      baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir"))
> +    skipfiles = (d.getVar("INHIBIT_PACKAGE_STRIP_FILES") or "").split()
>      if (d.getVar('INHIBIT_PACKAGE_STRIP') != '1' or \
>              d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT') != '1'):
>          for root, dirs, files in cpath.walk(dvar):
> @@ -961,6 +962,9 @@ python split_and_strip_files () {
>                  if debugdir and debugdir in os.path.dirname(file[len(dvar):]):
>                      continue
>
> +                if file in skipfiles:
> +                    continue
> +
>                  try:
>                      ltarget = cpath.realpath(file, dvar, False)
>                      s = cpath.lstat(ltarget)
> --
> 2.7.4
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 1/2] package: Add INHIBIT_PACKAGE_STRIP_FILES to allow files to remain unstripped

[Alejandro Enedino Hernandez Samaniego]

Hey Richard,


Do we expect to backport this to older releases?


Cheers,


Alejandro


On 02/14/2018 07:07 AM, Richard Purdie wrote:
> There are cases where its useful to allow only a select few files
> to be excluded from the package stripping mechanism. Currently
> this isn't possible so add a variable to allow this.
>
> This is to be used sparingly as in general the core code should be
> doing the right thing. This is better than the alternative of leaving the whole
> package unstripped.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>   meta/classes/package.bbclass | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index 6a7f35a..90e5236 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -946,6 +946,7 @@ python split_and_strip_files () {
>       inodes = {}
>       libdir = os.path.abspath(dvar + os.sep + d.getVar("libdir"))
>       baselibdir = os.path.abspath(dvar + os.sep + d.getVar("base_libdir"))
> +    skipfiles = (d.getVar("INHIBIT_PACKAGE_STRIP_FILES") or "").split()
>       if (d.getVar('INHIBIT_PACKAGE_STRIP') != '1' or \
>               d.getVar('INHIBIT_PACKAGE_DEBUG_SPLIT') != '1'):
>           for root, dirs, files in cpath.walk(dvar):
> @@ -961,6 +962,9 @@ python split_and_strip_files () {
>                   if debugdir and debugdir in os.path.dirname(file[len(dvar):]):
>                       continue
>   
> +                if file in skipfiles:
> +                    continue
> +
>                   try:
>                       ltarget = cpath.realpath(file, dvar, False)
>                       s = cpath.lstat(ltarget)