| Submitter | Mike Crowe |
|---|---|
| Date | Feb. 16, 2012, 3:13 p.m. |
| Message ID | <1329405215-9037-1-git-send-email-mac@mcrowe.com> |
| Download | mbox | patch |
| Permalink | /patch/21341/ |
| State | New |
| Headers | show |
Comments
On 02/16/2012 07:13 AM, Mike Crowe wrote: > ${libdir} and ${base_libdir} may be the same. If they are don't try and > move files onto themselves. > > Signed-off-by: Mike Crowe<mac@mcrowe.com> > --- > meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb | 10 ++++++---- > 1 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb > index 2289211..9647e51 100644 > --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb > +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb > @@ -1,6 +1,6 @@ > require e2fsprogs.inc > > -PR = "r2" > +PR = "r3" > > SRC_URI += "file://fallocate.patch \ > file://acinclude.m4" > @@ -32,9 +32,11 @@ do_install () { > > do_install_append () { > # e2initrd_helper and the pkgconfig files belong in libdir > - install -d ${D}${libdir} > - mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} > - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} > + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then > + install -d ${D}${libdir} > + mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} > + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} > + fi > } > > # blkid used to be part of e2fsprogs but is useful outside, add it Merged into OE-core thanks Sau!
Patch
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb index 2289211..9647e51 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb @@ -1,6 +1,6 @@ require e2fsprogs.inc -PR = "r2" +PR = "r3" SRC_URI += "file://fallocate.patch \ file://acinclude.m4" @@ -32,9 +32,11 @@ do_install () { do_install_append () { # e2initrd_helper and the pkgconfig files belong in libdir - install -d ${D}${libdir} - mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} - mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + if [ ! ${D}${libdir} -ef ${D}${base_libdir} ]; then + install -d ${D}${libdir} + mv ${D}${base_libdir}/e2initrd_helper ${D}${libdir} + mv ${D}${base_libdir}/pkgconfig ${D}${libdir} + fi } # blkid used to be part of e2fsprogs but is useful outside, add it
${libdir} and ${base_libdir} may be the same. If they are don't try and move files onto themselves. Signed-off-by: Mike Crowe <mac@mcrowe.com> --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.bb | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)