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)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

1 files changed, 2 insertions, 2 deletions

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index ef1a9cec9f..2cffbfa12c 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -90,7 +90,7 @@ useradd_sysroot () {
 }
 
 useradd_sysroot_sstate () {
-        if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+        if [ "${BB_CURRENTTASK}" = "package_setscene" ]
         then
                 useradd_sysroot
         fi
@@ -100,7 +100,7 @@ do_install[prefuncs] += "${SYSROOTFUNC}"
 SYSROOTFUNC = "useradd_sysroot"
 SYSROOTFUNC_virtclass-native = ""
 SYSROOTFUNC_virtclass-nativesdk = ""
-SSTATEPOSTINSTFUNCS += "${SYSROOTPOSTFUNC}"
+SSTATEPREINSTFUNCS += "${SYSROOTPOSTFUNC}"
 SYSROOTPOSTFUNC = "useradd_sysroot_sstate"
 SYSROOTPOSTFUNC_virtclass-native = ""
 SYSROOTPOSTFUNC_virtclass-nativesdk = ""