Merge bk://openembedded@openembedded.bkbits.net/packages

into r2d2.tm.informatik.uni-frankfurt.de:/home/projekte/packages

2004/05/09 21:24:34+02:00 uni-frankfurt.de!mickey
fix dropbear postinst and remove some of the older ones

BKrev: 409e85773s6vjz_WL2cqBkPDJYOZcQ

diff --git a/dropbear/dropbear-0.40/configure.patch b/dropbear/dropbear-0.40/configure.patch
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/dropbear/dropbear_0.36.oe b/dropbear/dropbear_0.36.oe
deleted file mode 100644 (file)
index d10c993..0000000
--- a/dropbear/dropbear_0.36.oe
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Dropbear SSH Implementation"
-LICENSE = "MIT"
-DEPENDS = "virtual/libc zlib ncurses"
-
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2"
-S = "${WORKDIR}/dropbear-${PV}"
-
-inherit autotools
-
-CFLAGS_prepend = "-I. "
-LD = "${CC}"
-do_install_prepend () {
-       install -d ${D}${sbindir} ${D}${bindir}
-}

diff --git a/dropbear/dropbear_0.38.oe b/dropbear/dropbear_0.38.oe
deleted file mode 100644 (file)
index d10c993..0000000
--- a/dropbear/dropbear_0.38.oe
+++ /dev/null
@@ -1,14 +0,0 @@
-DESCRIPTION = "Dropbear SSH Implementation"
-LICENSE = "MIT"
-DEPENDS = "virtual/libc zlib ncurses"
-
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2"
-S = "${WORKDIR}/dropbear-${PV}"
-
-inherit autotools
-
-CFLAGS_prepend = "-I. "
-LD = "${CC}"
-do_install_prepend () {
-       install -d ${D}${sbindir} ${D}${bindir}
-}

diff --git a/dropbear/dropbear_0.40.oe b/dropbear/dropbear_0.40.oe
deleted file mode 100644 (file)
index 24123d8..0000000
--- a/dropbear/dropbear_0.40.oe
+++ /dev/null
@@ -1,15 +0,0 @@
-DESCRIPTION = "Dropbear SSH Implementation"
-LICENSE = "MIT"
-DEPENDS = "virtual/libc zlib ncurses"
-
-SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
-        file://${FILESDIR}/configure.patch;patch=1"
-S = "${WORKDIR}/dropbear-${PV}"
-
-inherit autotools
-
-CFLAGS_prepend = "-I. "
-LD = "${CC}"
-do_install_prepend () {
-       install -d ${D}${sbindir} ${D}${bindir}
-}

diff --git a/dropbear/dropbear_0.41.oe b/dropbear/dropbear_0.41.oe
index 30a598c..cde8246 100644 (file)
--- a/dropbear/dropbear_0.41.oe
+++ b/dropbear/dropbear_0.41.oe
@@ -1,7 +1,7 @@
 DESCRIPTION = "Dropbear SSH Implementation"
 LICENSE = "MIT"
 DEPENDS = "virtual/libc zlib ncurses"
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
         file://${FILESDIR}/configure.patch;patch=1"
@@ -20,7 +20,7 @@ do_install_prepend () {
 }
 pkg_postinst_append () {
 
-if [ "x$D" != "x" ]; then
+if [ "x$D" = "x" ]; then
        if [ ! -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
                dropbearkey -t rsa -f ${sysconfdir}/dropbear/dropbear_rsa_host_key
        fi