r543 - in x86/branches/utf8: . packages packages/byacc packages/cdrtools packages/ed packages/lfs-bootscripts packages/linux packages/nALFS-profile scripts

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Wed Aug 3 06:02:49 PDT 2005


Author: alexander
Date: 2005-08-03 07:02:48 -0600 (Wed, 03 Aug 2005)
New Revision: 543

Added:
   x86/branches/utf8/packages/byacc/
   x86/branches/utf8/packages/byacc/Makefile
   x86/branches/utf8/packages/ed/
   x86/branches/utf8/packages/ed/Makefile
   x86/branches/utf8/packages/nALFS-profile/
   x86/branches/utf8/packages/nALFS-profile/Makefile
Modified:
   x86/branches/utf8/BUGS
   x86/branches/utf8/Makefile
   x86/branches/utf8/packages/cdrtools/Makefile
   x86/branches/utf8/packages/lfs-bootscripts/langconf
   x86/branches/utf8/packages/linux/Makefile
   x86/branches/utf8/scripts/shutdown-helper
Log:
Built the rest of packages. Fixed some bugs in langconf.

The CD should be buildable now, but I want to fix ncurses/ldconfig interaction,
unzip, w3m help files and nALFS before making a semi-official release.


Modified: x86/branches/utf8/BUGS
===================================================================
--- x86/branches/utf8/BUGS	2005-08-03 12:08:09 UTC (rev 542)
+++ x86/branches/utf8/BUGS	2005-08-03 13:02:48 UTC (rev 543)
@@ -14,6 +14,14 @@
   length in bytes and its width in cells are the same; 2) assumption that
   translated strings fit. Possible fix: compile this program with NLS disabled.
 
+ncurses:
+  [SHOWSTOPPER] ldconfig creates /usr/lib/libncursesw.so.5 -> libncurses.so
+  symlink. However, this doesn't lead to miscompilation:
+  /usr/lib/libncursesw.so.5 -> libncurses.so -> libncursesw.co -> 
+  -> ../../libncursesw.so.5 -> libncursesw.so.5.4
+  Possible fix: replace the "libncurses.so -> libncursesw.co" symlink with
+  a linker script.
+
 gpm/kernel:
   In UTF-8 mode, cannot copy/paste non-ASCII characters on the Linux console.
   There is a kernel patch that is supposed to circument this limitation, but it
@@ -116,3 +124,7 @@
 mutt:
   Flowed text wrapping is wrong. To see this, run this command:
   mutt -f packages/mutt/bug
+
+ed:
+  Doesn't support multibyte encodings at all. Installed for private use as a
+  dependency of LSB testsuite.

Modified: x86/branches/utf8/Makefile
===================================================================
--- x86/branches/utf8/Makefile	2005-08-03 12:08:09 UTC (rev 542)
+++ x86/branches/utf8/Makefile	2005-08-03 13:02:48 UTC (rev 543)
@@ -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 stop-here ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts ch-syslinux
+	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
 
 # Rules for building tools/stage1
 # These can be called individually, if necessary
@@ -889,6 +889,14 @@
 	make -C $(PKG)/$@ chroot
 	make unmount
 
+byacc: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make umount
+
+ed: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make umount
+
 eject: prep-chroot
 	make -C $(PKG)/$@ chroot
 	make unmount
@@ -917,6 +925,10 @@
 	make -C $(PKG)/$@ chroot
 	make unmount
 
+nALFS-profile: prep-chroot
+	make -C $(PKG)/$@ chroot
+	make unmount
+
 initramfs: prep-chroot
 	make -C $@ chroot
 	make unmount
@@ -1433,6 +1445,12 @@
 ch-raidtools: popdev
 	make -C $(PKG)/raidtools stage2
 
+ch-byacc: popdev
+	make -C $(PKG)/byacc stage2
+
+ch-ed: popdev
+	make -C $(PKG)/ed stage2
+
 ch-eject: popdev
 	make -C $(PKG)/eject stage2
 
@@ -1451,6 +1469,9 @@
 ch-klibc: popdev
 	make -C $(PKG)/klibc stage2
 
+ch-nALFS-profile: popdev
+	make -C $(PKG)/nALFS-profile stage2
+
 ch-initramfs: popdev
 	make -C initramfs
 

Added: x86/branches/utf8/packages/byacc/Makefile
===================================================================
--- x86/branches/utf8/packages/byacc/Makefile	2005-08-03 12:08:09 UTC (rev 542)
+++ x86/branches/utf8/packages/byacc/Makefile	2005-08-03 13:02:48 UTC (rev 543)
@@ -0,0 +1,26 @@
+# Byacc Makefile
+
+# Package versions
+NM= byacc
+VRS= 20050505
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tgz
+URL= ftp://invisible-island.net/$(NM)/$(FILE)
+
+# RULES
+
+.PHONY: clean chroot stage2
+
+chroot:
+	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo""
+	@echo "=====> Building $(NM) in chroot"
+	@echo""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -f /usr/share/man/man1/yacc.1 ] ; then unpack $(FILE) && cd $(DIR) && \
+	 ./configure --prefix=/usr && make -j3 && make install ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)

Modified: x86/branches/utf8/packages/cdrtools/Makefile
===================================================================
--- x86/branches/utf8/packages/cdrtools/Makefile	2005-08-03 12:08:09 UTC (rev 542)
+++ x86/branches/utf8/packages/cdrtools/Makefile	2005-08-03 13:02:48 UTC (rev 543)
@@ -7,6 +7,16 @@
 FILE= $(DIR).tar.bz2
 URL= ftp://ftp.berlios.de/pub/cdrecord/$(FILE)
 
+# Strictly speaking, this is not needed for making the LFS Live CD, but
+# without this patch you can't make a Windows-readabe CD with non-ASCII
+# filenames in UTF-8 locale.
+
+# XXX Is it legal to change (unreadable in non-ISO-8859-1 locales) copyright
+# notices with iconv? RedHat already does this (they convert to UTF-8, we
+# can't do that because we can't assume that UTF-8 locale is used).
+
+RHPATCH= mkisofs-iconv-10.patch
+
 #RULES
 
 .PHONY: clean chroot stage2
@@ -20,6 +30,11 @@
 	@echo ""
 	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
 	@if [ ! -f $(WD)/bin/mkisofs ] ; then unpack $(FILE) && cd $(DIR) && \
+	 for F in cdrecord/cdrecord.c cdrecord/diskid.c cdrecord/sector.c \
+	          readcd/readcd.c scgcheck/scgcheck.c scgskeleton/skel.c ; do \
+	  LC_CTYPE=de_DE iconv -f ISO-8859-1 -t US-ASCII//TRANSLIT $$F >tmp ; \
+	  mv tmp $$F ; done && \
+	  patch -Np1 -i $(REDHAT)/$(NM)/$(RHPATCH) && \
 	 make -j3 INS_BASE=$(WD) DEFINSUSR=root DEFINSGRP=root && \
 	 make -j3 INS_BASE=$(WD) DEFINSUSR=root DEFINSGRP=root install ; fi
 	@make clean

Added: x86/branches/utf8/packages/ed/Makefile
===================================================================
--- x86/branches/utf8/packages/ed/Makefile	2005-08-03 12:08:09 UTC (rev 542)
+++ x86/branches/utf8/packages/ed/Makefile	2005-08-03 13:02:48 UTC (rev 543)
@@ -0,0 +1,31 @@
+# Byacc Makefile
+
+# Package versions
+NM= ed
+VRS= 0.2
+DIR= $(NM)-$(VRS)
+FILE= $(DIR).tar.bz2
+PATCH= $(DIR)-mkstemp.patch
+URL= $(HTTP)/$(NM)/$(FILE)
+URL1= $(HTTP)/$(NM)/$(PATCH)
+
+# RULES
+
+.PHONY: clean chroot stage2
+
+chroot:
+	@chroot "$(MP)" $(chenv2) 'cd $(ROOT) && make ch-$(NM) $(chbash2)'
+
+stage2:
+	@echo""
+	@echo "=====> Building $(NM) in chroot"
+	@echo""
+	@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
+	@if [ ! -f $(PATCH) ] ; then $(WGET) $(URL1) ; fi
+	@if [ ! -f /bin/ed ] ; then unpack $(FILE) && cd $(DIR) && \
+	 patch -Np1 -i ../$(PATCH) && \
+	 ./configure --prefix=/usr --exec-prefix="" && \
+	 make -j3 && make install ; fi
+	@make clean
+clean:
+	@-rm -rf $(DIR)

Modified: x86/branches/utf8/packages/lfs-bootscripts/langconf
===================================================================
--- x86/branches/utf8/packages/lfs-bootscripts/langconf	2005-08-03 12:08:09 UTC (rev 542)
+++ x86/branches/utf8/packages/lfs-bootscripts/langconf	2005-08-03 13:02:48 UTC (rev 543)
@@ -151,7 +151,6 @@
 echo "LANG=\"$F_LANG\" ; export LANG" >>/etc/profile
 
 echo "KEYMAP=\"$F_KEYMAP\"" >/etc/sysconfig/console
-echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
 
 if [ "`LC_ALL="$F_LANG" locale charmap`" = "UTF-8" ]
 then
@@ -159,8 +158,13 @@
 	echo "BROKEN_COMPOSE=0" >>/etc/sysconfig/console
 	if [ -n "$F_LEGACYCHARSET" ]
 	then
+		echo "FONT=\"$F_FONT -m ${F_LEGACYCHARSET#iso-}\"" >>/etc/sysconfig/console
 		echo "LEGACY_CHARSET=\"$F_LEGACYCHARSET\"" >>/etc/sysconfig/console
+	else
+		echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
 	fi
+else
+	echo "FONT=\"$F_FONT\"" >>/etc/sysconfig/console
 fi
 
-sed -i "s,\"us\",\"$F_XKEYMAP\"," /etc/X11/xorg.conf
+sed -i "s/\"us\"/\"$F_XKEYMAP\"/" /etc/X11/xorg.conf

Modified: x86/branches/utf8/packages/linux/Makefile
===================================================================
--- x86/branches/utf8/packages/linux/Makefile	2005-08-03 12:08:09 UTC (rev 542)
+++ x86/branches/utf8/packages/linux/Makefile	2005-08-03 13:02:48 UTC (rev 543)
@@ -6,9 +6,11 @@
 DIR= $(NM)-$(VRS)
 FILE= $(DIR).tar.bz2
 PATCH1= squashfs2.1-patch
+FILE2= patches-2.6.4-cdh1.tar.gz
 URL= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE)
 #URL1= http://ftp.roedu.net/pub/mirrors/ftp.namesys.com/pub/reiser4-for-2.6/2.6.11/broken-out
 URL1= http://ftp.namesys.com/pub/reiser4-for-2.6/2.6.11/broken-out
+URL2= http://chris.heathens.co.nz/linux/downloads/$(FILE2)
 
 #RULES
 
@@ -23,11 +25,14 @@
 	@echo ""
 	@-mkdir /boot/isolinux
 	@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && mv $(FILE) $(SRC) ; fi
+	@if [ ! -f $(FILE2) ] ; then $(WGET) $(URL2) ; fi
 	@if [ ! -f /boot/isolinux/linux ] ; then unpack $(SRC)/$(FILE) && cd $(DIR) && \
 	 if [ ! -f ../serie ] ; then $(WGET) $(URL1).2/serie && mv serie ../ ; fi && \
 	 for i in `cat ../serie` ; do if [ ! -f ../$$i ] ; then $(WGET) $(URL1).2/$$i && \
 	 mv $$i ../ ; fi && patch -Np1 -i ../$$i ; done && \
 	 patch -Np1 -i $(ROOT)/$(PKG)/squashfs/squashfs2.1/linux-2.6.9/$(PATCH1) && \
+	 tar zxf ../$(FILE2) && \
+	 patch -Np1 -i patches-2.6.4-cdh1/p1_conv_8bit_to_uni.patch && \
 	 make mrproper && \
 	 cp $(ROOT)/linux/config .config && \
 	 make -j3 && \

Added: x86/branches/utf8/packages/nALFS-profile/Makefile
===================================================================
--- x86/branches/utf8/packages/nALFS-profile/Makefile	2005-08-03 12:08:09 UTC (rev 542)
+++ x86/branches/utf8/packages/nALFS-profile/Makefile	2005-08-03 13:02:48 UTC (rev 543)
@@ -0,0 +1,29 @@
+# nALFS profile Makefile
+
+# Package versions
+NM= profile
+VRS= LFS-6.1
+DIR= $(VRS)
+FILE= $(NM)-$(DIR).tar.bz2
+URL= http://www.linuxfromscratch.org/alfs/downloads/profiles/stable/$(FILE)
+
+# RULES
+
+.PHONY: stage1 clean stage2 chroot
+
+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 [ ! -d /root/$(DIR) ] ; then unpack $(FILE) && \
+	 sed -i 's@/your/$(DIR)/packages@/sources at g' $(DIR)/config/general.ent && \
+	 cp -ra $(DIR) /root/nALFS-profile-$(DIR) ; fi
+	@make clean
+	 
+# Does what it says
+clean:
+	@-rm -rf $(DIR)

Modified: x86/branches/utf8/scripts/shutdown-helper
===================================================================
--- x86/branches/utf8/scripts/shutdown-helper	2005-08-03 12:08:09 UTC (rev 542)
+++ x86/branches/utf8/scripts/shutdown-helper	2005-08-03 13:02:48 UTC (rev 543)
@@ -4,7 +4,7 @@
 /lib/ld-linux.so.2
 /lib/libreadline.so.5.0
 /lib/libhistory.so.5.0
-/lib/libncurses.so.5
+/lib/libncursesw.so.5
 /lib/libdl.so.2
 /lib/libblkid.so.1
 /lib/libuuid.so.1




More information about the livecd mailing list