summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2018-07-03 23:36:08 -0400
committerPaul Gortmaker <paul.gortmaker@windriver.com>2018-07-03 23:36:08 -0400
commit2e226b95234698bed6d0f5406bae2ba153e1834a (patch)
treeae69abcfe2ebf0935effafb09b3cc2f5c9946a51
parent71d60a0005f82568136ecf6054a67e01cffcacac (diff)
downloadlongterm-queue-4.12-2e226b95234698bed6d0f5406bae2ba153e1834a.tar.gz
kbuild: context refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r--queue/kbuild-rpm-pkg-fix-jobserver-unavailable-warning.patch19
1 files changed, 10 insertions, 9 deletions
diff --git a/queue/kbuild-rpm-pkg-fix-jobserver-unavailable-warning.patch b/queue/kbuild-rpm-pkg-fix-jobserver-unavailable-warning.patch
index a41c159..8f642b6 100644
--- a/queue/kbuild-rpm-pkg-fix-jobserver-unavailable-warning.patch
+++ b/queue/kbuild-rpm-pkg-fix-jobserver-unavailable-warning.patch
@@ -1,4 +1,4 @@
-From 606625be47bc87b6fab0af10cd57aaa675cb9e42 Mon Sep 17 00:00:00 2001
+From 7f018cbd1b37f4234666bccf5ecf1824e2f48086 Mon Sep 17 00:00:00 2001
From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Sat, 30 Sep 2017 10:10:09 +0900
Subject: [PATCH] kbuild: rpm-pkg: fix jobserver unavailable warning
@@ -13,24 +13,25 @@ the following warning message is displayed.
Follow the suggestion.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
-index 73f9f3192b9f..b559671d28ca 100644
+index 7badec3498b8..95ee0b73b5f9 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
-@@ -50,7 +50,7 @@ rpm-pkg rpm: FORCE
- $(MAKE) clean
- $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
+@@ -51,7 +51,7 @@ rpm-pkg rpm: FORCE
$(call cmd,src_tar,$(KERNELPATH),kernel.spec)
+ $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
+ mv -f $(objtree)/.tmp_version $(objtree)/.version
- rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz
+ +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz
rm $(KERNELPATH).tar.gz kernel.spec
# binrpm-pkg
-@@ -58,7 +58,7 @@ rpm-pkg rpm: FORCE
- binrpm-pkg: FORCE
- $(MAKE) KBUILD_SRC=
- $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec
+@@ -62,7 +62,7 @@ binrpm-pkg: FORCE
+ $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
+ mv -f $(objtree)/.tmp_version $(objtree)/.version
+
- rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
+ +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
$(UTS_MACHINE) -bb $(objtree)/binkernel.spec