* [PATCH] e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same
@ 2012-02-16 15:13 Mike Crowe
2012-02-24 4:16 ` Saul Wold
0 siblings, 1 reply; 2+ messages in thread
From: Mike Crowe @ 2012-02-16 15:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Mike Crowe
${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
--
1.7.9
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same
2012-02-16 15:13 [PATCH] e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same Mike Crowe
@ 2012-02-24 4:16 ` Saul Wold
0 siblings, 0 replies; 2+ messages in thread
From: Saul Wold @ 2012-02-24 4:16 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer; +Cc: Mike Crowe
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!
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-24 4:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-16 15:13 [PATCH] e2fsprogs: Cope with ${libdir} and ${base_libdir} being the same Mike Crowe
2012-02-24 4:16 ` Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox