r804 - in x86/branches/utf8-newmake: . initramfs isolinux packages/blfs-bootscripts packages/cdrtools scripts

alexander at linuxfromscratch.org alexander at linuxfromscratch.org
Fri Sep 30 01:54:34 PDT 2005


Author: alexander
Date: 2005-09-30 02:54:29 -0600 (Fri, 30 Sep 2005)
New Revision: 804

Modified:
   x86/branches/utf8-newmake/Makefile
   x86/branches/utf8-newmake/initramfs/init.h
   x86/branches/utf8-newmake/isolinux/isolinux.cfg
   x86/branches/utf8-newmake/isolinux/keymaps.msg
   x86/branches/utf8-newmake/isolinux/locales1.msg
   x86/branches/utf8-newmake/isolinux/locales2.msg
   x86/branches/utf8-newmake/isolinux/options.msg
   x86/branches/utf8-newmake/packages/blfs-bootscripts/Makefile
   x86/branches/utf8-newmake/packages/cdrtools/Makefile
   x86/branches/utf8-newmake/scripts/shutdown-helper
Log:
Built the rest of packages
Disabled building of unionfs.ko because unionfs is compiled into the kernel
Merged the changes to isolinux help screens from utf8 branch
(but they are not functional due to binary /init bug -
it forgets to pass environment variables to the real /sbin/init)


Modified: x86/branches/utf8-newmake/Makefile
===================================================================
--- x86/branches/utf8-newmake/Makefile	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/Makefile	2005-09-30 08:54:29 UTC (rev 804)
@@ -220,7 +220,7 @@
 	ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-libaal ch-reiser4progs \
 	ch-squashfs ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which \
 	ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm ch-linux \
-	stop-here ch-ctags ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
+	ch-ctags ch-initramfs ch-cdrtools ch-blfs-bootscripts \
 	ch-syslinux ch-nALFS-profile
 ifeq ($(LFS-ARCH),ppc)
 	@make ch-yaboot

Modified: x86/branches/utf8-newmake/initramfs/init.h
===================================================================
--- x86/branches/utf8-newmake/initramfs/init.h	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/initramfs/init.h	2005-09-30 08:54:29 UTC (rev 804)
@@ -29,7 +29,7 @@
 #define	ISO_BLOCK_SIZE	2048
 #define	ISO_PD_BLOCK	0x10
 
-#define VOLUME_ID	""			/* Volume ID of CD.
+#define VOLUME_ID	"lfslivecd-x86-6.x-utf8-r1"			/* Volume ID of CD.
 						   This string is automatically set during the
 						   livecd build and needs to match the string passed
 						   to 'mkisofs -V' */

Modified: x86/branches/utf8-newmake/isolinux/isolinux.cfg
===================================================================
--- x86/branches/utf8-newmake/isolinux/isolinux.cfg	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/isolinux/isolinux.cfg	2005-09-30 08:54:29 UTC (rev 804)
@@ -4,9 +4,6 @@
 timeout 600
 display boot.msg
 F1 options.msg
-F2 locales1.msg
-F3 locales2.msg
-F4 keymaps.msg
 
 label linux
   kernel linux

Modified: x86/branches/utf8-newmake/isolinux/keymaps.msg
===================================================================
--- x86/branches/utf8-newmake/isolinux/keymaps.msg	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/isolinux/keymaps.msg	2005-09-30 08:54:29 UTC (rev 804)
@@ -1,29 +0,0 @@
-70
07The following keymaps are available on this CD:
-
-azerty:
-azerty be-latin1 fr-latin1 fr-latin9 fr fr-pc wangbe wangbe2
-
-dvorak:
-ANSI-dvorak dvorak-l dvorak dvorak-r
-
-fgGIod:
-tr_f-latin5 trf
-
-qwerty:
-bg_bds-cp1251 bg-cp1251 bg_pho-cp1251 br-abnt br-abnt2 br-latin1-abnt2
-br-latin1-us by2_win cf cz-cp1250 cz-lat2 cz-lat2-prog cz dk-latin1 dk
-es et et-nodeadkeys fi-latin1 fi-latin9 fi gr gr-pc hu101
-il-heb il il-phonetic is-latin1 is-latin1-us it it-ibm it2 jp106
-la-latin1 lt.baltic lt.l4 mk0 mk-cp1251 mk nl nl2 no-latin1 no
-pc110 pl pl2 pt-latin1 pt-latin9 ro_win ru1 ru3 ru4 ru-ms ru-yawerty
-se-ir209 se-lat6 sk-prog-qwerty sk-qwerty sr-cy sv-latin1 tralt tr_q-latin5
-trq ua ua-ws uk us-acentos us
-
-qwertz:
-croat cz-us-qwertz de_CH-latin1 de-latin1 de-latin1-nodeadkeys de fr_CH-latin1
-fr_CH hu sg-latin1-lk450 sg-latin1 sg sk-prog-qwertz sk-qwertz slovene
-
-
-
-[F1] = options  [F2] = locales, page 1  [F3] = locales, page 2  [F4] = keymaps
-

Modified: x86/branches/utf8-newmake/isolinux/locales1.msg
===================================================================
--- x86/branches/utf8-newmake/isolinux/locales1.msg	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/isolinux/locales1.msg	2005-09-30 08:54:29 UTC (rev 804)
@@ -1,29 +0,0 @@
-70
07Available locales (page 1 of 2)
-
-aa_DJ.ISO-8859-1         en_AU.ISO-8859-1         es_ES.ISO-8859-15 at euro
-af_ZA.ISO-8859-1         en_BW.ISO-8859-1         es_GT.ISO-8859-1
-an_ES.ISO-8859-15        en_CA.ISO-8859-1         es_HN.ISO-8859-1
-be_BY.CP1251             en_DK.ISO-8859-1         es_MX.ISO-8859-1
-bg_BG.CP1251             en_GB.ISO-8859-1         es_NI.ISO-8859-1
-br_FR.ISO-8859-1         en_HK.ISO-8859-1         es_PA.ISO-8859-1
-br_FR.ISO-8859-15 at euro   en_IE.ISO-8859-1         es_PE.ISO-8859-1
-bs_BA.ISO-8859-2         en_IE.ISO-8859-15 at euro   es_PR.ISO-8859-1
-ca_ES.ISO-8859-1         en_NZ.ISO-8859-1         es_PY.ISO-8859-1
-ca_ES.ISO-8859-15 at euro   en_PH.ISO-8859-1         es_SV.ISO-8859-1
-cs_CZ.ISO-8859-2         en_SG.ISO-8859-1         es_US.ISO-8859-1
-da_DK.ISO-8859-1         en_US.ISO-8859-1         es_UY.ISO-8859-1
-de_AT.ISO-8859-1         en_ZA.ISO-8859-1         es_VE.ISO-8859-1
-de_AT.ISO-8859-15 at euro   en_ZW.ISO-8859-1         et_EE.ISO-8859-1
-de_BE.ISO-8859-1         es_AR.ISO-8859-1         et_EE.ISO-8859-15
-de_BE.ISO-8859-15 at euro   es_BO.ISO-8859-1         eu_ES.ISO-8859-1
-de_CH.ISO-8859-1         es_CL.ISO-8859-1         eu_ES.ISO-8859-15 at euro
-de_DE.ISO-8859-1         es_CO.ISO-8859-1         fi_FI.ISO-8859-1
-de_DE.ISO-8859-15 at euro   es_CR.ISO-8859-1         fi_FI.ISO-8859-15 at euro
-de_LU.ISO-8859-1         es_DO.ISO-8859-1         fo_FO.ISO-8859-1
-de_LU.ISO-8859-15 at euro   es_EC.ISO-8859-1         fr_BE.ISO-8859-1
-el_GR.ISO-8859-7         es_ES.ISO-8859-1         fr_BE.ISO-8859-15 at euro
-
-
-
-[F1] = options  [F2] = locales, page 1  [F3] = locales, page 2  [F4] = keymaps
-

Modified: x86/branches/utf8-newmake/isolinux/locales2.msg
===================================================================
--- x86/branches/utf8-newmake/isolinux/locales2.msg	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/isolinux/locales2.msg	2005-09-30 08:54:29 UTC (rev 804)
@@ -1,29 +0,0 @@
-70
07Available locales (page 2 of 2)
-
-fr_CA.ISO-8859-1         lt_LT.ISO-8859-13        sk_SK.ISO-8859-2
-fr_CH.ISO-8859-1         lv_LV.ISO-8859-13        sl_SI.ISO-8859-2
-fr_FR.ISO-8859-1         mi_NZ.ISO-8859-13        so_DJ.ISO-8859-1
-fr_FR.ISO-8859-15 at euro   mk_MK.ISO-8859-5         so_KE.ISO-8859-1
-fr_LU.ISO-8859-1         ms_MY.ISO-8859-1         so_SO.ISO-8859-1
-fr_LU.ISO-8859-15 at euro   mt_MT.ISO-8859-3         sq_AL.ISO-8859-1
-ga_IE.ISO-8859-1         nb_NO.ISO-8859-1         st_ZA.ISO-8859-1
-ga_IE.ISO-8859-15 at euro   nl_BE.ISO-8859-1         sv_FI.ISO-8859-1
-gd_GB.ISO-8859-15        nl_BE.ISO-8859-15 at euro   sv_FI.ISO-8859-15 at euro
-gl_ES.ISO-8859-1         nl_NL.ISO-8859-1         sv_SE.ISO-8859-1
-gl_ES.ISO-8859-15 at euro   nl_NL.ISO-8859-15 at euro   tg_TJ.KOI8-T
-gv_GB.ISO-8859-1         nn_NO.ISO-8859-1         tl_PH.ISO-8859-1
-hr_HR.ISO-8859-2         oc_FR.ISO-8859-1         uk_UA.KOI8-U
-hu_HU.ISO-8859-2         om_KE.ISO-8859-1         uz_UZ.ISO-8859-1
-id_ID.ISO-8859-1         pl_PL.ISO-8859-2         wa_BE.ISO-8859-1
-is_IS.ISO-8859-1         pt_BR.ISO-8859-1         wa_BE.ISO-8859-15 at euro
-it_CH.ISO-8859-1         pt_PT.ISO-8859-1         xh_ZA.ISO-8859-1
-it_IT.ISO-8859-1         pt_PT.ISO-8859-15 at euro   zu_ZA.ISO-8859-1
-it_IT.ISO-8859-15 at euro   ro_RO.ISO-8859-2         
-kl_GL.ISO-8859-1         ru_RU.ISO-8859-5         
-kw_GB.ISO-8859-1         ru_RU.KOI8-R             
-lg_UG.ISO-8859-10        ru_UA.KOI8-U             
-
-
-
-[F1] = options  [F2] = locales, page 1  [F3] = locales, page 2  [F4] = keymaps
-

Modified: x86/branches/utf8-newmake/isolinux/options.msg
===================================================================
--- x86/branches/utf8-newmake/isolinux/options.msg	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/isolinux/options.msg	2005-09-30 08:54:29 UTC (rev 804)
@@ -20,9 +20,10 @@
 is set to UTC instead of local time.
 
 Set your locale by adding LANG=your_locale anywhere after
-"linux". To see the list of presumably working locales,
-press F2 and F3. Add KEYMAP=your_keymap to set the keyboard
-layout. To see the list of available keymaps, press F4.
+"linux".
 
-[F1] = options  [F2] = locales, page 1  [F3] = locales, page 2  [F4] = keymaps
+If you don't specify your timezone or locale at the boot prompt,
+a configuration dialog will appear later during boot.
 
+More information is available in /root/README on this CD.
+

Modified: x86/branches/utf8-newmake/packages/blfs-bootscripts/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/blfs-bootscripts/Makefile	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/packages/blfs-bootscripts/Makefile	2005-09-30 08:54:29 UTC (rev 804)
@@ -6,7 +6,7 @@
 
 FILE= $(DIR).tar.bz2
 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE)
-SHA-$(FILE)= 9ab7259c47697b3e81cb28d003e70f01d09cca75
+SHA-$(FILE)= 9fa8932329962cfa9227ab1c3b5d7aead8866610
 
 PATCH1=$(NM)-add-autosshd-1.patch
 SHA-$(PATCH1)= d69c9467e6cfcbff70006ad065f2765dc46c986b

Modified: x86/branches/utf8-newmake/packages/cdrtools/Makefile
===================================================================
--- x86/branches/utf8-newmake/packages/cdrtools/Makefile	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/packages/cdrtools/Makefile	2005-09-30 08:54:29 UTC (rev 804)
@@ -8,6 +8,15 @@
 URL-$(FILE)= $(HTTPBLFS)/A-C/$(FILE)
 SHA-$(FILE)= f94cfe51dd512d4e0b9106b986bde12d4f7967ce
 
+# Strictly speaking, this is not needed for making the LFS Live CD because
+# filenames on the LiveCD don't contain non-ASCII characters, but
+# without this patch you can't make a Windows-readabe CD with non-ASCII
+# filenames in UTF-8 locale.
+
+PATCH1= $(DIR)-mkisofs_iconv-10.patch
+URL-$(PATCH1)= http://www.linuxfromscratch.org/~alexander/patches/$(PATCH1)
+SHA-$(PATCH1)= 4a4d6a784e57678a865844021f52fe5fad3623bb
+
 # Targets
 
 include $(ROOT)/scripts/functions
@@ -16,10 +25,21 @@
 	chroot "$(MP)" $(chenv-blfs) \
 	'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
 
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) $(PATCH1)
 	$(std_build)
 
 compile-stage2:
+	# downconvert messages from ISO-8859-1 to ASCII to make
+	# sure that they are readable everywhere
+	#
+	# RedHat's cdrtools-2.01a27-UTF8.patch changes the same
+	# messages, but converts them to UTF-8 instead since
+	# encodings other than UTF-8 are not supported by RedHat
+	for F in cdrecord/cdrecord.c cdrecord/diskid.c cdrecord/sector.c \
+	         readcd/readcd.c scgcheck/scgcheck.c scgskeleton/skel.c ; do \
+	    LC_ALL=de_DE iconv -f ISO-8859-1 -t US-ASCII//TRANSLIT $$F >tmp ; \
+	    mv tmp $$F ; done
+	patch -Np1 -i ../$(PATCH1)
 	make $(PM) INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root
 	make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install
 

Modified: x86/branches/utf8-newmake/scripts/shutdown-helper
===================================================================
--- x86/branches/utf8-newmake/scripts/shutdown-helper	2005-09-28 16:16:23 UTC (rev 803)
+++ x86/branches/utf8-newmake/scripts/shutdown-helper	2005-09-30 08:54:29 UTC (rev 804)
@@ -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