diff mbox

[3.5.y.z,extended,stable] Patch "Makefile: Fix install error with make -j option" has been added to staging queue

Message ID 1373539908-27036-1-git-send-email-luis.henriques@canonical.com
State New
Headers show

Commit Message

Luis Henriques July 11, 2013, 10:51 a.m. UTC
This is a note to let you know that I have just added a patch titled

    Makefile: Fix install error with make -j option

to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.5.y.z tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

From d6867056f9c600be13e6122234c241d8f7992610 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@calxeda.com>
Date: Thu, 2 May 2013 14:50:37 +0200
Subject: [PATCH] Makefile: Fix install error with make -j option

commit d2aae8477cd00325bb7c7c7e95be488088900c48 upstream.

Make modules_install fails with -j option:

   DEPMOD
 Usage: .../.source/linux/scripts/depmod.sh /sbin/depmod <kernelrelease>
 make[1]: *** [_modinst_post] Error 1

Adding kernelrelease dependency to fix this.

Signed-off-by: Robert Richter <robert.richter@calxeda.com>
Signed-off-by: Michal Marek <mmarek@suse.cz>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--
1.8.1.2

Comments

Robert Richter July 11, 2013, 11:41 a.m. UTC | #1
On 11.07.13 06:51:48, Luis Henriques wrote:
> This is a note to let you know that I have just added a patch titled
> 
>     Makefile: Fix install error with make -j option

Please remove the patch, it has been reverted by Linus already.

Thanks,

-Robert

> 
> to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree 
> which can be found at:
> 
>  http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue
> 
> If you, or anyone else, feels it should not be added to this tree, please 
> reply to this email.
> 
> For more information about the 3.5.y.z tree, see
> https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
> 
> Thanks.
> -Luis
> 
> ------
> 
> From d6867056f9c600be13e6122234c241d8f7992610 Mon Sep 17 00:00:00 2001
> From: Robert Richter <robert.richter@calxeda.com>
> Date: Thu, 2 May 2013 14:50:37 +0200
> Subject: [PATCH] Makefile: Fix install error with make -j option
> 
> commit d2aae8477cd00325bb7c7c7e95be488088900c48 upstream.
> 
> Make modules_install fails with -j option:
> 
>    DEPMOD
>  Usage: .../.source/linux/scripts/depmod.sh /sbin/depmod <kernelrelease>
>  make[1]: *** [_modinst_post] Error 1
> 
> Adding kernelrelease dependency to fix this.
> 
> Signed-off-by: Robert Richter <robert.richter@calxeda.com>
> Signed-off-by: Michal Marek <mmarek@suse.cz>
> Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Makefile b/Makefile
> index 058db1d..2520627 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -961,7 +961,7 @@ _modinst_:
>  # boot a modules.dep even before / is mounted read-write.  However the
>  # boot script depmod is the master version.
>  PHONY += _modinst_post
> -_modinst_post: _modinst_
> +_modinst_post: include/config/kernel.release _modinst_
>  	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modinst
>  	$(call cmd,depmod)
> 
> --
> 1.8.1.2
>
Luis Henriques July 11, 2013, 11:47 a.m. UTC | #2
Robert Richter <robert.richter@calxeda.com> writes:

> On 11.07.13 06:51:48, Luis Henriques wrote:
>> This is a note to let you know that I have just added a patch titled
>> 
>>     Makefile: Fix install error with make -j option
>
> Please remove the patch, it has been reverted by Linus already.
>
> Thanks,
>
> -Robert
>

Ouch!  I missed that completely!  Commit

 6d128e1 Revert "Makefile: Fix install error with make -j option"

should have been tagged for stable as well.

Thanks for bringing this to my attention.  I've dropped that patch
from 3.5 kernel queue.

Cheers,
diff mbox

Patch

diff --git a/Makefile b/Makefile
index 058db1d..2520627 100644
--- a/Makefile
+++ b/Makefile
@@ -961,7 +961,7 @@  _modinst_:
 # boot a modules.dep even before / is mounted read-write.  However the
 # boot script depmod is the master version.
 PHONY += _modinst_post
-_modinst_post: _modinst_
+_modinst_post: include/config/kernel.release _modinst_
 	$(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modinst
 	$(call cmd,depmod)