r504 - in x86/trunk: . packages/squashfs

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 13:04:59 PDT 2005


Author: jhuntwork
Date: 2005-08-02 14:04:58 -0600 (Tue, 02 Aug 2005)
New Revision: 504

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

Modified: x86/trunk/packages/squashfs/Makefile
===================================================================
--- x86/trunk/packages/squashfs/Makefile	2005-08-02 20:00:57 UTC (rev 503)
+++ x86/trunk/packages/squashfs/Makefile	2005-08-02 20:04:58 UTC (rev 504)
@@ -1,27 +1,47 @@
 # SquashFS Makefile
+#==============================================================================
 
-# Package versions
 NM= squashfs
-VRS= 2.1
+VRS= 2.2
 DIR= $(NM)$(VRS)
-PATCH=
+
 FILE= $(DIR).tar.gz
-URL= http://easynews.dl.sourceforge.net/sourceforge/squashfs/$(FILE)
+URL-$(FILE)= http://easynews.dl.sourceforge.net/sourceforge/squashfs/$(FILE)
+SHA-$(FILE)= 086c1e38185d6aaa7b6c490a7eea4c653936d158
 
-#RULES
+# Targets
+# =============================================================================
 
-.PHONY: clean chroot stage2
+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
-	@unpack $(FILE) && cd $(DIR) && \
-	 cd $(NM)-tools && make && cp mksquashfs $(WD)/bin
+stage2: Makefile $(FILE)
+	@$(std_build)
 
+compile-stage2:
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@cd $(NM)-tools ; make >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	 @cp -v mksquashfs $(WD)/bin >>../$(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 20:00:57 UTC (rev 503)
+++ x86/trunk/todo-list	2005-08-02 20:04:58 UTC (rev 504)
@@ -39,4 +39,3 @@
 packages/shadow
 packages/slang
 packages/slrn
-packages/squashfs




More information about the livecd mailing list