r515 - in x86/trunk: . packages/samba

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 14:20:46 PDT 2005


Author: jhuntwork
Date: 2005-08-02 15:20:46 -0600 (Tue, 02 Aug 2005)
New Revision: 515

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

Modified: x86/trunk/packages/samba/Makefile
===================================================================
--- x86/trunk/packages/samba/Makefile	2005-08-02 21:13:43 UTC (rev 514)
+++ x86/trunk/packages/samba/Makefile	2005-08-02 21:20:46 UTC (rev 515)
@@ -1,35 +1,63 @@
 # Samba Makefile
+#==============================================================================
 
-# Package versions
 NM= samba
 VRS= 3.0.14a
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-URL= http://us2.samba.org/samba/ftp/$(FILE)
 
-#RULES
+FILE= $(DIR).tar.bz2
+URL-$(FILE)= $(HTTPBLFS)/Q-S/$(FILE)
+SHA-$(FILE)= e3596ad58ac4813403ded19d7e2e964c2c0d06d9
 
-.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 ""
-	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
-	@if [ ! -f /usr/bin/smbmount ] ; then unpack $(FILE) && cd $(DIR) && \
-	 cd source && \
-	 ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --with-piddir=/var/run --with-fhs \
-	 --with-smbmount && \
-	 make && \
-	 make install && \
-	 install -m644 $(ROOT)/etc/samba/smb.conf /etc/samba && \
-	 cd client && \
-	 gcc $(CFLAGS) -static mount.cifs.c -o mount.cifs && \
-	 cp mount.cifs /usr/bin ; fi
-	@make clean
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Configuring)
+#==============================================================================
+# Configure commands below \/
+#==============================================================================
+	@cd source ; ./configure --prefix=/usr --sysconfdir=/etc \
+	 --localstatedir=/var --with-piddir=/var/run --with-fhs \
+	 --with-smbmount >../../$(DIR)-$@.log 2>&1
+#
+#==Status Messages==========================================
+#
+	@$(OK)
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@cd source ; make >>../../$(DIR)-$@.log 2>&1
+	@install -m644 $(ROOT)/etc/samba/smb.conf /etc/samba
+	@cd source/client ; \
+	 gcc $(CFLAGS) -static mount.cifs.c -o mount.cifs \
+	 >../../../$(DIR)-$@.log 2>&1 ; cp mount.cifs /usr/bin
+	
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@cd source ; make install >>../../$(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 21:13:43 UTC (rev 514)
+++ x86/trunk/todo-list	2005-08-02 21:20:46 UTC (rev 515)
@@ -25,5 +25,4 @@
 reiser4progs
 reiserfsprogs
 rp-pppoe
-samba
 shadow




More information about the livecd mailing list