Merge pull request #5 from CheetahPixie/patch-1

Remove the sp register from UNPRESERVED_REGS

AUTHORS

@@ -1 +1 @@
-Laurent Vivier <Laurent@lvivier.info>
+Laurent Vivier <Laurent@Vivier.EU>

COPYING

@@ -1,12 +1,12 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
-			    Preamble
+                            Preamble
 
   The licenses for most software are designed to take away your
 freedom to share and change it.  By contrast, the GNU General Public
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
+
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License applies to any program or other work which contains
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            NO WARRANTY
 
   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
 FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
 PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
 possible use to the public, the best way to achieve this is to make it
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.

ChangeLog

@@ -1,3 +1,195 @@
+2013-09-05 14:39:22 +0200 Laurent Vivier <laurent@vivier.eu>
+
+        * Update email address
+    
+2013-09-05 14:30:46 +0200 Laurent Vivier <laurent@vivier.eu>
+
+        * Update GPLv2
+
+2013-09-04 18:10:46 +0200 Laurent Vivier <laurent@vivier.eu>
+
+        * Use ext2_fs.h from e2fslibs-dev package
+
+2013-09-02 21:12:46 +0200 Laurent Vivier <laurent@vivier.eu>
+
+        * macos: correct typo in GetCurrentMode()
+
+2011-12-18 14:40:02 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * update (c) date
+
+2011-12-18 14:39:01 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * gcc-4.6: correct strict aliasing errors.
+
+2011-12-18 14:39:01 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * Remove unused variables (detected with gcc-4.6) in m68k part
+
+2011-12-18 14:39:01 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * Remove unused variables (detected with gcc-4.6)
+
+2011-12-18 14:39:01 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * add emile.conf man page into .deb
+
+2011-12-18 14:39:01 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * Add more details on "root" option
+
+2011-12-18 14:39:01 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * debian: correct non-m68k build
+
+2011-12-18 14:39:01 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * Change VERSION from 0.13CVS to 0.13
+
+2011-12-18 14:39:01 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * debian: allows to compile emile with gcc-4.1
+
+2011-12-18 14:38:58 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * include linux/fs.h before linux/ext2_fs.h
+
+2011-12-18 14:38:53 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * remove close() of unitialized fd
+
+2011-12-18 14:38:44 +0100  Laurent Vivier <laurent@vivier.eu>
+
+        * Add -Wa,-mcpu=68030 and -Wa,-mcpu=68040
+
+2009-06-19 00:25:11 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Add EnterSupervisorMode()
+
+2009-06-18 22:24:51 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Define get_physical() and make_resident()
+
+2009-06-18 22:24:15 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Add include of macos/errors.h
+
+2009-06-18 22:11:03 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Add LockMemory() and LockMemoryContiguous()
+
+2009-06-18 22:02:41 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Replace space by tab
+
+2009-06-18 22:00:27 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Add GetPhysical() trap
+
+2009-06-12 01:14:50 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * switch off interrupts before the PPC bootstrap
+
+2009-06-12 00:59:26 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Correctly create the PPC bootstrap section
+
+2009-06-11 22:02:04 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Preserve register %a2.
+
+2009-06-10 02:19:09 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Add 64bit build host support for the first level parameters (replace void* by u_int32_t)
+
+2009-06-08 22:39:40 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * uptdate .gitignore
+
+2009-06-08 22:37:03 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * second: because of mess between gcc and as: remove cpu directive and use the default provided by gcc (68020). Add rules to manage 68040 and 68030 assembly files in the Makefile. Classic will wait later...
+
+2009-06-08 21:55:43 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * libunix: because of mess between gcc and as: remove cpu directive and use the default provided by gcc (68020). Classic will wait later...
+
+2009-06-08 18:33:19 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * EMILE PPC is also compiled with m68k tools except clearly identified files
+
+2009-06-08 18:32:34 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Correct branch local label to go backward instead forward (assembler error)
+
+2009-06-08 18:30:59 +0200  Laurent Vivier <laurent@vivier.eu>
+
+        * Correct signe of response according Gestalt signature
+
+2008-10-27 20:51:15 +0100  Laurent Vivier <Laurent@lvivier.info>
+
+        * Allow to compile with gcc-4 by adding a contraint on memory for MacOS traps
+
+2008-09-25 16:55:52 +0200  Laurent Vivier <Laurent@lvivier.info>
+
+        * Change VERSION from 0.13 to 0.13CVS
+
+2008-09-17 14:53:27 +0200  Laurent Vivier <Laurent@lvivier.info>
+
+        * Define vga_set_palette() to define current display palette.
+
+2008-09-17 14:51:45 +0200  Laurent Vivier <Laurent@lvivier.info>
+
+        * create .gitignore
+
+2008-09-17 14:45:35 +0200  Laurent Vivier <Laurent@lvivier.info>
+
+        * Push parameters of _SetEntries into the stack instead of registers. Add graphical display type (clut, fixed, direct).
+
+2008-09-14 23:59:22 +0200  Laurent Vivier <Laurent@lvivier.info>
+
+        * Add SetEntries() to set color palette
+
+2008-09-14 23:55:35 +0200  Laurent Vivier <Laurent@lvivier.info>
+
+        * Add some definitions to video.h
+
+2008-09-11 00:21:35 +0200  Finn Thain <fthain@telegraphics.com.au>
+
+        * This patch corrects the generated tools.mk when no tool to create manual from docbook is found
+
+2008-09-05 14:20:41 +0200  Laurent Vivier <Laurent@lvivier.info>
+
+        * Move all docs management from Rules.mk to docs/Makefile, to avoid conflists between variables (SOURCES, OBJS, ...)
+
+2008-09-05 14:02:55 +0200  Laurent Vivier <Laurent@lvivier.info>
+
+        * Update README
+
+2008-09-02 19:40:35 +0000  Laurent Vivier <Laurent@lvivier.info>
+
+        * Add command line interface
+
+2008-08-13 20:17:46 +0000  Laurent Vivier <Laurent@lvivier.info>
+
+        * use temp file to set configuration
+
+2008-08-13 19:40:59 +0000  Laurent Vivier <Laurent@lvivier.info>
+
+        * change Standards-Version
+
+2008-08-13 19:40:12 +0000  Laurent Vivier <Laurent@lvivier.info>
+
+        * Change FSF address
+
+2008-08-13 13:07:08 +0000  Laurent Vivier <Laurent@lvivier.info>
+
+        * move to version 0.13
+
+2008-08-13 13:06:59 +0000  Laurent Vivier <Laurent@lvivier.info>
+
+        * Update
+
 2008-08-13 15:03  Laurent Vivier <Laurent@lvivier.info>
 
 	* docs/emile-mkisofs.sgml: add usage of --emiledriver and --config

Makefile

@@ -1,5 +1,5 @@
 #
-#  (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+#  (c) 2004-2013 Laurent Vivier <Laurent@Vivier.EU>
 #
 #
 
@@ -9,6 +9,14 @@ include config.mk
 include tools.mk
 include kernel.mk
 
+SYSTEM:=$(shell uname -s)
+MACHINE:=$(shell uname -m)
+ifeq ($(SYSTEM), Linux)
+NATIVE:=$(MACHINE)-linux
+else
+NATIVE:=$(MACHINE)-$(SYSTEM)
+endif
+
 # Target
 
 .PHONY: first libemile libblock libiso9660 libiso9660-m68k libgzip-m68k tools \
@@ -27,8 +35,9 @@ all: tools.mk docs libemile libblock libiso9660 libiso9660-m68k libgzip-m68k \
      libconfig libconfig-m68k \
      second/$(KARCH)-linux-all/second second/m68k-linux-scsi-driver/apple_driver
 
-tools.mk: scripts/tools.sh
-	sh scripts/tools.sh > $@
+tools.mk:
+	@echo "Please run ./configure"
+	@false
 
 ALL_BIN = cdboot-sarge.bin cdboot-woody.bin cdboot-etch.bin
 
@@ -123,7 +132,7 @@ multiboot.bin: tools first vmlinuz second/$(KARCH)-linux-all/second
 	tools/emile-install -c $(FLOPPY_CONF) multiboot.bin.X
 	mv multiboot.bin.X multiboot.bin
 	ln -s multiboot.bin last.bin
-	
+
 boot.bin: floppy.bin
 	rm -f last.bin
 	cp floppy.bin boot.bin.X
@@ -196,7 +205,7 @@ first-uninstall::
 	$(MAKE) -C first uninstall
 
 second-install::
-	$(MAKE) -C second install 
+	$(MAKE) -C second install
 
 second-uninstall::
 	$(MAKE) -C second uninstall
@@ -220,13 +229,13 @@ libconfig-m68k::
 	$(MAKE) -C libconfig all TARGET=m68k-linux
 
 libconfig::
-	$(MAKE) -C libconfig all TARGET=native CROSS_COMPILE=$(CROSS_COMPILE)
+	$(MAKE) -C libconfig all TARGET=$(NATIVE) CROSS_COMPILE=$(CROSS_COMPILE)
 
 libiso9660::
-	$(MAKE) -C libiso9660 all TARGET=native CROSS_COMPILE=$(CROSS_COMPILE)
+	$(MAKE) -C libiso9660 all TARGET=$(NATIVE) CROSS_COMPILE=$(CROSS_COMPILE)
 
 libext2::
-	$(MAKE) -C libext2 all TARGET=native CROSS_COMPILE=$(CROSS_COMPILE)
+	$(MAKE) -C libext2 all TARGET=$(NATIVE) CROSS_COMPILE=$(CROSS_COMPILE)
 
 libcontainer::
 	$(MAKE) -C libcontainer all TARGET=m68k-linux
@@ -238,10 +247,10 @@ libgzip-m68k::
 	$(MAKE) -C libgzip all TARGET=m68k-linux
 
 libgzip::
-	$(MAKE) -C libgzip all TARGET=native CROSS_COMPILE=$(CROSS_COMPILE)
+	$(MAKE) -C libgzip all TARGET=$(NATIVE) CROSS_COMPILE=$(CROSS_COMPILE)
 
 libemile::
-	$(MAKE) -C libemile all CROSS_COMPILE=$(CROSS_COMPILE)
+	$(MAKE) -C libemile all TARGET=$(NATIVE) CROSS_COMPILE=$(CROSS_COMPILE)
 
 libfloppy::
 	$(MAKE) -C libfloppy all CC=$(M68K_CC) AS=$(M68K_AS)
@@ -253,16 +262,16 @@ libstream::
 	$(MAKE) -C libstream all CC=$(M68K_CC) AS=$(M68K_AS)
 
 libmap::
-	$(MAKE) -C libmap all TARGET=native CROSS_COMPILE=$(CROSS_COMPILE)
+	$(MAKE) -C libmap all TARGET=$(NATIVE) CROSS_COMPILE=$(CROSS_COMPILE)
 
 libmap-m68k::
 	$(MAKE) -C libmap all TARGET=m68k-linux
 
 tools::  libemile libiso9660 libext2 libgzip libconfig libmap
-	$(MAKE) -C tools all CROSS_COMPILE=$(CROSS_COMPILE)
+	$(MAKE) -C tools all CROSS_COMPILE=$(CROSS_COMPILE) TARGET=$(NATIVE)
 
 tools-install:: tools
-	$(MAKE) -C tools install
+	$(MAKE) -C tools install TARGET=$(NATIVE)
 
 tools-uninstall::
 	$(MAKE) -C tools uninstall
@@ -302,15 +311,15 @@ libstream-clean:
 	$(MAKE) -C libstream clean
 
 libiso9660-clean::
-	$(MAKE) -C libiso9660 clean TARGET=native
+	$(MAKE) -C libiso9660 clean TARGET=$(NATIVE)
 	$(MAKE) -C libiso9660 clean TARGET=$(KARCH)-linux
 
 libext2-clean::
-	$(MAKE) -C libext2 clean TARGET=native
+	$(MAKE) -C libext2 clean TARGET=$(NATIVE)
 	$(MAKE) -C libext2 clean TARGET=$(KARCH)-linux
 
 libconfig-clean::
-	$(MAKE) -C libconfig clean TARGET=native
+	$(MAKE) -C libconfig clean TARGET=$(NATIVE)
 	$(MAKE) -C libconfig clean TARGET=$(KARCH)-linux
 
 libcontainer-clean::
@@ -320,11 +329,11 @@ libblock-clean::
 	$(MAKE) -C libblock clean
 
 libgzip-clean::
-	$(MAKE) -C libgzip clean TARGET=native
+	$(MAKE) -C libgzip clean TARGET=$(NATIVE)
 	$(MAKE) -C libgzip clean TARGET=$(KARCH)-linux
 
 libmap-clean::
-	$(MAKE) -C libmap clean TARGET=native
+	$(MAKE) -C libmap clean TARGET=$(NATIVE)
 	$(MAKE) -C libmap clean TARGET=$(KARCH)-linux
 
 tools-clean:
@@ -358,8 +367,7 @@ clean:: libemile-clean libmacos-clean libunix-clean tools-clean first-clean \
 	      multiboot.bin
 
 DISTFILES = AUTHORS ChangeLog COPYING Makefile README README.floppy \
-	    README.scsi Rules.mk floppy.conf kernel.mk config.mk \
-	    scripts/tools.sh
+	    README.scsi Rules.mk config/floppy.conf kernel.mk config.mk
 
 dist:
 	rm -fr $(PACKAGE)-$(VERSION)

README

@@ -1,5 +1,5 @@
 			EMILE
-		(C) 2004-2008 Laurent Vivier
+		(C) 2004-2013 Laurent Vivier
 
 	All files are distributed under the terms of GPL license. See COPYING.
 
@@ -23,4 +23,4 @@ This work has only be tested on a MacIIci with 8 x 4 MB RAM, a Two-Page Display,
 and ethernet card sonic.
 
 Have fun
-Laurent Vivier <Laurent@lvivier.info>
+Laurent Vivier <Laurent@Vivier.EU>

README.floppy

@@ -78,4 +78,4 @@ If you have a ramdisk, the two last steps become:
 	# emile-set-cmdline /dev/fd0 "root=/dev/ramdisk ramdisk_size=2048"
 	
 --------------------------------------------------------------------------------
-Laurent Vivier <Laurent@lvivier.info>
+Laurent Vivier <Laurent@Vivier.EU>

README.scsi

@@ -126,4 +126,4 @@ partition to HFS... and all works fine ;-)
 
 And now, you can start linux in less than 2 seconds...
 
-Laurent Vivier <Laurent@lvivier.info>
+Laurent Vivier <Laurent@Vivier.EU>

Rules.mk

@@ -1,5 +1,5 @@
 #
-#  (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+#  (c) 2005-2013 Laurent Vivier <Laurent@Vivier.EU>
 #
 
 OBJS	 = $(patsubst %.S,%.o,$(SOURCES:.c=.o))
@@ -8,6 +8,7 @@ MODULE ?= $(shell basename $(TOP))
 
 DISTFILES ?= $(SOURCES) $(HEADERS) Makefile
 
+ARFLAGS+=-U
 $(LIBRARY): $(LIBRARY)($(patsubst %.S,%.o,$(SOURCES:.c=.o)))
 
 %.gz: %
@@ -30,3 +31,7 @@ else
 clean:
 	rm -f $(OBJS) $(PROGRAMS) $(LIBRARY) $(CLEAN) $(LIBRARIES)
 endif
+
+ifeq ($(shell readlink -e /usr/include/linux/ext2_fs.h),)
+CPPFLAGS += -DCONFIG_E2FSLIBS
+endif

config.mk

@@ -2,14 +2,13 @@
 #
 
 PACKAGE       = emile
-VERSION       = 0.13CVS
+VERSION       = 0.14
 
 PREFIX=/
 
 # kernel boot arguments
 
 #FLOPPY=/dev/floppy/0
-FLOPPY=/dev/sda
 #CONSOLE=console=ttyS0,9600n8 console=tty0
 #GESTALTID=43
 
@@ -18,7 +17,7 @@ RESCUE_ARGS="root=/dev/ramdisk ramdisk_size=2048 $(CONSOLE)"
 CDBOOT_ARGS="root=/dev/ramdisk ramdisk_size=13000 $(CONSOLE)"
 CDBOOT_ARGS26="root=/dev/ram ramdisk_size=13000 $(CONSOLE)"
 INSTALLER_ARGS="prompt_ramdisk=1 load_ramdisk=1 ramdisk_start=0 root=/dev/fd0 ramdisk_size=4096 $(CONSOLE)"
-FLOPPY_CONF="floppy.conf"
+FLOPPY_CONF="config/floppy.conf"
 BOOT_ARGS="root=/dev/sda4 $(CONSOLE)"
 
 LINUXPATH=vmlinux

config/cdrom-etch.conf

@@ -0,0 +1,18 @@
+timeout 5
+default 0
+vga default
+
+title Etch Install
+kernel /install/kernels/vmlinuz-2.6.26-1-mac
+args root=/dev/ram debian-installer/framebuffer=false suite=etch-m68k modules=etch-support
+initrd /install/cdrom/initrd.gz
+
+title Etch Install (Expert Mode)
+kernel /install/kernels/vmlinuz-2.6.26-1-mac
+args root=/dev/ram debian-installer/framebuffer=false suite=etch-m68k modules=etch-support priority=low
+initrd /install/cdrom/initrd.gz
+
+title Rescue Mode
+kernel /install/kernels/vmlinuz-2.6.26-1-mac
+args root=/dev/ram debian-installer/framebuffer=false suite=etch-m68k modules=etch-support rescue/enable=true
+initrd /install/cdrom/initrd.gz

config/cdrom-sarge.conf

@@ -0,0 +1,18 @@
+timeout 5
+default 0
+vga default
+
+title Sarge Install
+kernel /install/kernels/vmlinuz-2.2.25-mac
+args root=/dev/ramdisk ramdisk_size=13000
+initrd /install/cdrom/initrd22.gz
+
+title Sarge Install (Expert Mode)
+kernel /install/kernels/vmlinuz-2.2.25-mac
+args priority=low root=/dev/ramdisk ramdisk_size=13000
+initrd /install/cdrom/initrd22.gz
+
+title Rescue Mode
+kernel /install/kernels/vmlinuz-2.2.25-mac
+args root=/dev/ramdisk ramdisk_size=13000 rescue/enable=true
+initrd /install/cdrom/initrd22.gz

config/floppy.conf

@@ -1,6 +1,6 @@
 # floppy.conf
 #
-# (c) 2007-2008 Laurent Vivier <Laurent@lvivier.info>
+# (c) 2007-2013 Laurent Vivier <Laurent@Vivier.EU>
 # configuration to create a floppy with several kernel entries
 #
 
@@ -37,7 +37,7 @@ initrd /install/cdrom/initrd22.gz
 
 title Debian CD Etch
 root iso9660:(sd3)
-kernel /install/kernels/vmlinuz-2.6.17-2-mac
+kernel /install/kernels/vmlinuz-2.6.26-1-mac
 args root=/dev/ramdisk ramdisk_size=16384
 initrd /install/cdrom/initrd.gz
 

configure

@@ -13,7 +13,35 @@ WHERE=$(hostname)
 ARCH=$(uname -m)
 OS=$(uname -o)
 
-cat <<!EOF
+if test "${ARCH}" != "m68k" ; then
+	M68K_CROSS_COMPILE=${M68K_CROSS_COMPILE:-m68k-linux-}
+	if ! type "${M68K_CROSS_COMPILE}${CC}" > /dev/null 2>&1
+	then
+		M68K_CROSS_COMPILE=m68k-linux-gnu-
+		if ! type "${M68K_CROSS_COMPILE}${CC}" > /dev/null 2>&1
+		then
+			echo "Cannot find m68k cross-compiler" 1>&2
+			unset M68K_CROSS_COMPILE
+		fi
+	fi
+fi
+
+if test "${ARCH}" != "ppc" ; then
+	PPC_CROSS_COMPILE=${PPC_CROSS_COMPILE:-powerpc-linux-}
+	if ! type "${PPC_CROSS_COMPILE}${CC}" > /dev/null 2>&1
+	then
+		PPC_CROSS_COMPILE=powerpc-linux-gnu-
+		if ! type "${PPC_CROSS_COMPILE}${CC}" > /dev/null 2>&1
+		then
+			echo "Cannot find powerpc cross-compiler" 1>&2
+			unset PPC_CROSS_COMPILE
+		fi
+	fi
+fi
+
+exec 5> tools.mk.tmp
+
+cat 1>&5 <<!EOF
 # file generated by $0
 
 WHEN			= \$(shell LANG=C date)
@@ -23,27 +51,6 @@ ARCH			= ${ARCH}
 OS			= ${OS}
 
 SIGNATURE = \$(PACKAGE)-\$(VERSION) \$(WHO)@\$(WHERE)(\$(ARCH) \$(OS)) \$(WHEN)
-!EOF
-
-# m68k cross-compiler
-
-if test "${ARCH}" != "m68k"
-then
-	M68K_CROSS_COMPILE=m68k-linux-
-	if ! type "${M68K_CROSS_COMPILE}${CC}" > /dev/null 2>&1
-	then
-		M68K_CROSS_COMPILE=m68k-linux-gnu-
-		if ! type "${M68K_CROSS_COMPILE}${CC}" > /dev/null 2>&1
-		then
-			echo "Cannot find m68k cross-compiler" 1>&2
-			exit 1
-		fi
-	fi
-	M68K_GCC_VERSION=$(${M68K_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null)
-	echo "cross-compiler is ${M68K_CROSS_COMPILE}${CC} ${M68K_GCC_VERSION}" 1>&2
-fi
-
-cat <<!EOF
 
 M68K_CROSS_COMPILE = ${M68K_CROSS_COMPILE}
 
@@ -54,35 +61,29 @@ M68K_OBJCOPY		= \$(M68K_CROSS_COMPILE)${OBJCOPY}
 M68K_STRIP		= \$(M68K_CROSS_COMPILE)${STRIP}
 !EOF
 
-if test "${ARCH}" != "ppc"
-then
-	PPC_CROSS_COMPILE=powerpc-linux-
-	if ! type "${PPC_CROSS_COMPILE}${CC}" > /dev/null 2>&1
-	then
-		PPC_CROSS_COMPILE=powerpc-linux-gnu-
-		if ! type "${PPC_CROSS_COMPILE}${CC}" > /dev/null 2>&1
-		then
-			echo "Cannot find powerpc cross-compiler" 1>&2
-		else
-			PPC_GCC_VERSION=$(${PPC_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null)
-			echo "cross-compiler is ${PPC_CROSS_COMPILE}${CC} ${PPC_GCC_VERSION}" 1>&2
-cat <<!EOF
+if [ "${M68K_CROSS_COMPILE}" != "" ] ; then
+	M68K_GCC_VERSION=$(${M68K_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null)
+	echo "cross-compiler is ${M68K_CROSS_COMPILE}${CC} ${M68K_GCC_VERSION}" 1>&2
+fi
 
+if [ "${PPC_CROSS_COMPILE}" != "" ] ; then
+	PPC_GCC_VERSION=$(${PPC_CROSS_COMPILE}${CC} -dumpversion 2> /dev/null)
+	echo "cross-compiler is ${PPC_CROSS_COMPILE}${CC} ${PPC_GCC_VERSION}" 1>&2
+cat 1>&5 <<!EOF
 PPC_CROSS_COMPILE = ${PPC_CROSS_COMPILE}
 
-PPC_AS		= \$(PPC_CROSS_COMPILE)${AS}
-PPC_CC		= \$(PPC_CROSS_COMPILE)${CC}
-PPC_LD		= \$(PPC_CROSS_COMPILE)${LD}
-PPC_OBJCOPY	= \$(PPC_CROSS_COMPILE)${OBJCOPY}
-PPC_STRIP	= \$(PPC_CROSS_COMPILE)${STRIP}
+PPC_AS			= \$(PPC_CROSS_COMPILE)${AS}
+PPC_CC			= \$(PPC_CROSS_COMPILE)${CC}
+PPC_LD			= \$(PPC_CROSS_COMPILE)${LD}
+PPC_OBJCOPY		= \$(PPC_CROSS_COMPILE)${OBJCOPY}
+PPC_STRIP		= \$(PPC_CROSS_COMPILE)${STRIP}
 !EOF
-		fi
-	fi
+
 fi
 
 # target compiler
 
-cat <<!EOF
+cat 1>&5 <<!EOF
 
 ifeq (\$(TARGET),m68k-linux)
 
@@ -102,9 +103,8 @@ override STRIP		= \$(M68K_STRIP)
 
 !EOF
 
-if type "${PPC_CROSS_COMPILE}${CC}" > /dev/null 2>&1
-then
-cat <<!EOF
+if [ "${PPC_GCC_VERSION}" != "" ] ; then
+cat 1>&5 <<!EOF
 else ifeq (\$(TARGET),ppc-linux)
 
 override AS		= \$(M68K_AS)
@@ -116,23 +116,24 @@ override STRIP		= \$(M68K_STRIP)
 !EOF
 fi
 
-cat <<!EOF
+cat 1>&5 <<!EOF
 else
 
-AS		= \$(CROSS_COMPILE)${AS}
-CC		= \$(CROSS_COMPILE)${CC}
-LD		= \$(CROSS_COMPILE)${LD}
-OBJCOPY		= \$(CROSS_COMPILE)${OBJCOPY}
-STRIP		= \$(CROSS_COMPILE)${STRIP}
+AS			= \$(CROSS_COMPILE)${AS}
+CC			= \$(CROSS_COMPILE)${CC}
+LD			= \$(CROSS_COMPILE)${LD}
+OBJCOPY			= \$(CROSS_COMPILE)${OBJCOPY}
+STRIP			= \$(CROSS_COMPILE)${STRIP}
 
 endif
 !EOF
 
+
 # docbook to man
 
 if type docbook-to-man > /dev/null 2>&1
 then
-cat <<!EOF
+cat 1>&5 <<!EOF
  
 %.5: %.sgml
 	docbook-to-man \$< > \$@
@@ -143,17 +144,17 @@ cat <<!EOF
 else
 if type docbook2man > /dev/null 2>&1
 then
-cat <<!EOF
+cat 1>&5 <<!EOF
 
 %.5: %.sgml
-	docbook2man \$<
- 
+	docbook2man \$< > \$@
+
 %.8: %.sgml
-	docbook2man \$<
+	docbook2man \$< > \$@
 !EOF
 else
- 
-cat <<!EOF
+
+cat 1>&5 <<!EOF
 %.5: %.sgml
 	@echo "Missing tools to generate \$@ from \$<" >&2 && false
  
@@ -162,3 +163,5 @@ cat <<!EOF
 !EOF
 fi
 fi
+
+mv tools.mk.tmp tools.mk

debian/Makefile

@@ -1,6 +1,6 @@
 #
 #
-# (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+# (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
 #
 #
 

debian/changelog

@@ -1,8 +1,14 @@
-emile (0.13CVS) unstable; urgency=low
+emile (0.14) unstable; urgency=low
+
+  * update to gcc-4.8 support and kernel 3.10
+
+ -- Laurent Vivier <Laurent@vivier.eu>  Thu, 05 Sep 2013 14:06:35 +0200
+
+emile (0.13) unstable; urgency=low
 
   * add apple_driver to boot from CDROM
 
- -- Laurent Vivier <Laurent@lvivier.info>  Wed, 13 Aug 2008 14:11:20 +0200
+ -- Laurent Vivier <Laurent@vivier.eu>  Tue, 01 Feb 2011 00:37:54 +0100
 
 emile (0.12) unstable; urgency=low
 

debian/compat

@@ -1 +1 @@
-4
+9

debian/control

@@ -3,8 +3,8 @@ Section: admin
 Priority: optional
 Maintainer: Wouter Verhelst <wouter@debian.org>
 Uploaders: Wouter Verhelst <wouter@debian.org>, Stephen R. Marenka <smarenka@debian.org>
-Build-Depends: debhelper (>> 4.1.16), docbook-to-man, gcc-3.3 | gcc-3.4 | gcc-4.1 [!m68k]
-Build-Depends-Indep: gcc-3.4-m68k-linux [!m68k] | m68k-linux-gcc [!m68k] | gcc-3.4-m68k-linux-gnu [!m68k]
+Build-Depends: debhelper (>= 9), docbook-to-man, gcc, e2fslibs-dev
+Build-Depends-Indep: gcc-4.6-m68k-linux-gnu [!m68k]
 Standards-Version: 3.7.2
 
 Package: emile-bootblocks

debian/copyright

@@ -1,6 +1,6 @@
 This is the Debian GNU/Linux packaged version of EMILE, the Early Mac Image 
 LoadEr. It was written by and is Copyright(C) 2004-2008 Laurent Vivier
-<laurent@lvivier.info>. The home page is at http://emile.sf.net/
+<Laurent@Vivier.EU>. The home page is at http://emile.sf.net/
 
 It was debianized by Wouter Verhelst <wouter@debian.org> and Stephen Marenka 
 <stephen@marenka.net>.

debian/emile.install

@@ -5,6 +5,7 @@ sbin/emile-set-output
 sbin/emile
 sbin/emile-map-set
 sbin/emile-mkisofs
+usr/share/man/man5/emile.conf.5.gz
 usr/share/man/man8/emile-first-tune.8.gz
 usr/share/man/man8/emile-install.8.gz
 usr/share/man/man8/emile-map-set.8.gz

debian/rules

@@ -35,7 +35,8 @@ build: build-stamp
 build-stamp:
 	dh_testdir
 	# Add here commands to compile the package.
-	$(MAKE) M68K_CROSS_COMPILE="$(M68K_CROSS_COMPILE)" CROSS_COMPILE="$(CROSS_COMPILE)" $(target)
+	M68K_CROSS_COMPILE="$(M68K_CROSS_COMPILE)" ./configure
+	$(MAKE) CROSS_COMPILE="$(CROSS_COMPILE)" $(target)
 	touch build-stamp
 
 clean:

docs/Makefile

@@ -1,5 +1,5 @@
 #
-# (c) 2005-2008 Laurent Vivier <Laurent@lvivier.info>
+# (c) 2005-2008 Laurent Vivier <Laurent@Vivier.EU>
 #
 #
 

docs/emile-first-tune.sgml

@@ -144,7 +144,7 @@ manpage.1: manpage.sgml
 
   <refsect1>
     <title>REPORTING BUGS</title>
-    <para>Report bugs to Laurent Vivier &lt;Laurent@lvivier.info&gt;</para>
+    <para>Report bugs to Laurent Vivier &lt;Laurent@Vivier.EU&gt;</para>
   </refsect1>
 
   <refsect1>
@@ -165,7 +165,7 @@ manpage.1: manpage.sgml
       or any later version published by the Free Software Foundation.
     </para>
     <para>This manual page has been updated by Laurent Vivier 
-    &lt;Laurent@lvivier.info&gt;.</para>
+    &lt;Laurent@Vivier.EU&gt;.</para>
     <para>
 	On Debian systems, the complete text of the GNU General Public
 	License can be found in /usr/share/common-licenses/GPL.

docs/emile-install.sgml

@@ -133,7 +133,7 @@ manpage.1: manpage.sgml
 
   <refsect1>
     <title>REPORTING BUGS</title>
-    <para>Report bugs to Laurent Vivier &lt;Laurent@lvivier.info&gt;</para>
+    <para>Report bugs to Laurent Vivier &lt;Laurent@Vivier.EU&gt;</para>
   </refsect1>
 
   <refsect1>
@@ -154,7 +154,7 @@ manpage.1: manpage.sgml
       or any later version published by the Free Software Foundation.
     </para>
     <para>This manual page has been updated by Laurent Vivier
-    &lt;Laurent@lvivier.info&gt;.</para>
+    &lt;Laurent@Vivier.EU&gt;.</para>
     <para>
 	On Debian systems, the complete text of the GNU General Public
 	License can be found in /usr/share/common-licenses/GPL.

docs/emile-map-set.sgml

@@ -135,7 +135,7 @@ manpage.1: manpage.sgml
 
   <refsect1>
     <title>REPORTING BUGS</title>
-    <para>Report bugs to Laurent Vivier &lt;Laurent@lvivier.info&gt;</para>
+    <para>Report bugs to Laurent Vivier &lt;Laurent@Vivier.EU&gt;</para>
   </refsect1>
 
   <refsect1>
@@ -156,7 +156,7 @@ manpage.1: manpage.sgml
       or any later version published by the Free Software Foundation.
     </para>
     <para>This manual page has been updated by Laurent Vivier
-    &lt;Laurent@lvivier.info&gt;.</para>
+    &lt;Laurent@Vivier.EU&gt;.</para>
     <para>
 	On Debian systems, the complete text of the GNU General Public
 	License can be found in /usr/share/common-licenses/GPL.

docs/emile-mkisofs.sgml

@@ -15,7 +15,7 @@ manpage.1: manpage.sgml
   <!-- Please adjust the date whenever revising the manpage. -->
   <!ENTITY dhdate      "<date>March 23, 2007</date>">
   <!ENTITY dhsection   "<manvolnum>8</manvolnum>">
-  <!ENTITY dhemail     "<email>laurent@lvivier.info</email>">
+  <!ENTITY dhemail     "<email>Laurent@Vivier.EU</email>">
   <!ENTITY dhusername  "Laurent Vivier">
   <!ENTITY dhucpackage "<refentrytitle>emile-mkisofs</refentrytitle>">
   <!ENTITY dhpackage   "emile">
@@ -214,7 +214,7 @@ manpage.1: manpage.sgml
 
   <refsect1>
     <title>REPORTING BUGS</title>
-    <para>Report bugs to Laurent Vivier &lt;Laurent@lvivier.info&gt;</para>
+    <para>Report bugs to Laurent Vivier &lt;Laurent@Vivier.EU&gt;</para>
   </refsect1>
 
   <refsect1>

docs/emile-set-cmdline.sgml

@@ -121,7 +121,7 @@ manpage.1: manpage.sgml
 
   <refsect1>
     <title>REPORTING BUGS</title>
-    <para>Report bugs to Laurent Vivier &lt;Laurent@lvivier.info&gt;</para>
+    <para>Report bugs to Laurent Vivier &lt;Laurent@Vivier.EU&gt;</para>
   </refsect1>
 
   <refsect1>
@@ -142,7 +142,7 @@ manpage.1: manpage.sgml
       or any later version published by the Free Software Foundation.
     </para>
     <para>This manual page has been updated by Laurent Vivier
-    &lt;Laurent@lvivier.info&gt;.</para>
+    &lt;Laurent@Vivier.EU&gt;.</para>
     <para>
 	On Debian systems, the complete text of the GNU General Public
 	License can be found in /usr/share/common-licenses/GPL.

docs/emile-set-output.sgml

@@ -158,7 +158,7 @@ manpage.1: manpage.sgml
 
   <refsect1>
     <title>REPORTING BUGS</title>
-    <para>Report bugs to Laurent Vivier &lt;Laurent@lvivier.info&gt;</para>
+    <para>Report bugs to Laurent Vivier &lt;Laurent@Vivier.EU&gt;</para>
   </refsect1>
 
   <refsect1>
@@ -179,7 +179,7 @@ manpage.1: manpage.sgml
       or any later version published by the Free Software Foundation.
     </para>
     <para>This manual page has been updated by Laurent Vivier
-    &lt;Laurent@lvivier.info&gt;.</para>
+    &lt;Laurent@Vivier.EU&gt;.</para>
     <para>
 	On Debian systems, the complete text of the GNU General Public
 	License can be found in /usr/share/common-licenses/GPL.

docs/emile.conf.sgml

@@ -15,7 +15,7 @@ manpage.1: manpage.sgml
   <!-- Please adjust the date whenever revising the manpage. -->
   <!ENTITY dhdate      "<date>July 22, 2008</date>">
   <!ENTITY dhsection   "<manvolnum>5</manvolnum>">
-  <!ENTITY dhemail     "<email>Laurent@lvivier.info</email>">
+  <!ENTITY dhemail     "<email>Laurent@Vivier.EU</email>">
   <!ENTITY dhusername  "Laurent Vivier">
   <!ENTITY dhucpackage "<refentrytitle>emile</refentrytitle>">
   <!ENTITY dhpackage   "emile">
@@ -144,6 +144,9 @@ manpage.1: manpage.sgml
         <term><option>root</option></term>
         <listitem>
           <para>Define the partition where are stored the entry files.</para>
+          <para>The syntax is (sd SCSI ID,PARTITION ID)</para>
+          <para>SCSI ID can be given by "scsiadd -s"</para>
+          <para>PARTITION NUMBER is given by "emile --scanbus" minus 1</para>
         </listitem>
       </varlistentry>
 
@@ -198,7 +201,7 @@ args            root=/dev/sda4 ro
 
   <refsect1>
     <title>REPORTING BUGS</title>
-    <para>Report bugs to Laurent Vivier &lt;Laurent@lvivier.info&gt;</para>
+    <para>Report bugs to Laurent Vivier &lt;Laurent@Vivier.EU&gt;</para>
   </refsect1>
 
   <refsect1>

docs/emile.sgml

@@ -140,7 +140,7 @@ manpage.1: manpage.sgml
 
   <refsect1>
     <title>REPORTING BUGS</title>
-    <para>Report bugs to Laurent Vivier &lt;Laurent@lvivier.info&gt;</para>
+    <para>Report bugs to Laurent Vivier &lt;Laurent@Vivier.EU&gt;</para>
   </refsect1>
 
   <refsect1>
@@ -161,7 +161,7 @@ manpage.1: manpage.sgml
       or any later version published by the Free Software Foundation.
     </para>
     <para>This manual page has been updated by Laurent Vivier
-    &lt;Laurent@lvivier.info&gt;.</para>
+    &lt;Laurent@Vivier.EU&gt;.</para>
     <para>
 	On Debian systems, the complete text of the GNU General Public
 	License can be found in /usr/share/common-licenses/GPL.

first/Makefile

@@ -1,6 +1,6 @@
 #
 #
-# (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+# (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
 #
 #
 

first/first.S

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004,2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004,2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

first/floppy.i

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

first/macos.i

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

first/scsi.i

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

kernel.mk

@@ -1,5 +1,5 @@
 #
-# (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+# (c) 2004-2013 Laurent Vivier <Laurent@Vivier.EU>
 #
 
 # Kernel architecture

libblock/Makefile

@@ -1,5 +1,5 @@
 #
-#  (c) 2005-2007 Laurent Vivier <Laurent@lvivier.info>
+#  (c) 2005-2007 Laurent Vivier <Laurent@Vivier.EU>
 #
 
 TOP=$(shell pwd)

libblock/block.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libblock/block_close.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libblock/block_fstat.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libblock/block_init.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libblock/block_lseek.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libblock/block_mount.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libblock/block_open.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libblock/block_read.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005-2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005-2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libblock/libblock.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/Makefile

@@ -1,5 +1,5 @@
 #
-#  (c) 2005-2007 Laurent Vivier <Laurent@lvivier.info>
+#  (c) 2005-2007 Laurent Vivier <Laurent@Vivier.EU>
 #
 
 TOP = $(shell pwd)

libconfig/config_add_property.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2007 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2007 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/config_find_entry.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/config_find_indexed_property.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/config_get_indexed_property.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/config_get_next_property.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/config_get_property.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/config_remove_indexed_property.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/config_remove_property.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/config_set_indexed_property.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/config_set_property.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libconfig/libconfig.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2007 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2007 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libcontainer/Makefile

@@ -1,5 +1,5 @@
 #
-#  (c) 2005-2007 Laurent Vivier <Laurent@lvivier.info>
+#  (c) 2005-2007 Laurent Vivier <Laurent@Vivier.EU>
 #
 
 TOP=$(shell pwd)

libcontainer/container.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libcontainer/container_close.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libcontainer/container_fstat.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005-2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005-2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libcontainer/container_init.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libcontainer/container_lseek.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libcontainer/container_mount.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libcontainer/container_open.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libcontainer/container_read.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libcontainer/libcontainer.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/Makefile

@@ -1,16 +1,17 @@
 #
-#  (c) 2004-2007 Laurent Vivier <Laurent@lvivier.info>
+#  (c) 2004-2007 Laurent Vivier <Laurent@Vivier.EU>
 #
 #
 
 TOP=$(shell pwd)
+VPATH=$(TOP)
 
 CPPFLAGS = $(CROSS_COMPILE_CPPFLAGS)
 LDFLAGS = $(CROSS_COMPILE_LDFLAGS)
 
 LIBRARY = libemile.a
 
-SOURCES = emile_checksum.c emile_first_get_param.c \
+SOURCES = emile_first_get_param.c \
 	  emile_first_set_param.c emile_first_set_param_scsi.c \
 	  emile_floppy_create_image.c emile_second_create_mapfile.c \
 	  emile_scsi_create_container.c emile_scsi_get_dev.c \
@@ -22,9 +23,11 @@ SOURCES = emile_checksum.c emile_first_get_param.c \
 HEADERS = emile.h libemile.h bootblock.h
 
 CFLAGS  = -Wall -Werror -g
-CPPFLAGS = -I../libmacos -I../libcontainer -I../libstream -I../libconfig -I../libmap -I.
+CPPFLAGS = -I$(TOP)/../libmacos -I$(TOP)/../libcontainer -I$(TOP)/../libstream -I$(TOP)/../libconfig -I$(TOP)/../libmap -I$(TOP)
 
-all: $(LIBRARY)
+all:
+	test -d $(TARGET) || mkdir $(TARGET)
+	$(MAKE) -C $(TARGET) -f $(TOP)/Makefile $(LIBRARY) TOP=$(TOP)
 
 include $(TOP)/../tools.mk
 include $(TOP)/../Rules.mk

libemile/bootblock.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004,2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004,2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_first_get_param.c

@@ -1,7 +1,7 @@
 static __attribute__((used)) char* rcsid = "$CVSHeader$";
 /*
  *
- * (c) 2004 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_first_set_param.c

@@ -1,7 +1,7 @@
 static __attribute__((used)) char* rcsid = "$CVSHeader$";
 /*
  *
- * (c) 2004 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_first_set_param_scsi.c

@@ -1,7 +1,7 @@
 static __attribute__((used)) char* rcsid = "$CVSHeader$";
 /*
  *
- * (c) 2004 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_first_set_param_scsi_extents.c

@@ -1,7 +1,7 @@
 static __attribute__((used)) char* rcsid = "$CVSHeader$";
 /*
  *
- * (c) 2004-2006 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004-2006 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 
@@ -20,7 +20,7 @@ int emile_first_set_param_scsi_extents( int fd, int drive_num, int second_offset
 	int ret;
 	char first[1024];
 	int current;
-	unsigned short max_blocks;
+	/* unsigned short max_blocks; */
 	int location;
 
 	location = lseek(fd, 0, SEEK_CUR);
@@ -31,7 +31,8 @@ int emile_first_set_param_scsi_extents( int fd, int drive_num, int second_offset
 	if (ret == -1)
 		return EEMILE_CANNOT_READ_FIRST;
 
-	max_blocks = read_short((u_int16_t*)&first[1022]) / 6;
+	/* max_blocks = read_short((u_int16_t*)&first[1022]) / 6; */
+	(void)read_short((u_int16_t*)&first[1022]); 
 
 	write_short((u_int16_t*)&first[1014], blocksize);
 	write_short((u_int16_t*)&first[1016], drive_num);

libemile/emile_floppy_create_image.c

@@ -1,7 +1,7 @@
 static __attribute__((used)) char* rcsid = "$CVSHeader$";
 /*
  *
- * (c) 2004 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 
@@ -108,13 +108,11 @@ int emile_floppy_create(char *image, char* first_level, char* second_level)
 
 	if (first_level == NULL)
 	{
-		close(fd);
 		return EEMILE_MISSING_FIRST;
 	}
 
 	if (second_level == NULL)
 	{
-		close(fd);
 		return EEMILE_MISSING_SECOND;
 	}
 

libemile/emile_scsi_create_container.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_scsi_get_dev.c

@@ -1,7 +1,7 @@
 static __attribute__((used)) char* rcsid = "$CVSHeader$";
 /*
  *
- * (c) 2004 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_scsi_get_rdev.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_second_create_mapfile.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_second_get_configuration.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005-2007 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005-2007 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_second_get_param.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2006 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2006 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/emile_second_set_configuration.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2005-2007 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2005-2007 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 
@@ -20,7 +20,6 @@ int emile_second_set_configuration(int fd, int8_t *configuration)
 	int ret;
 	int size;
 	int len;
-	off_t offset;
 	char *buf;
 
 	if (configuration == NULL)
@@ -33,7 +32,7 @@ int emile_second_set_configuration(int fd, int8_t *configuration)
 	ret = read(fd, &header, sizeof(header));
 	if (!EMILE_COMPAT(EMILE_06_SIGNATURE, read_long(&header.signature)))
 	{
-		offset = lseek(fd, FIRST_LEVEL_SIZE, SEEK_SET);
+		lseek(fd, FIRST_LEVEL_SIZE, SEEK_SET);
 		ret = read(fd, &header, sizeof(header));
 		if (!EMILE_COMPAT(EMILE_06_SIGNATURE, read_long(&header.signature)))
 			return EEMILE_INVALID_SECOND;

libemile/emile_second_set_param.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2006 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2006 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libemile/libemile.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2004-2007  Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2004-2007  Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 
@@ -76,8 +76,6 @@ extern int emile_floppy_create_image(char* first_level, char* second_level,
 				     char* image);
 extern int emile_scsi_create_container(int fd, unsigned short *unit_id,
 				       struct emile_container* container, int maxbloks);
-extern unsigned short emile_checksum(unsigned char *addr, unsigned int length);
-extern unsigned short emile_checksum_ATA(unsigned char *addr, unsigned int length);
 extern int8_t* emile_second_get_configuration(int fd);
 extern int emile_second_set_configuration(int fd, int8_t *configuration);
 extern int emile_second_get_next_property(int8_t *configuration, int index, char *name, char *property);

libext2/Makefile

@@ -1,5 +1,5 @@
 #
-#  (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+#  (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
 #
 
 TOP = $(shell pwd)

libext2/ext2.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 
@@ -8,7 +8,12 @@
 #define __EXT2_H__
 
 #include <unistd.h>
+#include <linux/fs.h>
+#ifdef CONFIG_E2FSLIBS
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 
 #include <libstream.h>
 

libext2/ext2_close.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_closedir.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_fstat.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_init.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_lseek.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_mount.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_open.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_opendir.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_read.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_readdir.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 

libext2/ext2_utils.c

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 
@@ -24,9 +24,17 @@ void ext2_get_super(device_io_t *device, struct ext2_super_block *super)
 	super->s_free_inodes_count = __le32_to_cpu(super->s_free_inodes_count);
 	super->s_first_data_block = __le32_to_cpu(super->s_first_data_block);
 	super->s_log_block_size = __le32_to_cpu(super->s_log_block_size);
+#ifdef CONFIG_E2FSLIBS
+	super->s_log_cluster_size = __le32_to_cpu(super->s_log_cluster_size);
+#else
 	super->s_log_frag_size = __le32_to_cpu(super->s_log_frag_size);
+#endif
 	super->s_blocks_per_group = __le32_to_cpu(super->s_blocks_per_group);
+#ifdef CONFIG_E2FSLIBS
+	super->s_clusters_per_group = __le32_to_cpu(super->s_clusters_per_group);
+#else
 	super->s_frags_per_group = __le32_to_cpu(super->s_frags_per_group);
+#endif
 	super->s_inodes_per_group = __le32_to_cpu(super->s_inodes_per_group);
 	super->s_mtime = __le32_to_cpu(super->s_mtime);
 	super->s_wtime = __le32_to_cpu(super->s_wtime);
@@ -148,14 +156,24 @@ int ext2_get_inode(ext2_VOLUME* volume,
         }
 	inode->i_generation = __le32_to_cpu(le_inode->i_generation);
 	inode->i_file_acl = __le32_to_cpu(le_inode->i_file_acl);
-	inode->i_dir_acl = __le32_to_cpu(le_inode->i_dir_acl);
+	inode->i_size_high = __le32_to_cpu(le_inode->i_size_high);
 	inode->i_faddr = __le32_to_cpu(le_inode->i_faddr);
+#ifdef CONFIG_E2FSLIBS
+	inode->osd2.linux2.l_i_blocks_hi =
+                       __le16_to_cpu(le_inode->osd2.linux2.l_i_blocks_hi);
+	inode->osd2.linux2.l_i_file_acl_high =
+                       __le16_to_cpu(le_inode->osd2.linux2.l_i_file_acl_high);
+#else
 	inode->osd2.linux2.l_i_frag = le_inode->osd2.linux2.l_i_frag;
 	inode->osd2.linux2.l_i_fsize = le_inode->osd2.linux2.l_i_fsize;
+#endif
 	inode->osd2.linux2.l_i_uid_high =
 			__le16_to_cpu(le_inode->osd2.linux2.l_i_uid_high);
 	inode->osd2.linux2.l_i_gid_high =
 			__le16_to_cpu(le_inode->osd2.linux2.l_i_gid_high);
+#ifdef CONFIG_E2FSLIBS
+
+#endif
 	return 0;
 }
 

libext2/ext2_utils.h

@@ -1,13 +1,18 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */
 
 #ifndef __EXT2_UTILS_H__
 #define __EXT2_UTILS_H__
 
+#include <linux/fs.h>
+#ifdef CONFIG_E2FSLIBS
+#include <ext2fs/ext2_fs.h>
+#else
 #include <linux/ext2_fs.h>
+#endif
 #include <libstream.h>
 #include "ext2.h"
 

libext2/libext2.h

@@ -1,6 +1,6 @@
 /*
  *
- * (c) 2008 Laurent Vivier <Laurent@lvivier.info>
+ * (c) 2008 Laurent Vivier <Laurent@Vivier.EU>
  *
  */