Changeset 2052

Show
Ignore:
Timestamp:
08/30/07 22:23:50 (1 year ago)
Author:
alexander
Message:

Merged all applicable changes from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/minimal/Makefile

    r2033 r2052  
    3333 
    3434export CD_ARCH := $(shell uname -m | sed 's|i[3456]|x|') 
    35 export VERSION ?= $(CD_ARCH)-6.3-min-pre2 
     35export VERSION ?= $(CD_ARCH)-6.3-min 
    3636export CFLAGS ?= -O2 -pipe -s -fno-strict-aliasing 
    3737 

  • branches/minimal/doc/lfscd-remastering-howto.txt

    r1916 r2052  
    1  
    21AUTHOR:         Alexander E. Patrakov <patrakov@ums.usu.ru>, Sylvie Migneault <alisou@alixe.org> 
    32 
    4 DATE:           2006-08-06 
     3DATE:           2007-08-28 
    54 
    65LICENSE:        GNU Free Documentation License Version 1.2 
    76 
    8 SYNOPSIS:       lfscd-remastering-HOWTO, for LFS LiveCD version 6.2-x 
     7SYNOPSIS:       lfscd-remastering-HOWTO, for LFS LiveCD version 6.3 
    98 
    10 DESCRIPTION:    This is a guide that will show you how to remaster LFS liveCD-x86-6.2-x 
     9DESCRIPTION:    This is a guide that shows you how to remaster LFS LiveCD 6.3 
    1110 
    12 PREREQUISITES:  LFS LiveCD 6.2-x. 
     11PREREQUISITES:  LFS LiveCD 6.3 
    1312 
    1413For LFS LiveCD 6.1-x, see the old "lfscd-remastering-howto-6.1.txt" hint by 
    1514Sylvie Migneault. For LFS LiveCD 6.1.1-x, the old hint should work if one 
    16 globally replaces LFS_CD with lfslivecd-VERSION, e.g. lfslivecd-x86-6.1.1-3 
     15globally replaces LFS_CD with lfslivecd-VERSION, e.g. lfslivecd-x86-6.1.1-3. 
     16 
     17For LFS LiveCD 6.2-x, see the old "lfscd-remastering-howto-6.2.txt" hint. 
    1718 
    1819HINT: 
    …… 
    8788as static nodes. 
    8889 
     90Copy the DNS configuration into the chroot: 
     91        cp /etc/resolv.conf $WORK/root/etc/resolv.conf 
     92 
    8993Chroot to the filesystem: 
    9094        chroot $WORK/root 
    …… 
    9397additional packages you want. Modify other files as necessary. 
    9498 
    95 Get the initramfs files as a zip archive from 
    96         http://wiki.linuxfromscratch.org/livecd/browser/trunk/packages/initramfs 
     99Check out the initramfs files: 
     100        svn co svn://svn.linuxfromscratch.org/livecd/trunk/packages/initramfs 
    97101 
    98 Unzip the archive. Remove the "include $(ROOT)/scripts/functions" line from the 
    99 Makefile. Generate the initramfs image for your CD: 
    100         make compile-stage2 VERSION="x86-6.3-custom" 
     102Remove the "include $(ROOT)/scripts/functions" and 
     103"cp initramfs_data.cpio.gz /boot/isolinux/initramfs_data.cpio.gz" lines 
     104from the Makefile. Generate the initramfs image for your CD: 
    101105 
    102 (you can replace the "x86-6.3-custom" with your own string). This produces the 
    103 initramfs_data.cpio.gz file in the current directory. If this directory is not 
    104 "/build", copy it to /build: 
     106For x86: 
     107        make compile-stage2 VERSION="x86-6.3-custom" LINKER=ld-linux.so.2 
     108 
     109For x86_64: 
     110        make compile-stage2 VERSION="x86_64-6.3-custom" \ 
     111            LINKER=ld-linux-x86-64.so.2 64bit=true 
     112 
     113(you can replace the "6.3-custom" with your own string). This produces the 
     114initramfs_data.cpio.gz file in the current directory. Copy it to /build: 
    105115        cp initramfs_data.cpio.gz /build 
    106116 
    …… 
    114124        rmdir $WORK/root/build 
    115125 
    116 Clean up bash history: 
     126Clean up bash history and DNS configuration: 
    117127        rm $WORK/root/root/.bash_history 
     128        rm $WORK/root/etc/resolv.conf 
    118129 
    119130You may also want to remove other history files. 
    …… 
    143154Replace the stock initramfs image with your own: 
    144155        cp $WORK/build/initramfs_data.cpio.gz \ 
    145             $WORK/iso/boot/isolinux/iniramfs_data.cpio.gz 
     156            $WORK/iso/boot/isolinux/initramfs_data.cpio.gz 
    146157 
    147158Recompress the root.ext2 file: 
    148159        mkzftree -F $WORK/root.ext2 $WORK/iso/root.ext2 
    149160 
    150 Recreate the CD image: 
     161Recreate the CD image (the string avter "lfslivecd-" must be the same as you 
     162used when creating the initramfs): 
    151163        cd $WORK/iso ; mkisofs -z -R -l --allow-leading-dots -D -o \ 
    152164        ../lfslivecd-x86-6.3-custom.iso -b boot/isolinux/isolinux.bin \ 
    …… 
    165177 
    166178   [2005-11-07] 
    167     * Initial hint by Sylvie Migneault. 
     179    * Initial hint by Sylvie Migneault 
    168180 
    169181   [2006-08-06] 
    …… 
    172184   [2007-06-11] 
    173185    * Updated for 6.3-pre2 
     186 
     187   [2007-08-28] 
     188    * Updated for the final 6.3 version 

  • branches/minimal/etc/profile

    r1956 r2052  
    77XML_CATALOG_FILES="/usr/share/docbook/xsl-stylesheets-1.69.1/catalog.xml /etc/xml/catalog" 
    88 
    9 WWW_HOME="/usr/share/LFS-BOOK-SVN-HTML/index.html" 
     9WWW_HOME="/usr/share/LFS-BOOK-6.3-HTML/index.html" 
    1010 
    1111NNTPSERVER=news.gmane.org 

  • branches/minimal/isolinux/options1.msg

    r2020 r2052  
    55 
    66Options [page 1 of 4]: 
    7 vga=[res] 
    8   Examples: 
    9   vga=795 (1280x1024x24)   vga=792 (1024x768x24)   vga=789 (800x600x24) 
    10   vga=794 (1280x1024x16)   vga=791 (1024x768x16)   vga=788 (800x600x16) 
    11  
    12   NOTE: This is for the framebuffer console and has nothing to do with X 
    13   server resolution. Also, it causes some X video drivers (e.g., "s3virge") to 
    14   malfunction. X server bug reports will be ignored if you use this option. 
    157 
    168TZ=[timezone] 
    …… 
    2719  Example: LANG=fr_FR.UTF-8 
    2820 
    29 If you don't specify your timezone or locale at the boot prompt, 
    30 a configuration dialog will appear later during boot. 
     21  If you don't specify your timezone or locale at the boot prompt, 
     22  a configuration dialog will appear later during boot. 
    3123 
     24nodhcp 
     25  Prevents the CD from attempting to obtain an IP address automatically. 
     26  May be required for wireless networking, because the WEP or WPA key 
     27  needs to be set up first. 
     28 

  • branches/minimal/isolinux/options2.msg

    r2020 r2052  
    55 
    66Options [page 2 of 4]: 
     7 
    78toram 
    89  Loads the whole CD contents (except sources and proprietary video 
    …… 
    1112  Note: this needs at least 512 MB of RAM, and you also need 
    1213  to enable swap if you have less than 768 MB of RAM. 
    13  
    14 nodhcp 
    15   Prevents the CD from attempting to obtain an IP address automatically. 
    16   May be required for wireless networking, because the WEP or WPA key 
    17   needs to be set up first. 
    1814 
    1915rootdelay=X 
    …… 
    3026  See /root/README for details. 
    3127 
     28 

  • branches/minimal/isolinux/options3.msg

    r2020 r2052  
    1515  lead to data loss. 
    1616 
    17 new_firewire 
    18   Uses the new FireWire drivers. 
    19  
    2017load=module1,module2,... 
    2118  Loads the specified modules unconditionally from initramfs. Use if your SCSI 

  • branches/minimal/isolinux/options4.msg

    r2027 r2052  
    55 
    66Options [page 4 of 4]: 
     7new_firewire 
     8  Uses the new FireWire stack. 
     9 
    710nomsi noapic nolapic pci=noacpi acpi=off blacklist=yenta-socket ide=nodma 
    811  These options work around various chipset bugs. Try them one-by-one in the 
    …… 
    1215brltty=drv[,dev[,tbl]] 
    1316  Example: brltty=bm,usb: 
    14  
    1517  Enables a refreshable Braille display supported by driver drv, connected to 
    1618  device dev, with a translation table tbl. The example specifies a BAUM 
    1719  SuperVario 40 Braille display connected by USB with default Braille table. 
     20 
     21vga=[res] 
     22  Examples: 
     23  vga=795 (1280x1024x24)   vga=792 (1024x768x24)   vga=789 (800x600x24) 
     24  vga=794 (1280x1024x16)   vga=791 (1024x768x16)   vga=788 (800x600x16) 
     25 
     26  NOTE: This is for the framebuffer console and has nothing to do with X 
     27  server resolution. Also, it causes some X video drivers (e.g., "s3virge") to 
     28  malfunction. X server bug reports will be ignored if you use this option. 

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

    r2020 r2052  
    22 
    33NM= LFS-BOOK 
    4 VRS= SVN 
     4VRS= 6.3 
    55DIRBASE= $(NM)-$(VRS) 
    66DIR= $(DIRBASE)-XML 
    …… 
    1111#SHA-$(FILE)= 729bcf04d8e4ed0af3c58daf0d289e94d6385052 
    1212 
    13 REV= 8319 
     13REV= 8348 
    1414REVPARM= -r $(REV) 
    1515 
    1616ifeq ($(CD_ARCH),x86) 
    17 URL= svn://svn.linuxfromscratch.org/LFS/branches/6.3/BOOK 
     17URL= svn://svn.linuxfromscratch.org/LFS/tags/6.3/BOOK 
    1818endif 
    1919ifeq ($(CD_ARCH),x86_64) 

  • branches/minimal/packages/bash/Makefile

    r1873 r2052  
    1010 
    1111PATCH1= $(DIR)-fixes-5.patch 
    12 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) 
     12URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1) 
    1313SHA-$(PATCH1)= b85f303e6317fe50b6f5d0c204e2e68824010a88 
    1414 

  • branches/minimal/packages/bzip2/Makefile

    r1871 r2052  
    1010 
    1111PATCH1= $(DIR)-install_docs-1.patch 
    12 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) 
     12URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1) 
    1313SHA-$(PATCH1)= 86fa168b260bb12651ebfa6d47939e926e067036 
    1414 

  • branches/minimal/packages/coreutils/Makefile

    r1839 r2052  
    1010 
    1111PATCH1= $(DIR)-uname-1.patch 
    12 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) 
     12URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1) 
    1313SHA-$(PATCH1)= 42cc795e56b96994a4dc9e8f2a8dd72b6a25665f 
    1414 
    1515PATCH2= $(DIR)-suppress_uptime_kill_su-1.patch 
    16 URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH2) 
     16URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH2) 
    1717SHA-$(PATCH2)= e1e783efd515639b78627c37025b96168594f408 
    1818 
    1919PATCH3= $(DIR)-i18n-1.patch 
    20 URL-$(PATCH3)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH3) 
     20URL-$(PATCH3)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH3) 
    2121SHA-$(PATCH3)= 5db7b7919910ccda018d01f2fc1b65e1c1da954d 
    2222 

  • branches/minimal/packages/db/Makefile

    r1820 r2052  
    1010 
    1111PATCH1= $(DIR)-fixes-1.patch 
    12 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) 
     12URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1) 
    1313SHA-$(PATCH1)= adf217ef8606f25b6fd4e7c9a0c1ea9f01c4f250 
    1414 

  • branches/minimal/packages/jhalfs/Makefile

    r1991 r2052  
    22 
    33NM= jhalfs 
    4 VRS= 2.3 
     4VRS= 2.3.1 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    88URL-$(FILE)= http://www.linuxfromscratch.org/alfs/downloads/jhalfs/stable/$(FILE) 
    9 SHA-$(FILE)= 1d4d9530692cced7bccf10122d28ff814d5195a6 
     9SHA-$(FILE)= 95a41e2e1c3ff01feaaefafeda7d187760a24dfe 
    1010 
    1111FILE1= configuration 

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

    r2020 r2052  
    22 
    33NM= lfs-bootscripts 
    4 VRS= 20070813 
     4VRS= 6.3 
    55DIR= $(NM)-$(VRS) 
    66 
    77FILE= $(DIR).tar.bz2 
    8 URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/development/$(FILE) 
    9 SHA-$(FILE)= ab777ce44476494caba80518be9ced4f724a89d5 
     8URL-$(FILE)= http://www.linuxfromscratch.org/lfs/downloads/6.3/$(FILE) 
     9SHA-$(FILE)= f2447b29f99e9b4d6700d89a4d572584951531b8 
    1010 
    1111PATCH1= $(NM)-livecd-1.patch 

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

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

  • branches/minimal/packages/linux/Makefile

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

  • branches/minimal/packages/linux64/Makefile

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

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

    r1839 r2052  
    99SHA-$(FILE)= 5c6ba8eb287a69f14433feb34e720b066536d163 
    1010 
     11PATCH1= $(DIR)-fixes-1.patch 
     12URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1) 
     13SHA-$(PATCH1)= 5ac2a79c2e471991503173982728e65f60f3e071 
     14 
    1115# Targets 
    1216 
    …… 
    1721        'cd $(ROOT) && make ch-$(NM) $(chbash-post-bash)' 
    1822 
    19 stage2: Makefile $(FILE) 
     23stage2: Makefile $(FILE) $(PATCH1) 
    2024        $(std_build) 
    2125 
    …… 
    3135        echo '#define VGRIND "/usr/bin/vgrind"' >>include/manconfig.h.in 
    3236        echo '#define GRAP "/usr/bin/grap"' >>include/manconfig.h.in 
     37        patch -Np1 -i ../$(PATCH1) 
    3338        ./configure --prefix=/usr --enable-mb-groff --disable-setuid 
    3439        make 

  • branches/minimal/packages/ncurses/Makefile

    r1873 r2052  
    1010 
    1111PATCH1=$(DIR)-coverity_fixes-1.patch 
    12 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) 
     12URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1) 
    1313SHA-$(PATCH1)= ad7a49ad6e35e61d975700226279594106842f59 
    1414 

  • branches/minimal/packages/readline/Makefile

    r1873 r2052  
    1010 
    1111PATCH1= $(DIR)-fixes-3.patch 
    12 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) 
     12URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1) 
    1313SHA-$(PATCH1)= de765322d083e26685469f84d75de7465a866cfa 
    1414 

  • branches/minimal/packages/texinfo/Makefile

    r1953 r2052  
    1010 
    1111PATCH1= $(DIR)-tempfile_fix-1.patch 
    12 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) 
     12URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1) 
    1313SHA-$(PATCH1)= 2ead28cb8e2679cdb53e1e4908209f0a31397dfe 
    1414 
    1515PATCH2= $(DIR)-multibyte-1.patch 
    16 URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH2) 
     16URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH2) 
    1717SHA-$(PATCH2)= b97ae3468c03f8389dbf5c9b6eed64f996f9ed5c 
    1818 

  • branches/minimal/packages/udev/Makefile

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

  • branches/minimal/packages/vim/Makefile

    r1945 r2052  
    1414 
    1515PATCH1= $(NM)-$(VRS)-fixes-1.patch 
    16 URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH1) 
     16URL-$(PATCH1)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH1) 
    1717SHA-$(PATCH1)= 6005e12fc31ce07a4da2806ea4c503cb569f235e 
    1818 
    1919PATCH2= $(NM)-$(VRS)-mandir-1.patch 
    20 URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/development/$(PATCH2) 
     20URL-$(PATCH2)= http://www.linuxfromscratch.org/patches/lfs/6.3/$(PATCH2) 
    2121SHA-$(PATCH2)= 182f46dfacefdd3bf6f821dea71f90547d414230 
    2222