Patchwork useradd.bbclass: use correct value for $D in postinst functions

login
register
mail settings
Submitter Phil Blundell
Date Sept. 7, 2011, 8:20 p.m.
Message ID <1315426812.4368.1.camel@lenovo.internal.reciva.com>
Download mbox | patch
Permalink /patch/11211/
State New, archived
Headers show

Comments

Phil Blundell - Sept. 7, 2011, 8:20 p.m.
This corrects the location of the password file used during package installation. 

See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009183.html and subsequent discussion.

Signed-off-by: Phil Blundell <philb@gnu.org>
---
 meta/classes/useradd.bbclass |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Saul Wold - Sept. 8, 2011, 3:55 a.m.
On 09/07/2011 01:20 PM, Phil Blundell wrote:
> This corrects the location of the password file used during package installation.
>
> See http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009183.html and subsequent discussion.
>
> Signed-off-by: Phil Blundell<philb@gnu.org>
> ---
>   meta/classes/useradd.bbclass |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
> index 5f5b68d..1e03a04 100644
> --- a/meta/classes/useradd.bbclass
> +++ b/meta/classes/useradd.bbclass
> @@ -15,8 +15,8 @@ SYSROOT=""
>
>   if test "x$D" != "x"; then
>   	# Installing into a sysroot
> -	SYSROOT="${STAGING_DIR_TARGET}"
> -	OPT="--root ${STAGING_DIR_TARGET}"
> +	SYSROOT="$D"
> +	OPT="--root $D"
>
>   	# Add groups and users defined for all recipe packages
>   	GROUPADD_PARAM="${@get_all_cmd_params(d, 'group')}"
> @@ -79,7 +79,7 @@ useradd_sysroot () {
>
>   	# Explicitly set $D since it isn't set to anything
>   	# before do_install
> -	D=${D}
> +	D=${STAGING_DIR_TARGET}
>   	useradd_preinst
>   }
>

Merged into OE-Core

Thanks
	Sau!

Patch

diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass
index 5f5b68d..1e03a04 100644
--- a/meta/classes/useradd.bbclass
+++ b/meta/classes/useradd.bbclass
@@ -15,8 +15,8 @@  SYSROOT=""
 
 if test "x$D" != "x"; then
 	# Installing into a sysroot
-	SYSROOT="${STAGING_DIR_TARGET}"
-	OPT="--root ${STAGING_DIR_TARGET}"
+	SYSROOT="$D"
+	OPT="--root $D"
 
 	# Add groups and users defined for all recipe packages
 	GROUPADD_PARAM="${@get_all_cmd_params(d, 'group')}"
@@ -79,7 +79,7 @@  useradd_sysroot () {
 
 	# Explicitly set $D since it isn't set to anything
 	# before do_install
-	D=${D}
+	D=${STAGING_DIR_TARGET}
 	useradd_preinst
 }