diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-26 14:41:51 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-31 21:11:43 +0100 |
commit | e2c5e5a513b9f9bf34d2970b43b1582d9c85f0bb (patch) | |
tree | 028cb5c8d110959c1fc078bc96e502e205ae1fe8 /meta | |
parent | c5a9efca9671ce0c526701463f480dbb387aacce (diff) | |
download | poky-e2c5e5a513b9f9bf34d2970b43b1582d9c85f0bb.tar.gz |
useradd.bbclass: Execute user addition code before do_package_setscene, not after do_populate_sysroot_setscene
The user addition needs to happen before the do_package files are extracted
by do_package_setscene since those are the ones we need to preserve the file
ownership information for. This patch ensures this happens.
(From OE-Core rev: 34282c1b996ef008384af456735692d66ddabc13)
(From OE-Core rev: b571766ffc7ec5aa78035557c25a0e8b244c17c8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/useradd.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 4e4ac032e4..27647cbc8b 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass | |||
@@ -90,7 +90,7 @@ useradd_sysroot () { | |||
90 | } | 90 | } |
91 | 91 | ||
92 | useradd_sysroot_sstate () { | 92 | useradd_sysroot_sstate () { |
93 | if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] | 93 | if [ "${BB_CURRENTTASK}" = "package_setscene" ] |
94 | then | 94 | then |
95 | useradd_sysroot | 95 | useradd_sysroot |
96 | fi | 96 | fi |
@@ -100,7 +100,7 @@ do_install[prefuncs] += "${SYSROOTFUNC}" | |||
100 | SYSROOTFUNC = "useradd_sysroot" | 100 | SYSROOTFUNC = "useradd_sysroot" |
101 | SYSROOTFUNC_virtclass-native = "" | 101 | SYSROOTFUNC_virtclass-native = "" |
102 | SYSROOTFUNC_virtclass-nativesdk = "" | 102 | SYSROOTFUNC_virtclass-nativesdk = "" |
103 | SSTATEPOSTINSTFUNCS += "${SYSROOTPOSTFUNC}" | 103 | SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}" |
104 | SYSROOTPOSTFUNC = "useradd_sysroot_sstate" | 104 | SYSROOTPOSTFUNC = "useradd_sysroot_sstate" |
105 | SYSROOTPOSTFUNC_virtclass-native = "" | 105 | SYSROOTPOSTFUNC_virtclass-native = "" |
106 | SYSROOTPOSTFUNC_virtclass-nativesdk = "" | 106 | SYSROOTPOSTFUNC_virtclass-nativesdk = "" |