From: Oyvind Repvik <nail@nslu2-linux.org>
Date: Wed, 3 Aug 2005 15:51:45 +0000 (+0000)
Subject: Update u-a to remove the symlinks as well
X-Git-Tag: Release-2010-05/1~9453^2~3994^2~16^2
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b57ec72f165d15125f9038279a0f812c17d23a0a;p=openembedded.git

Update u-a to remove the symlinks as well
---

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 8719894e6a..25ea543f29 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -53,6 +53,7 @@ ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/hotplug-ng/*.bb \
 ${PKGDIR}/packages/initscripts/*.bb \
 ${PKGDIR}/packages/install/*.bb \
+${PKGDIR}/packages/iperf/*.bb \
 ${PKGDIR}/packages/ipkg-utils/*.bb \
 ${PKGDIR}/packages/ipkg/*.bb \
 ${PKGDIR}/packages/ircp/*.bb \
diff --git a/packages/dropbear/dropbear_0.46.bb b/packages/dropbear/dropbear_0.46.bb
index 739950ed1a..80373e3a1b 100644
--- a/packages/dropbear/dropbear_0.46.bb
+++ b/packages/dropbear/dropbear_0.46.bb
@@ -3,7 +3,7 @@ HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
 SECTION = "console/network"
 LICENSE = "MIT"
 DEPENDS = "zlib"
-PR = "r2"
+PR = "r3"
 PROVIDES = "ssh sshd"
 
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
@@ -41,10 +41,6 @@ do_install() {
 		   ${D}${localstatedir}
 
 	install -m 0755 dropbearmulti ${D}${sbindir}/
-#	for i in ${BINCOMMANDS}
-#	do
-#		ln -s ${sbindir}/dropbearmulti ${D}${bindir}/$i
-#	done
 	ln -s ${sbindir}/dropbearmulti ${D}${bindir}/dbclient
 	
 	for i in ${SBINCOMMANDS}
@@ -71,4 +67,6 @@ pkg_postrm_append () {
   if [ -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
         rm ${sysconfdir}/dropbear/dropbear_dss_host_key
   fi
+  update-alternatives --remove ssh ${bindir}/dropbearmulti
+  update-alternatives --remove scp ${bindir}/dropbearmulti
 }