Skip to contentSkip to conversation

Patch "tools/objtool/Makefile: don't assume sync-check.sh is executable" has been added to the 4.14-stable tree

PATCH [email protected] 3 participants 5 messages Jan 17, 2018 – Jan 18, 2018

Subsystems (2)
Stable branch objtool
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

tools/objtool/Makefile: don't assume sync-check.sh is executable

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001

From: Andrew Morton <[email protected]>
Date: Fri, 12 Jan 2018 16:53:17 -0800
Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable

From: Andrew Morton <[email protected]>

commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.

patch(1) loses the x bit. So if a user follows our patching instructions in Documentation/admin-guide/README.rst, their kernel will not compile.

Fixes 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
Reported-by Nicolas Bock <[email protected]>

Reported-by Joakim Tjernlund <[email protected]>

Cc Ingo Molnar <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Linus Torvalds <[email protected]>
Cc Holger Hoffstätte <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
---
 tools/objtool/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/Makefile +1 -1
@@ -46,7 +46,7 @@ $(OBJTOOL_IN): fixdep FORCE
 	@$(MAKE) $(build)=objtool
 
 $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
-	@./sync-check.sh
+	@$(CONFIG_SHELL) ./sync-check.sh
 	$(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch

#1 lore raw
Quoted 31 lines · On Wed, 17 Jan 2018 11:02:12 +0100 <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

tools/objtool/Makefile: don't assume sync-check.sh is executable

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001

From: Andrew Morton <[email protected]>
Date: Fri, 12 Jan 2018 16:53:17 -0800
Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable

From: Andrew Morton <[email protected]>

commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.

patch(1) loses the x bit. So if a user follows our patching instructions in Documentation/admin-guide/README.rst, their kernel will not compile.

Fixes 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
Reported-by Nicolas Bock <[email protected]>
Quoted 7 lines

Reported-by Joakim Tjernlund <[email protected]>

Cc Ingo Molnar <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Linus Torvalds <[email protected]>
Cc Holger Hoffst�tte <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>

I'm curious. 3bd51c5a371de wasn't marked for any -stable so why is its fix being merged?

Quoted 13 lines
---
 tools/objtool/Makefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/objtool/Makefile +1 -1
@@ -46,7 +46,7 @@ $(OBJTOOL_IN): fixdep FORCE
 	@$(MAKE) $(build)=objtool
 
 $(OBJTOOL): $(LIBSUBCMD) $(OBJTOOL_IN)
-	@./sync-check.sh
+	@$(CONFIG_SHELL) ./sync-check.sh
 	$(QUIET_LINK)$(CC) $(OBJTOOL_IN) $(LDFLAGS) -o $@
#2 lore raw
Quoted 41 lines · Andrew Morton
Quoted 31 lines · On Wed, 17 Jan 2018 11:02:12 +0100 <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

tools/objtool/Makefile: don't assume sync-check.sh is executable

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001

From: Andrew Morton <[email protected]>
Date: Fri, 12 Jan 2018 16:53:17 -0800
Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable

From: Andrew Morton <[email protected]>

commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.

patch(1) loses the x bit. So if a user follows our patching instructions in Documentation/admin-guide/README.rst, their kernel will not compile.

Fixes 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
Reported-by Nicolas Bock <[email protected]>
Quoted 7 lines

Reported-by Joakim Tjernlund <[email protected]>

Cc Ingo Molnar <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Linus Torvalds <[email protected]>
Cc Holger Hoffstätte <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 2 lines

I'm curious. 3bd51c5a371de wasn't marked for any -stable so why is its fix being merged?

Because some people/distributions/tools download a kernel-4.14 base image and apply a patchset to create the final version (less to download). Using patch to assemble the final version loses the x bit and voila:
build error. This patch removes the need for the executable bit, and everyone is happy again.

-h

#3 lore raw
Quoted 42 lines · Holger Hoffstätte
Quoted 41 lines · Andrew Morton
Quoted 38 lines · On Wed, 17 Jan 2018 11:02:12 +0100 <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

tools/objtool/Makefile: don't assume sync-check.sh is executable

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001

From: Andrew Morton <[email protected]>
Date: Fri, 12 Jan 2018 16:53:17 -0800
Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable

From: Andrew Morton <[email protected]>

commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.

patch(1) loses the x bit. So if a user follows our patching instructions in Documentation/admin-guide/README.rst, their kernel will not compile.

Fixes 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
Reported-by Nicolas Bock <[email protected]>

Reported-by Joakim Tjernlund <[email protected]>

Cc Ingo Molnar <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Linus Torvalds <[email protected]>
Cc Holger Hoffstätte <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 8 lines
Quoted 2 lines

I'm curious. 3bd51c5a371de wasn't marked for any -stable so why is its fix being merged?

Because some people/distributions/tools download a kernel-4.14 base image and apply a patchset to create the final version (less to download). Using patch to assemble the final version loses the x bit and voila:
build error. This patch removes the need for the executable bit, and everyone is happy again.

Argh..I just realized that I explained the wrong question, sorry. I guess the move was done simply so that any (inevitable) future patches apply more easily.

-h

author maintainer
#4 lore raw
In reply to Andrew Morton
Quoted 41 lines · Andrew Morton
Quoted 31 lines · On Wed, 17 Jan 2018 11:02:12 +0100 <[email protected]> wrote:

This is a note to let you know that I've just added the patch titled

tools/objtool/Makefile: don't assume sync-check.sh is executable

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
tools-objtool-makefile-don-t-assume-sync-check.sh-is-executable.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 Mon Sep 17 00:00:00 2001

From: Andrew Morton <[email protected]>
Date: Fri, 12 Jan 2018 16:53:17 -0800
Subject: tools/objtool/Makefile: don't assume sync-check.sh is executable

From: Andrew Morton <[email protected]>

commit 0f908ccbeca99ddf0ad60afa710e72aded4a5ea7 upstream.

patch(1) loses the x bit. So if a user follows our patching instructions in Documentation/admin-guide/README.rst, their kernel will not compile.

Fixes 3bd51c5a371de ("objtool: Move kernel headers/code sync check to a script")
Reported-by Nicolas Bock <[email protected]>
Quoted 7 lines

Reported-by Joakim Tjernlund <[email protected]>

Cc Ingo Molnar <[email protected]>
Cc Josh Poimboeuf <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
Signed-off-by Linus Torvalds <[email protected]>
Cc Holger Hoffst�tte <[email protected]>
Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 2 lines

I'm curious. 3bd51c5a371de wasn't marked for any -stable so why is its fix being merged?

Because that commit is in the 4.14.10 release as part of the whole PTI mess. Distros like Gentoo that package the kernel as a patch on top of a clean tree break when trying to build the kernel without this commit.

thanks,

greg k-h