RFC: conf/i386.rmk
Hi,
I'm thinking that we have quite a bit of duplicate stuff in each of the 4 i386 ports (cpuid, pci, serial, etc) that could well live in a firmware-agnostic conf/i386.rmk file.
This would simplify things and make them easier to maintain. What do you think?
Signature · 5 lines
Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."
Quoted 9 lines · Robert Millan
Hi,
I'm thinking that we have quite a bit of duplicate stuff in each of the 4 i386 ports (cpuid, pci, serial, etc) that could well live in a firmware-agnostic conf/i386.rmk file.
This would simplify things and make them easier to maintain. What do you think?
Btw, I think grub-emu could go there too. The only arch-specific thing in it AFAICS is cpuid.mod.
Signature · 5 lines
Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."
Quoted 8 lines · Robert Millan
Quoted 7 lines · Robert Millan
Hi,
I'm thinking that we have quite a bit of duplicate stuff in each of the 4 i386 ports (cpuid, pci, serial, etc) that could well live in a firmware-agnostic conf/i386.rmk file.
Quoted 5 lines
Quoted 2 lines
This would simplify things and make them easier to maintain. What do you think?
Btw, I think grub-emu could go there too. The only arch-specific thing in it AFAICS is cpuid.mod.
I tried moving more stuff to common.rmk many times but gave up every time. One of the reasons is that the sparc64 support is very out-of-date and doesn't use common.rmk at all. I cannot even test it (well, I haven't tries hard).
Limiting the scope to i386 could help, but I think there is very little code specific to all i386 platforms but not to other architectures.
Signature · 2 lines
Regards, Pavel Roskin
Quoted 10 lines · Pavel Roskin
Quoted 9 lines · Robert Millan
Quoted 8 lines · Robert Millan
Hi,
I'm thinking that we have quite a bit of duplicate stuff in each of the 4 i386 ports (cpuid, pci, serial, etc) that could well live in a firmware-agnostic conf/i386.rmk file.
This would simplify things and make them easier to maintain. What do you think?
Quoted 7 lines
Quoted 2 lines
Btw, I think grub-emu could go there too. The only arch-specific thing in it AFAICS is cpuid.mod.
I tried moving more stuff to common.rmk many times but gave up every time. One of the reasons is that the sparc64 support is very out-of-date and doesn't use common.rmk at all. I cannot even test it (well, I haven't tries hard).
If sparc64 support is out of date and the maintainer is nowhere to be seen then I think you can put that support to graveyard until someone comes up to update it. Putting all common stuff to every platform to common.rmk is a good way and the only way (in my opinion) to go forward.
Quoted 9 lines · Vesa Jääskeläinen
Quoted 4 lines
I tried moving more stuff to common.rmk many times but gave up every time. One of the reasons is that the sparc64 support is very out-of-date and doesn't use common.rmk at all. I cannot even test it (well, I haven't tries hard).
If sparc64 support is out of date and the maintainer is nowhere to be seen then I think you can put that support to graveyard until someone comes up to update it. Putting all common stuff to every platform to common.rmk is a good way and the only way (in my opinion) to go forward.
OK, then there is an issue that it doesn't work if done naively. Either genmk.rb should sort statements or we need some makefile magic (recursively expanded variables, perhaps) that would be transparent to genmk.rb. Maybe we need both.
We may want to have another common file for all ieee1275 pratforms.
Signature · 2 lines
Regards, Pavel Roskin
Quoted 7 lines · Pavel Roskin
Quoted 5 lines · Vesa Jääskeläinen
Quoted 4 lines
I tried moving more stuff to common.rmk many times but gave up every time. One of the reasons is that the sparc64 support is very out-of-date and doesn't use common.rmk at all. I cannot even test it (well, I haven't tries hard).
Quoted 6 lines
Quoted 4 lines
If sparc64 support is out of date and the maintainer is nowhere to be seen then I think you can put that support to graveyard until someone comes up to update it. Putting all common stuff to every platform to common.rmk is a good way and the only way (in my opinion) to go forward.
OK, then there is an issue that it doesn't work if done naively.
What is the problem exactly?
Signature · 5 lines
Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."
Quoted 8 lines · Robert Millan
Quoted 7 lines · Pavel Roskin
Quoted 5 lines · Vesa Jääskeläinen
Quoted 4 lines
I tried moving more stuff to common.rmk many times but gave up every time. One of the reasons is that the sparc64 support is very out-of-date and doesn't use common.rmk at all. I cannot even test it (well, I haven't tries hard).
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
If sparc64 support is out of date and the maintainer is nowhere to be seen then I think you can put that support to graveyard until someone comes up to update it. Putting all common stuff to every platform to common.rmk is a good way and the only way (in my opinion) to go forward.
OK, then there is an issue that it doesn't work if done naively.
What is the problem exactly?
Take all text in conf/i386-pc.rmk from "For grub-emu" to "Scripts" and move it to the end of conf/common.rmk. Run autogen.sh, configure --enable-grub-emu and make. You'll get:
make: *** No rule to make target grub-emu', needed by all-local'. Stop.
Signature · 2 lines
Regards, Pavel Roskin
PATCH 1/1 Move cpuid.mod to conf/i386.rmk (Re: RFC: conf/i386.rmk)
Quoted 16 lines · Pavel Roskin
Quoted 15 lines · Robert Millan
Quoted 13 lines · Pavel Roskin
Quoted 9 lines · Vesa Jääskeläinen
Quoted 4 lines
I tried moving more stuff to common.rmk many times but gave up every time. One of the reasons is that the sparc64 support is very out-of-date and doesn't use common.rmk at all. I cannot even test it (well, I haven't tries hard).
If sparc64 support is out of date and the maintainer is nowhere to be seen then I think you can put that support to graveyard until someone comes up to update it. Putting all common stuff to every platform to common.rmk is a good way and the only way (in my opinion) to go forward.
OK, then there is an issue that it doesn't work if done naively.
Quoted 8 lines
Quoted 1 line
What is the problem exactly?
Take all text in conf/i386-pc.rmk from "For grub-emu" to "Scripts" and move it to the end of conf/common.rmk. Run
autogen.sh, configure --enable-grub-emu and make. You'll get:make: *** No rule to make target
grub-emu', needed byall-local'. Stop.
Okay then. Since it appears this kind of changes are delicate, I propose doing them granularly.
Here's my first patch, that moves cpuid.mod and sets the base for moving more stuff later (I've tested the resulting cpuid.mod is built correctly).
Signature · 5 lines
Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."
2008-09-05 Robert Millan <[email protected]>
* conf/i386.rmk: New file. Provides declaration for building `cpuid.mod'.
* conf/i386-pc.rmk (pkglib_MODULES): Remove `cpuid.mod'. (cpuid_mod_SOURCES, cpuid_mod_CFLAGS, cpuid_mod_LDFLAGS): Remove variables.
Include `conf/i386.mk'.
* conf/i386-efi.rmk: Likewise.
* conf/x86_64-efi.rmk: Likewise.
* conf/i386-coreboot.rmk: Likewise.
* conf/i386-ieee1275.rmk: Likewise.
i386.rmk +8 -0
@@ -0,0 +1,8 @@ +# -*- makefile -*- + +pkglib_MODULES += cpuid.mod + +# For cpuid.mod. +cpuid_mod_SOURCES = commands/i386/cpuid.c +cpuid_mod_CFLAGS = $(COMMON_CFLAGS) +cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS)
i386-pc.rmk +2 -6
@@ -163,7 +163,7 @@ pkglib_MODULES = biosdisk.mod _chain.mod _linux.mod linux.mod normal.mod \ _multiboot.mod chain.mod multiboot.mod reboot.mod halt.mod \ vbe.mod vbetest.mod vbeinfo.mod video.mod gfxterm.mod \ - videotest.mod play.mod bitmap.mod tga.mod cpuid.mod serial.mod \ + videotest.mod play.mod bitmap.mod tga.mod serial.mod \ ata.mod vga.mod memdisk.mod jpeg.mod png.mod pci.mod lspci.mod \ aout.mod _bsd.mod bsd.mod pxe.mod pxecmd.mod datetime.mod date.mod \ datehook.mod
@@ -278,11 +278,6 @@ tga_mod_CFLAGS = $(COMMON_CFLAGS) tga_mod_LDFLAGS = $(COMMON_LDFLAGS) -# For cpuid.mod. -cpuid_mod_SOURCES = commands/i386/cpuid.c -cpuid_mod_CFLAGS = $(COMMON_CFLAGS) -cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS) - # For ata.mod. ata_mod_SOURCES = disk/ata.c ata_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -358,4 +353,5 @@ datehook_mod_CFLAGS = $(COMMON_CFLAGS) datehook_mod_LDFLAGS = $(COMMON_LDFLAGS) +include $(srcdir)/conf/i386.mk include $(srcdir)/conf/common.mk
i386-efi.rmk +2 -6
@@ -76,7 +76,7 @@ # Modules. pkglib_MODULES = kernel.mod normal.mod _chain.mod chain.mod appleldr.mod \ - _linux.mod linux.mod cpuid.mod halt.mod reboot.mod pci.mod lspci.mod \ + _linux.mod linux.mod halt.mod reboot.mod pci.mod lspci.mod \ datetime.mod date.mod datehook.mod # For kernel.mod.
@@ -144,11 +144,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS) linux_mod_LDFLAGS = $(COMMON_LDFLAGS) -# For cpuid.mod. -cpuid_mod_SOURCES = commands/i386/cpuid.c -cpuid_mod_CFLAGS = $(COMMON_CFLAGS) -cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS) - # For halt.mod. halt_mod_SOURCES = commands/halt.c halt_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -184,4 +179,5 @@ datehook_mod_CFLAGS = $(COMMON_CFLAGS) datehook_mod_LDFLAGS = $(COMMON_LDFLAGS) +include $(srcdir)/conf/i386.mk include $(srcdir)/conf/common.mk
x86_64-efi.rmk +2 -6
@@ -78,7 +78,7 @@ # Modules. pkglib_MODULES = kernel.mod normal.mod _chain.mod chain.mod appleldr.mod \ - cpuid.mod halt.mod reboot.mod _linux.mod linux.mod pci.mod lspci.mod \ + halt.mod reboot.mod _linux.mod linux.mod pci.mod lspci.mod \ datetime.mod date.mod datehook.mod # For kernel.mod.
@@ -146,11 +146,6 @@ linux_mod_CFLAGS = $(COMMON_CFLAGS) linux_mod_LDFLAGS = $(COMMON_LDFLAGS) -# For cpuid.mod. -cpuid_mod_SOURCES = commands/i386/cpuid.c -cpuid_mod_CFLAGS = $(COMMON_CFLAGS) -cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS) - # For halt.mod. halt_mod_SOURCES = commands/halt.c halt_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -186,4 +181,5 @@ datehook_mod_CFLAGS = $(COMMON_CFLAGS) datehook_mod_LDFLAGS = $(COMMON_LDFLAGS) +include $(srcdir)/conf/i386.mk include $(srcdir)/conf/common.mk
i386-coreboot.rmk +2 -6
@@ -94,7 +94,7 @@ # Modules. pkglib_MODULES = _linux.mod linux.mod normal.mod \ _multiboot.mod multiboot.mod aout.mod \ - play.mod cpuid.mod serial.mod ata.mod \ + play.mod serial.mod ata.mod \ memdisk.mod pci.mod lspci.mod reboot.mod \ halt.mod datetime.mod date.mod datehook.mod
@@ -156,11 +156,6 @@ play_mod_CFLAGS = $(COMMON_CFLAGS) play_mod_LDFLAGS = $(COMMON_LDFLAGS) -# For cpuid.mod. -cpuid_mod_SOURCES = commands/i386/cpuid.c -cpuid_mod_CFLAGS = $(COMMON_CFLAGS) -cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS) - # For ata.mod. ata_mod_SOURCES = disk/ata.c ata_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -196,4 +191,5 @@ datehook_mod_CFLAGS = $(COMMON_CFLAGS) datehook_mod_LDFLAGS = $(COMMON_LDFLAGS) +include $(srcdir)/conf/i386.mk include $(srcdir)/conf/common.mk
i386-ieee1275.rmk +2 -6
@@ -96,7 +96,7 @@ grub_install_SOURCES = util/ieee1275/grub-install.in # Modules. -pkglib_MODULES = normal.mod halt.mod reboot.mod suspend.mod cpuid.mod \ +pkglib_MODULES = normal.mod halt.mod reboot.mod suspend.mod \ multiboot.mod _multiboot.mod aout.mod serial.mod linux.mod \ _linux.mod nand.mod memdisk.mod pci.mod lspci.mod datetime.mod \ date.mod datehook.mod
@@ -143,11 +143,6 @@ halt_mod_CFLAGS = $(COMMON_CFLAGS) halt_mod_LDFLAGS = $(COMMON_LDFLAGS) -# For cpuid.mod. -cpuid_mod_SOURCES = commands/i386/cpuid.c -cpuid_mod_CFLAGS = $(COMMON_CFLAGS) -cpuid_mod_LDFLAGS = $(COMMON_LDFLAGS) - # For serial.mod. serial_mod_SOURCES = term/i386/pc/serial.c serial_mod_CFLAGS = $(COMMON_CFLAGS)
@@ -198,4 +193,5 @@ datehook_mod_CFLAGS = $(COMMON_CFLAGS) datehook_mod_LDFLAGS = $(COMMON_LDFLAGS) +include $(srcdir)/conf/i386.mk include $(srcdir)/conf/common.mk
Re: [PATCH] Move cpuid.mod to conf/i386.rmk (Re: RFC: conf/i386.rmk)
Quoted 6 lines · Robert Millan
Okay then. Since it appears this kind of changes are delicate, I propose doing them granularly.
Here's my first patch, that moves cpuid.mod and sets the base for moving more stuff later (I've tested the resulting cpuid.mod is built correctly).
Committed. I'll use this base to move similar stuff, and try to make the i386-*.rmk files smaller this way.
Signature · 5 lines
Robert Millan The DRM opt-in fallacy: "Your data belongs to us. We will decide when (and how) you may access your data; but nobody's threatening your freedom: we still allow you to remove your data and not access it at all."
Quoted 8 lines · Robert Millan
Quoted 7 lines · Robert Millan
Hi,
I'm thinking that we have quite a bit of duplicate stuff in each of the 4 i386 ports (cpuid, pci, serial, etc) that could well live in a firmware-agnostic conf/i386.rmk file.
Quoted 5 lines
Quoted 2 lines
This would simplify things and make them easier to maintain. What do you think?
Btw, I think grub-emu could go there too. The only arch-specific thing in it AFAICS is cpuid.mod.
Right, seems fine to me.
--
Marco