--- toast-linux 2005/01/13 05:33:00 1.130
+++ toast-linux 2005/02/05 08:21:03 1.131
@@ -124,23 +124,23 @@
WGET = wget
FROMCONF = dev toast-linux.stub mkhd bochs-config toast.vmx
-FROMCONF2 = smartcat linux-config busybox-config
+FROMCONF2 = smartcat linux-config-smallk linux-config-largek busybox-config
PKGS = TOOLCHAIN LINUX BUSYBOX E2FSPROGS NTFSPROGS PARTED DEVMAP LVM2 GENEXT2FS MTOOLS SYSLINUX CDRTOOLS
# TOOLCHAIN_VERSION = ??? [only available from cvsweb right now...]
-LINUX_VERSION = 2.6.9
+LINUX_VERSION = 2.6.10
BUSYBOX_VERSION = 1.00
E2FSPROGS_VERSION = 1.35
NTFSPROGS_VERSION = 1.9.2
PARTED_VERSION = 1.6.12
-DEVMAP_VERSION = 1.00.19
+DEVMAP_VERSION = stable
LVM2_VERSION = 0-stable
GENEXT2FS_VERSION = 1.3
GENEXT2FS_PATCHLEVEL = 7.1
MTOOLS_VERSION = 3.9.9
-SYSLINUX_VERSION = 2.10
-CDRTOOLS_VERSION = 2.00.3
+SYSLINUX_VERSION = 3.07
+CDRTOOLS_VERSION = 2.01
TOOLCHAIN_DIR = toolchain
LINUX_DIR = linux-$(LINUX_VERSION)
@@ -148,7 +148,7 @@
E2FSPROGS_DIR = e2fsprogs-$(E2FSPROGS_VERSION)
NTFSPROGS_DIR = ntfsprogs-$(NTFSPROGS_VERSION)
PARTED_DIR = parted-$(PARTED_VERSION)
-DEVMAP_DIR = device-mapper.$(DEVMAP_VERSION)
+DEVMAP_DIR = device-mapper-$(DEVMAP_VERSION)
LVM2_DIR = LVM2.$(LVM2_VERSION)
GENEXT2FS_DIR = genext2fs-$(GENEXT2FS_VERSION).orig
MTOOLS_DIR = mtools-$(MTOOLS_VERSION)
@@ -181,9 +181,9 @@
GENEXT2FS_PATCH_URL = http://ftp.debian.org/debian/pool/main/g/genext2fs/$(GENEXT2FS_PATCH)
MTOOLS_URL = http://mtools.linux.lu/$(MTOOLS_ARCHIVE)
SYSLINUX_URL = http://kernel.org/pub/linux/utils/boot/syslinux/$(SYSLINUX_ARCHIVE)
-CDRTOOLS_URL = http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/cdrtools/$(CDRTOOLS_VERSION)/$(CDRTOOLS_ARCHIVE)
-# ftp://ftp.berlios.de/pub/cdrecord/cdrtools-2.00.3.tar.gz
-# http://gd.tuwien.ac.at/utils/schilling/cdrtools/cdrtools-2.00.3.tar.gz
+CDRTOOLS_URL = ftp://ftp.berlios.de/pub/cdrecord/$(CDRTOOLS_ARCHIVE)
+# http://distro.ibiblio.org/pub/linux/distributions/sorcerer/sources/cdrtools/$(CDRTOOLS_VERSION)/$(CDRTOOLS_ARCHIVE)
+# http://gd.tuwien.ac.at/utils/schilling/cdrtools/$(CDRTOOLS_ARCHIVE)
TOOLCHAIN_MAKE_DIR = $(TOOLCHAIN_DIR)/gcc-3.3.x
TOOLCHAIN_ROOT_DIR = $(TOOLCHAIN_MAKE_DIR)/toolchain_i386/i386-linux-uclibc
@@ -191,9 +191,10 @@
TOOLCHAIN_BIN_DIR = $(CURDIR)/$(TOOLCHAIN_ROOT_DIR)/bin
PKG_DIRS = $(foreach PKG, $(PKGS), $($(PKG)_DIR))
-LINUX_PATCH_FILES = $(foreach PATCH, $(LINUX_PATCHES), $($(PATCH)_ARCHIVE))
-LINUX = $(LINUX_DIR)/arch/i386/boot/bzImage
+KPATH = arch/i386/boot/bzImage
+SMALLK = smallk/$(KPATH)
+LARGEK = largek/$(KPATH)
BUSYBOX = $(BUSYBOX_DIR)/busybox
TUNE2FS = $(E2FSPROGS_DIR)/misc/tune2fs
RESIZE2FS = $(E2FSPROGS_DIR)/resize/resize2fs
@@ -206,7 +207,7 @@
MFORMAT = $(MTOOLS_DIR)/mformat
MCOPY = $(MTOOLS_DIR)/mcopy
MDIR = $(MTOOLS_DIR)/mdir
-SYSLINUX = $(SYSLINUX_DIR)/syslinux
+SYSLINUX = $(SYSLINUX_DIR)/mtools/syslinux
MKISOFS = $(CDRTOOLS_DIR)/mkisofs/mkisofs
INSTALL_DIR = $(DESTDIR)!PREFIX!
@@ -239,7 +240,7 @@
$(CDRTOOLS_ARCHIVE): ; $(WGET) $(CDRTOOLS_URL)
clean:
- rm -fr $(PKG_DIRS) symbols floppy* cd* root* toast-linux* $(FROMCONF) $(FROMCONF2)
+ rm -fr $(PKG_DIRS) symbols floppy* cd* root* toast-linux* $(FROMCONF) $(FROMCONF2) smallk largek
vmclean:
rm -f toast*.vm* toast*.sav nvram* vmware.log
@@ -252,22 +253,27 @@
.DELETE_ON_ERROR:
-$(LINUX_DIR)/.config: $(LINUX_ARCHIVE) linux-config smartcat
+$(LINUX_DIR)/ok: $(LINUX_ARCHIVE) smartcat
rm -fr $(LINUX_DIR)
./smartcat $< | tar x
- cat linux-config > $@
- yes '' | $(MAKE) -C $(LINUX_DIR) oldconfig dep
touch $@
-$(LINUX): $(LINUX_DIR)/.config
- $(MAKE) -C $(LINUX_DIR) bzImage
+%/.config: $(LINUX_DIR)/ok linux-config-%
+ rm -fr $*
+ mkdir $*
+ cat linux-config-$* > $@
+ yes '' | $(MAKE) -C $(LINUX_DIR) O=$(CURDIR)/$* oldconfig dep
+ touch $@
-modules: $(LINUX)
+%/$(KPATH): %/.config
+ $(MAKE) -C $(LINUX_DIR) O=$(CURDIR)/$* bzImage
+
+%-modules: %/$(KPATH)
rm -fr $@
- $(MAKE) -C $(LINUX_DIR) modules modules_install INSTALL_MOD_PATH=$(CURDIR)/$@
+ $(MAKE) -C $(LINUX_DIR) O=$(CURDIR)/$* modules modules_install INSTALL_MOD_PATH=$(CURDIR)/$@
-modsize: modules
- cd modules/lib/modules/*/kernel/drivers; ls -lS `find -name '*.ko'`
+%-modsize: %-modules
+ cd $*-modules/lib/modules/*/kernel/drivers; ls -lS `find -name '*.ko'`
$(TOOLCHAIN_DIR)/ok: $(TOOLCHAIN_ARCHIVE) smartcat
rm -fr $(TOOLCHAIN_DIR)
@@ -312,7 +318,9 @@
$(DEVMAP): $(DEVMAP_ARCHIVE) $(TOOLCHAIN_DIR)/ok smartcat
rm -fr $(DEVMAP_DIR)
- ./smartcat $< | tar x
+ mkdir $(DEVMAP_DIR)
+ ./smartcat $< | tar x -C $(DEVMAP_DIR)
+ mv $(DEVMAP_DIR)/*/* $(DEVMAP_DIR)/
set -e; cd $(DEVMAP_DIR); ./configure --disable-shared CC="$(TOOLCHAIN_BIN_DIR)/gcc -static -Os"; $(MAKE) lib
$(LVM2): $(LVM2_ARCHIVE) $(DEVMAP) $(TOOLCHAIN_DIR)/ok smartcat
@@ -335,7 +343,7 @@
$(FROMCONF2):
!CONFIGURE! $@
-root: $(LINUX) symbols !CONFIGURE!
+root: symbols !CONFIGURE!
rm -fr $@
!CONFIGURE! $@
mkdir -p $@/{root,proc,sys,tmp,media/floppy,mnt,var/run}
@@ -379,10 +387,10 @@
rm -f $@
$(GENEXT2FS) -d root -f dev -b $(ROOTFS_BLOCKS) -i $(ROOTFS_INODES) $@
-floppy: $(LINUX) rootfs.gz !CONFIGURE!
+floppy: $(SMALLK) rootfs.gz !CONFIGURE!
rm -fr $@
!CONFIGURE! $@
- cp $(LINUX) $@/linux
+ cp $(SMALLK) $@/linux
cp rootfs.gz $@/initrd
floppy.img: floppy $(MFORMAT) $(SYSLINUX) $(MCOPY) $(MDIR)
@@ -418,9 +426,9 @@
bochs-config-cd: bochs-config
perl -pe 's/(^boot:) floppy/$$1 cdrom/; s/inserted/ejected/ if /floppy/; s/ejected/inserted/ if /cdrom/' $< > $@
-config-linux: $(LINUX_DIR)/.config
- $(MAKE) -C $(LINUX_DIR) menuconfig
- cp $< linux-config
+config-linux-%: %/.config
+ $(MAKE) -C $(LINUX_DIR) O=$(CURDIR)/$* menuconfig
+ cp $< linux-config-$*
config-busybox: $(BUSYBOX_DIR)/.config
$(MAKE) -C $(BUSYBOX_DIR) menuconfig
@@ -472,11 +480,6 @@
- install disk should double as a rescue disk including e2fsck
- install disk should automatically resize FAT and NTFS partitions
-Packages that need upgrading:
- latest Linux kernel
- GNOME 2.6.1 is out
- binutils 2.15 is out
-
=head1 SEE ALSO
TODO: refer to toast itself, some other distributions like Gentoo
@@ -933,7 +936,7 @@
chmod 666 /dev/null
---- FILE linux-config ---
+--- FILE linux-config-smallk ---
#
# Automatically generated make config: don't edit
#