Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Kubecek <mkubecek@suse.cz>2018-11-05 18:28:38 +0100
committerMichal Kubecek <mkubecek@suse.cz>2018-11-05 18:28:38 +0100
commit78325a61894e2472a978db3d34cce4c798facd12 (patch)
treea12f7a411ccc574114db4b3cf46abce240d6c7d9
parentc3bd57dd5b6132377d9efe57fee5653f1b5f5dac (diff)
scripts/mkmakefile: honor second argument.
-rw-r--r--patches.rpmify/scripts-mkmakefile-honor-second-argument.patch27
-rw-r--r--series.conf1
2 files changed, 28 insertions, 0 deletions
diff --git a/patches.rpmify/scripts-mkmakefile-honor-second-argument.patch b/patches.rpmify/scripts-mkmakefile-honor-second-argument.patch
new file mode 100644
index 0000000000..5b0802458b
--- /dev/null
+++ b/patches.rpmify/scripts-mkmakefile-honor-second-argument.patch
@@ -0,0 +1,27 @@
+From: Michal Kubecek <mkubecek@suse.cz>
+Date: Mon, 5 Nov 2018 13:43:02 +0100
+Subject: scripts/mkmakefile: honor second argument
+Patch-mainline: Never, SUSE specific
+References: none
+
+Commit 4fd61277f662 ("kbuild: do not pass $(objtree) to
+scripts/mkmakefile") assumes mkmakefile is always used to generate a
+makefile in current directory. This is not true when generating makefile
+for our kernel-*-devel package.
+
+Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
+---
+ scripts/mkmakefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/scripts/mkmakefile
++++ b/scripts/mkmakefile
+@@ -17,7 +17,7 @@ if [ "${quiet}" != "silent_" ]; then
+ echo " GEN Makefile"
+ fi
+
+-cat << EOF > Makefile
++cat << EOF > "${2:-.}/Makefile"
+ # Automatically generated by $0: don't edit
+
+ ifeq ("\$(origin V)", "command line")
diff --git a/series.conf b/series.conf
index 30212ec442..cf24863df9 100644
--- a/series.conf
+++ b/series.conf
@@ -37,6 +37,7 @@
patches.rpmify/Add-ksym-provides-tool.patch
patches.rpmify/Revert-kconfig-only-write-CONFIG_FOO-is-not-set-for-.patch
patches.rpmify/powerpc-boot-Fix-missing-crc32poly.h-when-building-w.patch
+ patches.rpmify/scripts-mkmakefile-honor-second-argument.patch
########################################################
# kABI consistency patches