diff options
author | Jackie Huang <jackie.huang@windriver.com> | 2014-04-22 04:24:41 -0400 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-05-03 20:45:03 +0200 |
commit | 13237318a5ff732aec27f67e8b6ec71491f3e91b (patch) | |
tree | 21089b7334bb9687d6e6a8dbbd0594d4f93b4ef4 | |
parent | 2726a6c88d27af134e9174d8b108b40af7f65dab (diff) | |
download | meta-openembedded-13237318a5ff732aec27f67e8b6ec71491f3e91b.tar.gz |
eject: Fix wrong return value
Remove the unnecessary return(1) from function usage(), so that eject -h
can return the right value.
Signed-off-by: Zhangle Yang <zhangle.yang@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-support/eject/eject_2.1.5.bb | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch b/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch new file mode 100644 index 000000000..5e13036c5 --- /dev/null +++ b/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch | |||
@@ -0,0 +1,12 @@ | |||
1 | Upstream-Status: Inappropriate [the upstream is no longer active] | ||
2 | |||
3 | --- eject/eject.c.orig 2013-09-11 18:08:36.000000000 +0800 | ||
4 | +++ eject/eject.c 2013-09-11 18:09:05.000000000 +0800 | ||
5 | @@ -207,7 +207,6 @@ | ||
6 | "If omitted, name defaults to `%s'.\n" | ||
7 | "By default tries -r, -s, -f, and -q in order until success.\n"), | ||
8 | DEFAULTDEVICE); | ||
9 | - exit(1); | ||
10 | } | ||
11 | |||
12 | |||
diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb index 98319a35b..c47c65344 100644 --- a/meta-oe/recipes-support/eject/eject_2.1.5.bb +++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb | |||
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" | |||
5 | 5 | ||
6 | inherit autotools gettext update-alternatives | 6 | inherit autotools gettext update-alternatives |
7 | 7 | ||
8 | SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz" | 8 | SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz \ |
9 | file://eject-2.1.5-error-return.patch \ | ||
10 | " | ||
9 | 11 | ||
10 | SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738" | 12 | SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738" |
11 | SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55" | 13 | SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55" |