diff mbox

[1/1] populate: fix empty files.list

Message ID 1410195198-13085-1-git-send-email-jeanmarie.lemetayer@gmail.com
State Accepted
Headers show

Commit Message

Jean-Marie Lemetayer Sept. 8, 2014, 4:53 p.m. UTC
The output format of the file(1) command have changed since (at least)
the version 5.14. We need to to take care of an extra space.

Signed-off-by: Jean-Marie Lemetayer <jeanmarie.lemetayer@gmail.com>
---
 scripts/populate.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Jean-Marie Lemetayer Sept. 8, 2014, 4:58 p.m. UTC | #1
Hi,

Sorry my vi have automatically deleted a trailing space in the first
patch. The second is clean.

Regards,
Jean-Marie Lemetayer

2014-09-08 18:53 GMT+02:00 Jean-Marie Lemetayer <jeanmarie.lemetayer@gmail.com>:
> The output format of the file(1) command have changed since (at least)
> the version 5.14. We need to to take care of an extra space.
>
> Signed-off-by: Jean-Marie Lemetayer <jeanmarie.lemetayer@gmail.com>
> ---
>  scripts/populate.in | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/populate.in b/scripts/populate.in
> index 28a9740..c29be1c 100644
> --- a/scripts/populate.in
> +++ b/scripts/populate.in
> @@ -280,9 +280,9 @@ CT_TMP_DIR="${TMPDIR:-/tmp}/populate-${rand}-${$}"
>  trap "rm -rf ${CT_TMP_DIR}" EXIT
>
>  # List all ELF (executables|shared objects)...
> -find . -type f -exec file {} \;                                             \
> -|"${grep}" -E ': ELF [[:digit:]]+-bit (L|M)SB (executable|shared object),'  \
> -|cut -d ":" -f 1                                                            \
> +find . -type f -exec file {} \;                                              \
> +|"${grep}" -E ': ELF [[:digit:]]+-bit (L|M)SB +(executable|shared object),'  \
> +|cut -d ":" -f 1                                                             \
>  >"${CT_TMP_DIR}/files.list"
>
>  # ... and use that list to find missing dependencies
> --
> 1.9.1
>

--
For unsubscribe information see http://sourceware.org/lists.html#faq
Yann E. MORIN Sept. 11, 2014, 9:37 p.m. UTC | #2
Jean-Marie, All,

On 2014-09-08 18:53 +0200, Jean-Marie Lemetayer spake thusly:
> The output format of the file(1) command have changed since (at least)
> the version 5.14. We need to to take care of an extra space.
> 
> Signed-off-by: Jean-Marie Lemetayer <jeanmarie.lemetayer@gmail.com>
> ---
>  scripts/populate.in | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/populate.in b/scripts/populate.in
> index 28a9740..c29be1c 100644
> --- a/scripts/populate.in
> +++ b/scripts/populate.in
> @@ -280,9 +280,9 @@ CT_TMP_DIR="${TMPDIR:-/tmp}/populate-${rand}-${$}"
>  trap "rm -rf ${CT_TMP_DIR}" EXIT
>  
>  # List all ELF (executables|shared objects)...
> -find . -type f -exec file {} \;                                             \
> -|"${grep}" -E ': ELF [[:digit:]]+-bit (L|M)SB (executable|shared object),'  \
> -|cut -d ":" -f 1                                                            \
> +find . -type f -exec file {} \;                                              \
> +|"${grep}" -E ': ELF [[:digit:]]+-bit (L|M)SB +(executable|shared object),'  \
> +|cut -d ":" -f 1                                                             \

I've un-shifted the trailing back-slashes, since it was not required to
keep alignment.

Applied, thanks!

Regards,
Yann E. MORIN.

>  >"${CT_TMP_DIR}/files.list"
>  
>  # ... and use that list to find missing dependencies
> -- 
> 1.9.1
> 
> 
> --
> For unsubscribe information see http://sourceware.org/lists.html#faq
>
diff mbox

Patch

diff --git a/scripts/populate.in b/scripts/populate.in
index 28a9740..c29be1c 100644
--- a/scripts/populate.in
+++ b/scripts/populate.in
@@ -280,9 +280,9 @@  CT_TMP_DIR="${TMPDIR:-/tmp}/populate-${rand}-${$}"
 trap "rm -rf ${CT_TMP_DIR}" EXIT
 
 # List all ELF (executables|shared objects)...
-find . -type f -exec file {} \;                                             \
-|"${grep}" -E ': ELF [[:digit:]]+-bit (L|M)SB (executable|shared object),'  \
-|cut -d ":" -f 1                                                            \
+find . -type f -exec file {} \;                                              \
+|"${grep}" -E ': ELF [[:digit:]]+-bit (L|M)SB +(executable|shared object),'  \
+|cut -d ":" -f 1                                                             \
 >"${CT_TMP_DIR}/files.list"
 
 # ... and use that list to find missing dependencies