From: Nicolas Thill <nico@openwrt.org>
Date: Sun, 18 Jun 2006 18:22:24 +0000 (+0000)
Subject: remove unneeded autoconf call and flags, rename S50dropbear to dropbear.init, normali... 
X-Git-Tag: reboot~30718^2~541
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b418646d03619ff973bff5a79b8dad5b03fe6a97;p=openwrt%2Fstaging%2Fxback.git

remove unneeded autoconf call and flags, rename S50dropbear to dropbear.init, normalize Makefile: - indent configure invocation, - use "install -d" instead of "mkdir -p".

SVN-Revision: 3995
---

diff --git a/openwrt/package/dropbear/Makefile b/openwrt/package/dropbear/Makefile
index db79dd5c41..bda4d8fc91 100644
--- a/openwrt/package/dropbear/Makefile
+++ b/openwrt/package/dropbear/Makefile
@@ -34,44 +34,42 @@ define Build/Configure
 	$(SED) 's,^/\* #define PKG_MULTI.*,#define PKG_MULTI,g' $(PKG_BUILD_DIR)/options.h
 	$(SED) 's,^#define DO_HOST_LOOKUP,/* & */,g' $(PKG_BUILD_DIR)/options.h
 	(cd $(PKG_BUILD_DIR); rm -rf config.cache; \
-		autoconf; \
 		$(TARGET_CONFIGURE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include" \
-		LDFLAGS="-L$(STAGING_DIR)/usr/lib" \
+		CFLAGS="$(TARGET_CFLAGS)" \
 		./configure \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME) \
-		--program-prefix="" \
-		--program-suffix="" \
-		--prefix=/usr \
-		--exec-prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=/usr/share \
-		--includedir=/usr/include \
-		--infodir=/usr/share/info \
-		--libdir=/usr/lib \
-		--libexecdir=/usr/lib \
-		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		--sbindir=/usr/sbin \
-		--sysconfdir=/etc \
-		$(DISABLE_LARGEFILE) \
-		$(DISABLE_NLS) \
-		--with-shared \
-		--disable-pam \
-		--enable-openpty \
-		--enable-syslog \
-		--disable-shadow \
-		--disable-lastlog \
-		--disable-utmp \
-		--disable-utmpx \
-		--disable-wtmp \
-		--disable-wtmpx \
-		--disable-loginfunc \
-		--disable-pututline \
-		--disable-pututxline \
-		--disable-zlib \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			$(DISABLE_LARGEFILE) \
+			$(DISABLE_NLS) \
+			--with-shared \
+			--disable-pam \
+			--enable-openpty \
+			--enable-syslog \
+			--disable-shadow \
+			--disable-lastlog \
+			--disable-utmp \
+			--disable-utmpx \
+			--disable-wtmp \
+			--disable-wtmpx \
+			--disable-loginfunc \
+			--disable-pututline \
+			--disable-pututxline \
+			--disable-zlib \
 	);
 endef
 
@@ -86,21 +84,21 @@ define Build/Compile
 endef
 	
 define Package/dropbear/install
-	mkdir -p $(1)/usr/bin
-	mkdir -p $(1)/usr/sbin
-	install -m 755 $(PKG_BUILD_DIR)/dropbearmulti \
+	install -d -m0755 $(1)/usr/sbin
+	install -m0755 $(PKG_BUILD_DIR)/dropbearmulti \
 		$(1)/usr/sbin/dropbear
+	install -d -m0755 $(1)/usr/bin
 	ln -sf ../sbin/dropbear $(1)/usr/bin/scp
 	ln -sf ../sbin/dropbear $(1)/usr/bin/ssh
 	ln -sf ../sbin/dropbear $(1)/usr/bin/dbclient
 	ln -sf ../sbin/dropbear $(1)/usr/bin/dropbearkey
-	mkdir -p $(1)/etc/init.d
-	install -m 755 ./files/S50dropbear $(1)/etc/init.d/
+	install -d -m0755 $(1)/etc/init.d
+	install -m0755 ./files/dropbear.init $(1)/etc/init.d/S50dropbear
 endef
 
 define Package/dropbearconvert/install
-	mkdir -p $(1)/usr/bin
-	install -m 755 $(PKG_BUILD_DIR)/dropbearconvert \
+	install -d -m0755 $(1)/usr/bin
+	install -m0755 $(PKG_BUILD_DIR)/dropbearconvert \
 		$(1)/usr/bin/dropbearconvert
 endef
 
diff --git a/openwrt/package/dropbear/files/S50dropbear b/openwrt/package/dropbear/files/S50dropbear
deleted file mode 100755
index 88fc288491..0000000000
--- a/openwrt/package/dropbear/files/S50dropbear
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-for type in rsa dss; do {
-  # check for keys
-  key=/etc/dropbear/dropbear_${type}_host_key
-  [ ! -f $key ] && {
-    # generate missing keys
-    mkdir -p /etc/dropbear
-    [ -x /usr/bin/dropbearkey ] && {
-      /usr/bin/dropbearkey -t $type -f $key 2>&- >&- && exec $0 $*
-    } &
-    exit 0
-  }
-}; done
-
-/usr/sbin/dropbear
diff --git a/openwrt/package/dropbear/files/dropbear.init b/openwrt/package/dropbear/files/dropbear.init
new file mode 100755
index 0000000000..88fc288491
--- /dev/null
+++ b/openwrt/package/dropbear/files/dropbear.init
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+for type in rsa dss; do {
+  # check for keys
+  key=/etc/dropbear/dropbear_${type}_host_key
+  [ ! -f $key ] && {
+    # generate missing keys
+    mkdir -p /etc/dropbear
+    [ -x /usr/bin/dropbearkey ] && {
+      /usr/bin/dropbearkey -t $type -f $key 2>&- >&- && exec $0 $*
+    } &
+    exit 0
+  }
+}; done
+
+/usr/sbin/dropbear