findutils: fix sort dir on updatedb

Submitted by rongqing.li@windriver.com on July 25, 2012, 8:07 a.m.

Details

Message ID 1343203659-23756-1-git-send-email-rongqing.li@windriver.com
State Accepted
Commit 05c3c327370971eaa9d872a88782278126030229
Headers show

Commit Message

rongqing.li@windriver.com July 25, 2012, 8:07 a.m.
From: Roy.Li <rongqing.li@windriver.com>

[YOCTO #2826]

m4/nullsort.m4 tries to find sort dir, and write it to updatedb,
but nullsort.m4 is checking the host dir. Once the sort dirs on
target and host are different, updatedb will fail due to wrong
sort dir.

Since we always have sort under ${bindir}, so we can assign it
directly.

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
 meta/recipes-extended/findutils/findutils_4.4.2.bb |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Patch hide | download patch | download mbox

diff --git a/meta/recipes-extended/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
index 127eb4b..218bf83 100644
--- a/meta/recipes-extended/findutils/findutils_4.4.2.bb
+++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
@@ -1,6 +1,6 @@ 
 require findutils.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI += "file://01-27017.patch \
             file://02-28824.patch \
@@ -15,4 +15,6 @@  SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd7
 # http://savannah.gnu.org/bugs/?27299
 CACHED_CONFIGUREVARS += "${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}"
 
+EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
+
 BBCLASSEXTEND = "native"

Comments

Saul Wold July 26, 2012, 7:07 p.m.
On 07/25/2012 01:07 AM, rongqing.li@windriver.com wrote:
> From: Roy.Li <rongqing.li@windriver.com>
>
> [YOCTO #2826]
>
> m4/nullsort.m4 tries to find sort dir, and write it to updatedb,
> but nullsort.m4 is checking the host dir. Once the sort dirs on
> target and host are different, updatedb will fail due to wrong
> sort dir.
>
> Since we always have sort under ${bindir}, so we can assign it
> directly.
>
> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> ---
>   meta/recipes-extended/findutils/findutils_4.4.2.bb |    4 +++-
>   1 files changed, 3 insertions(+), 1 deletions(-)
>
> diff --git a/meta/recipes-extended/findutils/findutils_4.4.2.bb b/meta/recipes-extended/findutils/findutils_4.4.2.bb
> index 127eb4b..218bf83 100644
> --- a/meta/recipes-extended/findutils/findutils_4.4.2.bb
> +++ b/meta/recipes-extended/findutils/findutils_4.4.2.bb
> @@ -1,6 +1,6 @@
>   require findutils.inc
>
> -PR = "r4"
> +PR = "r5"
>
>   SRC_URI += "file://01-27017.patch \
>               file://02-28824.patch \
> @@ -15,4 +15,6 @@ SRC_URI[sha256sum] = "434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd7
>   # http://savannah.gnu.org/bugs/?27299
>   CACHED_CONFIGUREVARS += "${@base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', 'gl_cv_func_wcwidth_works=yes', '', d)}"
>
> +EXTRA_OECONF += "ac_cv_path_SORT=${bindir}/sort"
> +
>   BBCLASSEXTEND = "native"
>

Merged into OE-Core

Thanks
	Sau!