Patchwork [meta-oe] gpm: sets D equal to DESTDIR instead of ROOT in do_install

login
register
mail settings
Submitter stephen.arnold42
Date April 4, 2014, 10:47 p.m.
Message ID <1396651675-32469-1-git-send-email-stephen.arnold42@gmail.com>
Download mbox | patch
Permalink /patch/70165/
State Accepted, archived
Headers show

Comments

stephen.arnold42 - April 4, 2014, 10:47 p.m.
This corrects a gpm install failure due to ROOT being used instead of
DESTDIR, resulting in DESTDIR being undefined.

Upstream-Status: Inappropriate (distribution/packaging fix)

Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>
---
 meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Martin Jansa - April 20, 2014, 11:45 a.m.
On Fri, Apr 04, 2014 at 03:47:55PM -0700, Stephen Arnold wrote:
> This corrects a gpm install failure due to ROOT being used instead of
> DESTDIR, resulting in DESTDIR being undefined.

Merged, thanks!

> 
> Upstream-Status: Inappropriate (distribution/packaging fix)
> 
> Signed-off-by: Stephen Arnold <stephen.arnold42@gmail.com>
> ---
>  meta-oe/recipes-support/gpm/gpm_1.99.7.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
> index e35e50e..a30a891 100644
> --- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
> +++ b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
> @@ -40,7 +40,7 @@ CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-
>  CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error"
>  
>  do_install () {
> -    oe_runmake 'ROOT=${D}' install
> +    oe_runmake 'DESTDIR=${D}' install
>      install -m 0644 src/headers/gpm.h ${D}${includedir}
>      install -d ${D}/${sysconfdir}/init.d
>      install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
index e35e50e..a30a891 100644
--- a/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
+++ b/meta-oe/recipes-support/gpm/gpm_1.99.7.bb
@@ -40,7 +40,7 @@  CFLAGS += "-Wno-extra -Wno-error=unused-but-set-parameter -Wno-error=unused-but-
 CFLAGS += "-Wno-error=int-to-pointer-cast -Wno-error"
 
 do_install () {
-    oe_runmake 'ROOT=${D}' install
+    oe_runmake 'DESTDIR=${D}' install
     install -m 0644 src/headers/gpm.h ${D}${includedir}
     install -d ${D}/${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/gpm