Patchwork gzip: fix MakeMaker issues with using wrong SHELL/GREP

login
register
mail settings
Submitter Ming Liu
Date Nov. 28, 2013, 10:26 a.m.
Message ID <1385634389-31914-1-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/62527/
State New
Headers show

Comments

Ming Liu - Nov. 28, 2013, 10:26 a.m.
Paths of shell/grep is being determined by detecting from host at configure
stage, and then will be hard coded into scripts like zgrep, this would
cause a following runtime error:
"/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory"

Fixed by using runtime paths instead.

Signed-off-by: Ming Liu <ming.liu@windriver.com>
---
 meta/recipes-extended/gzip/gzip.inc | 5 +++++
 1 file changed, 5 insertions(+)
Ming Liu - Nov. 29, 2013, 8:36 a.m.
On 11/28/2013 06:26 PM, Ming Liu wrote:
> Paths of shell/grep is being determined by detecting from host at configure
> stage, and then will be hard coded into scripts like zgrep, this would
> cause a following runtime error:
> "/usr/bin/zgrep: line 230: /usr/bin/grep: No such file or directory"
>
> Fixed by using runtime paths instead.
>
> Signed-off-by: Ming Liu <ming.liu@windriver.com>
> ---
>   meta/recipes-extended/gzip/gzip.inc | 5 +++++
>   1 file changed, 5 insertions(+)
>
> diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
> index 6ec1dae..4b265a6 100644
> --- a/meta/recipes-extended/gzip/gzip.inc
> +++ b/meta/recipes-extended/gzip/gzip.inc
> @@ -12,6 +12,11 @@ SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
>   
>   inherit autotools
>   
> +do_configure_prepend () {
> +	sed '\#|/bin/sh|\$(SHELL)|#d' -i Makefile.am
> +	sed 's#\(|\[@\]GREP@|\)\$(GREP)#\1/bin/grep#g' -i Makefile.am
There is a hardcode /bin/grep here, should be removed, and I am told 
it's better to use patch instead of prepending to do_configure task, so 
I will send the V2 soon.

//Ming Liu
> +}
> +
>   do_install_append () {
>   	# Rename and move files into /bin (FHS), which is typical place for gzip
>   	install -d ${D}${base_bindir}

Patch

diff --git a/meta/recipes-extended/gzip/gzip.inc b/meta/recipes-extended/gzip/gzip.inc
index 6ec1dae..4b265a6 100644
--- a/meta/recipes-extended/gzip/gzip.inc
+++ b/meta/recipes-extended/gzip/gzip.inc
@@ -12,6 +12,11 @@  SRC_URI = "${GNU_MIRROR}/gzip/${BP}.tar.gz"
 
 inherit autotools
 
+do_configure_prepend () {
+	sed '\#|/bin/sh|\$(SHELL)|#d' -i Makefile.am
+	sed 's#\(|\[@\]GREP@|\)\$(GREP)#\1/bin/grep#g' -i Makefile.am
+}
+
 do_install_append () {
 	# Rename and move files into /bin (FHS), which is typical place for gzip
 	install -d ${D}${base_bindir}