Patchwork useradd.bbclass: Execute user addition code before do_package_setscene, not after do_populate_sysroot_setscene

login
register
mail settings
Submitter Richard Purdie
Date Jan. 26, 2012, 2:41 p.m.
Message ID <1327588911.19643.387.camel@ted>
Download mbox | patch
Permalink /patch/20185/
State Accepted
Commit 34282c1b996ef008384af456735692d66ddabc13
Headers show

Comments

Richard Purdie - Jan. 26, 2012, 2:41 p.m.
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.

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

Patch

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index e460f56..6ee575e 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -96,7 +96,7 @@  useradd_sysroot () {
 }
 
 useradd_sysroot_sstate () {
-	if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+	if [ "${BB_CURRENTTASK}" = "package_setscene" ]
 	then
 		useradd_sysroot
 	fi
@@ -106,7 +106,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 = ""