Changeset 2001

Show
Ignore:
Timestamp:
08/01/07 11:49:01 (1 year ago)
Author:
jhuntwork
Message:
  • Merge appropriate changes from r2000 to minimal branch
  • Restored ability to build a 64-bit kernel for x86
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/minimal/Makefile

    r1996 r2001  
    276276        ch-device-mapper ch-LVM2 ch-dmraid ch-dhcpcd ch-distcc ch-ppp ch-rp-pppoe ch-pptp \ 
    277277        ch-cpio ch-mutt ch-msmtp ch-tin ch-mdadm ch-which ch-brltty  \ 
    278         ch-strace ch-iptables ch-eject ch-hdparm ch-linux \ 
     278        ch-strace ch-iptables ch-eject ch-hdparm \ 
    279279        ch-sysfsutils ch-pcmcia-cs ch-pcmciautils \ 
    280280        ch-blfs-bootscripts ch-oui-data ch-hibernate-script ch-slang ch-mc \ 
    …… 
    283283ifeq ($(CD_ARCH),x86) 
    284284        make ch-grub 
     285        make ch-linux 
     286        make ch-binutils64 
     287        make ch-gcc64 
    285288endif 
     289        make ch-linux64 
     290        make ch-initramfs 
    286291        make update-caches 
    287292 
    …… 
    381386        @>$(MP)/var/log/wtmp 
    382387        @>$(MP)/var/log/lastlog 
    383         @install -m644 isolinux/{isolinux.cfg,*.msg,splash.lss} $(MP)/boot/isolinux 
     388        @install -m644 isolinux/{isolinux.cfg,splash.lss} $(MP)/boot/isolinux 
     389ifeq ($(CD_ARCH),x86_64) 
     390        @sed -i -e '/linux64/d' -e 's/ 32-bit//' $(MP)/boot/isolinux/options.msg 
     391        @sed -i '/linux64/,$$d' $(MP)/boot/isolinux/isolinux.cfg 
     392endif 
    384393        @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/boot/isolinux/boot.msg 
    385394        @sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue* 

  • branches/minimal/isolinux/boot.msg

    r1574 r2001  
    22splash.lss 
    3307This is the Official LFS LiveCD, Version: 
    4 07Press [Enter] to boot or press F1 for more options. 
     407Press [Enter] to boot, F1 for basic options 
    55 

  • branches/minimal/isolinux/options.msg

    r1994 r2001  
    1 70 07To use a framebuffer console, type "linux vga=xxx" 
    2 where xxx denotes a screen resolution and color depth. 
    3 This has nothing to do with X server resolution, and bug reports 
    4 about X window system will be ignored if you pass this parameter. 
     170 07To specify options at boot time, type [kernel] [options] 
     2Available kernels: 
     3linux - The default 32-bit kernel 
     4linux64 - A 64-bit kernel for use with CLFS 
    55 
    6 Examples: 
     6Basic options: 
     7vga=[res] 
     8  Examples: 
     9  vga=795 (1280x1024x24)  vga=794 (1280x1024x16) 
     10  vga=792 (1024x768x24)   vga=791 (1024x768x16) 
     11  vga=789 (800x600x24)    vga=788 (800x600x16) 
    712 
    8 795 = 1280x1024x24   794 = 1280x1024x16 
    9 792 = 1024x768x24    791 = 1024x768x16 
    10 789 = 800x600x24     788 = 800x600x16 
     13  NOTE: This is for the framebuffer console and has nothing 
     14  to do with X server resolution. 
    1115 
    12 To set your timezone, add TZ=your_timezone anywhere 
    13 after "linux" or "linux.ata". For example, TZ=EDT+4 means that the 
    14 timezone is named "EDT" and is 4 hours behind (west) of UTC. 
    15 Specifications like TZ=America/New_York also work. 
    16 Also, add UTC=1 if the hardware clock in your computer 
    17 is set to UTC instead of local time. 
     16TZ=[timezone] 
     17  Examples: 
     18  TZ=EDT-4    TZ=America/New_York 
    1819 
    19 Set your locale by adding LANG=your_locale anywhere after "linux". 
     20  The first example means that the timezone is named "EDT" 
     21  and is 4 hours behind (west) of UTC. 
     22 
     23UTC=[0,1] 
     24  Use UTC=1 if the hardware clock is set to UTC or 
     25  use UTC=0 if the hardware clock is set to local time. 
     26 
     27LANG=[locale] 
    2028 
    2129If you don't specify your timezone or locale at the boot prompt, 
    2230a configuration dialog will appear later during boot. 
    2331 
    24 More information is available in /root/README on this CD. 
    25  

  • branches/minimal/packages/linux/Makefile

    r1996 r2001  
    2424compile-stage2: 
    2525        patch -Np1 -i ../$(PATCH3) 
    26         mkdir -p /boot/isolinux 
     26        install -d /boot/isolinux 
    2727        make mrproper 
    2828        cp ../config.$(CD_ARCH) .config 
    2929        make 
    3030        make modules_install 
    31 ifeq ($(CD_ARCH),x86) 
    3231        cp -v arch/i386/boot/bzImage /boot/isolinux/linux 
    33 endif 
    34 ifeq ($(CD_ARCH),x86_64) 
    35         cp -v arch/x86_64/boot/bzImage /boot/isolinux/linux 
    36 endif 
    3732        cd .. ; ./debian-style-headers.sh $(DIR) 
    3833 

  • branches/minimal/packages/traceroute/Makefile

    r1994 r2001  
    2525 
    2626compile-stage2: 
    27 ifeq ($(CD_ARCH),x86_64) 
    2827        patch -Np1 -i ../$(PATCH) 
    29 endif 
    3028        sed -i -e 's/-o bin/-o root/' Makefile.in 
    3129        ./configure --prefix=/usr