r548 - in x86/branches/utf8: . etc packages packages/mdadm

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Thu Aug 4 03:00:45 PDT 2005


Author: alexander
Date: 2005-08-04 04:00:39 -0600 (Thu, 04 Aug 2005)
New Revision: 548

Added:
   x86/branches/utf8/packages/mdadm/
   x86/branches/utf8/packages/mdadm/Makefile
Modified:
   x86/branches/utf8/BUGS
   x86/branches/utf8/Makefile
   x86/branches/utf8/etc/bashrc
Log:
Replaced raidtools with mdadm.
Added code to set iutf8 terminal flag to bashrc.
Removed invalid item from BUGS.


Modified: x86/branches/utf8/BUGS
===================================================================
--- x86/branches/utf8/BUGS	2005-08-04 09:33:33 UTC (rev 547)
+++ x86/branches/utf8/BUGS	2005-08-04 10:00:39 UTC (rev 548)
@@ -93,10 +93,6 @@
   easier and there is a de-facto standard for such operation:
   /charset KOI8-R
 
-w3m:
-  RedHat has w3m-0.4.1-helpcharset.patch, relevant for Japanese. Needs
-  investigation.
-
 nALFS:
   Absolutely untested. Does not contain any "setlocale" call but uses ncurses.
   This means incorrect line-drawing characters in UTF-8 locales on linux

Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-08-04 09:33:33 UTC (rev 547)
+++ x86/branches/utf8/Makefile	2005-08-04 10:00:39 UTC (rev 548)
@@ -186,7 +186,7 @@
 	ch-startup-notification ch-gvim ch-xfce ch-lua ch-ion ch-irssi ch-xchat ch-tcpwrappers ch-portmap \
 	ch-nfs-utils ch-traceroute 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-tin \
-	ch-raidtools ch-eject ch-byacc ch-ed ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux ch-nALFS-profile
+	ch-mdadm ch-eject ch-byacc ch-ed ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux ch-nALFS-profile
 
 # Rules for building tools/stage1
 # These can be called individually, if necessary
@@ -885,7 +885,7 @@
 	make -C $(PKG)/$@ chroot
 	make unmount
 
-raidtools: prep-chroot
+mdadm: prep-chroot
 	make -C $(PKG)/$@ chroot
 	make unmount
 
@@ -1442,8 +1442,8 @@
 ch-tin: popdev
 	make -C $(PKG)/tin stage2
 
-ch-raidtools: popdev
-	make -C $(PKG)/raidtools stage2
+ch-mdadm: popdev
+	make -C $(PKG)/mdadm stage2
 
 ch-byacc: popdev
 	make -C $(PKG)/byacc stage2

Modified: x86/branches/utf8/etc/bashrc
===================================================================
--- x86/branches/utf8/etc/bashrc	2005-08-04 09:33:33 UTC (rev 547)
+++ x86/branches/utf8/etc/bashrc	2005-08-04 10:00:39 UTC (rev 548)
@@ -16,3 +16,8 @@
 fi
 
 export PS1
+
+if [ "`locale charmap 2>/dev/null`" = "UTF-8" ]
+then
+	stty iutf8
+fi

Added: x86/branches/utf8/packages/mdadm/Makefile
===================================================================
--- x86/branches/utf8/packages/mdadm/Makefile	2005-08-04 09:33:33 UTC (rev 547)
+++ x86/branches/utf8/packages/mdadm/Makefile	2005-08-04 10:00:39 UTC (rev 548)
@@ -0,0 +1,27 @@
+# mdadm Makefile
+
+# Package versions
+NM= mdadm
+VRS= 1.12.0
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tgz
+URL= http://www.cse.unsw.edu.au/~neilb/source/$(NM)/$(FILE)
+
+#RULES
+
+.PHONY: clean chroot stage2
+
+chroot:
+	@chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo ""
+	@echo "=====> Building $(NM) in chroot"
+	@echo ""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -f /usr/sbin/mdadm ] ; then unpack $(FILE) && cd $(DIR) && \
+	 make DESTDIR=/usr && make DESTDIR=/usr install ; fi
+	@make clean
+
+clean:
+	@-rm -rf $(DIR)




More information about the livecd mailing list