2.4.9-ac18

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla/Makefile linux.ac/Makefile
--- linux.vanilla/Makefile   Sun Aug 26 20:45:48 2001
+++ linux.ac/Makefile   Fri Sep 28 15:50:34 2001
@@ -1,11 +1,20 @@
 VERSION = 2
 PATCHLEVEL = 4
 SUBLEVEL = 9
-EXTRAVERSION =
+EXTRAVERSION = -ac18
 
 KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 
-ARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+KERNELPATH=kernel-$(shell echo $(KERNELRELEASE) | sed -e "s/-//")
+
+# SUBARCH tells the usermode build what the underlying arch is.  That is set
+# first, and if a usermode build is happening, the "ARCH=um" on the command
+# line overrides the setting of ARCH below.  If a native build is happening,
+# then ARCH is assigned, getting whatever value it gets normally, and 
+# SUBARCH is subsequently ignored.
+
+SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/)
+ARCH := $(SUBARCH)
 
 CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
      else if [ -x /bin/bash ]; then echo /bin/bash; \
@@ -136,7 +145,8 @@
    drivers/net/net.o \
    drivers/media/media.o
 DRIVERS-$(CONFIG_AGP) += drivers/char/agp/agp.o
-DRIVERS-$(CONFIG_DRM) += drivers/char/drm/drm.o
+DRIVERS-$(CONFIG_DRM_NEW) += drivers/char/drm/drm.o
+DRIVERS-$(CONFIG_DRM_OLD) += drivers/char/drm-4.0/drm.o
 DRIVERS-$(CONFIG_NUBUS) += drivers/nubus/nubus.a
 DRIVERS-$(CONFIG_ISDN) += drivers/isdn/isdn.a
 DRIVERS-$(CONFIG_NET_FC) += drivers/net/fc/fc.o
@@ -146,6 +156,7 @@
 DRIVERS-$(CONFIG_ARCNET) += drivers/net/arcnet/arcnetdrv.o
 DRIVERS-$(CONFIG_ATM) += drivers/atm/atm.o
 DRIVERS-$(CONFIG_IDE) += drivers/ide/idedriver.o
+DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
 DRIVERS-$(CONFIG_SCSI) += drivers/scsi/scsidrv.o
 DRIVERS-$(CONFIG_FUSION_BOOT) += drivers/message/fusion/fusion.o
 DRIVERS-$(CONFIG_IEEE1394) += drivers/ieee1394/ieee1394drv.o
@@ -164,10 +175,9 @@
 DRIVERS-$(CONFIG_DIO) += drivers/dio/dio.a
 DRIVERS-$(CONFIG_SBUS) += drivers/sbus/sbus_all.o
 DRIVERS-$(CONFIG_ZORRO) += drivers/zorro/driver.o
-DRIVERS-$(CONFIG_FC4) += drivers/fc4/fc4.a
 DRIVERS-$(CONFIG_ALL_PPC) += drivers/macintosh/macintosh.o
 DRIVERS-$(CONFIG_MAC) += drivers/macintosh/macintosh.o
-DRIVERS-$(CONFIG_ISAPNP) += drivers/pnp/pnp.o
+DRIVERS-$(CONFIG_PNP) += drivers/pnp/pnp.o
 DRIVERS-$(CONFIG_SGI_IP22) += drivers/sgi/sgi.a
 DRIVERS-$(CONFIG_VT) += drivers/video/video.o
 DRIVERS-$(CONFIG_PARIDE) += drivers/block/paride/paride.a
@@ -175,7 +185,7 @@
 DRIVERS-$(CONFIG_TC) += drivers/tc/tc.a
 DRIVERS-$(CONFIG_USB) += drivers/usb/usbdrv.o
 DRIVERS-$(CONFIG_INPUT) += drivers/input/inputdrv.o
-DRIVERS-$(CONFIG_I2O) += drivers/i2o/i2o.o
+DRIVERS-$(CONFIG_I2O) += drivers/message/i2o/i2o.o
 DRIVERS-$(CONFIG_IRDA) += drivers/net/irda/irda.o
 DRIVERS-$(CONFIG_I2C) += drivers/i2c/i2c.o
 DRIVERS-$(CONFIG_PHONE) += drivers/telephony/telephony.o
@@ -197,6 +207,10 @@
    drivers/zorro/devlist.h drivers/zorro/gen-devlist \
    drivers/sound/bin2hex drivers/sound/hex2hex \
    drivers/atm/fore200e_mkfirm drivers/atm/{pca,sba}*{.bin,.bin1,.bin2} \
+   drivers/scsi/aic7xxx/aicasm/aicasm_gram.c \
+   drivers/scsi/aic7xxx/aicasm/aicasm_scan.c \
+   drivers/scsi/aic7xxx/aicasm/y.tab.h \
+   drivers/scsi/aic7xxx/aicasm/aicasm \
    net/khttpd/make_times_h \
    net/khttpd/times.h \
    submenu*
@@ -217,13 +231,15 @@
    drivers/sound/pndsperm.c \
    drivers/sound/pndspini.c \
    drivers/atm/fore200e_*_fw.c drivers/atm/.fore200e_*.fw \
-   .version .config* config.in config.old \
+   .version* .config* config.in config.old \
    scripts/tkparse scripts/kconfig.tk scripts/kconfig.tmp \
    scripts/lxdialog/*.o scripts/lxdialog/lxdialog \
    .menuconfig.log \
    include/asm \
    .hdepend scripts/mkdep scripts/split-include scripts/docproc \
-   $(TOPDIR)/include/linux/modversions.h
+   $(TOPDIR)/include/linux/modversions.h \
+   kernel.spec
+
 # directories removed with 'make mrproper'
 MRPROPER_DIRS = \
    include/config \
@@ -247,7 +263,7 @@
 boot: vmlinux
    @$(MAKE) CFLAGS="$(CFLAGS) $(CFLAGS_KERNEL)" -C arch/$(ARCH)/boot
 
-vmlinux: $(CONFIGURATION) init/main.o init/version.o linuxsubdirs
+vmlinux: include/linux/version.h $(CONFIGURATION) init/main.o init/version.o linuxsubdirs
    $(LD) $(LINKFLAGS) $(HEAD) init/main.o init/version.o \
       --start-group \
       $(CORE_FILES) \
@@ -292,11 +308,8 @@
 $(TOPDIR)/include/linux/compile.h: include/linux/compile.h
 
 newversion:
-   @if [ ! -f .version ]; then \
-      echo 1 > .version; \
-   else \
-      expr 0`cat .version` + 1 > .version; \
-   fi
+   . scripts/mkversion > .version.tmp
+   @mv -f .version.tmp .version
 
 include/linux/compile.h: $(CONFIGURATION) include/linux/version.h newversion
    @echo -n \#define UTS_VERSION \"\#`cat .version` > .ver
@@ -418,7 +431,8 @@
    $(MAKE) -C Documentation/DocBook mrproper
 
 distclean: mrproper
-   rm -f core `find . \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
+   rm -f core `find . \( -not -type d \) -and \
+      \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
       -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
       -o -name '.*.rej' -o -name '.SUMS' -o -size 0 \) -type f -print` TAGS tags
 
@@ -501,3 +515,30 @@
 
 scripts/split-include: scripts/split-include.c
    $(HOSTCC) $(HOSTCFLAGS) -o scripts/split-include scripts/split-include.c
+
+#
+# RPM target
+#
+#   If you do a make spec before packing the tarball you can rpm -ta it
+#
+spec:
+   . scripts/mkspec >kernel.spec
+
+#
+#   Build a tar ball, generate an rpm from it and pack the result
+#   There arw two bits of magic here
+#   1) The use of /. to avoid tar packing just the symlink
+#   2) Removing the .dep files as they have source paths in them that
+#      will become invalid
+#
+rpm:   clean spec
+   find . \( -size 0 -o -name .depend -o -name .hdepend \) -type f -print | xargs rm -f
+   set -e; \
+   cd $(TOPDIR)/.. ; \
+   ln -sf $(TOPDIR) $(KERNELPATH) ; \
+   tar -cvz --exclude CVS -f $(KERNELPATH).tar.gz $(KERNELPATH)/. ; \
+   rm $(KERNELPATH) ; \
+   cd $(TOPDIR) ; \
+   . scripts/mkversion > .version ; \
+   rpm -ta $(TOPDIR)/../$(KERNELPATH).tar.gz ; \
+   rm $(TOPDIR)/../$(KERNELPATH).tar.gz