[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <5415D9F1.4080605@yandex.ru>
Date: Sun, 14 Sep 2014 22:09:53 +0400
From: Kirill Tkhai <tkhai@...dex.ru>
To: Peter Foley <pefoley2@...oley.com>
CC: Michal Marek <mmarek@...e.cz>, arnd@...db.de,
linux-kbuild@...r.kernel.org, gregkh@...uxfoundation.org,
LKML <linux-kernel@...r.kernel.org>, oleg@...hat.com,
grant.likely@...retlab.ca, ebiederm@...ssion.com,
Andrew Morton <akpm@...ux-foundation.org>,
ktkhai@...allels.com, Sam Ravnborg <sam@...nborg.org>
Subject: Re: [PATCH 1/3] kbuild: Make targets names tree-wide unique on x86
On 14.09.2014 19:57, Peter Foley wrote:
> On Sun, Sep 14, 2014 at 6:18 AM, Kirill Tkhai <tkhai@...dex.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-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists