From 5ac8df09f8034b9c51f02906df7bd3b2904060bc Mon Sep 17 00:00:00 2001
From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 18 Jun 2006 18:22:24 +0000
Subject: remove unneeded autoconf call and flags, rename S50dropbear to
dropbear.init, normalize Makefile: - indent configure invocation, - use
"install -d" instead of "mkdir -p".
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3995 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
package/dropbear/Makefile | 84 ++++++++++++++++++------------------
package/dropbear/files/S50dropbear | 16 -------
package/dropbear/files/dropbear.init | 16 +++++++
3 files changed, 57 insertions(+), 59 deletions(-)
delete mode 100755 package/dropbear/files/S50dropbear
create mode 100755 package/dropbear/files/dropbear.init
(limited to 'package')
diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile
index db79dd5c4..bda4d8fc9 100644
--- a/package/dropbear/Makefile
+++ b/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/package/dropbear/files/S50dropbear b/package/dropbear/files/S50dropbear
deleted file mode 100755
index 88fc28849..000000000
--- a/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/package/dropbear/files/dropbear.init b/package/dropbear/files/dropbear.init
new file mode 100755
index 000000000..88fc28849
--- /dev/null
+++ b/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
--
cgit v1.2.3