| Message ID | 20140914101821.3745.21235.stgit@localhost (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Sep 14, 2014 at 6:18 AM, Kirill Tkhai <tkhai@yandex.ru> wrote: > diff --git a/init/Makefile b/init/Makefile > index 7bc47ee..566a9ff 100644 > --- a/init/Makefile > +++ b/init/Makefile > @@ -2,23 +2,28 @@ > # Makefile for the linux kernel. > # > > -obj-y := main.o version.o mounts.o > +obj-y := main.o version.o do_mounts.o > + > ifneq ($(CONFIG_BLK_DEV_INITRD),y) > obj-y += noinitramfs.o > else > -obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o > +obj-y += initramfs.o do_mounts_initrd.o > +endif > + > +ifeq ($(CONFIG_BLK_DEV_RAM),y) > +obj-y += do_mounts_rd.o > endif > + > +ifeq ($(CONFIG_BLK_DEV_MD),y) > +obj-y += do_mounts_md.o > +endif > + > obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o > > ifneq ($(CONFIG_ARCH_INIT_TASK),y) > obj-y += init_task.o > endif > > -mounts-y := do_mounts.o > -mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o > -mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o > -mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o > - Can't you keep the obj-$(CONFIG_*) syntax? e.g. obj-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 14.09.2014 19:57, Peter Foley wrote: > On Sun, Sep 14, 2014 at 6:18 AM, Kirill Tkhai <tkhai@yandex.ru> wrote: >> diff --git a/init/Makefile b/init/Makefile >> index 7bc47ee..566a9ff 100644 >> --- a/init/Makefile >> +++ b/init/Makefile >> @@ -2,23 +2,28 @@ >> # Makefile for the linux kernel. >> # >> >> -obj-y := main.o version.o mounts.o >> +obj-y := main.o version.o do_mounts.o >> + >> ifneq ($(CONFIG_BLK_DEV_INITRD),y) >> obj-y += noinitramfs.o >> else >> -obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o >> +obj-y += initramfs.o do_mounts_initrd.o >> +endif >> + >> +ifeq ($(CONFIG_BLK_DEV_RAM),y) >> +obj-y += do_mounts_rd.o >> endif >> + >> +ifeq ($(CONFIG_BLK_DEV_MD),y) >> +obj-y += do_mounts_md.o >> +endif >> + >> obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o >> >> ifneq ($(CONFIG_ARCH_INIT_TASK),y) >> obj-y += init_task.o >> endif >> >> -mounts-y := do_mounts.o >> -mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o >> -mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o >> -mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o >> - > > Can't you keep the obj-$(CONFIG_*) syntax? > e.g. > obj-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o > They are need only in CONFIG_XXX=y case. They contain stubs which are not compiled in case of =m. Look at rd_load_image() for example. So, here I prevent compilation errors, and make them uncompilable in =m case like it used to be before. Kirill -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile index c1a9635..c425735 100644 --- a/drivers/acpi/acpica/Makefile +++ b/drivers/acpi/acpica/Makefile @@ -5,10 +5,10 @@ ccflags-y := -Os -DBUILDING_ACPICA ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT -# use acpi.o to put all files here into acpi.o modparam namespace -obj-y += acpi.o +# use acpica.o to put all files here into acpica.o modparam namespace +obj-y += acpica.o -acpi-y := \ +acpica-y := \ dsargs.o \ dscontrol.o \ dsfield.o \ @@ -24,7 +24,7 @@ acpi-y := \ dswscope.o \ dswstate.o -acpi-y += \ +acpica-y += \ evevent.o \ evgpe.o \ evgpeblk.o \ @@ -41,7 +41,7 @@ acpi-y += \ evxfgpe.o \ evxfregn.o -acpi-y += \ +acpica-y += \ exconfig.o \ exconvrt.o \ excreate.o \ @@ -67,7 +67,7 @@ acpi-y += \ exsystem.o \ exutils.o -acpi-y += \ +acpica-y += \ hwacpi.o \ hwesleep.o \ hwgpe.o \ @@ -78,9 +78,9 @@ acpi-y += \ hwxface.o \ hwxfsleep.o -acpi-$(ACPI_FUTURE_USAGE) += hwtimer.o +acpica-$(ACPI_FUTURE_USAGE) += hwtimer.o -acpi-y += \ +acpica-y += \ nsaccess.o \ nsalloc.o \ nsarguments.o \ @@ -103,9 +103,9 @@ acpi-y += \ nsxfname.o \ nsxfobj.o -acpi-$(ACPI_FUTURE_USAGE) += nsdumpdv.o +acpica-$(ACPI_FUTURE_USAGE) += nsdumpdv.o -acpi-y += \ +acpica-y += \ psargs.o \ psloop.o \ psobject.o \ @@ -118,7 +118,7 @@ acpi-y += \ pswalk.o \ psxface.o -acpi-y += \ +acpica-y += \ rsaddr.o \ rscalc.o \ rscreate.o \ @@ -134,7 +134,7 @@ acpi-y += \ rsutils.o \ rsxface.o -acpi-y += \ +acpica-y += \ tbdata.o \ tbfadt.o \ tbfind.o \ @@ -145,7 +145,7 @@ acpi-y += \ tbxfload.o \ tbxfroot.o -acpi-y += \ +acpica-y += \ utaddress.o \ utalloc.o \ utbuffer.o \ @@ -176,7 +176,7 @@ acpi-y += \ utxferror.o \ utxfmutex.o -acpi-$(ACPI_FUTURE_USAGE) += \ +acpica-$(ACPI_FUTURE_USAGE) += \ utcache.o \ utfileio.o \ utprint.o \ diff --git a/drivers/pnp/pnpacpi/Makefile b/drivers/pnp/pnpacpi/Makefile index 40c93da..2a7ae46 100644 --- a/drivers/pnp/pnpacpi/Makefile +++ b/drivers/pnp/pnpacpi/Makefile @@ -1,6 +1,6 @@ # # Makefile for the kernel PNPACPI driver. # -obj-y += pnp.o +obj-y += pnpacpi.o -pnp-y := core.o rsparser.o +pnpacpi-y := core.o rsparser.o diff --git a/init/Makefile b/init/Makefile index 7bc47ee..566a9ff 100644 --- a/init/Makefile +++ b/init/Makefile @@ -2,23 +2,28 @@ # Makefile for the linux kernel. # -obj-y := main.o version.o mounts.o +obj-y := main.o version.o do_mounts.o + ifneq ($(CONFIG_BLK_DEV_INITRD),y) obj-y += noinitramfs.o else -obj-$(CONFIG_BLK_DEV_INITRD) += initramfs.o +obj-y += initramfs.o do_mounts_initrd.o +endif + +ifeq ($(CONFIG_BLK_DEV_RAM),y) +obj-y += do_mounts_rd.o endif + +ifeq ($(CONFIG_BLK_DEV_MD),y) +obj-y += do_mounts_md.o +endif + obj-$(CONFIG_GENERIC_CALIBRATE_DELAY) += calibrate.o ifneq ($(CONFIG_ARCH_INIT_TASK),y) obj-y += init_task.o endif -mounts-y := do_mounts.o -mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o -mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o -mounts-$(CONFIG_BLK_DEV_MD) += do_mounts_md.o - # dependencies on generated files need to be listed explicitly $(obj)/version.o: include/generated/compile.h
These are the duplicate targets names found on x86 allyesconfig. Change "acpi" on "acpica" in drivers/acpi/acpica/Makefile. Change "pnp" on "pnpacpi" in drivers/pnp/pnpacpi/Makefile. Also remove "mounts" target from init/Makefile. It's artificial driver name, let's do not litter namespace. Signed-off-by: Kirill Tkhai <ktkhai@parallels.com> --- drivers/acpi/acpica/Makefile | 28 ++++++++++++++-------------- drivers/pnp/pnpacpi/Makefile | 4 ++-- init/Makefile | 19 ++++++++++++------- 3 files changed, 28 insertions(+), 23 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html