r532 - in x86/trunk: . packages/openssh

justin at linuxfromscratch.org justin at linuxfromscratch.org
Tue Aug 2 16:09:52 PDT 2005


Author: justin
Date: 2005-08-02 17:09:51 -0600 (Tue, 02 Aug 2005)
New Revision: 532

Modified:
   x86/trunk/packages/openssh/Makefile
   x86/trunk/todo-list
Log:
Updated openssh Makefile.

Modified: x86/trunk/packages/openssh/Makefile
===================================================================
--- x86/trunk/packages/openssh/Makefile	2005-08-02 23:06:01 UTC (rev 531)
+++ x86/trunk/packages/openssh/Makefile	2005-08-02 23:09:51 UTC (rev 532)
@@ -1,34 +1,63 @@
 # OpenSSH Makefile
+#==============================================================================
 
-# Package versions
 NM= openssh
 VRS= 3.9p1
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/$(FILE)
 
-#RULES
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/M-P/$(FILE)
+SHA-$(FILE)= 7226920d228a2160a0ed1ccd9a607c6ca89f71e0
 
-.PHONY: clean chroot stage2
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-blfs) 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+	@chroot "$(MP)" $(chenv-blfs) \
+	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2:
-	@echo ""
-	@echo "=====> Building $(NM) in chroot"
-	@echo ""
-	@-install -v -d -m700 /var/lib/sshd
+stage2: Makefile $(FILE)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@install -v -d -m700 /var/lib/sshd >../$(DIR)-$@.log 2>&1
 	@chown root:sys /var/lib/sshd
-	@-groupadd sshd
-	@-useradd -c sshd -d /var/lib/sshd -g sshd -s /bin/false sshd
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/bin/ssh ] ; then unpack $(FILE) && cd $(DIR) && \
-	 sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure && \
-	 ./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin --with-md5-passwords \
-	 --with-privsep-path=/var/lib/sshd && \
-	 make -j3 && make install-nokeys ; fi
-	@make clean
+	@groupadd sshd
+	@useradd -c sshd -d /var/lib/sshd -g sshd -s /bin/false sshd
+	@sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure
+	@./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin \
+	 --with-md5-passwords --with-privsep-path=/var/lib/sshd \
+	 >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make $(PM) >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make install-nokeys >>../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
 
 clean:
 	@-rm -rf $(DIR)
+
+.PHONY: clean chroot compile-stage2

Modified: x86/trunk/todo-list
===================================================================
--- x86/trunk/todo-list	2005-08-02 23:06:01 UTC (rev 531)
+++ x86/trunk/todo-list	2005-08-02 23:09:51 UTC (rev 532)
@@ -3,7 +3,6 @@
 hotplug
 inputattach
 lfs-bootscripts
-openssh
 openssl
 pango
 pciutils




More information about the livecd mailing list