[oe-commits] [openembedded-core] 17/23: package.bbclass: improve permission handling
git at git.openembedded.org
git at git.openembedded.org
Thu Apr 14 09:59:23 UTC 2016
rpurdie pushed a commit to branch krogoth
in repository openembedded-core.
commit b7504ece784fad997e72f4cd89cdf73f24901541
Author: Dan McGregor <dan.mcgregor at usask.ca>
AuthorDate: Wed Apr 13 16:17:56 2016 -0600
package.bbclass: improve permission handling
Change fs_link_table to be keyed by path, just like fs_perms_table.
When a new entry is coming in for either table, remove any previous
entry for that path. This way later permission file entries override
earlier ones.
[YOCTO #9430]
Signed-off-by: Dan McGregor <dan.mcgregor at usask.ca>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/package.bbclass | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 894b729..76b9f86 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -775,9 +775,13 @@ python fixup_perms () {
entry = fs_perms_entry(d.expand(line))
if entry and entry.path:
if entry.link:
- fs_link_table[entry.link] = entry
+ fs_link_table[entry.path] = entry
+ if entry.path in fs_perms_table:
+ fs_perms_table.pop(entry.path)
else:
fs_perms_table[entry.path] = entry
+ if entry.path in fs_link_table:
+ fs_link_table.pop(entry.path)
f.close()
# Debug -- list out in-memory table
@@ -789,8 +793,9 @@ python fixup_perms () {
# We process links first, so we can go back and fixup directory ownership
# for any newly created directories
# Process in sorted order so /run gets created before /run/lock, etc.
- for link in sorted(fs_link_table):
- dir = fs_link_table[link].path
+ for entry in sorted(fs_link_table.values(), key=lambda x: x.link):
+ link = entry.link
+ dir = entry.path
origin = dvar + dir
if not (cpath.exists(origin) and cpath.isdir(origin) and not cpath.islink(origin)):
continue
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list