rename dropbear_sshd to just dropbear (d11b7015) · Commits · Dom Sekotill / buildroot

package/Config.in

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@ source "package/directfb/Config.in"
		source "package/distcc/Config.in"
		source "package/dm/Config.in"
		source "package/dnsmasq/Config.in"
		source "package/dropbear_sshd/Config.in"
		source "package/dropbear/Config.in"
		source "package/e2fsprogs/Config.in"
		source "package/fakeroot/Config.in"
		source "package/file/Config.in"

package/dropbear_sshd/Config.in→package/dropbear/Config.in

+5 −5

Original line number	Diff line number	Diff line
		config BR2_PACKAGE_DROPBEAR_SSHD
		bool "dropbear_sshd"
		config BR2_PACKAGE_DROPBEAR
		bool "dropbear"
		default n
		help
		A small SSH 2 server designed for small memory environments.

		http://matt.ucc.asn.au/dropbear/
		http://matt.ucc.asn.au/dropbear/dropbear.html

		config BR2_PACKAGE_DROPBEAR_SSHD_URANDOM
		config BR2_PACKAGE_DROPBEAR_URANDOM
		bool " Use /dev/urandom (low entropy systems only)?"
		default n
		depends on BR2_PACKAGE_DROPBEAR_SSHD
		depends on BR2_PACKAGE_DROPBEAR
		help
		By default, dropbear uses the much more secure /dev/random. If you
		are using a system lacking usable entropy sources, this could cause

package/dropbear_sshd/dropbear-init.patch→package/dropbear/dropbear-init.patch

+0 −0

File moved.

View file

package/dropbear_sshd/dropbear_sshd.mk→package/dropbear/dropbear.mk

+93 −0

Original line number	Diff line number	Diff line
		#############################################################
		#
		# dropbear_sshd
		# dropbear
		#
		#############################################################
		DROPBEAR_SSHD_VER:=0.46
		DROPBEAR_SSHD_SOURCE:=dropbear-$(DROPBEAR_SSHD_VER).tar.bz2
		DROPBEAR_SSHD_SITE:=http://matt.ucc.asn.au/dropbear/releases/
		DROPBEAR_SSHD_DIR:=$(BUILD_DIR)/dropbear-$(DROPBEAR_SSHD_VER)
		DROPBEAR_SSHD_CAT:=bzcat
		DROPBEAR_SSHD_BINARY:=dropbearmulti
		DROPBEAR_SSHD_TARGET_BINARY:=usr/sbin/dropbear
		DROPBEAR_VER:=0.46
		DROPBEAR_SOURCE:=dropbear-$(DROPBEAR_VER).tar.bz2
		DROPBEAR_SITE:=http://matt.ucc.asn.au/dropbear/releases/
		DROPBEAR_DIR:=$(BUILD_DIR)/dropbear-$(DROPBEAR_VER)
		DROPBEAR_CAT:=bzcat
		DROPBEAR_BINARY:=dropbearmulti
		DROPBEAR_TARGET_BINARY:=usr/sbin/dropbear

		$(DL_DIR)/$(DROPBEAR_SOURCE):
		$(WGET) -P $(DL_DIR) $(DROPBEAR_SITE)/$(DROPBEAR_SOURCE)

		$(DL_DIR)/$(DROPBEAR_SSHD_SOURCE):
		$(WGET) -P $(DL_DIR) $(DROPBEAR_SSHD_SITE)/$(DROPBEAR_SSHD_SOURCE)
		dropbear-source: $(DL_DIR)/$(DROPBEAR_SOURCE)

		dropbear_sshd-source: $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE)
		$(DROPBEAR_DIR)/.unpacked: $(DL_DIR)/$(DROPBEAR_SOURCE)
		$(DROPBEAR_CAT) $(DL_DIR)/$(DROPBEAR_SOURCE) \| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
		toolchain/patch-kernel.sh $(DROPBEAR_DIR) package/dropbear/ dropbear\*.patch
		$(SED) 's,^/\* #define DROPBEAR_MULTI.*,#define DROPBEAR_MULTI,g' $(DROPBEAR_DIR)/options.h
		touch $(DROPBEAR_DIR)/.unpacked

		$(DROPBEAR_SSHD_DIR)/.unpacked: $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE)
		$(DROPBEAR_SSHD_CAT) $(DL_DIR)/$(DROPBEAR_SSHD_SOURCE) \| tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
		toolchain/patch-kernel.sh $(DROPBEAR_SSHD_DIR) package/dropbear_sshd/ dropbear\*.patch
		$(SED) 's,^/\* #define DROPBEAR_MULTI.*,#define DROPBEAR_MULTI,g' $(DROPBEAR_SSHD_DIR)/options.h
		touch $(DROPBEAR_SSHD_DIR)/.unpacked

		$(DROPBEAR_SSHD_DIR)/.configured: $(DROPBEAR_SSHD_DIR)/.unpacked
		(cd $(DROPBEAR_SSHD_DIR); rm -rf config.cache; \
		$(DROPBEAR_DIR)/.configured: $(DROPBEAR_DIR)/.unpacked
		(cd $(DROPBEAR_DIR); rm -rf config.cache; \
		autoconf; \
		$(TARGET_CONFIGURE_OPTS) \
		CFLAGS="$(TARGET_CFLAGS)" \
		@@ -45,43 +44,44 @@ $(DROPBEAR_SSHD_DIR)/.configured: $(DROPBEAR_SSHD_DIR)/.unpacked
		$(DISABLE_NLS) \
		--with-shared \
		);
		ifeq ($(strip $(BR2_PACKAGE_DROPBEAR_SSHD_URANDOM)),y)
		ifeq ($(strip $(BR2_PACKAGE_DROPBEAR_URANDOM)),y)
		$(SED) 's,^#define DROPBEAR_RANDOM_DEV.*,#define DROPBEAR_RANDOM_DEV \"/dev/urandom\",' \
		$(DROPBEAR_SSHD_DIR)/options.h
		$(DROPBEAR_DIR)/options.h
		endif
		touch $(DROPBEAR_SSHD_DIR)/.configured
		touch $(DROPBEAR_DIR)/.configured

		$(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY): $(DROPBEAR_SSHD_DIR)/.configured
		$(DROPBEAR_DIR)/$(DROPBEAR_BINARY): $(DROPBEAR_DIR)/.configured
		$(MAKE) $(TARGET_CONFIGURE_OPTS) LD=$(TARGET_CC) \
		PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
		MULTI=1 SCPPROGRESS=1 -C $(DROPBEAR_SSHD_DIR)
		MULTI=1 SCPPROGRESS=1 -C $(DROPBEAR_DIR)

		$(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY): $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY)
		$(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY): $(DROPBEAR_DIR)/$(DROPBEAR_BINARY)
		#$(MAKE) DESTDIR=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) \
		# LD=$(TARGET_CC) -C $(DROPBEAR_SSHD_DIR) install
		# LD=$(TARGET_CC) -C $(DROPBEAR_DIR) install
		#rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \
		# $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc
		install -d -m 755 $(TARGET_DIR)/usr/sbin
		install -d -m 755 $(TARGET_DIR)/usr/bin
		install -m 755 $(DROPBEAR_SSHD_DIR)/$(DROPBEAR_SSHD_BINARY) \
		$(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY)
		$(STRIP) $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY)
		install -m 755 $(DROPBEAR_DIR)/$(DROPBEAR_BINARY) \
		$(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)
		$(STRIP) $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)
		ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/scp
		ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/ssh
		ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dbclient
		ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearkey
		ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/dropbearconvert
		cp $(DROPBEAR_SSHD_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/
		cp $(DROPBEAR_DIR)/S50dropbear $(TARGET_DIR)/etc/init.d/
		chmod a+x $(TARGET_DIR)/etc/init.d/S50dropbear

		dropbear_sshd: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_SSHD_TARGET_BINARY)
		dropbear: uclibc zlib $(TARGET_DIR)/$(DROPBEAR_TARGET_BINARY)

		dropbear_sshd-clean:
		dropbear-clean:
		$(MAKE) DESTDIR=$(TARGET_DIR) $(TARGET_CONFIGURE_OPTS) \
		LD=$(TARGET_CC) -C $(DROPBEAR_SSHD_DIR) uninstall
		-$(MAKE) -C $(DROPBEAR_SSHD_DIR) clean
		LD=$(TARGET_CC) -C $(DROPBEAR_DIR) uninstall
		-$(MAKE) -C $(DROPBEAR_DIR) clean

		dropbear_sshd-dirclean:
		rm -rf $(DROPBEAR_SSHD_DIR)
		dropbear-dirclean:
		rm -rf $(DROPBEAR_DIR)

		#############################################################
		#
		@@ -89,5 +89,5 @@ dropbear_sshd-dirclean:
		#
		#############################################################
		ifeq ($(strip $(BR2_PACKAGE_DROPBEAR_SSHD)),y)
		TARGETS+=dropbear_sshd
		TARGETS+=dropbear
		endif