Add openssl and openssh. Fix up UML kernel build.

3 files changed, 96 insertions, 1 deletions

diff --git a/make/openssh.mk b/make/openssh.mk
new file mode 100644
index 000000000..1ac8958c2
--- /dev/null
+++ b/make/openssh.mk
@@ -0,0 +1,46 @@
+#############################################################
+#
+# openssh
+#
+#############################################################
+
+OPENSSH_SITE:=ftp://mirror.cs.wisc.edu/pub/mirrors/OpenBSD/OpenSSH/portable/
+OPENSSH_DIR:=$(BUILD_DIR)/openssh-3.4p1
+OPENSSH_SOURCE:=openssh-3.4p1.tar.gz
+OPENSSH_PATCH:=$(SOURCE_DIR)/openssh_3.4p1-4.diff.gz
+
+$(DL_DIR)/$(OPENSSH_SOURCE):
+	wget -P $(DL_DIR) --passive-ftp $(OPENSSH_SITE)/$(OPENSSH_SOURCE)
+
+$(OPENSSH_DIR)/.unpacked: $(DL_DIR)/$(OPENSSH_SOURCE)
+	zcat $(DL_DIR)/$(OPENSSH_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch  $(OPENSSH_DIR)/.unpacked
+
+$(OPENSSH_DIR)/.patched: $(OPENSSH_DIR)/.unpacked
+	zcat $(OPENSSH_PATCH) | patch -d $(OPENSSH_DIR) -p1
+	touch $(OPENSSH_DIR)/.patched
+
+$(OPENSSH_DIR)/.configured: $(OPENSSH_DIR)/.patched
+	(cd $(OPENSSH_DIR); rm -rf config.cache; CC=$(TARGET_CC1) \
+	./configure --prefix=/usr \
+	    --includedir=$(STAGING_DIR)/include \
+	    --disable-lastlog --disable-utmp --disable-utmpx --disable-wtmp --disable-wtmpx \
+	    --disable-nls --without-x);
+	touch  $(OPENSSH_DIR)/.configured
+
+$(OPENSSH_DIR)/openssh: $(OPENSSH_DIR)/.configured
+	make CC=$(TARGET_CC1) -C $(OPENSSH_DIR)
+	-$(STRIP) --strip-unneeded $(OPENSSH_DIR)/*.so*
+
+$(TARGET_DIR)/usr/bin/openssh: $(OPENSSH_DIR)/openssh
+	make CC=$(TARGET_CC1) DESTDIR=$(TARGET_DIR) -C $(OPENSSH_DIR) install
+	rm -rf $(TARGET_DIR)/usr/share/doc/openssh
+
+openssh: $(TARGET_DIR)/usr/bin/openssh
+
+openssh-clean: 
+	make -C $(OPENSSH_DIR) clean
+
+openssh-dirclean: 
+	rm -rf $(OPENSSH_DIR)
+
diff --git a/make/openssl.mk b/make/openssl.mk
new file mode 100644
index 000000000..14c6379f6
--- /dev/null
+++ b/make/openssl.mk
@@ -0,0 +1,49 @@
+#############################################################
+#
+# openssl
+#
+#############################################################
+
+# TARGETS
+OPENSSL_SITE:=http://www.openssl.org/source
+OPENSSL_SOURCE:=openssl-0.9.6g.tar.gz
+OPENSSL_DIR:=$(BUILD_DIR)/openssl-0.9.6g
+
+
+$(DL_DIR)/$(OPENSSL_SOURCE):
+	wget -P $(DL_DIR) --passive-ftp $(OPENSSL_SITE)/$(OPENSSL_SOURCE)
+
+$(OPENSSL_DIR)/.unpacked: $(DL_DIR)/$(OPENSSL_SOURCE)
+	gunzip -c $(DL_DIR)/$(OPENSSL_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch  $(OPENSSL_DIR)/.unpacked
+
+$(OPENSSL_DIR)/Makefile: $(OPENSSL_DIR)/.unpacked
+	(cd $(OPENSSL_DIR); \
+	PATH=$(TARGET_PATH) ./Configure linux-elf --prefix=$(STAGING_DIR) \
+		--openssldir=$(STAGING_DIR) -L$(STAGING_DIR)/lib -ldl \
+		-I$(STAGING_DIR)/include no-threads shared no-asm)
+
+$(OPENSSL_DIR)/apps/openssl: $(OPENSSL_DIR)/Makefile
+	make CC=$(TARGET_CC1) -C $(OPENSSL_DIR)
+
+$(STAGING_DIR)/bin/openssl: $(OPENSSL_DIR)/apps/openssl
+	make CC=$(TARGET_CC1) -C $(OPENSSL_DIR) install
+
+$(TARGET_DIR)/bin/openssl: $(STAGING_DIR)/bin/openssl
+	cp -fa $(STAGING_DIR)/bin/openssl  $(TARGET_DIR)/bin/
+	cp -fa $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/
+	cp -fa $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/
+
+openssl-clean: 
+	rm -f $(STAGING_DIR)/bin/openssl  $(TARGET_DIR)/bin/openssl
+	rm -f $(STAGING_DIR)/lib/libcrypto.so* $(TARGET_DIR)/lib/libcrypto.so*
+	rm -f $(STAGING_DIR)/lib/libssl.so* $(TARGET_DIR)/lib/libssl.so*
+	$(MAKE) -C $(OPENSSL_DIR) clean
+
+openssl-dirclean: 
+	rm -rf $(OPENSSL_DIR) 
+
+openssl: uclibc $(TARGET_DIR)/bin/openssl
+
+#EOF
+
diff --git a/make/user-mode-linux.mk b/make/user-mode-linux.mk
index 36c44a6a6..90224d08a 100644
--- a/make/user-mode-linux.mk
+++ b/make/user-mode-linux.mk
@@ -3,7 +3,7 @@
 # Linux kernel targets
 #
 #############################################################
-UMLINUX_DIR=$(BUILD_DIR)/linux
+UMLINUX_DIR=$(BUILD_DIR)/linux-2.4.19
 UMLINUX_SOURCE=linux-2.4.19.tar.bz2
 UMLINUX_SITE=http://ftp.us.kernel.org/pub/linux/kernel/v2.4
 UMLINUX_PATCH_1:=uml-patch-2.4.19-5.bz2