Changeset 2020

Show
Ignore:
Timestamp:
08/14/07 20:47:48 (1 year ago)
Author:
jhuntwork
Message:

Brought minimal branch up to date.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/minimal/Makefile

    r2005 r2020  
    2828 
    2929# Machine architecure, LiveCD version, and specific arch variables. 
     30# When building a 32-bit CD from a 64-bit multilib host, 
     31# please use "linux32 make" instead of plain "make". 
    3032#============================================================================== 
    3133 
    …… 
    4042endif 
    4143 
    42 ifeq ($(CD_ARH),x86_64) 
     44ifeq ($(CD_ARCH),x86_64) 
    4345export 64bit = true 
    44 export LFS_TARGET ?= $(MACHTYPE) 
     46export LFS_TARGET ?= x86_64-unknown-linux-gnu 
    4547export LINKER := ld-linux-x86-64.so.2 
    4648endif 
    …… 
    173175        touch $(MKTREE) 
    174176ifdef 64bit 
    175         -if [ ! -L $(MP)/lib64 ] ; then ln -s lib $(MP)/lib64 ; fi 
    176         -if [ ! -L $(MP)/usr/lib64 ] ; then ln -s lib $(MP)/usr/lib64 ; fi 
     177        -ln -nsf lib $(WD)/lib64 
     178        -ln -nsf lib $(MP)/lib64 
     179        -ln -nsf lib $(MP)/usr/lib64 
    177180endif 
    178181 
    …… 
    280283        ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \ 
    281284        ch-fuse ch-dosfstools ch-ntfsprogs ch-libaal ch-reiser4progs \ 
    282         ch-bin86 ch-lilo ch-syslinux ch-scsi-firmware ch-net-firmware ch-initramfs 
     285        ch-bin86 ch-lilo ch-syslinux ch-scsi-firmware ch-net-firmware ch-initramfs ch-linux32 
    283286ifeq ($(CD_ARCH),x86) 
    284287        make ch-grub 
    …… 
    388391        @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/isolinux 
    389392ifeq ($(CD_ARCH),x86_64) 
    390         @sed -i -e '/linux64/d' -e 's/ 32-bit//' $(MP)/boot/isolinux/options.msg 
     393        @sed -i -e '/linux64/d' -e 's/ 32-bit//' $(MP)/boot/isolinux/options?.msg 
    391394        @sed -i '/linux64/,$$d' $(MP)/boot/isolinux/isolinux.cfg 
    392395endif 
    …… 
    434437 
    435438scrub: clean 
    436         @-rm lfslivecd-$(VERSION).iso 
     439        @rm -f lfslivecd-$(VERSION).iso lfslivecd-$(VERSION)-nosrc.iso 
    437440 
    438441mount: $(MKTREE) 

  • branches/minimal/doc/README

    r1890 r2020  
    1515* lynx (text web browser) 
    1616* w3m (text web browser) 
    17 * irssi (console irc client, unstable version) 
     17* irssi (console irc client) 
    1818* seamonkey (graphical web browser, mail and news reader and irc client) 
    1919* xchat (x-based irc client) 
    …… 
    2626Text Editors 
    2727* vim 
    28 * nano (unstable version) 
     28* nano 
    2929* joe 
    3030 
    …… 
    3232* SSH server & client 
    3333* NFS server & client 
    34 * Samba (client only) 
     34* Samba server & client 
    3535* Subversion 
    3636* cvs 
    …… 
    7171Makefiles that can download, check and build each LFS package for you.) 
    7272 
     73VMWARE ISSUE 
     74=========================== 
     75This CD does not detect virtual SCSI disks connected to a virtual machine in 
     76VMware Workstation 5.x or earlier or VMware Server 1.0.x or earlier. This is 
     77a known VMware bug. The solution is to upgrade to VMware Workstation 6.x, or 
     78to choose "BusLogic" as the virtual SCSI controller type instead of the 
     79default "LSI Logic". 
     80 
     81The same issue will be present on an LFS system built from this CD. 
     82 
    7383CONFIGURING NET CONNECTION 
    7484=========================== 
    …… 
    7888in your location, or if you want to use dialup or GPRS connection, run the 
    7989"net-setup" command. 
     90 
     91If you don't want the CD to start dhcpcd on the detected network cards, 
     92type "linux nodhcp" at the boot loader prompt. This may be required for 
     93wireless connections that utilize WEP or WPA encryption. 
    8094 
    8195CONFIGURING X 
    …… 
    121135        VertRefresh     56-86   # because an 85 Hz mode has been requested 
    122136        # the Modeline may also be pasted here 
     137        Option "PreferredMode" "1280x1024_85.00" # only for the "intel" driver 
    123138EndSection 
    124139 
    …… 
    130145 
    131146When you are finished editing /etc/X11/xorg.conf, run startx. 
     147 
     148PROPRIETARY VIDEO DRIVERS 
     149========================= 
     150 
     151The CD contains pre-built proprietary video drivers in the /drivers directory 
     152(if you loaded the CD contents to RAM, you have to mount the CD and look into 
     153/media/cdrom/drivers instead). They are never selected by default by the 
     154autoconfiguration process. Here is how to enable them: 
     155 
     156NVIDIA: 
     157 
     158cd /drivers 
     159tar -C / -xf NVIDIA-Linux-[userspace_arch]-[version]-glx.tgz 
     160tar -C / -xf NVIDIA-Linux-[kernel_arch]-[version]-kernel-[kernel_version].tgz 
     161depmod -ae 
     162ldconfig 
     163vim /etc/X11/xorg.conf   # use the "nvidia" driver instead of "vesa" or "nv" 
     164 
     165FGLRX: 
     166 
     167cd /drivers 
     168tar -C / -xf fglrx-x710-[version]-[userspace_arch]-1.tgz 
     169tar -C / -xf fglrx-module-[version]-[kernel_arch]-1_kernel_[kernel_version].tgz 
     170depmod -ae 
     171ldconfig 
     172vim /etc/X11/xorg.conf   # use the "fglrx" driver instead of "vesa" or "ati" 
    132173 
    133174CUSTOMIZING THE CD CONTENTS 
    …… 
    245286Known non-working cases: 
    246287    All CP1251-based locales (no CP1251 Braille table in brltty) 
     288    All UTF-8 locales (kernel deficiency) 
    247289    zh_TW (configuration instructions available in Chinese only). If you use 
    248290      this locale, please email livecd@linuxfromscratch.org and help us add 
    …… 
    336378# echo 254:3 >/sys/power/resume 
    337379 
    338 In the case of the first boot, this will print an error, but store the device 
    339 numbers to be used for hibernation. Ignore the error and hibernate when needed. 
    340  
    341 On the second boot (i.e., after hibernating), this "echo" command will restore 
    342 the computer state from the swap device. 
     380In the case of the first boot, this will store the device numbers to be used 
     381for hibernation. On the second boot (i.e., after hibernating), this "echo" 
     382command will restore the computer state from the swap device. 
    343383 
    344384AUTOMATING THE BUILD 
    …… 
    358398the build. 
    359399 
     400LOADING CD CONTENTS TO RAM 
     401=========================== 
     402The CD works much faster if you load all its contents to RAM. As a bonus, you 
     403will be able to eject the CD immediately and use the CD-ROM drive for other 
     404purposes (e.g., for watching a DVD while compiling LFS). 
     405 
     406To load the CD contents to RAM, type "linux toram" at the boot prompt. 
     407 
     408The minimum required amount of RAM is 512 MB. If you have less than 768 MB of 
     409RAM, add swap when the CD boot finishes. 
     410 
     411Note: in order to save RAM, sources and proprietary drivers are not loaded 
     412there. In order to access them, please mount this CD and look into 
     413/media/cdrom/sources and /media/cdrom/drivers. 
     414 
     415BOOTING FROM ISO IMAGE 
     416=========================== 
     417If you want to boot this CD on a computer without a CD-ROM drive, follow 
     418the steps below: 
     419 
     4201) Store the ISO image of this CD as a file on a partition formatted with 
     421   one of the following filesystems: 
     422   vfat, ntfs, ext2, ext3, ext4, reiserfs, reiser4, xfs 
     4232) Copy the boot/isolinux/{linux,initramfs_data.cpio.gz} files from the CD 
     424   to your hard disk 
     4253) Configure the boot loader to load "linux" as a kernel image and 
     426   "initramfs_data.cpio.gz" as an initrd. The following parameters have to 
     427   be passed to the kernel: 
     428 
     429   rw root=iso:/dev/XXX:/path/to/lfslivecd.iso rootfstype=[fs_type] 
     430 
     431   where /dev/XXX is a partition where you stored the LiveCD image, and 
     432   [fs_type] is the type of the filesystem on that partition. You may 
     433   also want to add rootflags=... option if mounting this partition requires 
     434   special flags. 
     435 
     436If there is only Windows on the target computer, please use grub4dos as a boot 
     437loader. It is available from http://sourceforge.net/projects/grub4dos 
     438 
     439MAKING A BOOTABLE USB DRIVE 
     440=========================== 
     441Install GRUB on a flash drive, then follow instructions in the 
     442"BOOTING FROM ISO IMAGE" above, using a partition on your flash drive. 
     443The following tips will ensure that the flash drive is bootable in any 
     444computer: 
     445 
     446* Use the persistent symlink such as /dev/disk/by-uuid/890C-F46A to identify 
     447  the target partition. 
     448* Add "rootdelay=20" to the kernel arguments. 
     449 
    360450THANKS 
    361451=========================== 

  • branches/minimal/isolinux/boot.msg

    r2001 r2020  
    22splash.lss 
    3307This is the Official LFS LiveCD, Version: 
    4 07Press [Enter] to boot, F1 for basic options 
     407Press [Enter] to boot, F1 - F4 for available options 
    55 

  • branches/minimal/isolinux/isolinux.cfg

    r1994 r2020  
    33timeout 600 
    44display boot.msg 
    5 F1 options.msg 
     5F1 options1.msg 
     6F2 options2.msg 
     7F3 options3.msg 
     8F4 options4.msg 
    69 
    710label linux 

  • branches/minimal/packages/LFS-BOOK/Makefile

    r1994 r2020  
    1111#SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052 
    1212 
    13 REV= 8250 
     13REV= 8319 
    1414REVPARM= -r $(REV) 
    1515 
    1616ifeq ($(CD_ARCH),x86) 
    17 URL= svn://svn.linuxfromscratch.org/LFS/trunk/BOOK 
     17URL= svn://svn.linuxfromscratch.org/LFS/branches/6.3/BOOK 
    1818endif 
    1919ifeq ($(CD_ARCH),x86_64) 

  • branches/minimal/packages/binutils/Makefile

    r1994 r2020  
    1919compile-pass1: 
    2020# --disable-shared overrides unsuitable default from config.site 
    21         unset CFLAGS ; CC="gcc -B/usr/bin/" ../$(DIR)/configure --prefix=$(WD) --disable-nls --disable-shared 
     21        unset CFLAGS ; CC="gcc -B/usr/bin/" ../$(DIR)/configure \ 
     22            --prefix=$(WD) --disable-nls --disable-shared --disable-werror 
    2223        unset CFLAGS ; make 
    2324        unset CFLAGS ; make install 

  • branches/minimal/packages/glibc/Makefile

    r1994 r2020  
    22 
    33NM= glibc 
    4 VRS= 2.5 
     4VRS= 2.5.1 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    8 URL-$(FILE)= $(HTTP)/$(NM)/$(FILE) 
    9 SHA-$(FILE)= ec9a007c4875062099a4701ac9137fcdb5a71447 
     8URL-$(FILE)= http://ftp.gnu.org/gnu/glibc/$(FILE) 
     9SHA-$(FILE)= 2b7da136df025bb8c787be3351cba58374226d9c 
    1010 
    11 FILE2= $(NM)-libidn-$(VRS).tar.bz2 
    12 URL-$(FILE2)= $(HTTP)/$(NM)/$(FILE2) 
    13 SHA-$(FILE2)= ee7e019e01aa338e28db1eeb34abb2cb09d2f30a 
    14  
    15 PATCH1= $(DIR)-branch_update-3.patch 
    16 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) 
    17 SHA-$(PATCH1)= 3af17e283bf76659c189ee05f2ae56f19a88478c 
     11FILE2= $(NM)-libidn-$(VRS).tar.gz 
     12URL-$(FILE2)= http://ftp.gnu.org/gnu/glibc/$(FILE2) 
     13SHA-$(FILE2)= 816f410835a8d4ecbccdfed2d86ccc6284c2fa92 
    1814 
    1915PATCH50= $(DIR)-supported_locales-1.patch 
    …… 
    2319include $(ROOT)/scripts/functions 
    2420 
    25 stage1: $(FILE) $(FILE2) $(PATCH1) 
     21stage1: $(FILE) $(FILE2) 
    2622        $(sep_dir_build) 
    2723 
    2824compile-stage1: 
    29         cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) 
    3025# --enable-static overrides the unsuitable default in config.site 
    3126        ../$(DIR)/configure --prefix=$(WD) --disable-profile \ 
    …… 
    4338        'cd $(ROOT) && make ch-$(NM) $(chbash-pre-bash)' 
    4439 
    45 stage2: $(FILE) $(FILE2) $(PATCH1) 
     40stage2: $(FILE) $(FILE2) 
    4641        $(sep_dir_build) 
    4742        touch $@ 
    4843 
    4944compile-stage2: 
    50         cd ../$(DIR) ; patch -Np1 -i ../$(PATCH1) 
    5145        cd ../$(DIR) ; unpack ../$(FILE2) ; mv glibc-libidn-$(VRS) libidn 
    5246        sed -i \ 

  • branches/minimal/packages/lfs-bootscripts/Makefile

    r1851 r2020  
    22 
    33NM= lfs-bootscripts 
    4 VRS= 20070420 
     4VRS= 20070813 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/development/$(FILE) 
    9 SHA-$(FILE)= 59c9c4443c85b1e6dd903036c24845944775c36b 
     9SHA-$(FILE)= ab777ce44476494caba80518be9ced4f724a89d5 
    1010 
    11 PATCH1= $(DIR)-livecd-1.patch 
     11PATCH1= $(NM)-livecd-1.patch 
    1212 
    1313# Targets 

  • branches/minimal/packages/libaal/Makefile

    r2003 r2020  
    2121 
    2222compile-stage2: 
    23         ./configure --prefix=/usr 
     23        ./configure --prefix=/usr --enable-static 
    2424        make 
    2525        make install 

  • branches/minimal/packages/linux-headers/Makefile

    r1973 r2020  
    22 
    33NM= linux 
    4 VRS= 2.6.22.1 
     4VRS= 2.6.22.2 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) 
    9 SHA-$(FILE)= 7aa119f88768c3070f96a48562ea68b2ecd8a2ef 
     9SHA-$(FILE)= e2606e42a3b40e16f65f750f1dd7cf6a580ea71a 
    1010 
    1111# Targets 

  • branches/minimal/packages/linux/Makefile

    r2003 r2020  
    22 
    33NM= linux 
    4 VRS= 2.6.22.1 
     4VRS= 2.6.22.2 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) 
    9 SHA-$(FILE)= 7aa119f88768c3070f96a48562ea68b2ecd8a2ef 
     9SHA-$(FILE)= e2606e42a3b40e16f65f750f1dd7cf6a580ea71a 
    1010 
    1111PATCH1= reiser4-for-2.6.22-2.patch.gz 

  • branches/minimal/packages/linux64/Makefile

    r2001 r2020  
    22 
    33NM= linux 
    4 VRS= 2.6.22.1 
     4VRS= 2.6.22.2 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= http://www.kernel.org/pub/linux/kernel/v2.6/$(FILE) 
    9 SHA-$(FILE)= 7aa119f88768c3070f96a48562ea68b2ecd8a2ef 
     9SHA-$(FILE)= e2606e42a3b40e16f65f750f1dd7cf6a580ea71a 
    1010 
    1111PATCH1= reiser4-for-2.6.22-2.patch.gz 

  • branches/minimal/packages/man-pages/Makefile

    r1973 r2020  
    22 
    33NM= man-pages 
    4 VRS= 2.62 
     4VRS= 2.63 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= http://www.kernel.org/pub/linux/docs/manpages/Archive/$(FILE) 
    9 SHA-$(FILE)= e75dacd3d330a882f0baa7f61828b898b514fb42 
     9SHA-$(FILE)= 025d341ad9d197bd16108cbe80182c1c23369f58 
    1010 
    1111# Targets 

  • branches/minimal/packages/reiser4progs/Makefile

    r2003 r2020  
    66 
    77FILE= $(DIR).tar.gz 
    8 URL-$(FILE)= http://ftp.namesys.com/pub/reiser4progs/$(FILE)  
     8URL-$(FILE)= http://ftp.namesys.com/pub/reiser4progs/$(FILE) 
    99SHA-$(FILE)= 9acc4f829c5760ee159cb3f507e58478e578990d 
    1010 

  • branches/minimal/packages/syslinux/Makefile

    r1945 r2020  
    2121 
    2222compile-stage2: 
     23        mkdir -p /boot/isolinux 
    2324        cp -v isolinux.bin /boot/isolinux 
    2425        cp -v $(ROOT)/isolinux/{isolinux.cfg,*.msg,splash.lss} /boot/isolinux 

  • branches/minimal/packages/udev/Makefile

    r1945 r2020  
    33NM= udev 
    44VRS= 113 
    5 CONFVRS= 20070304 
     5CONFVRS= 20070731 
    66DIR= $(NM)-$(VRS) 
    77CONFDIR=$(NM)-config-$(CONFVRS) 
    …… 
    1313FILE1= $(CONFDIR).tar.bz2 
    1414URL-$(FILE1)= http://www.linuxfromscratch.org/lfs/downloads/development/$(FILE1) 
    15 SHA-$(FILE1)= 22264702f2de999c513e43af04c8ef9262a15343 
     15SHA-$(FILE1)= f2163c98f3cae0312ec13e4efbbbe9a9af4a8d19 
    1616 
    1717# Targets