aboutsummaryrefslogtreecommitdiffstats
path: root/recipes/dropbear
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2009-06-16 18:16:05 +0100
committerPhil Blundell <philb@gnu.org>2009-06-16 18:16:05 +0100
commitf4c63b6c9d4d54890da763d96f0fe2680ba78201 (patch)
tree87b0e2a23c50f47b86ed4e24440348bd75954c7e /recipes/dropbear
parent4e0f69867535f4a93e0af3ffb26336e1a3a85f65 (diff)
downloadopenembedded-f4c63b6c9d4d54890da763d96f0fe2680ba78201.tar.gz
openembedded-f4c63b6c9d4d54890da763d96f0fe2680ba78201.tar.bz2
openembedded-f4c63b6c9d4d54890da763d96f0fe2680ba78201.zip
dropbear: last micro change was a bad idea, revert it
Diffstat (limited to 'recipes/dropbear')
-rw-r--r--recipes/dropbear/dropbear.inc32
1 files changed, 6 insertions, 26 deletions
diff --git a/recipes/dropbear/dropbear.inc b/recipes/dropbear/dropbear.inc
index f4addb5bd0..364799f12e 100644
--- a/recipes/dropbear/dropbear.inc
+++ b/recipes/dropbear/dropbear.inc
@@ -28,13 +28,7 @@ LD = "${CC}"
SBINCOMMANDS = "dropbear dropbearkey dropbearconvert"
BINCOMMANDS = "dbclient ssh scp"
-BINCOMMANDS_micro = "dbclient scp"
EXTRA_OEMAKE = 'MULTI=1 SCPPROGRESS=1 PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
-EXTRA_OEMAKE_micro = 'PROGRAMS="${SBINCOMMANDS} ${BINCOMMANDS}"'
-PACKAGES_prepend_micro = "dropbear-client dropbear-utils "
-FILES_dropbear-client = "${bindir}/dbclient"
-FILES_dropbear-utils = "${sbindir}/dropbearkey ${sbindir}/dropbearconvert"
-EXTRA_OECONF_micro = "--disable-utmp --disable-wtmp --disable-lastlog --disable-shadow"
do_configure_prepend() {
if [ "x${DISTRO_TYPE}" = "xdebug" ]; then
@@ -52,24 +46,13 @@ do_install() {
install -d ${D}${sbindir}
install -d ${D}${localstatedir}
- if [ -f dropbearmulti ]; then
- install -m 0755 dropbearmulti ${D}${sbindir}/
- ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
+ install -m 0755 dropbearmulti ${D}${sbindir}/
+ ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
- for i in ${SBINCOMMANDS}
- do
- ln -sf ./dropbearmulti ${D}${sbindir}/$i
- done
- else
- for i in ${SBINCOMMANDS}
- do
- install -m 0755 $i ${D}${sbindir}/
- done
- for i in ${BINCOMMANDS}
- do
- install -m 0755 $i ${D}${bindir}/
- done
- fi
+ for i in ${SBINCOMMANDS}
+ do
+ ln -sf ./dropbearmulti ${D}${sbindir}/$i
+ done
cat ${WORKDIR}/init | sed -e 's,/etc,${sysconfdir},g' \
-e 's,/usr/sbin,${sbindir},g' \
-e 's,/var,${localstatedir},g' \
@@ -86,9 +69,6 @@ pkg_postinst () {
update-alternatives --install ${bindir}/ssh ssh ${sbindir}/dropbearmulti 20
}
-pkg_postinst_micro() {
-}
-
pkg_postrm_append () {
if [ -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
rm ${sysconfdir}/dropbear/dropbear_rsa_host_key