* [PATCH] boot/ld.script dependency missing
@ 2003-12-01 21:29 Olaf Hering
2003-12-03 16:09 ` Tom Rini
0 siblings, 1 reply; 9+ messages in thread
From: Olaf Hering @ 2003-12-01 21:29 UTC (permalink / raw)
To: linuxppc-dev
fiddling with ld.script doesnt trigger a rebuild of the boot files.
diff -purNX /home/olaf/kernel/kernel_exclude.txt linux-2.6.0-test11.orig/arch/ppc/boot/openfirmware/Makefile linux-2.6.0-test11.SuSE/arch/ppc/boot/openfirmware/Makefile
--- linux-2.6.0-test11.orig/arch/ppc/boot/openfirmware/Makefile 2003-11-26 20:43:32.000000000 +0000
+++ linux-2.6.0-test11.SuSE/arch/ppc/boot/openfirmware/Makefile 2003-11-30 17:55:30.000000000 +0000
@@ -104,10 +104,10 @@ quiet_cmd_gen-coff = COFF $@
$(HACKCOFF) $@ && \
ln -sf $(notdir $@) $(images)/zImage$(initrd).pmac
-$(images)/vmlinux.coff: $(obj)/coffboot
+$(images)/vmlinux.coff: $(obj)/coffboot $(boot)/ld.script
$(call cmd,gen-coff)
-$(images)/vmlinux.initrd.coff: $(obj)/coffboot.initrd
+$(images)/vmlinux.initrd.coff: $(obj)/coffboot.initrd $(boot)/ld.script
$(call cmd,gen-coff)
quiet_cmd_gen-elf-pmac = ELF $@
@@ -116,19 +116,19 @@ quiet_cmd_gen-elf-pmac = ELF $@
$(OBJCOPY) $@ $@ --add-section=.note=$(obj)/note \
-R .comment $(del-ramdisk-sec)
-$(images)/vmlinux.elf-pmac: $(obj)/image.o $(NEWWORLDOBJS) $(LIBS) $(obj)/note
+$(images)/vmlinux.elf-pmac: $(obj)/image.o $(NEWWORLDOBJS) $(LIBS) $(obj)/note $(boot)/ld.script
$(call cmd,gen-elf-pmac)
$(images)/vmlinux.initrd.elf-pmac: $(obj)/image.initrd.o $(NEWWORLDOBJS) \
- $(LIBS) $(obj)/note
+ $(LIBS) $(obj)/note $(boot)/ld.script
$(call cmd,gen-elf-pmac)
quiet_cmd_gen-chrp = CHRP $@
cmd_gen-chrp = $(LD) $(CHRP_LD_ARGS) -o $@ $^ && \
$(OBJCOPY) $@ $@ -R .comment $(del-ramdisk-sec)
-$(images)/zImage.chrp: $(CHRPOBJS) $(obj)/image.o $(LIBS)
+$(images)/zImage.chrp: $(CHRPOBJS) $(obj)/image.o $(LIBS) $(boot)/ld.script
$(call cmd,gen-chrp)
-$(images)/zImage.initrd.chrp: $(CHRPOBJS) $(obj)/image.initrd.o $(LIBS)
+$(images)/zImage.initrd.chrp: $(CHRPOBJS) $(obj)/image.initrd.o $(LIBS) $(boot)/ld.script
$(call cmd,gen-chrp)
quiet_cmd_addnote = ADDNOTE $@
--
USB is for mice, FireWire is for men!
sUse lINUX ag, nÜRNBERG
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] boot/ld.script dependency missing
2003-12-01 21:29 [PATCH] boot/ld.script dependency missing Olaf Hering
@ 2003-12-03 16:09 ` Tom Rini
2003-12-10 12:28 ` Olaf Hering
2003-12-12 15:05 ` Olaf Hering
0 siblings, 2 replies; 9+ messages in thread
From: Tom Rini @ 2003-12-03 16:09 UTC (permalink / raw)
To: Olaf Hering; +Cc: linuxppc-dev
On Mon, Dec 01, 2003 at 10:29:31PM +0100, Olaf Hering wrote:
> fiddling with ld.script doesnt trigger a rebuild of the boot files.
This looks to be an incomplete patch. Please fix the rest of
arch/ppc/boot/ and verify that arch/ppc64/boot/ doesn't have the issue
as well. Thanks.
--
Tom Rini
http://gate.crashing.org/~trini/
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] boot/ld.script dependency missing
2003-12-03 16:09 ` Tom Rini
@ 2003-12-10 12:28 ` Olaf Hering
2003-12-10 15:15 ` Tom Rini
2003-12-12 15:05 ` Olaf Hering
1 sibling, 1 reply; 9+ messages in thread
From: Olaf Hering @ 2003-12-10 12:28 UTC (permalink / raw)
To: Tom Rini; +Cc: linuxppc-dev
On Wed, Dec 03, Tom Rini wrote:
> On Mon, Dec 01, 2003 at 10:29:31PM +0100, Olaf Hering wrote:
>
> > fiddling with ld.script doesnt trigger a rebuild of the boot files.
This one is for 2.4.23.
--- ./arch/ppc/boot/pmac/Makefile~ 2003-08-25 13:44:40.000000000 +0200
+++ ./arch/ppc/boot/pmac/Makefile 2003-12-10 13:11:52.000000000 +0100
@@ -84,7 +84,7 @@ vmlinux.initrd.coff: coffboot.initrd $(H
rm -f coffboot.initrd
ln -sf vmlinux.initrd.coff ../images/zImage.initrd.pmac
-vmlinux.elf-pmac: $(CHRPOBJS) $(LIBS) $(MKNOTE) image.o
+vmlinux.elf-pmac: $(CHRPOBJS) $(LIBS) $(MKNOTE) image.o ../ld.script
$(LD) $(CHRP_LD_ARGS) -o ../images/$@ $(CHRPOBJS) $(LIBS) image.o
$(MKNOTE) > note
$(OBJCOPY) ../images/$@ ../images/$@ --add-section=.note=note \
@@ -92,7 +92,7 @@ vmlinux.elf-pmac: $(CHRPOBJS) $(LIBS) $(
rm -f note
vmlinux.initrd.elf-pmac: $(CHRPOBJS) $(LIBS) $(MKNOTE) image.o \
- ../images/ramdisk.image.gz
+ ../images/ramdisk.image.gz ../ld.script
$(OBJCOPY) image.o image-elf.o \
--add-section=.ramdisk=../images/ramdisk.image.gz \
--set-section-flags=.ramdisk=contents,alloc,load,readonly,data
--- ./arch/ppc/boot/chrp/Makefile~ 2003-06-13 16:51:31.000000000 +0200
+++ ./arch/ppc/boot/chrp/Makefile 2003-12-10 13:11:25.000000000 +0100
@@ -50,13 +50,13 @@ ifdef CONFIG_XMON
--set-section-flags=.sysmap=contents,alloc,load,readonly,data
endif
-zImage: $(OBJS) $(LIBS) $(ADDNOTE)
+zImage: $(OBJS) $(LIBS) $(ADDNOTE) ../ld.script
$(LD) $(LD_ARGS) -o ../images/$@.chrp $(OBJS) $(LIBS)
$(OBJCOPY) ../images/$@.chrp ../images/$@.chrp -R .comment -R .ramdisk
cp ../images/$@.chrp ../images/$@.chrp-rs6k
$(ADDNOTE) ../images/$@.chrp-rs6k
-zImage.initrd: $(OBJS) $(LIBS) $(ADDNOTE) ../images/ramdisk.image.gz
+zImage.initrd: $(OBJS) $(LIBS) $(ADDNOTE) ../images/ramdisk.image.gz ../ld.script
$(OBJCOPY) image.o image.o \
--add-section=.ramdisk=../images/ramdisk.image.gz \
--set-section-flags=.ramdisk=contents,alloc,load,readonly,data
--
USB is for mice, FireWire is for men!
sUse lINUX ag, nÜRNBERG
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] boot/ld.script dependency missing
2003-12-10 12:28 ` Olaf Hering
@ 2003-12-10 15:15 ` Tom Rini
2003-12-10 15:16 ` Olaf Hering
0 siblings, 1 reply; 9+ messages in thread
From: Tom Rini @ 2003-12-10 15:15 UTC (permalink / raw)
To: Olaf Hering; +Cc: linuxppc-dev
On Wed, Dec 10, 2003 at 01:28:40PM +0100, Olaf Hering wrote:
> On Wed, Dec 03, Tom Rini wrote:
>
> > On Mon, Dec 01, 2003 at 10:29:31PM +0100, Olaf Hering wrote:
> >
> > > fiddling with ld.script doesnt trigger a rebuild of the boot files.
>
> This one is for 2.4.23.
This too is incomplete, as prep/ and simple/ also need the change.
Please update this, thanks.
--
Tom Rini
http://gate.crashing.org/~trini/
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] boot/ld.script dependency missing
2003-12-10 15:15 ` Tom Rini
@ 2003-12-10 15:16 ` Olaf Hering
2003-12-10 15:31 ` Tom Rini
0 siblings, 1 reply; 9+ messages in thread
From: Olaf Hering @ 2003-12-10 15:16 UTC (permalink / raw)
To: Tom Rini; +Cc: linuxppc-dev
On Wed, Dec 10, Tom Rini wrote:
> On Wed, Dec 10, 2003 at 01:28:40PM +0100, Olaf Hering wrote:
>
> > On Wed, Dec 03, Tom Rini wrote:
> >
> > > On Mon, Dec 01, 2003 at 10:29:31PM +0100, Olaf Hering wrote:
> > >
> > > > fiddling with ld.script doesnt trigger a rebuild of the boot files.
> >
> > This one is for 2.4.23.
>
> This too is incomplete, as prep/ and simple/ also need the change.
> Please update this, thanks.
you mean this line in prep/Makefile?
zImage: $(obj-y) $(LIBS) ../ld.script ../images/vmlinux.gz ../common/dummy.o \
--
USB is for mice, FireWire is for men!
sUse lINUX ag, nÜRNBERG
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] boot/ld.script dependency missing
2003-12-10 15:16 ` Olaf Hering
@ 2003-12-10 15:31 ` Tom Rini
2003-12-10 15:38 ` Olaf Hering
0 siblings, 1 reply; 9+ messages in thread
From: Tom Rini @ 2003-12-10 15:31 UTC (permalink / raw)
To: Olaf Hering; +Cc: linuxppc-dev
On Wed, Dec 10, 2003 at 04:16:56PM +0100, Olaf Hering wrote:
> On Wed, Dec 10, Tom Rini wrote:
>
> > On Wed, Dec 10, 2003 at 01:28:40PM +0100, Olaf Hering wrote:
> >
> > > On Wed, Dec 03, Tom Rini wrote:
> > >
> > > > On Mon, Dec 01, 2003 at 10:29:31PM +0100, Olaf Hering wrote:
> > > >
> > > > > fiddling with ld.script doesnt trigger a rebuild of the boot files.
> > >
> > > This one is for 2.4.23.
> >
> > This too is incomplete, as prep/ and simple/ also need the change.
> > Please update this, thanks.
>
> you mean this line in prep/Makefile?
>
> zImage: $(obj-y) $(LIBS) ../ld.script ../images/vmlinux.gz ../common/dummy.o \
And simple/ ?
--
Tom Rini
http://gate.crashing.org/~trini/
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] boot/ld.script dependency missing
2003-12-10 15:31 ` Tom Rini
@ 2003-12-10 15:38 ` Olaf Hering
2003-12-10 15:47 ` Tom Rini
0 siblings, 1 reply; 9+ messages in thread
From: Olaf Hering @ 2003-12-10 15:38 UTC (permalink / raw)
To: Tom Rini; +Cc: linuxppc-dev
On Wed, Dec 10, Tom Rini wrote:
> And simple/ ?
If they would need a patch then I would have added them to my patch.
--
USB is for mice, FireWire is for men!
sUse lINUX ag, nÜRNBERG
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] boot/ld.script dependency missing
2003-12-10 15:38 ` Olaf Hering
@ 2003-12-10 15:47 ` Tom Rini
0 siblings, 0 replies; 9+ messages in thread
From: Tom Rini @ 2003-12-10 15:47 UTC (permalink / raw)
To: Olaf Hering; +Cc: linuxppc-dev
On Wed, Dec 10, 2003 at 04:38:50PM +0100, Olaf Hering wrote:
> On Wed, Dec 10, Tom Rini wrote:
>
>
> > And simple/ ?
>
> If they would need a patch then I would have added them to my patch.
OK, thanks.
--
Tom Rini
http://gate.crashing.org/~trini/
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] boot/ld.script dependency missing
2003-12-03 16:09 ` Tom Rini
2003-12-10 12:28 ` Olaf Hering
@ 2003-12-12 15:05 ` Olaf Hering
1 sibling, 0 replies; 9+ messages in thread
From: Olaf Hering @ 2003-12-12 15:05 UTC (permalink / raw)
To: Tom Rini; +Cc: linuxppc-dev
On Wed, Dec 03, Tom Rini wrote:
> On Mon, Dec 01, 2003 at 10:29:31PM +0100, Olaf Hering wrote:
>
> > fiddling with ld.script doesnt trigger a rebuild of the boot files.
>
> This looks to be an incomplete patch. Please fix the rest of
> arch/ppc/boot/ and verify that arch/ppc64/boot/ doesn't have the issue
> as well. Thanks.
The patch for 2.6 is complete, others either do not need the ld.script,
or they already have the dependency.
--
USB is for mice, FireWire is for men!
sUse lINUX ag, nÜRNBERG
** Sent via the linuxppc-dev mail list. See http://lists.linuxppc.org/
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2003-12-12 15:05 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-12-01 21:29 [PATCH] boot/ld.script dependency missing Olaf Hering
2003-12-03 16:09 ` Tom Rini
2003-12-10 12:28 ` Olaf Hering
2003-12-10 15:15 ` Tom Rini
2003-12-10 15:16 ` Olaf Hering
2003-12-10 15:31 ` Tom Rini
2003-12-10 15:38 ` Olaf Hering
2003-12-10 15:47 ` Tom Rini
2003-12-12 15:05 ` Olaf Hering
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).