Patching 2.4.6--help fixing 1 hunk that failed

[Adam Warner <lists@consulting.net.nz>]

Hi all,

While I'm new to the list I'm aware of the archive and discussions. I
don't need friendly advice that I should be using Jari's loopAES :-)

OK, when I try and patch 2.4.6 with the international patch 2.4.3.1 I
get this reject:

patch -p1 -s < patch-int-2.4.3.1
1 out of 3 hunks FAILED -- saving rejects to file Makefile.rej

(-s is silent unless there is a reject. A very useful option that only
shows when there are patching problems)

The contents of Makefile.rej are:

***************
*** 118,130 ****
  
  CORE_FILES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
  NETWORKS	=net/network.o
  DRIVERS		=drivers/block/block.o \
  		 drivers/char/char.o \
  		 drivers/misc/misc.o \
  		 drivers/net/net.o \
  		 drivers/media/media.o
  LIBS		=$(TOPDIR)/lib/lib.a
- SUBDIRS		=kernel drivers mm fs net ipc lib
  
  DRIVERS-n :=
  DRIVERS-y :=
--- 118,131 ----
  
  CORE_FILES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
  NETWORKS	=net/network.o
+ CRYPTO		=crypto/crypto.o
  DRIVERS		=drivers/block/block.o \
  		 drivers/char/char.o \
  		 drivers/misc/misc.o \
  		 drivers/net/net.o \
  		 drivers/media/media.o
  LIBS		=$(TOPDIR)/lib/lib.a
+ SUBDIRS		=kernel drivers mm fs net ipc lib crypto
  
  DRIVERS-n :=
  DRIVERS-y :=


--------------------------------------------------------

Now I know little about fixing patch rejects. So any newbie advice would
be appreciated. It appears the Makefile cannot be successfully patched. 

Here's the relevant section of the Makefile:


CORE_FILES	=kernel/kernel.o mm/mm.o fs/fs.o ipc/ipc.o
NETWORKS	=net/network.o

LIBS		=$(TOPDIR)/lib/lib.a
SUBDIRS		=kernel drivers mm fs net ipc lib

DRIVERS-n :=
DRIVERS-y :=
DRIVERS-m :=
DRIVERS-  :=

DRIVERS-$(CONFIG_ACPI) += drivers/acpi/acpi.o
DRIVERS-$(CONFIG_PARPORT) += drivers/parport/driver.o
DRIVERS-y += drivers/char/char.o \
	drivers/block/block.o \
	drivers/misc/misc.o \
	drivers/net/net.o \
	drivers/media/media.o


-----------------------------

Does this mean the patch failed because someone decided to move the
DRIVERS section?

If we fix this should we send the fix to Alexander Kjeldaas so he can
upload a new 2.4.6 patch without rejects to here:

http://www.kernel.org/pub/linux/kernel/crypto/v2.4/

In what form would such a submission look like? Would we send the
complete fixed Makefile or a patch for the official 2.4.6 Makefile?

Many thanks,
Adam



Linux-crypto:  cryptography in and on the Linux system
Archive:       http://mail.nl.linux.org/linux-crypto/