r523 - in x86/trunk: . packages packages/mdadm

jhuntwork at linuxfromscratch.org jhuntwork at linuxfromscratch.org
Tue Aug 2 15:26:59 PDT 2005


Author: jhuntwork
Date: 2005-08-02 16:26:57 -0600 (Tue, 02 Aug 2005)
New Revision: 523

Added:
   x86/trunk/packages/mdadm/
Removed:
   x86/trunk/packages/raidtools/
Modified:
   x86/trunk/Makefile
   x86/trunk/packages/mdadm/Makefile
   x86/trunk/todo-list
Log:
Swapped deprecated raidtools in favor of mdadm

Modified: x86/trunk/Makefile
===================================================================
--- x86/trunk/Makefile	2005-08-02 22:21:57 UTC (rev 522)
+++ x86/trunk/Makefile	2005-08-02 22:26:57 UTC (rev 523)
@@ -212,7 +212,7 @@
 	ch-xchat ch-tcpwrappers ch-portmap ch-nfs-utils ch-traceroute \
 	ch-dialog ch-ncftp ch-pciutils ch-nALFS ch-device-mapper ch-LVM2 \
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
-	ch-squashfs ch-cpio ch-mutt ch-msmtp ch-slrn ch-raidtools ch-eject \
+	ch-squashfs ch-cpio ch-mutt ch-msmtp ch-slrn ch-mdadm ch-eject \
 	ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools \
 	ch-blfs-bootscripts ch-syslinux ch-nALFS-profile
 

Copied: x86/trunk/packages/mdadm (from rev 521, x86/trunk/packages/raidtools)

Modified: x86/trunk/packages/mdadm/Makefile
===================================================================
--- x86/trunk/packages/raidtools/Makefile	2005-08-02 22:16:16 UTC (rev 521)
+++ x86/trunk/packages/mdadm/Makefile	2005-08-02 22:26:57 UTC (rev 523)
@@ -1,30 +1,48 @@
-# raidtools Makefile
+# mdadm Makefile
+#==============================================================================
 
 # Package versions
-NM= raidtools
-VRS= 1.00.3
+NM= mdadm
+VRS= 1.9.0
 DIR= $(NM)-$(VRS)
-FILE= $(DIR).tar.gz
-PATCH1= $(DIR)-gcc-3.3_fix-1.patch
-URL= http://people.redhat.com/mingo/$(NM)/$(FILE)
 
-# RULES
+FILE= $(DIR).tgz
+URL-$(FILE)= http://www.cse.unsw.edu.au/~neilb/source/$(NM)/$(FILE)
+SHA-$(FILE)= 68b4ad16141f6f148126ded2ea78432dee0f5cd4
 
-.PHONY: clean stage2 chroot
+# Targets
+# =============================================================================
 
+include $(ROOT)/scripts/functions
+
 chroot:
-	@chroot "$(MP)" $(chenv-pre-bash) 'cd $(ROOT) && make ch-$(NM) $(chbash-pre-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 /sbin/mkraid ] ; then unpack $(FILE) && cd $(DIR) && \
-	 patch -Np1 -i ../$(PATCH1) && \
-	 ./configure --prefix=/usr --sysconfdir=/etc && \
-	 make -j3 && make install ; fi
-	@make clean
-	 
+stage2: Makefile $(FILE)
+	@$(std_build)
+
+compile-stage2:
+	@$(call echo_message, Making)
+#==============================================================================
+# Make commands below \/
+#==============================================================================
+	@make DESTDIR=/usr >../$(DIR)-$@.log 2>&1
+#
+#==Status Messages===========================================
+#
+	@$(OK)
+	@$(call echo_message, Installing)
+#==============================================================================
+# Install commands below \/
+#==============================================================================
+	@make DESTDIR=/usr 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 22:21:57 UTC (rev 522)
+++ x86/trunk/todo-list	2005-08-02 22:26:57 UTC (rev 523)
@@ -18,5 +18,4 @@
 ppp
 procps
 psmisc
-raidtools
 shadow




More information about the livecd mailing list