summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2016-12-09 16:19:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-12-13 22:47:31 +0000
commit5423c9a412c680b781417a64b412838845b5d075 (patch)
tree5a9cd2bc02f5567aab6d8b109fd85770e6d3e375
parente87250d801622befa09ddba9ec8ecf7a4dcf902c (diff)
downloadopenembedded-core-contrib-5423c9a412c680b781417a64b412838845b5d075.tar.gz
openembedded-core-contrib-5423c9a412c680b781417a64b412838845b5d075.tar.bz2
openembedded-core-contrib-5423c9a412c680b781417a64b412838845b5d075.zip
oe-setup-rpmrepo: standardize usage output
Made usage output of oe-setup-rpmrepo to look similar to the output of other oe scripts. [YOCTO #10751] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rwxr-xr-xscripts/oe-setup-rpmrepo28
1 files changed, 17 insertions, 11 deletions
diff --git a/scripts/oe-setup-rpmrepo b/scripts/oe-setup-rpmrepo
index 917b98b984..7dcded8f1d 100755
--- a/scripts/oe-setup-rpmrepo
+++ b/scripts/oe-setup-rpmrepo
@@ -23,16 +23,6 @@
# Instead, use OE_TMPDIR for passing this in externally.
TMPDIR="$OE_TMPDIR"
-function usage() {
- echo "Usage: $0 <rpm-dir>"
- echo " <rpm-dir>: default is $TMPDIR/deploy/rpm"
-}
-
-if [ $# -gt 1 ]; then
- usage
- exit 1
-fi
-
setup_tmpdir() {
if [ -z "$TMPDIR" ]; then
# Try to get TMPDIR from bitbake
@@ -53,6 +43,23 @@ setup_tmpdir() {
fi
}
+setup_tmpdir
+
+function usage() {
+ echo 'Usage: oe-setup-rpmrepo rpm-dir'
+ echo ''
+ echo 'OpenEmbedded setup-rpmrepo - setup rpm repository'
+ echo ''
+ echo 'arguments:'
+ echo " rpm-dir rpm repo directory, default is $TMPDIR/deploy/rpm"
+ echo ''
+}
+
+if [ $# -gt 1 -o "$1" = '--help' -o "$1" = '-h' ]; then
+ usage
+ exit 2
+fi
+
setup_sysroot() {
# Toolchain installs set up $OECORE_NATIVE_SYSROOT in their
# environment script. If that variable isn't set, we're
@@ -68,7 +75,6 @@ setup_sysroot() {
fi
}
-setup_tmpdir
setup_sysroot