Author: alexander
Date: 2007-10-10 07:33:16 -0600 (Wed, 10 Oct 2007)
New Revision: 2102
Added:
trunk/doc/README.html.head
trunk/doc/README.html.tail
trunk/packages/Markdown/
trunk/packages/Markdown/Makefile
trunk/packages/SmartyPants/
trunk/packages/SmartyPants/Makefile
trunk/packages/syslinux/split-boot-help
Removed:
trunk/isolinux/options1.msg
trunk/isolinux/options2.msg
trunk/isolinux/options3.msg
trunk/isolinux/options4.msg
Modified:
trunk/Makefile
trunk/doc/README.txt
trunk/isolinux/boot.msg
trunk/isolinux/isolinux.cfg
trunk/packages/perl/Makefile
trunk/packages/syslinux/Makefile
Log:
Reworked documentation.
Now isolinux help screens are autogenerated from the README.txt file,
and there is a README.html file in the root directory of the CD.
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/Makefile 2007-10-10 13:33:16 UTC (rev 2102)
@@ -285,7 +285,7 @@
ch-espeak ch-dotconf ch-speech-dispatcher ch-speechd-up ch-brltty \
ch-strace ch-iptables ch-eject ch-xlockmore ch-hdparm \
ch-sysfsutils ch-pcmcia-cs ch-pcmciautils ch-ddccontrol
ch-ddccontrol-db \
- ch-blfs-bootscripts ch-oui-data \
+ ch-blfs-bootscripts ch-oui-data ch-Markdown ch-SmartyPants \
ch-man-pages-fr ch-man-pages-es ch-man-pages-it ch-manpages-de
ch-manpages-ru \
ch-anthy ch-scim ch-scim-tables ch-scim-anthy ch-libhangul
ch-scim-hangul \
ch-libchewing ch-scim-chewing ch-scim-pinyin ch-scim-input-pad \
@@ -405,13 +405,8 @@
@>$(MP)/var/log/btmp
@>$(MP)/var/log/wtmp
@>$(MP)/var/log/lastlog
- @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss}
$(MP)/boot/isolinux
-ifeq ($(CD_ARCH),x86_64)
- @sed -i -e '/linux64/d' -e 's/ 32-bit//'
$(MP)/boot/isolinux/options?.msg
- @sed -i '/linux64/,$$d' $(MP)/boot/isolinux/isolinux.cfg
-endif
- @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg
- @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue*
+ @sed -i 's/Version:$$/Version: $(VERSION)/' $(MP)/boot/isolinux/boot.msg
+ @sed -i 's/Version:$$/Version: $(VERSION)/' $(MP)/etc/issue*
@install -m644 doc/lfscd-remastering-howto.txt $(MP)/root
@sed "s/\[version\]/$(VERSION)/" doc/README.txt >$(MP)/root/README.txt
@install -m600 root/.bashrc $(MP)/root/.bashrc
@@ -422,10 +417,16 @@
iso: prepiso
@make unmount
- # FIXME: sometimes e2fsck bombs out even after a clean build.
- # Kernel bug?
+ # Bug in old kernels requires a sync after unmounting the loop device
+ # for data integrity.
@sync ; sleep 1 ; sync
+ # e2fsck optimizes directories and returns 1 after a clean build.
+ # This is not a bug.
@-e2fsck -f -p root.ext2
+ @( LC_ALL=C ; export LC_ALL ; \
+ cat $(ROOT)/doc/README.html.head ; cat $(ROOT)/doc/README.txt | \
+ $(WD)/bin/Markdown | $(WD)/bin/SmartyPants ; \
+ cat $(ROOT)/doc/README.html.tail ) >$(MPBASE)/iso/README.html
@$(WD)/bin/mkzftree -F root.ext2 $(MPBASE)/iso/root.ext2
@cd $(MPBASE)/iso ; $(WD)/bin/mkisofs -z -R -l --allow-leading-dots -D
-o \
$(MPBASE)$(ROOT)/lfslivecd-$(VERSION).iso -b boot/isolinux/isolinux.bin
\
Added: trunk/doc/README.html.head
===================================================================
--- trunk/doc/README.html.head (rev 0)
+++ trunk/doc/README.html.head 2007-10-10 13:33:16 UTC (rev 2102)
@@ -0,0 +1,7 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Official Linux From Scratch LiveCD</title>
+</head>
+<body>
Added: trunk/doc/README.html.tail
===================================================================
--- trunk/doc/README.html.tail (rev 0)
+++ trunk/doc/README.html.tail 2007-10-10 13:33:16 UTC (rev 2102)
@@ -0,0 +1,2 @@
+</body>
+</html>
Modified: trunk/doc/README.txt
===================================================================
--- trunk/doc/README.txt 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/doc/README.txt 2007-10-10 13:33:16 UTC (rev 2102)
@@ -1,6 +1,6 @@
Official Linux From Scratch LiveCD
==================================
-Version: x86-6.3-r2052
+Version: [version]
PACKAGES
@@ -22,7 +22,7 @@
- seamonkey (graphical web browser, mail and news reader and irc client)
- xchat (x-based irc client)
- pidgin (multiprotocol x-based chat client)
- - finch (multiprotocol console chat client - works in UTF-8 locales only)
+ - finch (multiprotocol console chat client -- works in UTF-8 locales only)
- msmtp (SMTP client for use with mutt and tin)
- mutt (console email client)
- tin (console news reader)
@@ -90,11 +90,17 @@
------------
This CD does not detect virtual SCSI disks connected to a virtual machine in
-VMware Workstation 5.x or earlier or VMware Server 1.0.x or earlier. This is
-a known VMware bug. The solution is to upgrade to VMware Workstation 6.x, or
-to choose "BusLogic" as the virtual SCSI controller type instead of the
+VMware Workstation 5.x or earlier or VMware Server 1.0.3 or earlier. This is
+a known VMware bug. The solution is to upgrade to VMware Workstation >= 6.0 or
+VMware Server >= 1.0.4.
+
+The following workarounds help for older versions of VMware products:
+
+ * Choose "BusLogic" as the virtual SCSI controller type instead of the
default "LSI Logic".
+ * Pass the "mptbase.mpt_channel_mapping=1" option to the kernel command line.
+
The same issue will be present on an LFS system built from this CD.
CONFIGURING NET CONNECTION
@@ -244,37 +250,7 @@
linux [EMAIL PROTECTED]
-The CD tries to guess the proper screen font and keymap based on this
-information. If the guess is wrong, you can override it by adding the
-following parameters:
-KEYMAP:
- specifies the console keymap(s) to load (actually the arguments to
- the "loadkeys" program separated by the "+" sign)
-
-Example: "KEYMAP=es+euro1"
-
-LEGACY_CHARSET:
- sometimes a ready-made UTF-8 keymap is not available and
- must be obtained by converting an existing keymap from this charset to UTF-8.
- This parameter is not used in non-UTF-8 locales.
-
-Example: "LEGACY_CHARSET=iso-8859-15".
-
-FONT:
- specifies the screen font to set (actually, the arguments to the
- "setfont" program separated by the "+" sign).
-
-Example: "FONT=LatArCyrHeb-16+-m+8859-15"
-
-XKEYMAP:
- the keymap to use with X window system
-
-Example: "XKEYMAP=us"
-
-Alternatively, these items can be configured interactively using dialog-based
-interface if the locale is not specified on the boot prompt.
-
For some locales (e.g. lv_LV.ISO-8859-13) there is no valid console keymap,
but there is a keymap for X. In this case, the only solution is to use X.
@@ -362,7 +338,7 @@
Pass "resume=/dev/hda2" as one of the kernel arguments when booting this CD.
I.e., the complete boot line may look as:
-
+
linux LANG=ru_RU.UTF-8 TZ=Asia/Yekaterinburg resume=/dev/hda2
Alternatively, once the system is running, you can activate hibernation by
@@ -509,6 +485,287 @@
* Add "rootdelay=20" to the kernel arguments.
+BOOT OPTIONS
+------------
+
+### AVAILABLE KERNELS ###
+
+#### linux ####
+
+The default (32-bit on the x86 CD, 64-bit on the x86_64 CD) kernel.
+
+#### linux64 ####
+
+On the x86 CD, this is the alternative (64-bit) kernel, for use with
+Cross-Compiled Linux From Scratch <http://trac.cross-lfs.org/>.
+
+Don't use this kernel for building the regular version of LFS -- it will fail,
+because the x86 CD does not contain a 64-bit capable compiler, and because
+the included book on the x86 CD does not support x86_64 yet.
+
+On the x86_64 CD, this is the same as the default kernel.
+
+After the kernel name, options may be specified, as in the following example:
+
+ linux LANG=ru_RU.UTF-8 TZ=Asia/Yekaterinburg UTC=1
+
+See the list of available options below.
+
+### GRAPHICS AND SOUND ###
+
+#### vga=[resolution] ####
+
+Examples:
+
+ vga=795 (1280x1024x24) vga=792 (1024x768x24) vga=789 (800x600x24)
+ vga=794 (1280x1024x16) vga=791 (1024x768x16) vga=788 (800x600x16)
+
+This parameter enables the framebuffer console.
+
+It has nothing to do with X server resolution (to set it, edit
+/etc/X11/xorg.conf manually after booting). Also, it causes some X video
+drivers (e.g., "s3virge") to malfunction.
+
+X server bug reports will be ignored if you use this option.
+
+#### volume=[volume] ####
+
+Examples:
+
+ volume=50%
+ volume=-15dB
+
+Ths parameter sets the Master, Front and Headphone volume controls on all sound
+cards to the specified value. The default is 74%. PCM and similar controls are
+always set to 0dB, or, if the driver doesn't know about dB, to 74%.
+
+### DATE AND TIME ###
+
+#### TZ=[timezone] ####
+
+Examples:
+
+ TZ=EDT-4 TZ=America/New_York
+
+The first example means that the timezone is named "EDT"
+and is 4 hours behind (west) of UTC.
+
+#### UTC=[0,1] ####
+
+Example:
+
+ UTC=1
+
+Use UTC=1 if the hardware clock is set to UTC or
+use UTC=0 (default) if the hardware clock is set to local time.
+
+If no TZ parameter is passed at the kernel command line, the CD asks
+for the above settings during boot.
+
+### LOCALIZATION BASICS ###
+
+#### LANG=[locale] ####
+
+Example:
+
+ LANG=fr_FR.UTF-8
+
+If you don't specify your locale at the boot prompt, a configuration dialog
+will appear later during boot.
+
+The CD attempts to guess the keymap and the screen font based on the LANG
+variable. If the default guess is wrong, you can override it, as described
+in the "FINE-TUNING LOCALIZATION" section below.
+
+UTF-8 locales don't work well on Linux text console. Copying and pasting
+non-ASCII characters is impossible, as well as using dead keys for entering
+characters outside of the Latin-1 range of Unicode.
+
+UTF-8 locales don't work at all with accessibility software (brltty and
+speakup) due to the same kernel limitation.
+
+### FINE-TUNING LOCALIZATION ###
+
+#### KEYMAP=[keymap] ####
+
+Example:
+
+ KEYMAP=es+euro1
+
+Specifies the console keymap(s) to load, separated by the "+" sign.
+
+#### LEGACY_CHARSET=[charset] ####
+
+Example:
+
+ LEGACY_CHARSET=iso-8859-15
+
+Instructs the CD to convert an existing keymap from this charset to UTF-8
+with the "dumpkeys" program.
+
+#### FONT=[screen_font] ####
+
+Example:
+
+ FONT=LatArCyrHeb-16+-m+8859-15
+
+Specifies the screen font to set (actually, the arguments to the "setfont"
+program, separated by the "+" sign).
+
+#### XKEYMAP=[keymap1,keymap2] ####
+
+Example:
+
+ XKEYMAP=us,ru(winkeys)
+
+Keymap(s) for X window system. To switch between them, press Alt+Shift.
+
+### ACCESSIBILITY: BRLTTY ###
+
+#### brltty=drv[,dev[,tbl]] ####
+
+Example:
+
+ brltty=bm,usb:
+
+Enables a refreshable Braille display supported by driver drv, connected to
+device dev, with a translation table tbl. The example specifies a BAUM
+SuperVario 40 Braille display connected viw USB with default Braille table.
+
+Available drivers:
+
+ al, at, bd, bl, bm, bn, cb, ec, eu, fs, ht, il,
+ lt, mb, md, mn, pm, tn, ts, vd, vo, vr, vs.
+
+Available tables:
+
+ brf, cz, da-1252, da-lt, da, de, en_UK, en_US, es,
+ fi1, fi2, fr-2007, fr_CA, fr-cbifs, fr_FR, it, nabcc,
+ no-h, no-p, pl, pt, ru, se-old, simple, visiob.
+
+The charset of the selected locale must match the charset of the Braille table.
+
+BRLTTY is not compatible with UTF-8 locales.
+
+### ACCESSIBILITY: SPEAKUP ###
+
+#### speakup.synth=[syn] ####
+
+Example:
+
+ speakup.synth=soft
+
+Enables a speech synthesis engine syn. Available drivers: acntpc, acntsa,
+appolo, audptr, bns, decext, dectlk, dtlk, keypc, ltlk, soft, spkout, txprt.
+The "soft" driver uses Espeak to output sound through the first sound card.
+
+The GIT snapshot of speakup used on this CD has a known bug: copying and
+pasting text produces garbage and even can crash the computer. For copying
+and pasting text between programs, please use the "screen" terminal emulator
+instead of this buggy built-in feature of speakup.
+
+#### speakup.ser=[index] ####
+
+Example:
+
+ speakup.ser=2
+
+One-based serial port index to use with a hardware synth. The example above
+means that /dev/ttyS1 will be used.
+
+#### speakup.port=[port] ####
+
+A port address to use with speakup.
+
+### MODULE HANDLING ###
+
+#### load=module1,module2,... ####
+
+Example:
+
+ load=ide-generic
+
+Loads the specified modules unconditionally from initramfs. Use if your SCSI
+or IDE controller is not autodetected. If you don't specify this parameter
+and the CD doesn't detect your SCSI or IDE controller, you will be dropped
+into a debugging shell where you can load the needed module manually.
+
+#### blacklist=module1,module2,... ####
+
+Example:
+
+ blacklist=yenta-socket
+
+Prevents the specified modules from being autoloaded. Use if udev autoloads
+a module that causes your computer to misbehave (e.g., crash or freeze).
+
+#### module.option=value ####
+
+Example:
+
+ psmouse.proto=bare
+
+Sets arbitrary module options.
+
+### ALTERNATIVE DRIVERS ###
+
+Options in this section do not take parameters. Example:
+
+ pata new_firewire
+
+#### pata ####
+
+Causes the CD to use new libata-based drivers for IDE controllers. This option
+may be required for controller detection or recommended for optimal performance
+on computers manufactured in year 2006 and later.
+
+Caution: new drivers are safe to use only with IDE chipsets from AMD, Intel,
+ITE, JMicron, Marvell, Netcell, NVIDIA, Serverworks, Promise, Silicon Image,
+VIA, or Winbond. Drivers for other chipsets are likely to contain bugs that
+lead to data loss.
+
+#### new_firewire ####
+
+Uses the new (experimental) Juju FireWire stack.
+
+#### all-generic-ide ####
+
+Attempts to support unknown PCI IDE and SATA controllers (slow).
+For SATA support to work with this option, the SATA controller
+must be put into "Legacy" (as opposed to "Native") mode in the BIOS.
+
+### TROUBLESHOOTING ###
+
+#### debug ####
+
+Displays kernel messages during the boot process.
+
+#### rootdelay=X ####
+
+Example:
+
+ rootdelay=20
+
+Waits X seconds before attempting to find the CD. Required (with X=20)
+for booting from USB or FireWire CD-ROMs.
+
+#### nodhcp ####
+
+Prevents the CD from attempting to obtain an IP address automatically.
+May be required for wireless networking, because the WEP or WPA key
+needs to be set up first.
+
+#### Options for buggy motherboards ####
+
+Example:
+
+ nomsi noapic nolapic pci=noacpi acpi=off clock=pit ide=nodma
+
+These options work around various chipset bugs. Try them one-by-one in the
+order given above and in various combinations if the CD does not boot, or if
+a device does not work correctly or fails after hibernating and resuming.
+Note: if this helps, the bug is in the hardware or the BIOS, not in this CD.
+
THANKS
------
Modified: trunk/isolinux/boot.msg
===================================================================
--- trunk/isolinux/boot.msg 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/isolinux/boot.msg 2007-10-10 13:33:16 UTC (rev 2102)
@@ -1,5 +1,5 @@
splash.lss
07This is the Official LFS LiveCD, Version:
-07Press [Enter] to boot, F1 - F4 for available options
+07Press [Enter] to boot, F1 - F10 for available options
Modified: trunk/isolinux/isolinux.cfg
===================================================================
--- trunk/isolinux/isolinux.cfg 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/isolinux/isolinux.cfg 2007-10-10 13:33:16 UTC (rev 2102)
@@ -2,10 +2,16 @@
prompt 1
timeout 600
display boot.msg
-F1 options1.msg
-F2 options2.msg
-F3 options3.msg
-F4 options4.msg
+F1 F1.txt
+F2 F2.txt
+F3 F3.txt
+F4 F4.txt
+F5 F5.txt
+F6 F6.txt
+F7 F7.txt
+F8 F8.txt
+F9 F9.txt
+F10 F10.txt
label linux
kernel linux
Deleted: trunk/isolinux/options1.msg
===================================================================
--- trunk/isolinux/options1.msg 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/isolinux/options1.msg 2007-10-10 13:33:16 UTC (rev 2102)
@@ -1,28 +0,0 @@
-70 07To specify options at boot time, type [kernel] [options]
-Available kernels:
-linux - The default 32-bit kernel
-linux64 - A 64-bit kernel for use with CLFS
-
-Options [page 1 of 4]:
-
-TZ=[timezone]
- Examples: TZ=EDT-4 TZ=America/New_York
-
- The first example means that the timezone is named "EDT"
- and is 4 hours behind (west) of UTC.
-
-UTC=[0,1]
- Use UTC=1 if the hardware clock is set to UTC or
- use UTC=0 (default) if the hardware clock is set to local time.
-
-LANG=[locale]
- Example: LANG=fr_FR.UTF-8
-
- If you don't specify your timezone or locale at the boot prompt,
- a configuration dialog will appear later during boot.
-
-nodhcp
- Prevents the CD from attempting to obtain an IP address automatically.
- May be required for wireless networking, because the WEP or WPA key
- needs to be set up first.
-
Deleted: trunk/isolinux/options2.msg
===================================================================
--- trunk/isolinux/options2.msg 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/isolinux/options2.msg 2007-10-10 13:33:16 UTC (rev 2102)
@@ -1,28 +0,0 @@
-70 07To specify options at boot time, type [kernel] [options]
-Available kernels:
-linux - The default 32-bit kernel
-linux64 - A 64-bit kernel for use with CLFS
-
-Options [page 2 of 4]:
-
-toram
- Loads the whole CD contents (except sources and proprietary video
- drivers) to RAM.
- Note: this needs at least 512 MB of RAM, and you also need
- to enable swap if you have less than 768 MB of RAM.
-
-rootdelay=X
- Waits X seconds before attempting to find the CD. Required (with X=20)
- for booting from USB or FireWire CD-ROMs.
-
-all_generic_ide
- Attempts to support unknown PCI IDE and SATA controllers (slow).
- For SATA support to work with this option, the SATA controller
- must be put into "Legacy" (as opposed to "Native") mode in the BIOS.
-
-resume=/dev/XXX
- Uses /dev/XXX for software suspending (AKA hibernation) and resuming.
- See /root/README for details.
-
-debug
- Causes kernel messages to appear on the screen.
Deleted: trunk/isolinux/options3.msg
===================================================================
--- trunk/isolinux/options3.msg 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/isolinux/options3.msg 2007-10-10 13:33:16 UTC (rev 2102)
@@ -1,28 +0,0 @@
-70 07To specify options at boot time, type [kernel] [options]
-Available kernels:
-linux - The default 32-bit kernel
-linux64 - A 64-bit kernel for use with CLFS
-
-Options [page 3 of 4]:
-pata
- Uses new libata-based drivers for IDE controllers. This option may be
- required for controller detection or recommended for optimal performance
- on computers manufactured in year 2006 and later.
-
- Caution: new drivers are safe to use only with IDE chipsets from AMD, Intel,
- ITE, JMicron, Marvell, Netcell, NVIDIA, Serverworks, Promise, Silicon Image,
- VIA, or Winbond. Drivers for other chipsets are likely to contain bugs that
- lead to data loss.
-
-load=module1,module2,...
- Loads the specified modules unconditionally from initramfs. Use if your SCSI
- or IDE controller is not autodetected. If you don't specify this parameter
- and the CD doesn't detect your SCSI or IDE controller, you will be dropped
- into a debugging shell where you can load the needed module manually.
-
-blacklist=module1,module2,...
- Prevents the specified modules from being autoloaded.
-
-module.option=value
- Sets arbitrary module options.
-
Deleted: trunk/isolinux/options4.msg
===================================================================
--- trunk/isolinux/options4.msg 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/isolinux/options4.msg 2007-10-10 13:33:16 UTC (rev 2102)
@@ -1,28 +0,0 @@
-70 07To specify options at boot time, type [kernel] [options]
-Available kernels:
-linux - The default 32-bit kernel
-linux64 - A 64-bit kernel for use with CLFS
-
-Options [page 4 of 4]:
-new_firewire
- Uses the new FireWire stack.
-
-nomsi noapic pci=noacpi acpi=off clock=pit blacklist=yenta-socket ide=nodma
- These options work around various chipset bugs. Try them one-by-one in the
- order given above and in various combinations if the CD does not boot, or if
- a device does not work correctly or fails after hibernating and resuming.
-
-brltty=drv[,dev[,tbl]]
- Example: brltty=bm,usb:
- Enables a refreshable Braille display supported by driver drv, connected to
- device dev, with a translation table tbl. The example specifies a BAUM
- SuperVario 40 Braille display connected by USB with default Braille table.
-
-vga=[resolution]
- Examples:
- vga=795 (1280x1024x24) vga=792 (1024x768x24) vga=789 (800x600x24)
- vga=794 (1280x1024x16) vga=791 (1024x768x16) vga=788 (800x600x16)
-
- Enables the framebuffer console. This has nothing to do with X
- server resolution. Also, it causes some X video drivers (e.g., "s3virge") to
- malfunction. X server bug reports will be ignored if you use this option.
Added: trunk/packages/Markdown/Makefile
===================================================================
--- trunk/packages/Markdown/Makefile (rev 0)
+++ trunk/packages/Markdown/Makefile 2007-10-10 13:33:16 UTC (rev 2102)
@@ -0,0 +1,30 @@
+# Markdown Makefile
+
+NM= Markdown
+VRS= 1.0.1
+DIR= $(NM)_$(VRS)
+
+FILE= $(DIR).zip
+URL-$(FILE)= http://daringfireball.net/projects/downloads/$(FILE)
+SHA-$(FILE)= 7e6d1d9224f16fec5631bf6bc5147f1e64715a4b
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ unzip $(FILE)
+ # We want to run this outside of the chroot
+ sed -i 's/usr/tools/' $(DIR)/Markdown.pl
+ install -m755 $(DIR)/Markdown.pl /tools/bin/Markdown
+ make clean
+ @touch $@
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot
Added: trunk/packages/SmartyPants/Makefile
===================================================================
--- trunk/packages/SmartyPants/Makefile (rev 0)
+++ trunk/packages/SmartyPants/Makefile 2007-10-10 13:33:16 UTC (rev 2102)
@@ -0,0 +1,30 @@
+# SmartyPants Makefile
+
+NM= SmartyPants
+VRS= 1.5.1
+DIR= $(NM)_$(VRS)
+
+FILE= $(DIR).zip
+URL-$(FILE)= http://daringfireball.net/projects/downloads/$(FILE)
+SHA-$(FILE)= 339a493f89cfee1e9f051bb1b39f9dcae4c595ca
+
+# Targets
+
+include $(ROOT)/scripts/functions
+
+chroot:
+ chroot "$(MP)" $(chenv-blfs) \
+ 'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
+
+stage2: Makefile $(FILE)
+ unzip $(FILE)
+ # We want to run this outside of the chroot
+ sed -i 's/usr/tools/' $(DIR)/SmartyPants.pl
+ install -m755 $(DIR)/SmartyPants.pl /tools/bin/SmartyPants
+ make clean
+ @touch $@
+
+clean:
+ -rm -rf $(DIR)
+
+.PHONY: clean chroot
Modified: trunk/packages/perl/Makefile
===================================================================
--- trunk/packages/perl/Makefile 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/packages/perl/Makefile 2007-10-10 13:33:16 UTC (rev 2102)
@@ -22,7 +22,7 @@
compile-stage1:
patch -Np1 -i ../$(PATCH1)
./configure.gnu --prefix=$(WD) \
- -Dstatic_ext='Data/Dumper Fcntl IO POSIX' \
+ -Dstatic_ext='Data/Dumper Digest/MD5 Fcntl IO POSIX' \
-Darchname=$${LFS_TARGET%%-*}-linux
make perl utilities
cp -v perl pod/pod2man $(WD)/bin
Modified: trunk/packages/syslinux/Makefile
===================================================================
--- trunk/packages/syslinux/Makefile 2007-10-10 13:23:21 UTC (rev 2101)
+++ trunk/packages/syslinux/Makefile 2007-10-10 13:33:16 UTC (rev 2102)
@@ -16,13 +16,18 @@
chroot "$(MP)" $(chenv-blfs) \
'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)'
-stage2: Makefile $(FILE)
+stage2: Makefile $(FILE) split-boot-help $(ROOT)/doc/README.txt
$(std_build)
compile-stage2:
mkdir -p /boot/isolinux
cp -v isolinux.bin /boot/isolinux
- cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux
+ ../split-boot-help <$(ROOT)/doc/README.txt
+ cp -v F*.txt /boot/isolinux
+ cp -v $(ROOT)/isolinux/{isolinux.cfg,boot.msg,splash.lss} /boot/isolinux
+ifeq ($(CD_ARCH),x86_64)
+ sed -i 's/kernel linux64/kernel linux/' /boot/isolinux/isolinux.cfg
+endif
clean:
-rm -rf $(DIR)
Added: trunk/packages/syslinux/split-boot-help
===================================================================
--- trunk/packages/syslinux/split-boot-help (rev 0)
+++ trunk/packages/syslinux/split-boot-help 2007-10-10 13:33:16 UTC (rev
2102)
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+IFS=""
+IGNORE=1
+F=0
+
+while read -r LINE ; do
+ case "$LINE" in
+ "BOOT OPTIONS")
+ IGNORE=0
+ ;;
+ "THANKS")
+ IGNORE=1
+ ;;
+ \#\#\#\ *\ \#\#\#)
+ if [ "$IGNORE" = "0" ] ; then
+ F=$(( F+1 ))
+ TITLE=${LINE#????}
+ TITLE=${TITLE%????}
+ TITLE="F$F = $TITLE"
+ echo "$TITLE" >>boot-option-index
+ printf '\01770\014\01707' >"F$F.txt"
+ fi
+ ;;
+ "Example:")
+ # Save a bit of space on the screen
+ if [ "$IGNORE" = "0" ] ; then
+ echo -n "Example:" >>"F$F.txt"
+ # Skip the following empty line and grab the example
+ read -r LINE
+ read -r LINE
+ fi
+ ;;
+ esac
+ if [ "$IGNORE" = "0" ] && [ "$F" != "0" ] ; then
+ echo "$LINE" >>"F$F.txt"
+ fi
+done
+
+pr -t -2 -o 4 boot-option-index | col -x >>F1.txt
+
+for FILE in F*.txt ; do
+ LENGTH=`wc -l $FILE`
+ LENGTH=${LENGTH% *}
+ for (( i=$LENGTH ; i<28 ; i++ )) ; do
+ echo >>$FILE
+ done
+done
Property changes on: trunk/packages/syslinux/split-boot-help
___________________________________________________________________
Name: svn:executable
+ *
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
