* [KBUILD] md/raid6 breaks separate source/object tree
@ 2004-01-24 12:10 Richard Chan
2004-01-24 21:32 ` Andrew Morton
0 siblings, 1 reply; 4+ messages in thread
From: Richard Chan @ 2004-01-24 12:10 UTC (permalink / raw)
To: linux-kernel
md/raid6 is using an in-tree perl script to generate a C file.
This breaks kbuild separate src/obj tree.
CC [M] drivers/md/raid6main.o
CC [M] drivers/md/raid6algos.o
CC [M] drivers/md/raid6recov.o
HOSTCC drivers/md/mktables
drivers/md/mktables > drivers/md/raid6tables.c || ( rm -f
drivers/md/raid6tables.c && exit 1 )
CC [M] drivers/md/raid6tables.o
perl drivers/md/unroll.pl 1 <
/usr/src/linux-2.6.2-rc1.1.A/drivers/md/raid6int.uc >
drivers/md/raid6int1.c || ( rm -f drivers/md/raid6int1.c && exit 1 )
Can't open perl script "drivers/md/unroll.pl": No such file or directory
Somehow the src in $(PERL) $(src)/drivers/md/unroll.pl is not getting
substituted.
Still trying to figure it out...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [KBUILD] md/raid6 breaks separate source/object tree
2004-01-24 12:10 [KBUILD] md/raid6 breaks separate source/object tree Richard Chan
@ 2004-01-24 21:32 ` Andrew Morton
0 siblings, 0 replies; 4+ messages in thread
From: Andrew Morton @ 2004-01-24 21:32 UTC (permalink / raw)
To: Richard Chan; +Cc: linux-kernel
Richard Chan <rspchan@starhub.net.sg> wrote:
>
> md/raid6 is using an in-tree perl script to generate a C file.
> This breaks kbuild separate src/obj tree.
>
> CC [M] drivers/md/raid6main.o
> CC [M] drivers/md/raid6algos.o
> CC [M] drivers/md/raid6recov.o
> HOSTCC drivers/md/mktables
> drivers/md/mktables > drivers/md/raid6tables.c || ( rm -f
> drivers/md/raid6tables.c && exit 1 )
> CC [M] drivers/md/raid6tables.o
> perl drivers/md/unroll.pl 1 <
> /usr/src/linux-2.6.2-rc1.1.A/drivers/md/raid6int.uc >
> drivers/md/raid6int1.c || ( rm -f drivers/md/raid6int1.c && exit 1 )
> Can't open perl script "drivers/md/unroll.pl": No such file or directory
>
> Somehow the src in $(PERL) $(src)/drivers/md/unroll.pl is not getting
> substituted.
Does this patch (from Sam) fix it?
--- 25/drivers/md/Makefile~raid-makefile-cleanup 2004-01-24 01:26:56.000000000 -0800
+++ 25-akpm/drivers/md/Makefile 2004-01-24 01:26:56.000000000 -0800
@@ -24,26 +24,43 @@ obj-$(CONFIG_MD_MULTIPATH) += multipath.
obj-$(CONFIG_BLK_DEV_MD) += md.o
obj-$(CONFIG_BLK_DEV_DM) += dm-mod.o
-# Files generated that shall be removed upon make clean
-clean-files := raid6int*.c raid6tables.c mktables
-
-$(obj)/raid6int1.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 1 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int2.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 2 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int4.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 4 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int8.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 8 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int16.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 16 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int32.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 32 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6tables.c: $(obj)/mktables
- $(obj)/mktables > $@ || ( rm -f $@ && exit 1 )
+quiet_cmd_unroll = UNROLL $@
+ cmd_unroll = $(PERL) $(srctree)/$(src)/unroll.pl $(UNROLL) \
+ < $< > $@ || ( rm -f $@ && exit 1 )
+
+targets += raid6int1.c
+$(obj)/raid6int1.c: UNROLL := 1
+$(obj)/raid6int1.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int2.c
+$(obj)/raid6int2.c: UNROLL := 2
+$(obj)/raid6int2.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int4.c
+$(obj)/raid6int4.c: UNROLL := 4
+$(obj)/raid6int4.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int8.c
+$(obj)/raid6int8.c: UNROLL := 8
+$(obj)/raid6int8.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int16.c
+$(obj)/raid6int16.c: UNROLL := 16
+$(obj)/raid6int16.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int32.c
+$(obj)/raid6int32.c: UNROLL := 32
+$(obj)/raid6int32.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+quiet_cmd_mktable = TABLE $@
+ cmd_mktable = $(obj)/mktables > $@ || ( rm -f $@ && exit 1 )
+
+targets += raid6tables.c
+$(obj)/raid6tables.c: $(obj)/mktables FORCE
+ $(call if_changed,mktable)
_
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [KBUILD] md/raid6 breaks separate source/object tree
@ 2004-01-24 12:26 sam
2004-01-24 20:44 ` Sam Ravnborg
0 siblings, 1 reply; 4+ messages in thread
From: sam @ 2004-01-24 12:26 UTC (permalink / raw)
To: Richard Chan; +Cc: linux-kernel
Date: Lør, 24 Jan 2004 20:10:25 +0800 skrev Richard Chan <rspchan@starhub.net.sg> :
>md/raid6 is using an in-tree perl script to generate a C file.
>This breaks kbuild separate src/obj tree.
>Somehow the src in $(PERL) $(src)/drivers/md/unroll.pl is not
>getting substituted.
Replace $(src)/unroll.pl with $(srctree)/$(src)/unroll.pl in
drivers/md/Makefile and it works again.
Fix is already sent to hpa/akpm - but I do not have it available
here (on WEB mail).
Sam
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [KBUILD] md/raid6 breaks separate source/object tree
2004-01-24 12:26 sam
@ 2004-01-24 20:44 ` Sam Ravnborg
0 siblings, 0 replies; 4+ messages in thread
From: Sam Ravnborg @ 2004-01-24 20:44 UTC (permalink / raw)
To: sam; +Cc: Richard Chan, linux-kernel
On Sat, Jan 24, 2004 at 01:26:51PM +0100, sam@ravnborg.org wrote:
>
> Fix is already sent to hpa/akpm - but I do not have it available
> here (on WEB mail).
Here it is - it is a bit long because I made output look nice
when doing a build without V=1.
Sam
--- drivers/md/Makefile.old 2004-01-24 10:11:54.000000000 +0100
+++ drivers/md/Makefile 2004-01-24 10:12:13.000000000 +0100
@@ -24,26 +24,43 @@ obj-$(CONFIG_MD_MULTIPATH) += multipath.
obj-$(CONFIG_BLK_DEV_MD) += md.o
obj-$(CONFIG_BLK_DEV_DM) += dm-mod.o
-# Files generated that shall be removed upon make clean
-clean-files := raid6int*.c raid6tables.c mktables
-
-$(obj)/raid6int1.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 1 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int2.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 2 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int4.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 4 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int8.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 8 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int16.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 16 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6int32.c: $(src)/raid6int.uc $(src)/unroll.pl
- $(PERL) $(src)/unroll.pl 32 < $< > $@ || ( rm -f $@ && exit 1 )
-
-$(obj)/raid6tables.c: $(obj)/mktables
- $(obj)/mktables > $@ || ( rm -f $@ && exit 1 )
+quiet_cmd_unroll = UNROLL $@
+ cmd_unroll = $(PERL) $(srctree)/$(src)/unroll.pl $(UNROLL) \
+ < $< > $@ || ( rm -f $@ && exit 1 )
+
+targets += raid6int1.c
+$(obj)/raid6int1.c: UNROLL := 1
+$(obj)/raid6int1.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int2.c
+$(obj)/raid6int2.c: UNROLL := 2
+$(obj)/raid6int2.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int4.c
+$(obj)/raid6int4.c: UNROLL := 4
+$(obj)/raid6int4.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int8.c
+$(obj)/raid6int8.c: UNROLL := 8
+$(obj)/raid6int8.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int16.c
+$(obj)/raid6int16.c: UNROLL := 16
+$(obj)/raid6int16.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+targets += raid6int32.c
+$(obj)/raid6int32.c: UNROLL := 32
+$(obj)/raid6int32.c: $(src)/raid6int.uc $(src)/unroll.pl FORCE
+ $(call if_changed,unroll)
+
+quiet_cmd_mktable = TABLE $@
+ cmd_mktable = $(obj)/mktables > $@ || ( rm -f $@ && exit 1 )
+
+targets += raid6tables.c
+$(obj)/raid6tables.c: $(obj)/mktables FORCE
+ $(call if_changed,mktable)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2004-01-24 21:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-01-24 12:10 [KBUILD] md/raid6 breaks separate source/object tree Richard Chan
2004-01-24 21:32 ` Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2004-01-24 12:26 sam
2004-01-24 20:44 ` Sam Ravnborg
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox