--- toast-linux 2004/11/24 07:46:54 1.129 +++ toast-linux 2005/01/13 05:33:00 1.130 @@ -135,7 +135,7 @@ NTFSPROGS_VERSION = 1.9.2 PARTED_VERSION = 1.6.12 DEVMAP_VERSION = 1.00.19 -LVM2_VERSION = 2.00.25 +LVM2_VERSION = 0-stable GENEXT2FS_VERSION = 1.3 GENEXT2FS_PATCHLEVEL = 7.1 MTOOLS_VERSION = 3.9.9 @@ -317,7 +317,9 @@ $(LVM2): $(LVM2_ARCHIVE) $(DEVMAP) $(TOOLCHAIN_DIR)/ok smartcat rm -fr $(LVM2_DIR) - ./smartcat $< | tar x + mkdir $(LVM2_DIR) + ./smartcat $< | tar x -C $(LVM2_DIR) + mv $(LVM2_DIR)/*/* $(LVM2_DIR)/ perl -p -i -e 's/-O2/-Os/g' $(LVM2_DIR)/make.tmpl.in rm -f $(DEVMAP:.a=.so) set -e; cd $(LVM2_DIR); export CPATH="$(CURDIR)/$(DEVMAP_DIR)/include"; ./configure --host=i386-pc-linux-gnu CC="$(TOOLCHAIN_BIN_DIR)/gcc -Os -L$(CURDIR)/$(dir $(DEVMAP))"; $(MAKE) DESTDIR=dummy @@ -402,7 +404,7 @@ pod2man $< > $@ vmware: floppy.img cd.iso vmclean toast.vmx - vmware-vdiskmanager -c -a buslogic -s 8gb -t 1 toast.vmdk + vmware-vdiskmanager -c -a buslogic -s 16gb -t 1 toast.vmdk vmware -x toast.vmx bochs: floppy.img bochs-config mkhd