Patchwork [01/16] Remove useless (and incompatible with osx) install argument

login
register
mail settings
Submitter Yann Diorcet
Date Oct. 21, 2012, 3:37 p.m.
Message ID <1350833876-9499-1-git-send-email-diorcet.yann@gmail.com>
Download mbox | patch
Permalink /patch/193024/
State Accepted
Headers show

Comments

Yann Diorcet - Oct. 21, 2012, 3:37 p.m.
From: Yann Diorcet <yann.diorcet@belledonne-communications.com>

Make it works on darwin
---
 recipes/base-passwd/base-passwd.oe         |    4 ++--
 recipes/base-passwd/debian-base-passwd.inc |    5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
Esben Haabendal - Dec. 14, 2012, 7:42 p.m.
Yann Diorcet <diorcet.yann@gmail.com> writes:

> From: Yann Diorcet <yann.diorcet@belledonne-communications.com>
>
> Make it works on darwin
> ---
>  recipes/base-passwd/base-passwd.oe         |    4 ++--
>  recipes/base-passwd/debian-base-passwd.inc |    5 +++--
>  2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/recipes/base-passwd/base-passwd.oe b/recipes/base-passwd/base-passwd.oe
> index adbff61..188a565 100644
> --- a/recipes/base-passwd/base-passwd.oe
> +++ b/recipes/base-passwd/base-passwd.oe
> @@ -6,8 +6,8 @@ S = "${SRCDIR}"
>  
>  do_install () {
>  	install -d ${D}${sysconfdir}/
> -	install -D -p -m 644 passwd ${D}${sysconfdir}/
> -	install -D -p -m 644 group ${D}${sysconfdir}/
> +	install -p -m 644 passwd ${D}${sysconfdir}/
> +	install -p -m 644 group ${D}${sysconfdir}/
>  }
>  
>  require root-password.inc
> diff --git a/recipes/base-passwd/debian-base-passwd.inc b/recipes/base-passwd/debian-base-passwd.inc
> index b7b2eb8..549f2fe 100644
> --- a/recipes/base-passwd/debian-base-passwd.inc
> +++ b/recipes/base-passwd/debian-base-passwd.inc
> @@ -8,8 +8,9 @@ SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz"
>  S = "${SRCDIR}/base-passwd"
>  
>  do_install () {
> -	install -D -p -m 644 passwd.master ${D}${sysconfdir}/passwd
> -	install -D -p -m 644 group.master ${D}${sysconfdir}/group
> +	mkdir ${D}${sysconfdir}
> +	install -p -m 644 passwd.master ${D}${sysconfdir}/passwd
> +	install -p -m 644 group.master ${D}${sysconfdir}/group
>  }
>  
>  require root-password.inc

Merged to master, thanks.

/Esben

Patch

diff --git a/recipes/base-passwd/base-passwd.oe b/recipes/base-passwd/base-passwd.oe
index adbff61..188a565 100644
--- a/recipes/base-passwd/base-passwd.oe
+++ b/recipes/base-passwd/base-passwd.oe
@@ -6,8 +6,8 @@  S = "${SRCDIR}"
 
 do_install () {
 	install -d ${D}${sysconfdir}/
-	install -D -p -m 644 passwd ${D}${sysconfdir}/
-	install -D -p -m 644 group ${D}${sysconfdir}/
+	install -p -m 644 passwd ${D}${sysconfdir}/
+	install -p -m 644 group ${D}${sysconfdir}/
 }
 
 require root-password.inc
diff --git a/recipes/base-passwd/debian-base-passwd.inc b/recipes/base-passwd/debian-base-passwd.inc
index b7b2eb8..549f2fe 100644
--- a/recipes/base-passwd/debian-base-passwd.inc
+++ b/recipes/base-passwd/debian-base-passwd.inc
@@ -8,8 +8,9 @@  SRC_URI = "${DEBIAN_MIRROR}/main/b/base-passwd/base-passwd_${PV}.tar.gz"
 S = "${SRCDIR}/base-passwd"
 
 do_install () {
-	install -D -p -m 644 passwd.master ${D}${sysconfdir}/passwd
-	install -D -p -m 644 group.master ${D}${sysconfdir}/group
+	mkdir ${D}${sysconfdir}
+	install -p -m 644 passwd.master ${D}${sysconfdir}/passwd
+	install -p -m 644 group.master ${D}${sysconfdir}/group
 }
 
 require root-password.inc