On Thu, Jan 15, 2004 at 04:22:39PM -0600, Bill Kalebaugh wrote: > How do you put the xconfig patch in 2.6.1 to make xconfig work ??? >
I don't know anything about this patch, but from looking at the file names that would be cd into linux-2.6.1 (or where you kernel is located). then cat <patch file> | patch -p1 > here is the patch: > > # This is a BitKeeper generated patch for the following project: > # Project Name: Linux kernel tree > # This patch format is intended for GNU patch command version 2.5 or higher. > # This patch includes the following deltas: > # ChangeSet 1.1296.61.1 -> 1.1296.61.2 > # scripts/Makefile.lib 1.22 -> 1.23 > # Makefile 1.435 -> 1.436 > # > # The following is the BitKeeper ChangeSet Log > # 03/10/12 [EMAIL PROTECTED] 1.1296.61.2 > # kbuild: Fix make O=../build xconfig > # > # Compilation of qconf required -I path to qt. kbuild invalidated the > # path to qt by prefixing it with $(srctree). No longer prefix absolute > paths. > # Also do not duplicate CPPFLAGS. Previously it was appended twice to CFLAGS > # -------------------------------------------- > # > diff -Nru a/Makefile b/Makefile > --- a/Makefile Sat Oct 18 09:48:02 2003 > +++ b/Makefile Sat Oct 18 09:48:02 2003 > @@ -404,10 +404,6 @@ > > include $(srctree)/arch/$(ARCH)/Makefile > > -# Let architecture Makefiles change CPPFLAGS if needed > -CFLAGS := $(CPPFLAGS) $(CFLAGS) > -AFLAGS := $(CPPFLAGS) $(AFLAGS) > - > core-y += kernel/ mm/ fs/ ipc/ security/ crypto/ > > SUBDIRS += $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ > diff -Nru a/scripts/Makefile.lib b/scripts/Makefile.lib > --- a/scripts/Makefile.lib Sat Oct 18 09:48:02 2003 > +++ b/scripts/Makefile.lib Sat Oct 18 09:48:02 2003 > @@ -154,7 +154,8 @@ > __hostcxx_flags = $(_hostcxx_flags) > else > flags = $(foreach o,$($(1)),\ > - $(if $(filter -I%,$(o)),$(patsubst -I%,-I$(srctree)/%,$(o)),$(o))) > + $(if $(filter -I%,$(filter-out -I/%,$(o))), \ > + $(patsubst -I%,-I$(srctree)/%,$(o)),$(o))) > > # -I$(obj) locate generated .h files > # -I$(srctree)/$(src) locate .h files in srctree, from generated .c files > @@ -162,7 +163,7 @@ > __c_flags = -I$(obj) -I$(srctree)/$(src) $(call flags,_c_flags) > __a_flags = $(call flags,_a_flags) > __hostc_flags = -I$(obj) $(call flags,_hostc_flags) > -__hostcxx_flags = $(call flags,_hostcxx_flags) > +__hostcxx_flags = -I$(obj) $(call flags,_hostcxx_flags) > endif > > c_flags = -Wp,-MD,$(depfile) $(NOSTDINC_FLAGS) $(CPPFLAGS) \ > - > > Thank you for any help. > Bill K > > > > > -- > To UNSUBSCRIBE, email to [EMAIL PROTECTED] > with a subject of "unsubscribe". Trouble? Contact > [EMAIL PROTECTED] > -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
