diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Config.in | 13 | ||||
| -rw-r--r-- | mk/kernel-build.mk | 4 | ||||
| -rw-r--r-- | package/dropbear/Makefile | 8 | ||||
| -rw-r--r-- | package/openssh/Makefile | 8 |
5 files changed, 31 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore index 3c58ed468..5b3a479d2 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ toolchain_build_*/ .prereq_done .config* .busyboxcfg +.bbrebuild .defconfig all.config .cfg_*/ @@ -23,6 +23,19 @@ config ADK_HOST help Configure host for IPKG package management +config ADK_SSH_PUBKEY + string "SSH public key (root user only)" + default "" + help + Paste your generated SSH public key here and it will be embedded into + the built image, so you can use it to login instantly. + +#config ADK_PASSWORD +# string "root password for the embedded system" +# default "linux123" +# help +# Predefine the root password enabled in the the built image. + config ADK_DEVELSYSTEM bool "Compile a ADK development system" default n diff --git a/mk/kernel-build.mk b/mk/kernel-build.mk index bd8b47164..8ee6d1ac3 100644 --- a/mk/kernel-build.mk +++ b/mk/kernel-build.mk @@ -34,7 +34,9 @@ $(LINUX_DIR)/vmlinux: $(LINUX_DIR)/.config INSTALL_MOD_PATH=$(LINUX_BUILD_DIR)/modules \ modules_install $(MAKE_TRACE) $(TRACE) target/$(ADK_TARGET)-create-packages - $(MAKE) $(KERNEL_PKG) $(TARGETS) +ifneq ($(strip $(TARGETS)),) + $(MAKE) $(TARGETS) +endif touch -c $(LINUX_DIR)/vmlinux prepare: diff --git a/package/dropbear/Makefile b/package/dropbear/Makefile index 2ab254cd2..2e29902a7 100644 --- a/package/dropbear/Makefile +++ b/package/dropbear/Makefile @@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:= dropbear PKG_VERSION:= 0.52 -PKG_RELEASE:= 2 +PKG_RELEASE:= 3 PKG_MD5SUM:= 1c69ec674481d7745452f68f2ea5597e PKG_DESCR:= SSH 2 server/client designed for embedded systems PKG_SECTION:= net @@ -62,5 +62,11 @@ do-install: $(INSTALL_DIR) $(IDIR_DBCONVERT)/usr/bin $(INSTALL_BIN) $(WRKBUILD)/dropbearconvert \ $(IDIR_DBCONVERT)/usr/bin/dropbearconvert + # ssh pubkey + test -z $(ADK_SSH_PUBKEY) || ( \ + mkdir -p $(IDIR_DROPBEAR)/etc/dropbear; \ + echo $(ADK_SSH_PUBKEY) \ + >$(IDIR_DROPBEAR)/etc/dropbear/authorized_keys; \ + ) include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 1eb72097a..2896c1a29 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= openssh PKG_VERSION:= 5.5p1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_MD5SUM:= 88633408f4cb1eb11ec7e2ec58b519eb PKG_DESCR:= OpenSSH server PKG_SECTION:= net @@ -85,5 +85,11 @@ post-install: ${INSTALL_BIN} ${WRKINST}/usr/libexec/sftp-server \ ${IDIR_OPENSSH_SFTP_SERVER}/usr/libexec chmod 0700 {${IDIR_OPENSSH_CLIENT},${IDIR_OPENSSH_SERVER}}/etc/ssh + # ssh pubkey + test -z $(ADK_SSH_PUBKEY) || ( \ + mkdir -p $(IDIR_OPENSSH_SERVER)/etc/ssh; \ + echo $(ADK_SSH_PUBKEY) \ + >$(IDIR_OPENSSH_SERVER)/etc/ssh/authorized_keys; \ + ) include ${TOPDIR}/mk/pkg-bottom.mk |