boot/ld.script dependency missing

PATCH In review Olaf Hering 2 participants 9 messages Dec 1, 2003 – Dec 12, 2003 PowerPC

lore

Share & tools

lore

Olaf Hering

author

2003-12-01 21:29 UTC #0 lore raw

PATCH 1/1 boot/ld.script dependency missing

fiddling with ld.script doesnt trigger a rebuild of the boot files.

arch/ppc/boot/openfirmware/Makefile +6 -6

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
@@ -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/

Tom Rini

2003-12-03 16:09 UTC #1 lore raw

Quoted 1 line · Olaf Hering

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/

Olaf Hering

author

2003-12-10 12:28 UTC #2 lore raw

Quoted 3 lines · Tom Rini

Quoted 1 line · Olaf Hering
fiddling with ld.script doesnt trigger a rebuild of the boot files.

This one is for 2.4.23.

arch/ppc/boot/pmac/Makefile renamed from arch/ppc/boot/pmac/Makefile~ +2 -2

@@ -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 renamed from arch/ppc/boot/chrp/Makefile~ +2 -2

@@ -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/[email protected] $(OBJS) $(LIBS)
 	$(OBJCOPY) ../images/[email protected] ../images/[email protected] -R .comment -R .ramdisk
 	cp ../images/[email protected] ../images/[email protected]
 	$(ADDNOTE) ../images/[email protected]
 
-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/

Tom Rini

2003-12-10 15:15 UTC #3 lore raw

Quoted 7 lines · Olaf Hering

Quoted 3 lines · Tom Rini
Quoted 1 line · Olaf Hering
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/

Olaf Hering

author

2003-12-10 15:16 UTC #4 lore raw

Quoted 4 lines · Tom Rini

Quoted 2 lines · Olaf Hering
On Wed, Dec 03, Tom Rini wrote:

Quoted 8 lines

Quoted 5 lines
Quoted 3 lines · Olaf Hering
Quoted 2 lines
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/

Tom Rini

2003-12-10 15:31 UTC #5 lore raw

Quoted 10 lines · Olaf Hering

Quoted 8 lines · Tom Rini
Quoted 6 lines · Olaf Hering
Quoted 3 lines · Tom Rini
Quoted 1 line · Olaf Hering
fiddling with ld.script doesnt trigger a rebuild of the boot files.

Quoted 8 lines

Quoted 4 lines
Quoted 1 line
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/

Olaf Hering

author

2003-12-10 15:38 UTC #6 lore raw

Quoted 1 line · Tom Rini

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/

Tom Rini

2003-12-10 15:47 UTC #7 lore raw

Quoted 6 lines · Olaf Hering

Quoted 1 line · Tom Rini
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/

Olaf Hering

author

2003-12-12 15:05 UTC #8 lore raw

In reply to Tom Rini

Quoted 7 lines · Tom Rini

Quoted 1 line · Olaf Hering
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/