Author: jhuntwork
Date: 2005-05-12 22:10:55 -0600 (Thu, 12 May 2005)
New Revision: 143
Added:
trunk/etc/X11/
trunk/initramfs/init
trunk/packages/fonts-dejavu/
trunk/packages/isoinfo/
trunk/packages/klibc/
trunk/packages/lfs-bootscripts/mountfs
trunk/packages/lfs-bootscripts/udev
trunk/packages/slang/slang-1.4.9-luit-1.patch
trunk/packages/unionfs/
trunk/root/.bashrc
Removed:
trunk/initramfs/init.c
Modified:
trunk/Makefile
trunk/TODO
trunk/etc/bashrc
trunk/etc/fstab
trunk/etc/profile
trunk/etc/sysconfig/clock
trunk/initramfs/Makefile
trunk/isolinux/isolinux.cfg
trunk/isolinux/options.msg
trunk/linux/config
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
trunk/packages/lfs-bootscripts/Makefile
trunk/packages/linux/Makefile
trunk/packages/nano/Makefile
trunk/packages/openssh/Makefile
trunk/packages/sharutils/Makefile
trunk/packages/slang/Makefile
trunk/packages/util-linux/Makefile
Log:
Merged unionfs branch into trunk
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/Makefile 2005-05-13 04:10:55 UTC (rev 143)
@@ -173,11 +173,11 @@
blfs: ch-openssl ch-wget ch-reiserfsprogs ch-xfsprogs ch-slang ch-nano ch-joe
ch-screen ch-curl ch-zip \
ch-unzip ch-lynx ch-libxml2 ch-expat ch-subversion ch-lfs-bootscripts
ch-docbook-xml ch-libxslt \
- ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype
ch-fontconfig ch-Xorg ch-freefont ch-libjpeg \
+ ch-docbook-xsl ch-html_tidy ch-LFS-BOOK ch-libpng ch-freetype
ch-fontconfig ch-Xorg ch-freefont ch-fonts-dejavu ch-update-fontsdir ch-libjpeg
\
ch-libtiff ch-links ch-openssh ch-pkgconfig ch-glib2 ch-libungif
ch-imlib2 ch-pango ch-atk ch-gtk2 ch-cvs \
ch-libIDL ch-firefox ch-startup-notification ch-xfce ch-lua ch-ion
ch-irssi ch-xchat ch-samba ch-tcpwrappers ch-portmap \
ch-nfs-utils ch-traceroute ch-ncftp ch-pciutils ch-nALFS
ch-device-mapper ch-LVM2 ch-dhcpcd ch-ppp ch-rp-pppoe ch-libaal \
- ch-reiser4progs ch-squashfs ch-cpio ch-db ch-postfix ch-mutt ch-slrn
ch-linux ch-cdrtools ch-blfs-bootscripts \
+ ch-reiser4progs ch-squashfs ch-cpio ch-db ch-postfix ch-mutt ch-slrn
ch-linux ch-klibc ch-unionfs ch-initramfs ch-cdrtools ch-blfs-bootscripts \
ch-syslinux
# Rules for building tools/stage1
@@ -669,6 +669,10 @@
make -C $(PKG)/$@ chroot
make unmount
+fonts-dejavu: prep-chroot
+ make -C $(PKG)/$@ chroot
+ make unmount
+
libjpeg: prep-chroot
make -C $(PKG)/$@ chroot
make unmount
@@ -857,6 +861,18 @@
make -C $(PKG)/$@ chroot
make unmount
+klibc: prep-chroot
+ make -C $(PKG)/$@ chroot
+ make unmount
+
+unionfs: prep-chroot
+ make -C $(PKG)/$@ chroot
+ make unmount
+
+initramfs: prep-chroot
+ make -C $@ chroot
+ make unmount
+
strip: prep-chroot
@chroot $(MP) $(chenvstrip) 'cd $(ROOT) && make ch-strip'
make unmount
@@ -1207,6 +1223,12 @@
ch-freefont: popdev
make -C $(PKG)/freefont stage2
+ch-fonts-dejavu: popdev
+ make -C $(PKG)/fonts-dejavu stage2
+
+ch-update-fontsdir: popdev
+ cd /usr/X11R6/lib/X11/fonts/TTF ; /usr/X11R6/bin/mkfontscale ;
/usr/X11R6/bin/mkfontdir ; /usr/bin/fc-cache -f
+
ch-libjpeg: popdev
make -C $(PKG)/libjpeg stage2
@@ -1348,6 +1370,15 @@
ch-syslinux: popdev
make -C $(PKG)/syslinux stage2
+ch-klibc: popdev
+ make -C $(PKG)/klibc stage2
+
+ch-initramfs: popdev
+ make -C initramfs
+
+ch-unionfs: popdev
+ make -C $(PKG)/unionfs stage2
+
ch-strip: popdev
@$(WD)/bin/find /{,usr/}{bin,lib,sbin} -type f -exec $(WD)/bin/strip
--strip-debug '{}' ';'
@@ -1355,20 +1386,24 @@
# Rules to create the iso
#----------------------------------
-prepiso:
+prepiso: unmount
@-rm $(MP)/etc/rc.d/rc{2,3,5}.d/{K,S}21xprint
+ @>$(MP)/var/log/lastlog
@install -m644 etc/issue $(MP)/etc/issue
@sed -i "s/Version:/Version: $(VERSION)/" $(MP)/etc/issue
+ @install -m644 root/.bashrc $(MP)/root/.bashrc
+ @install -m644 etc/X11/app-defaults/XTerm
$(MP)/etc/X11/app-defaults/XTerm
+ @install -m644 etc/X11/twm/system.twmrc $(MP)/etc/X11/twm/system.twmrc
@install -m755 scripts/{net-setup,greeting,ll} $(MP)/usr/bin/
@-mv $(MP)/bin/uname.real $(MP)/bin/uname
@-mkdir $(MP)/iso
@-rm $(MP)/etc/X11/xorg.conf
- @for i in bin boot etc lib sbin sources ; do cp -ra $(MP)/$$i $(MP)/iso
; done && \
- cd $(MP) && tar cjvf etc.tar.bz2 etc && cp etc.tar.bz2 iso/ && \
- if [ -f root/.bash_history ] ; then rm root/.bash_history ; fi && \
- tar cjvf root.tar.bz2 root && cp root.tar.bz2 iso/ && \
- $(WD)/bin/mksquashfs usr usr.sqfs && mv usr.sqfs iso/ && \
- echo "LFS-LIVECD" > iso/LFS
+ @cp -rav $(MP)/sources $(MP)/iso && \
+ cp -rav $(MP)/boot $(MP)/iso && \
+ rm -f iso/root.sqfs && \
+ $(WD)/bin/mksquashfs $(MP) $(MP)/iso/root.sqfs -info -e \
+ boot sources tools iso lfs-livecd lost+found && \
+ echo "LFS-LIVECD" > $(MP)/iso/LFS
@touch prepiso
iso: prepiso
Modified: trunk/TODO
===================================================================
--- trunk/TODO 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/TODO 2005-05-13 04:10:55 UTC (rev 143)
@@ -1,11 +1,20 @@
* Package up kernel source and upload to mirrors
-* i18n READMEs and adjust font dirs again
- [ xfce ]
- [ ncurses-20050319 ]
- [ freefont ]
- [ xterm -lc ]
-* Automate name of irssi and xchat nicks based on cd version
-* udev rules for mice
+* i18n READMEs
+* udev rules for mice. Create a /dev/mouse symlink to /dev/input/mice?
* nALFS profile
-* Incorporate Firefox first-run into script, to improve loading performance
* New shutdown scripts to handle unmounts of drives, stopping of services, if
they were started, etc.
+* Decide upon the default timezone in the Makefile. GMT? (Fine with me - JH)
+* Create .xinitrc file for root and choose default wm, probably xfce.
+* Menus and background for xfce
+* Add some Greek TrueType fonts.
+* Remove Bitstream Vera, adjust /etc/fonts/fonts.conf accordingly
+* Ask someone how to use USB to serial converters. Add support to the kernel.
+* Find out why via-agp.ko doesn't load properly here (regression against pre2
livecd)
+* Find out exact requirements for Intel framebuffer
+* Reduce dhcpcd timeout. The boot process appears to hang when there is no
DHCP server in the network.
+* Add raid-tools
+* Add distcc
+* Remove .bash_history and /var/log/{btmp,wtmp}
+* Have version dynamically added (at end of build) to isolinux's boot.msg
+* Change /etc/issue information to acknowledge work done by the new livecd
team as well.
+ Should we list team members?
Copied: trunk/etc/X11 (from rev 142, branches/unionfs/etc/X11)
Modified: trunk/etc/bashrc
===================================================================
--- trunk/etc/bashrc 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/etc/bashrc 2005-05-13 04:10:55 UTC (rev 143)
@@ -1,2 +1,18 @@
alias ls='ls --color=auto'
eval $(dircolors -b /etc/dircolors)
+
+# Colors for PS1
+RED="\[\033[0;31m\]"
+GREEN="\[\033[0;32m\]"
+ORANGE="\[\033[0;33m\]"
+BRWHITE="\[\033[0;38m\]"
+WHITE="\[\033[00m\]"
+
+# Prompt
+if [ `whoami` == "root" ] ; then
+ PS1="${BRWHITE}\h:$RED\u | $BRWHITE\@ \d $RED|
$GREEN\w$BRWHITE\n$WHITE\\$ "
+else
+ PS1="$BRWHITE\h:$GREEN\u | $ORANGE\@ $BRWHITE\d $GREEN| \w\n$BRWHITE\\$
$WHITE"
+fi
+
+export PS1
Modified: trunk/etc/fstab
===================================================================
--- trunk/etc/fstab 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/etc/fstab 2005-05-13 04:10:55 UTC (rev 143)
@@ -1,9 +1,10 @@
# Begin /etc/fstab
# filesystem mount-point fs-type options dump
fsck-order
+unionfs / unionfs defaults 0 0
proc /proc proc defaults 0 0
sysfs /sys sysfs defaults 0 0
devpts /dev/pts devpts gid=4,mode=620 0 0
-tmpfs /dev/shm tmpfs defaults 0 0
+# tmpfs /dev/shm tmpfs defaults 0 0
# End /etc/fstab
Modified: trunk/etc/profile
===================================================================
--- trunk/etc/profile 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/etc/profile 2005-05-13 04:10:55 UTC (rev 143)
@@ -2,28 +2,16 @@
INPUTRC=/etc/inputrc
[EMAIL PROTECTED]
+
XML_CATALOG_FILES="/usr/share/docbook/xsl-stylesheets-1.68.1/catalog.xml
/etc/xml/catalog"
PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig
-WWW_HOME="/usr/share/LFS-BOOK-testing-HTML/index.html"
+WWW_HOME="/usr/share/LFS-BOOK-6.1-HTML/index.html"
NNTPSERVER=news.linuxfromscratch.org
-# Colors for PS1
-RED="\[\033[0;31m\]"
-GREEN="\[\033[0;32m\]"
-ORANGE="\[\033[0;33m\]"
-BRWHITE="\[\033[0;38m\]"
-WHITE="\[\033[00m\]"
+export PATH INPUTRC G_FILENAME_ENCODING PKG_CONFIG_PATH XML_CATALOG_FILES
WWW_HOME NNTPSERVER
-# Prompt
-if [ `whoami` == "root" ] ; then
- PS1="${BRWHITE}\h:$RED\u | $BRWHITE\@ \d $RED|
$GREEN\w$BRWHITE\n$WHITE\\$ "
-else
- PS1="$BRWHITE\h:$GREEN\u | $ORANGE\@ $BRWHITE\d $GREEN| \w\n$BRWHITE\\$
$WHITE"
-fi
-
-export PS1 PATH INPUTRC PKG_CONFIG_PATH XML_CATALOG_FILES WWW_HOME NNTPSERVER
-
source /etc/bashrc
Modified: trunk/etc/sysconfig/clock
===================================================================
--- trunk/etc/sysconfig/clock 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/etc/sysconfig/clock 2005-05-13 04:10:55 UTC (rev 143)
@@ -1,5 +1,8 @@
# Begin /etc/sysconfig/clock
-UTC=0
+# Default to localtime, but allow the user to
+# override this using the kernel command line
+UTC=${UTC-0}
+
# End /etc/sysconfig/clock
Modified: trunk/initramfs/Makefile
===================================================================
--- trunk/initramfs/Makefile 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/initramfs/Makefile 2005-05-13 04:10:55 UTC (rev 143)
@@ -2,14 +2,18 @@
# Written by Jeremy Huntwork, 2004-12-16
#
-CFLAGS = -Os -s -Wall -static
-CC = gcc
-all: init
+all: initramfs_data.cpio.gz
MK= mknod
+CP= cp
WD= temp
+KLIBC= /usr/lib/klibc
-init: init.c
- mkdir -p $(WD)/dev
+initramfs_data.cpio.gz: init
+ mkdir -p $(WD)/{dev,bin,lib,.tmpfs,.union}
+ $(CP)
$(KLIBC)/bin/{insmod,isoinfo,losetup,mkdir,mount,run-init,sh,sleep} $(WD)/bin
+ $(CP) $(KLIBC)/lib/klibc-*.so $(WD)/lib
+ $(CP) /lib/modules/$(KVERS)/kernel/fs/unionfs.ko $(WD)/lib
+ $(CP) init $(WD)
$(MK) -m 640 $(WD)/dev/console c 5 1
$(MK) -m 660 $(WD)/dev/hda b 3 0
$(MK) -m 660 $(WD)/dev/hdb b 3 64
@@ -28,11 +32,14 @@
$(MK) -m 660 $(WD)/dev/sr5 b 11 5
$(MK) -m 660 $(WD)/dev/sr6 b 11 6
$(MK) -m 660 $(WD)/dev/sr7 b 11 7
- $(CC) $(CFLAGS) $? -o $(WD)/$@
+ $(MK) -m 660 $(WD)/dev/loop0 b 7 0
cd $(WD); find . | cpio -o -H newc | gzip -9 > ../initramfs_data.cpio.gz
+ $(CP) initramfs_data.cpio.gz /boot/isolinux
rm -rf temp
+chroot:
+ @chroot "$(MP)" $(chenv3) 'cd $(ROOT) && make ch-initramfs $(chbash2)'
+
clean:
- -rm -f init
-rm -rf temp
-rm -f initramfs_data*
Copied: trunk/initramfs/init (from rev 142, branches/unionfs/initramfs/init)
Property changes on: trunk/initramfs/init
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/initramfs/init.c
===================================================================
--- trunk/initramfs/init.c 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/initramfs/init.c 2005-05-13 04:10:55 UTC (rev 143)
@@ -1,255 +0,0 @@
-/*
- Init for the Official LFS LiveCD
- Written by Jeremy Huntwork, based on code by Chris Lingard.
- Major overhaul/reorganization by James Lee on 2005-01-06.
-
- This code sets up a directory structure for the cd in the initramfs,
- finds and mounts the LFS LiveCD, makes essential symlinks to read-
- only directories on the cd and starts udev. Finally it passes
- control over to sysvinit to finish the boot process.
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/mount.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <linux/cdrom.h>
-#include <linux/reboot.h>
-
-#define CDROM_MOUNT "/.cdrom" /* Mount point for CD */
-#define CDROM_FSTYPE "iso9660" /* Filesystem of CD (could be udf?
:) */
-#define LFSID_FILE CDROM_MOUNT "/LFS" /* The file the LFS ID is stored in
*/
-#define LFSID_STRING "LFS-LIVECD" /* Text expected in the file */
-#define MAX_RETRIES 3 /* How many times to retry scanning
for the liveCD */
-
-
-/* Devices to check for the LFS-CD, could scan some stuff in /proc in a later
version */
-const char *devices[] =
-{
- "/dev/hda", "/dev/hdb", "/dev/hdc", "/dev/hdd", "/dev/hde", "/dev/hdf",
"/dev/hdg", "/dev/hdh",
- "/dev/sr0", "/dev/sr1", "/dev/sr2", "/dev/sr3", "/dev/sr4", "/dev/sr5",
"/dev/sr6", "/dev/sr7",
- NULL,
-};
-
-/* Dunno what this MAX_ thing is about, i'll just leave it, if it works */
-#define MAX_INIT_ARGS 8
-#define MAX_INIT_ENVS 8
-char *init_envp[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
-char *init_argv[MAX_INIT_ARGS+2] = { "init", NULL, };
-
-/* The var tree, just mkdir()'ed */
-const char *var_tree[] = {
- "var",
- "var/cache", "var/empty", "var/lib", "var/local", "var/lock",
- "var/log", "var/mail", "var/opt", "var/run", "var/spool",
"var/tmp",
- "var/lib/locate", "var/lib/misc", "var/lib/nfs", "var/lib/xkb",
"var/lib/xdm",
- NULL,
-};
-
-/* Links to be made */
-const char *cdrom_links[][2] =
-{
- {CDROM_MOUNT "/bin", "bin"},
- {CDROM_MOUNT "/lib", "lib"},
- {CDROM_MOUNT "/sbin", "sbin"},
- {CDROM_MOUNT "/etc", "etc"},
- {CDROM_MOUNT "/boot", "boot"},
- {CDROM_MOUNT "/sources", "sources"},
- {NULL, NULL},
-};
-
-const char *proc_links[][2] =
-{
- {"/proc/self/fd", "/dev/fd"},
- {"/proc/self/fd/0", "/dev/stdin"},
- {"/proc/self/fd/1", "/dev/stdout"},
- {"/proc/self/fd/2", "/dev/stderr"},
- {"/proc/kcore", "/dev/core"},
- {NULL, NULL},
-};
-
-
-int mountlfscd(void);
-inline int vfsmount(char *target, char *fs, int perms, char *params);
-
-int main(void)
-{
- int i;
-
- umask(0);
-
- printf("Initramfs activated\n");
-
- vfsmount("/proc", "proc", 0755, NULL);
- vfsmount("/sys", "sysfs", 0755, NULL);
-
- mkdir(CDROM_MOUNT, 0755);
-
- for (i=0;i<MAX_RETRIES;i++)
- {
- if (mountlfscd())
- break;
-
- /* Failed to find any device with an lfs boot cd in :( */
- printf("I couldn't find an LFS LiveCD in any drive!!\n");
- printf("I'm going to wait 10 seconds and try again (Try
%d/%d)\n", i, MAX_RETRIES);
- sleep(10);
- }
-
- if (i>=MAX_RETRIES)
- {
- printf("I couldn't find an LFS LiveCD in any drive after %d
retries!\n", MAX_RETRIES);
- /* reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2,
LINUX_REBOOT_CMD_HALT, NULL); */
- return(1);
- }
-
- /* If we're here, we have an lfs cd mounted and verified */
- printf("Building Directory Structure...\n");
- mkdir("tmp", 01777);
- mkdir("root", 01750);
- mkdir("home", 01755);
- mkdir("mnt", 01755);
- mkdir("mnt/lfs", 01755);
-
- /* Make var directories */
- for (i=0;var_tree[i]!=NULL;i++)
- mkdir(var_tree[i], 0755);
-
- /* Make some links */
- for(i=0;cdrom_links[i][0]!=NULL;i++)
- symlink(cdrom_links[i][0], cdrom_links[i][1]);
-
- printf("Populating /dev with device nodes...\n");
-
- i = mount("none", "/dev", "ramfs", 0, NULL);
- if (i<0)
- printf("Failed to mount /dev: %s\n", strerror(errno));
-
- system("/sbin/udevstart");
-
- /* Make some links */
- for(i=0;proc_links[i][0]!=NULL;i++)
- symlink(proc_links[i][0], proc_links[i][1]);
-
- /* Mount some stuff*/
- vfsmount("/dev/pts", "devpts", 0755, "gid=4,mode=620");
- vfsmount("/dev/shm", "tmpfs", 01777, NULL);
-
- /* We're done!! */
- printf("Starting init...\n");
- i = execve("/sbin/init", init_argv, init_envp);
- if (i<0)
- printf("Failed to start init: %s :(\n", strerror(errno));
-
- return(0);
-}
-
-/* Mount a virtual file system */
-inline int vfsmount(char *target, char *fs, int perms, char *params)
-{
- int i;
- printf("Mounting %s...\n", target);
- mkdir(target, perms);
- i = mount("none", target, fs, 0, params);
- if (i<0)
- {
- printf("Failed to mount %s[%s]: %s\n", target, fs,
strerror(errno));
- return(-1);
- }
- return(0);
-}
-
-/* This will look for and mount an LFS CD, if found/mounted it'll return 1,
otherwise 0 */
-int mountlfscd(void)
-{
- int i;
-
- for(i=0;devices[i]!=NULL;i++)
- {
- int fd, status;
- const char *curdevice = devices[i];
- char buf[32];
-
- /* Try to open CD drive to see if we can use it */
- fd = open(curdevice, O_RDONLY | O_NONBLOCK);
- if (fd<0)
- {
- /*
- We'll get here if we can't open the device
- (No such device, No such file or directory,
etc, etc)
-
- printf("%s: open failed: %s\n", curdevice,
strerror(errno)); */
- continue; /* On to the next device!! */
- }
-
- /* Try to see what the status of the CD drive is */
- status = ioctl(fd, CDROM_DRIVE_STATUS, 0);
- if (status<0)
- {
- /* We'll probably get here if we open a hard disk */
- /* printf("%s: ioctl failed: %s\n", curdevice,
strerror(errno)); */
- close(fd);
- continue; /* On to the next device!! */
- }
-
- close(fd); /* We don't need this fd any more */
-
- if (status != CDS_DISC_OK)
- {
- /* We'll probably get here if there's no CD in the
drive */
- printf("%s: Drive not ready\n", curdevice);
- continue; /* On to the next device!! */
- }
-
- /* If we're here, the cd drive seems to have a disc in it, and
is okay! */
-
- /* Try to mount the cd drive*/
- status = mount(curdevice, CDROM_MOUNT, CDROM_FSTYPE, MS_RDONLY,
NULL);
- if (status<0)
- {
- printf("%s: mount failed: %s\n", curdevice,
strerror(errno));
- continue; /* On to the next device!! */
- }
-
- /* If we're here, we have definatly have a data CD mounted at
the mount point :) */
-
-
- /* Lets try to make sure it's the LFS LiveCD :) */
- fd = open(LFSID_FILE, O_RDONLY);
- if (fd<0)
- {
- printf("%s: Not our LFS LiveCD!\n", curdevice);
- continue; /* On to the next device!! */
- }
-
- memset(buf, 0, 32); /* Clear buffer so we don't have to check
read's status */
- read(fd, buf, 10);
- close(fd);
-
- if (memcmp(buf, LFSID_STRING, strlen(LFSID_STRING)))
- {
- printf("%s: %s incorrect data\n", curdevice,
LFSID_FILE);
- status = umount(curdevice);
- if (status<0)
- printf("%s: umount failed: %s\n", curdevice,
strerror(errno));
- /* (don't care if umount failed, not much we
can do about it, but nice to say anyway) */
- continue; /* On to the next device!! */
- }
-
- /* YAY! we have the lfs boot cd mounted :) */
- printf("%s: LFS CD Verified\n", curdevice);
- return(1);
- }
-
- /* Nuts, can't find an lfs livecd anywhere */
-
- return(0);
-}
-
Modified: trunk/isolinux/isolinux.cfg
===================================================================
--- trunk/isolinux/isolinux.cfg 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/isolinux/isolinux.cfg 2005-05-13 04:10:55 UTC (rev 143)
@@ -7,7 +7,8 @@
label linux
kernel linux
+ append initrd=initramfs_data_cpio.gz
label linux-autosshd
kernel linux
- append autosshd
+ append autosshd initrd=initramfs_data_cpio.gz
Modified: trunk/isolinux/options.msg
===================================================================
--- trunk/isolinux/options.msg 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/isolinux/options.msg 2005-05-13 04:10:55 UTC (rev 143)
@@ -1,15 +1,18 @@
To use a framebuffer console, type "linux vga=xxx"
-where xxx is a screen resolution.
+where xxx denotes a screen resolution and color depth.
Examples:
-795 = 1280x1024x24
-794 = 1280x1024x16
-792 = 1024x768x24
-791 = 1024x768x16
-789 = 800x600x24
-788 = 800x600x16
+795 = 1280x1024x24 794 = 1280x1024x16
+792 = 1024x768x24 791 = 1024x768x16
+789 = 800x600x24 788 = 800x600x16
To enable expert mode type "expert" anywhere after
"linux". This will disable module loading and will
not attempt to bring up your network.
+
+To set your timezone, add TZ=your/timezone (e.g.
+TZ=America/New_York or TZ=UTC+4) anywhere after "linux".
+Also, add UTC=1 if the hardware clock in your computer
+is set to GMT instead of local time.
+
Modified: trunk/linux/config
===================================================================
--- trunk/linux/config 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/linux/config 2005-05-13 04:10:55 UTC (rev 143)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.11.6
-# Mon Apr 18 16:50:55 2005
+# Tue May 10 10:49:21 2005
#
CONFIG_X86=y
CONFIG_MMU=y
@@ -294,8 +294,10 @@
CONFIG_BLK_DEV_NBD=m
CONFIG_BLK_DEV_SX8=m
# CONFIG_BLK_DEV_UB is not set
-# CONFIG_BLK_DEV_RAM is not set
+CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+CONFIG_BLK_DEV_INITRD=y
CONFIG_INITRAMFS_SOURCE=""
CONFIG_LBD=y
# CONFIG_CDROM_PKTCDVD is not set
@@ -901,9 +903,9 @@
# CONFIG_PPP_FILTER is not set
CONFIG_PPP_ASYNC=m
CONFIG_PPP_SYNC_TTY=m
-# CONFIG_PPP_DEFLATE is not set
+CONFIG_PPP_DEFLATE=m
# CONFIG_PPP_BSDCOMP is not set
-# CONFIG_PPPOE is not set
+CONFIG_PPPOE=m
# CONFIG_SLIP is not set
# CONFIG_NET_FC is not set
# CONFIG_SHAPER is not set
@@ -993,8 +995,7 @@
#
CONFIG_SERIAL_CORE=y
CONFIG_UNIX98_PTYS=y
-CONFIG_LEGACY_PTYS=y
-CONFIG_LEGACY_PTY_COUNT=256
+# CONFIG_LEGACY_PTYS is not set
CONFIG_PRINTER=y
# CONFIG_LP_CONSOLE is not set
# CONFIG_PPDEV is not set
@@ -1011,8 +1012,7 @@
# CONFIG_WATCHDOG is not set
CONFIG_HW_RANDOM=m
# CONFIG_NVRAM is not set
-# CONFIG_RTC is not set
-# CONFIG_GEN_RTC is not set
+CONFIG_RTC=y
# CONFIG_DTLK is not set
# CONFIG_R3964 is not set
# CONFIG_APPLICOM is not set
@@ -1240,7 +1240,7 @@
CONFIG_USB_EHCI_HCD=y
# CONFIG_USB_EHCI_SPLIT_ISO is not set
# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
-# CONFIG_USB_OHCI_HCD is not set
+CONFIG_USB_OHCI_HCD=y
CONFIG_USB_UHCI_HCD=y
# CONFIG_USB_SL811_HCD is not set
@@ -1383,15 +1383,12 @@
#
# File systems
#
-CONFIG_EXT2_FS=y
+CONFIG_EXT2_FS=m
# CONFIG_EXT2_FS_XATTR is not set
-CONFIG_EXT3_FS=y
-CONFIG_EXT3_FS_XATTR=y
-# CONFIG_EXT3_FS_POSIX_ACL is not set
-# CONFIG_EXT3_FS_SECURITY is not set
-CONFIG_JBD=y
+CONFIG_EXT3_FS=m
+# CONFIG_EXT3_FS_XATTR is not set
+CONFIG_JBD=m
# CONFIG_JBD_DEBUG is not set
-CONFIG_FS_MBCACHE=y
CONFIG_REISER4_FS=m
# CONFIG_REISER4_DEBUG is not set
CONFIG_REISERFS_FS=m
@@ -1419,7 +1416,7 @@
# CONFIG_QUOTA is not set
CONFIG_DNOTIFY=y
# CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=y
+# CONFIG_AUTOFS4_FS is not set
#
# CD-ROM/DVD Filesystems
@@ -1427,15 +1424,15 @@
CONFIG_ISO9660_FS=y
CONFIG_JOLIET=y
# CONFIG_ZISOFS is not set
-CONFIG_UDF_FS=y
+CONFIG_UDF_FS=m
CONFIG_UDF_NLS=y
#
# DOS/FAT/NT Filesystems
#
-CONFIG_FAT_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
CONFIG_FAT_DEFAULT_CODEPAGE=437
CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
CONFIG_NTFS_FS=m
@@ -1514,44 +1511,44 @@
#
CONFIG_NLS=y
CONFIG_NLS_DEFAULT="iso8859-1"
-CONFIG_NLS_CODEPAGE_437=y
-# CONFIG_NLS_CODEPAGE_737 is not set
-# CONFIG_NLS_CODEPAGE_775 is not set
-# CONFIG_NLS_CODEPAGE_850 is not set
-# CONFIG_NLS_CODEPAGE_852 is not set
-# CONFIG_NLS_CODEPAGE_855 is not set
-# CONFIG_NLS_CODEPAGE_857 is not set
-# CONFIG_NLS_CODEPAGE_860 is not set
-# CONFIG_NLS_CODEPAGE_861 is not set
-# CONFIG_NLS_CODEPAGE_862 is not set
-# CONFIG_NLS_CODEPAGE_863 is not set
-# CONFIG_NLS_CODEPAGE_864 is not set
-# CONFIG_NLS_CODEPAGE_865 is not set
-# CONFIG_NLS_CODEPAGE_866 is not set
-# CONFIG_NLS_CODEPAGE_869 is not set
-# CONFIG_NLS_CODEPAGE_936 is not set
-# CONFIG_NLS_CODEPAGE_950 is not set
-# CONFIG_NLS_CODEPAGE_932 is not set
-# CONFIG_NLS_CODEPAGE_949 is not set
-# CONFIG_NLS_CODEPAGE_874 is not set
-# CONFIG_NLS_ISO8859_8 is not set
-# CONFIG_NLS_CODEPAGE_1250 is not set
-# CONFIG_NLS_CODEPAGE_1251 is not set
-# CONFIG_NLS_ASCII is not set
-CONFIG_NLS_ISO8859_1=y
-# CONFIG_NLS_ISO8859_2 is not set
-# CONFIG_NLS_ISO8859_3 is not set
-# CONFIG_NLS_ISO8859_4 is not set
-# CONFIG_NLS_ISO8859_5 is not set
-# CONFIG_NLS_ISO8859_6 is not set
-# CONFIG_NLS_ISO8859_7 is not set
-# CONFIG_NLS_ISO8859_9 is not set
-# CONFIG_NLS_ISO8859_13 is not set
-# CONFIG_NLS_ISO8859_14 is not set
-# CONFIG_NLS_ISO8859_15 is not set
-# CONFIG_NLS_KOI8_R is not set
-# CONFIG_NLS_KOI8_U is not set
-# CONFIG_NLS_UTF8 is not set
+CONFIG_NLS_CODEPAGE_437=m
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_UTF8=m
#
# Profiling support
@@ -1618,6 +1615,7 @@
CONFIG_CRC32=y
CONFIG_LIBCRC32C=m
CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=m
CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_X86_SMP=y
Modified:
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
===================================================================
---
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
2005-05-13 03:36:52 UTC (rev 142)
+++
trunk/packages/blfs-bootscripts/blfs-bootscripts-20050313-add-autosshd-1.patch
2005-05-13 04:10:55 UTC (rev 143)
@@ -1,7 +1,7 @@
-diff -Naur blfs-bootscripts-20050313.orig/blfs/init.d/autosshd
blfs-bootscripts-20050313/blfs/init.d/autosshd
---- blfs-bootscripts-20050313.orig/blfs/init.d/autosshd 1969-12-31
19:00:00.000000000 -0500
-+++ blfs-bootscripts-20050313/blfs/init.d/autosshd 2005-03-30
22:06:02.986977573 -0500
-@@ -0,0 +1,20 @@
+diff -Naur blfs-bootscripts-20050313-ORIG/blfs/init.d/autosshd
blfs-bootscripts-20050313/blfs/init.d/autosshd
+--- blfs-bootscripts-20050313-ORIG/blfs/init.d/autosshd 1970-01-01
05:00:00.000000000 +0500
++++ blfs-bootscripts-20050313/blfs/init.d/autosshd 2005-05-13
09:07:15.000000000 +0600
+@@ -0,0 +1,26 @@
+#!/bin/sh
+# Begin $rc_base/init.d/autosshd
+
@@ -15,16 +15,35 @@
+ /etc/rc.d/init.d/sshd start
+ fi
+ ;;
++ stop)
++ if statusproc /usr/sbin/sshd | grep -q "Process ID"
++ then
++ /etc/rc.d/init.d/sshd stop
++ fi
++ ;;
+ *)
-+ echo "Usage: $0 {start|stop|reload|restart|status}"
++ echo "Usage: $0 {start|stop}"
+ exit 1
+ ;;
+esac
+
+# End $rc_base/init.d/autosshd
-diff -Naur blfs-bootscripts-20050313.orig/Makefile
blfs-bootscripts-20050313/Makefile
---- blfs-bootscripts-20050313.orig/Makefile 2005-03-06 22:48:33.000000000
-0500
-+++ blfs-bootscripts-20050313/Makefile 2005-03-30 22:06:02.988977310 -0500
+diff -Naur blfs-bootscripts-20050313-ORIG/blfs/init.d/sshd
blfs-bootscripts-20050313/blfs/init.d/sshd
+--- blfs-bootscripts-20050313-ORIG/blfs/init.d/sshd 2004-09-29
10:00:58.000000000 +0600
++++ blfs-bootscripts-20050313/blfs/init.d/sshd 2005-05-13 09:09:05.000000000
+0600
+@@ -13,6 +13,9 @@
+ case "$1" in
+ start)
+ echo "Starting SSH Server..."
++ [ -f /etc/ssh/ssh_host_key ] || ssh-keygen -q -t rsa1 -f
/etc/ssh/ssh_host_key -N ""
++ [ -f /etc/ssh/ssh_host_rsa_key ] || ssh-keygen -q -t rsa -f
/etc/ssh/ssh_host_rsa_key -N ""
++ [ -f /etc/ssh/ssh_host_dsa_key ] || ssh-keygen -q -t dsa -f
/etc/ssh/ssh_host_dsa_key -N ""
+ loadproc /usr/sbin/sshd
+ ;;
+
+diff -Naur blfs-bootscripts-20050313-ORIG/Makefile
blfs-bootscripts-20050313/Makefile
+--- blfs-bootscripts-20050313-ORIG/Makefile 2005-03-07 08:48:33.000000000
+0500
++++ blfs-bootscripts-20050313/Makefile 2005-05-13 09:07:03.000000000 +0600
@@ -54,6 +54,16 @@
install -m $(CONFMODE) blfs/sysconfig/autofs.conf $(EXTDIR)/sysconfig/
ln -sf ../init.d/autofs $(EXTDIR)/rc.d/rcsysinit.d/S45autofs
Copied: trunk/packages/fonts-dejavu (from rev 142,
branches/unionfs/packages/fonts-dejavu)
Copied: trunk/packages/isoinfo (from rev 142, branches/unionfs/packages/isoinfo)
Copied: trunk/packages/klibc (from rev 142, branches/unionfs/packages/klibc)
Modified: trunk/packages/lfs-bootscripts/Makefile
===================================================================
--- trunk/packages/lfs-bootscripts/Makefile 2005-05-13 03:36:52 UTC (rev
142)
+++ trunk/packages/lfs-bootscripts/Makefile 2005-05-13 04:10:55 UTC (rev
143)
@@ -21,8 +21,15 @@
@echo ""
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && \
mv $(FILE) $(SRC) ; fi
- @if [ ! -f /etc/rc.d/init.d/mountsqfs ] ; then tar xjvf ${SRC}/${FILE}
&& \
- cd ${DIR} && make install-livecd ; fi
+ @if [ ! -f /etc/rc.d/init.d/functions ] ; then tar xjvf ${SRC}/${FILE}
&& \
+ cd ${DIR} && make install-livecd && \
+ install -m 755 lfs/init.d/mountkernfs /etc/rc.d/init.d && \
+ ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernks && \
+ install -m 755 ../udev /etc/rc.d/init.d/ && \
+ ln -sf ../init.d/udev /etc/rc.d/rcsysinit.d/S10udev && \
+ install -m 755 ../mountfs /etc/rc.d/init.d/ && \
+ ln -sf ../init.d/mountfs /etc/rc.d/rcsysinit.d/S40mountfs && \
+ rm -f /etc/rc.d/*/*mountsqfs /etc/rc.d/*/*startup ; fi
clean:
@-rm -rf bootscripts
Copied: trunk/packages/lfs-bootscripts/mountfs (from rev 142,
branches/unionfs/packages/lfs-bootscripts/mountfs)
Copied: trunk/packages/lfs-bootscripts/udev (from rev 142,
branches/unionfs/packages/lfs-bootscripts/udev)
Modified: trunk/packages/linux/Makefile
===================================================================
--- trunk/packages/linux/Makefile 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/packages/linux/Makefile 2005-05-13 04:10:55 UTC (rev 143)
@@ -21,21 +21,17 @@
@echo ""
@echo "=====> Building $(NM) in chroot"
@echo ""
+ @-mkdir /boot/isolinux
@if [ ! -f $(SRC)/$(FILE) ] ; then $(WGET) $(URL) && mv $(FILE) $(SRC)
; fi
@if [ ! -f /boot/isolinux/linux ] ; then tar xjvf $(SRC)/$(FILE) && cd
$(DIR) && \
$(WGET) $(URL1).2/serie && \
- for i in `cat serie` ; do $(WGET) -c $(URL1).2/$$i && \
+ for i in `cat serie` ; do $(WGET) $(URL1).2/$$i && \
mv $$i ../ && patch -Np1 -i ../$$i ; done && \
patch -Np1 -i
$(ROOT)/$(PKG)/squashfs/squashfs2.1/linux-2.6.9/$(PATCH1) && \
make mrproper && \
cp $(ROOT)/linux/config .config && \
make -j3 && \
- make modules_install && \
- cd $(ROOT)/initramfs && make && \
- cp initramfs_data.cpio.gz $(ROOT)/$(PKG)/$(NM)/$(DIR)/usr/ && \
- cd $(ROOT)/$(PKG)/$(NM)/$(DIR) && \
- make ; fi
- @-mkdir /boot/isolinux
+ make modules_install ; fi
@-cp $(DIR)/arch/i386/boot/bzImage /boot/isolinux/linux
clean:
Modified: trunk/packages/nano/Makefile
===================================================================
--- trunk/packages/nano/Makefile 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/packages/nano/Makefile 2005-05-13 04:10:55 UTC (rev 143)
@@ -21,7 +21,7 @@
@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
@if [ ! -f /usr/bin/nano ] ; then tar xzvf $(FILE) && cd $(DIR) && \
./configure --prefix=/usr --sysconfdir=/etc --enable-color
--enable-multibuffer \
- --enable-nanorc --with-slang=/usr/lib && \
+ --enable-nanorc && \
make -j3 && make install && \
mkdir -p /usr/share/doc/nano/examples && \
cp nanorc.sample /usr/share/doc/nano/examples && \
Modified: trunk/packages/openssh/Makefile
===================================================================
--- trunk/packages/openssh/Makefile 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/packages/openssh/Makefile 2005-05-13 04:10:55 UTC (rev 143)
@@ -2,11 +2,10 @@
# Package versions
NM= openssh
-VRS= 4.0p1
+VRS= 3.9p1
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.gz
URL= http://sunsite.ualberta.ca/pub/OpenBSD/OpenSSH/portable/$(FILE)
-HOSTORIG= `hostname`
#RULES
@@ -24,13 +23,12 @@
@-groupadd sshd
@-useradd -c sshd -d /var/lib/sshd -g sshd -s /bin/false sshd
@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
- @if [ ! -f /usr/bin/ssh ] ; then hostname $(HOSTNAME) && tar xzvf
$(FILE) && cd $(DIR) && \
+ @if [ ! -f /usr/bin/ssh ] ; then tar xzvf $(FILE) && cd $(DIR) && \
sed -i "s:-lcrypto:/usr/lib/libcrypto.a:g" configure && \
./configure --prefix=/usr --sysconfdir=/etc/ssh --libexecdir=/usr/sbin
--with-md5-passwords \
--with-privsep-path=/var/lib/sshd && \
- make -j3 && make install ; fi
+ make -j3 && make install-nokeys ; fi
@make clean
- @hostname $(HOSTORIG)
clean:
@-rm -rf $(DIR)
Modified: trunk/packages/sharutils/Makefile
===================================================================
--- trunk/packages/sharutils/Makefile 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/packages/sharutils/Makefile 2005-05-13 04:10:55 UTC (rev 143)
@@ -2,10 +2,10 @@
# Package versions
NM= sharutils
-VRS= 4.3.78
+VRS= 4.3.80
DIR= $(NM)-$(VRS)
FILE= $(DIR).tar.bz2
-URL= http://ftp.gnu.org/gnu/sharutils/REL-4.3.78/$(FILE)
+URL= http://ftp.gnu.org/gnu/sharutils/REL-$(VRS)/$(FILE)
# RULES
Modified: trunk/packages/slang/Makefile
===================================================================
--- trunk/packages/slang/Makefile 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/packages/slang/Makefile 2005-05-13 04:10:55 UTC (rev 143)
@@ -20,6 +20,7 @@
@echo ""
@if [ ! -f $(FILE) ] ; then $(WGET) $(URL) ; fi
@if [ ! -f /usr/lib/libslang.so.1.4.9 ] ; then tar xjvf $(FILE) && cd
$(DIR) && \
+ patch -Np1 -i ../slang-1.4.9-luit-1.patch && \
./configure --prefix=/usr && \
make && make install && \
make elf && make install-elf && \
Copied: trunk/packages/slang/slang-1.4.9-luit-1.patch (from rev 142,
branches/unionfs/packages/slang/slang-1.4.9-luit-1.patch)
Copied: trunk/packages/unionfs (from rev 142, branches/unionfs/packages/unionfs)
Modified: trunk/packages/util-linux/Makefile
===================================================================
--- trunk/packages/util-linux/Makefile 2005-05-13 03:36:52 UTC (rev 142)
+++ trunk/packages/util-linux/Makefile 2005-05-13 04:10:55 UTC (rev 143)
@@ -11,7 +11,7 @@
# RULES
-.PHONY: stage1 clean chroot stage2
+.PHONY: stage1 clean chroot stage2 klibc-losetup
stage1:
@echo ""
@@ -43,6 +43,15 @@
make HAVE_KILL=yes HAVE_SLN=yes install ; fi
@make clean
-
+klibc-losetup:
+ @echo ""
+ @echo "=====> Building losetup with klibc"
+ @echo ""
+ @if [ ! -f /usr/lib/klibc/bin/losetup ] ; then tar xjvf $(SRC)/$(FILE)
&& cd $(DIR) && \
+ patch -Np1 -i ../../klibc/util-linux-2.12q-klibc-1.patch && \
+ CC="klcc" LDFLAGS="-shared" ./configure && \
+ make lib/xstrncpy.o lib/getpass.o && make -C mount losetup && \
+ strip -s mount/losetup && install mount/losetup /usr/lib/klibc/bin ; fi
+ @make clean
clean:
@-rm -rf $(DIR)
Copied: trunk/root/.bashrc (from rev 142, branches/unionfs/root/.bashrc)
--
http://linuxfromscratch.org/mailman/listinfo/livecd
FAQ: http://www.linuxfromscratch.org/faq/
Unsubscribe: See the above information page
