fs-perms: Ensure /usr/src/debug/ file modes are correct

If files are copied into /usr/src/debug directly from WORKDIR (e.g. makedevs)
we'd get the permissions from the checkout which would depend on the host umask.

Avoid this and be deterministic by setting the file modes consistently. Core
code copies the files in so we're responsible for the permissions.

Unfortunately to force this change to apply we need to invalidate both
the package tasks and the hash equivalance mappings since file mode
'corruption' already made it into the output hashes (both input options
were mapped to the output hashes).

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 1f958bcd6c9cd12ec76d80586cba15f4d6ed17a7)
Signed-off-by: Steve Sakoman <steve@sakoman.com>

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index cc64ddffc3f450cf00b3c1dc107cec40dc5293b0..7c252dd46b539e45b5e35a43da2c600c96c2236e 100644 (file)
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -2225,7 +2225,7 @@ python do_package () {
     # cache.  This is useful if an item this class depends on changes in a
     # way that the output of this class changes.  rpmdeps is a good example
     # as any change to rpmdeps requires this to be rerun.
-    # PACKAGE_BBCLASS_VERSION = "2"
+    # PACKAGE_BBCLASS_VERSION = "4"
 
     # Init cachedpath
     global cpath

diff --git a/meta/conf/abi_version.conf b/meta/conf/abi_version.conf
index 2bdc55695bd988fae15f34abc744a24a4f6bc187..0a3fb307c847613921feb9faf3b9b611d58d90fa 100644 (file)
--- a/meta/conf/abi_version.conf
+++ b/meta/conf/abi_version.conf
@@ -12,4 +12,4 @@ OELAYOUT_ABI = "12"
 # a reset of the equivalence, for example when reproducibility issues break the
 # existing match data. Distros can also append to this value for the same effect.
 #
-HASHEQUIV_HASH_VERSION  = "1"
+HASHEQUIV_HASH_VERSION  = "4"

diff --git a/meta/files/fs-perms-persistent-log.txt b/meta/files/fs-perms-persistent-log.txt
index 3a7cf3ab94539ff6e02dedcdf99dc197903e58d0..518c1be3c93b7f6ba78ca0aab0f462466c4bd61d 100644 (file)
--- a/meta/files/fs-perms-persistent-log.txt
+++ b/meta/files/fs-perms-persistent-log.txt
@@ -41,7 +41,7 @@ ${includedir}         0755    root    root    true    0644    root    root
 ${oldincludedir}       0755    root    root    true    0644    root    root
 
 # Cleanup debug src
-/usr/src/debug         0755    root    root    true    -       root    root
+/usr/src/debug         0755    root    root    true    0644    root    root
 
 # Items from base-files
 # Links

diff --git a/meta/files/fs-perms.txt b/meta/files/fs-perms.txt
index c8c3ac5dbed419804885f62a0f88eee4a1df428a..daa4aed840fe7929bba31e0f55605c71dc7b1ff4 100644 (file)
--- a/meta/files/fs-perms.txt
+++ b/meta/files/fs-perms.txt
@@ -41,7 +41,7 @@ ${includedir}         0755    root    root    true    0644    root    root
 ${oldincludedir}       0755    root    root    true    0644    root    root
 
 # Cleanup debug src
-/usr/src/debug         0755    root    root    true    -       root    root
+/usr/src/debug         0755    root    root    true    0644    root    root
 
 # Items from base-files
 # Links