[yocto] [PATCH][meta-selinux] findutils/gnulib:drop the error output of 'ls' command
wenzong fan
wenzong.fan at windriver.com
Tue Jul 7 19:55:19 PDT 2015
Ping...
On 04/02/2015 10:26 AM, rongqing.li at windriver.com wrote:
> From: Roy Li <rongqing.li at windriver.com>
>
> The ls command is used to check if the file exists, and it is normal that
> the checked file does not exist, so drop the ls error ouput:
> ls: cannot access ./doc/fdl.texi: No such file or directory
>
> Signed-off-by: Roy Li <rongqing.li at windriver.com>
> ---
> .../drop-the-error-output-of-ls-command.patch | 29 ++++++++++++++++++++++
> .../findutils/findutils_4.4.2.bbappend | 1 +
> 2 files changed, 30 insertions(+)
> create mode 100644 recipes-extended/findutils/findutils-4.4.2/drop-the-error-output-of-ls-command.patch
>
> diff --git a/recipes-extended/findutils/findutils-4.4.2/drop-the-error-output-of-ls-command.patch b/recipes-extended/findutils/findutils-4.4.2/drop-the-error-output-of-ls-command.patch
> new file mode 100644
> index 0000000..069be41
> --- /dev/null
> +++ b/recipes-extended/findutils/findutils-4.4.2/drop-the-error-output-of-ls-command.patch
> @@ -0,0 +1,29 @@
> +[PATCH] drop the error output of 'ls' command
> +
> +Upstream-Status: pending
> +
> +ls is used to check if the file exists, and it is normal that
> +the checked file does not exist, so drop the ls error
> + ls: cannot access ./doc/fdl.texi: No such file or directory
> +
> +Signed-off-by: Roy Li <rongqing.li at windriver.com>
> +---
> + gnulib-tool | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/gnulib-tool b/gnulib-tool
> +index 354b1f0..beb81ba 100755
> +--- a/gnulib-tool
> ++++ b/gnulib-tool
> +@@ -602,7 +602,7 @@ else
> + {
> + # Use two sed invocations. A single sed -n -e 's,^.* -> \(.*\)$,\1,p'
> + # would do the wrong thing if the link target contains " -> ".
> +- LC_ALL=C ls -l "$1" | sed -e 's, -> ,#%%#,' | sed -n -e 's,^.*#%%#\(.*\)$,\1,p'
> ++ LC_ALL=C ls -l "$1" 2>/dev/null | sed -e 's, -> ,#%%#,' | sed -n -e 's,^.*#%%#\(.*\)$,\1,p'
> + }
> + fi
> +
> +--
> +1.9.1
> +
> diff --git a/recipes-extended/findutils/findutils_4.4.2.bbappend b/recipes-extended/findutils/findutils_4.4.2.bbappend
> index 3245e5c..e174888 100644
> --- a/recipes-extended/findutils/findutils_4.4.2.bbappend
> +++ b/recipes-extended/findutils/findutils_4.4.2.bbappend
> @@ -5,6 +5,7 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:"
> SRC_URI += "git://git.savannah.gnu.org/gnulib.git;protocol=git;rev=0e0635af0b23826911dc456bd0da40dcb19247de"
> SRC_URI += "file://findutils-with-selinux.patch"
> SRC_URI += "file://findutils-with-selinux-gnulib.patch"
> +SRC_URI += "file://drop-the-error-output-of-ls-command.patch;patchdir=../git/"
>
> inherit with-selinux
>
>
More information about the yocto
mailing list