diff --git a/.cvsignore b/.cvsignore index 36f56f6..c857fa0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -9,3 +9,4 @@ debug.log mkinitrd_helper.tar.bz2 hack_* stage1-usbnet +version.h diff --git a/config-stage1.h-master b/config-stage1.h-master deleted file mode 100644 index 0c5d375..0000000 --- a/config-stage1.h-master +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Guillaume Cottenceau (gc@mandrakesoft.com) - * - * Copyright 2000 MandrakeSoft - * - * This software may be freely redistributed under the terms of the GNU - * public license. - * - * 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., 675 Mass Ave, Cambridge, MA 02139, USA. - * - */ - -#ifndef _CONFIG_STAGE1_H_ -#define _CONFIG_STAGE1_H_ - -#define _GNU_SOURCE 1 - - -/* If we have more than that amount of memory (in Mbytes), we assume we can load the second stage as a ramdisk */ -#define MEM_LIMIT_RAMDISK 52 - -/* If we have more than that amount of memory (in Mbytes), we assume we can load the rescue as a ramdisk */ -#define MEM_LIMIT_RESCUE 40 - -#define DISTRIB_NAME "ALT Linux Junior" - -#define RAMDISK_COMPRESSION_RATIO 1.95 - -#define LIVE_LOCATION "/Mandrake/mdkinst/" -#define RAMDISK_LOCATION "/Mandrake/base/" -#define IMAGE_LOCATION "/tmp/image" -#define STAGE2_LOCATION "/tmp/stage2" - -/* user-definable (in Makefile): DISABLE_NETWORK, DISABLE_DISK, DISABLE_CDROM, DISABLE_PCMCIA */ - - -/* some factorizing for disabling more features */ - -#ifdef DISABLE_DISK -#ifdef DISABLE_CDROM -#define DISABLE_MEDIAS -#endif -#endif - - -#endif diff --git a/pcmcia_config.patch b/pcmcia_config.patch deleted file mode 100644 index ab70ae0..0000000 --- a/pcmcia_config.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- pcmcia/config~ Thu Aug 31 00:05:25 2000 -+++ pcmcia/config Fri Sep 17 17:25:35 1999 -@@ -34,7 +34,7 @@ - class "cdrom" module "oti12_cs" - - device "pcnet_cs" -- class "network" module "net/8390", "pcnet_cs" -+ class "network" module "8390", "pcnet_cs" - - device "axnet_cs" - class "network" module "net/8390", "axnet_cs" -@@ -64,25 +64,25 @@ - class "ftl" module "ftl_cs" - - device "serial_cs" -- class "serial" module "serial_cs" -+ class "serial" module "serial", "serial_cs" - - device "parport_cs" - class "parport" module "parport_cs" - - device "qlogic_cs" -- class "scsi" module "qlogic_cs" -- -+ class "scsi" module "scsi_mod", "qlogic_cs" -+ - device "aha152x_cs" -- class "scsi" module "aha152x_cs" -- -+ class "scsi" module "scsi_mod", "aha152x_cs" -+ - device "fdomain_cs" -- class "scsi" module "fdomain_cs" -- -+ class "scsi" module "scsi_mod", "fdomain_cs" -+ - device "sym53c500_cs" -- class "scsi" module "sym53c500_cs" -+ class "scsi" module "scsi_mod", "sym53c500_cs" - - device "ide-cs" -- class "ide" module "ide-cs" -+ class "ide" module "ide-mod", "ide-probe", "ide-cs" - - device "fmvj18x_cs" - class "network" module "fmvj18x_cs"