aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/eject
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-04-22 04:24:41 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2014-05-03 20:45:03 +0200
commit13237318a5ff732aec27f67e8b6ec71491f3e91b (patch)
tree21089b7334bb9687d6e6a8dbbd0594d4f93b4ef4 /meta-oe/recipes-support/eject
parent2726a6c88d27af134e9174d8b108b40af7f65dab (diff)
downloadmeta-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>
Diffstat (limited to 'meta-oe/recipes-support/eject')
-rw-r--r--meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch12
-rw-r--r--meta-oe/recipes-support/eject/eject_2.1.5.bb4
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 0000000000..5e13036c5d
--- /dev/null
+++ b/meta-oe/recipes-support/eject/eject/eject-2.1.5-error-return.patch
@@ -0,0 +1,12 @@
+Upstream-Status: Inappropriate [the upstream is no longer active]
+
+--- eject/eject.c.orig 2013-09-11 18:08:36.000000000 +0800
++++ eject/eject.c 2013-09-11 18:09:05.000000000 +0800
+@@ -207,7 +207,6 @@
+ "If omitted, name defaults to `%s'.\n"
+ "By default tries -r, -s, -f, and -q in order until success.\n"),
+ DEFAULTDEVICE);
+- exit(1);
+ }
+
+
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 98319a35b0..c47c653444 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"
inherit autotools gettext update-alternatives
-SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz"
+SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz \
+ file://eject-2.1.5-error-return.patch \
+"
SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738"
SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55"