From c1c058fc29f916c2f000bb7195f6195e271873b0 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Wed, 27 Oct 2010 17:27:34 -0700 Subject: bitbake.conf: include bin dirs from BBPATH in PATH MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Chris Larson Acked-by: Khem Raj Acked-by: Eric Bénard --- bin/cp | 29 -------------------------- bin/darwin/cp | 29 ++++++++++++++++++++++++++ bin/darwin/sed | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ bin/sed | 65 ---------------------------------------------------------- 4 files changed, 94 insertions(+), 94 deletions(-) delete mode 100755 bin/cp create mode 100755 bin/darwin/cp create mode 100755 bin/darwin/sed delete mode 100755 bin/sed (limited to 'bin') diff --git a/bin/cp b/bin/cp deleted file mode 100755 index 0a523b7987..0000000000 --- a/bin/cp +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# - We do not allow -i due to the non-interactive nature of OE tasks -# - We do not allow -r, as it has known problems, and is marked -# obsolescent in the standard -# - We allow -a as shorthand for -RpP -# - Otherwise, we stick to what SuSv3 defines - - -source $(dirname $0)/wrapper.sh - -saved="" -while getopts fpaRHLP opt; do - case "$opt" in - a) - opt="RpP" - ;; - \?) - exit 1 - ;; - esac - save "-$opt" -done -shift $(($OPTIND - 1)) -for arg; do - save "$arg" -done - -exec_real diff --git a/bin/darwin/cp b/bin/darwin/cp new file mode 100755 index 0000000000..0a523b7987 --- /dev/null +++ b/bin/darwin/cp @@ -0,0 +1,29 @@ +#!/bin/sh +# +# - We do not allow -i due to the non-interactive nature of OE tasks +# - We do not allow -r, as it has known problems, and is marked +# obsolescent in the standard +# - We allow -a as shorthand for -RpP +# - Otherwise, we stick to what SuSv3 defines + + +source $(dirname $0)/wrapper.sh + +saved="" +while getopts fpaRHLP opt; do + case "$opt" in + a) + opt="RpP" + ;; + \?) + exit 1 + ;; + esac + save "-$opt" +done +shift $(($OPTIND - 1)) +for arg; do + save "$arg" +done + +exec_real diff --git a/bin/darwin/sed b/bin/darwin/sed new file mode 100755 index 0000000000..352a3ca6e8 --- /dev/null +++ b/bin/darwin/sed @@ -0,0 +1,65 @@ +#!/bin/sh +# +# Sed portability notes +# - SuSv3 +# - Only -e, -f, and -n are standard options +# - Linux +# - -i argument is of the form -i[ext] +# - extended regular expressions argument is -r +# - Mac OSX +# - -i argument is of the form -i [ext] +# - extended regular expressions argument is -E +# +# Here we support a limited subset of the available sed capabilities, +# ensuring that all those supported by this script can be utilized +# regardless of the current platform. +# +# We accept -n, -e, -f, and -i with no backup extension. We support +# extended regular expressions using the -r argument. Note that extended +# regular expressions support may not be retained, depending upon the +# capabilities of the other platforms we wish to support, and we may need +# to reimplement -i internally in this script on some platforms. + + +source $(dirname $0)/wrapper.sh + +case `uname -s` in + Darwin) + inplace_arg="-i ''" + extended_re_arg="-E" + getopt_os="ir" + ;; + Linux) + inplace_arg="-i" + extended_re_arg="-r" + getopt_os="ir" + ;; +esac + +saved="" +while getopts ne:f:$getopt_os opt; do + case "$opt" in + n) + save "-$opt" + ;; + e|f) + save "-$opt" + save "$OPTARG" + ;; + i) + saved="$saved $inplace_arg" + ;; + r) + saved="$saved $extended_re_arg" + ;; + \?) + exit 1 + ;; + esac +done +shift $(($OPTIND - 1)) +for arg; do + save "$arg" +done + +exec_real diff --git a/bin/sed b/bin/sed deleted file mode 100755 index 352a3ca6e8..0000000000 --- a/bin/sed +++ /dev/null @@ -1,65 +0,0 @@ -#!/bin/sh -# -# Sed portability notes -# - SuSv3 -# - Only -e, -f, and -n are standard options -# - Linux -# - -i argument is of the form -i[ext] -# - extended regular expressions argument is -r -# - Mac OSX -# - -i argument is of the form -i [ext] -# - extended regular expressions argument is -E -# -# Here we support a limited subset of the available sed capabilities, -# ensuring that all those supported by this script can be utilized -# regardless of the current platform. -# -# We accept -n, -e, -f, and -i with no backup extension. We support -# extended regular expressions using the -r argument. Note that extended -# regular expressions support may not be retained, depending upon the -# capabilities of the other platforms we wish to support, and we may need -# to reimplement -i internally in this script on some platforms. - - -source $(dirname $0)/wrapper.sh - -case `uname -s` in - Darwin) - inplace_arg="-i ''" - extended_re_arg="-E" - getopt_os="ir" - ;; - Linux) - inplace_arg="-i" - extended_re_arg="-r" - getopt_os="ir" - ;; -esac - -saved="" -while getopts ne:f:$getopt_os opt; do - case "$opt" in - n) - save "-$opt" - ;; - e|f) - save "-$opt" - save "$OPTARG" - ;; - i) - saved="$saved $inplace_arg" - ;; - r) - saved="$saved $extended_re_arg" - ;; - \?) - exit 1 - ;; - esac -done -shift $(($OPTIND - 1)) -for arg; do - save "$arg" -done - -exec_real -- cgit 1.2.3-korg