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

PATCH New Richard Purdie 1 participant 1 message Jan 26, 2012

Share & tools

Richard Purdie

author

2012-01-26 14:49 UTC #0 lore raw

PATCH 1/1 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.

Signed-off-by Richard Purdie <[email protected]>

---

meta/classes/useradd.bbclass +2 -2

index e460f56..6ee575e 100644
@@ -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 = ""