Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

Pull misc kbuild changes from Michal Marek: "There are only a few things in the misc branch: - Fix for bugon.cocci semantic patch - Kdevelop4 files are .gitignored - Put make binrpm-pkg on diet" * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: scripts/package: binrpm-pkg do not create source and devel package .gitignore: Add Kdevelop4 project files bugon.cocci: fix Options at the macro

Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull misc kbuild changes from Michal Marek: "There are only a few things in the misc branch: - Fix for bugon.cocci semantic patch - Kdevelop4 files are .gitignored - Put make binrpm-pkg on diet" * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: scripts/package: binrpm-pkg do not create source and devel package .gitignore: Add Kdevelop4 project files bugon.cocci: fix Options at the macro
Linus Torvalds
2 parents d08372ca28 b9a544240d
Showing 3 changed files Side-by-side Diff
.gitignore
scripts/coccinelle/misc/bugon.cocci
scripts/package/mkspec
@@ -96,4 +96,7 @@
  
 # Kconfig presets
 all.config
+
+# Kdevelop4
+*.kdev4
@@ -8,7 +8,7 @@
 // Confidence: High
 // Copyright: (C) 2014 Himangi Saraogi.  GPLv2.
 // Comments:
-// Options: --no-includes, --include-headers
+// Options: --no-includes --include-headers
  
 virtual patch
 virtual context
@@ -117,6 +117,7 @@
 echo 'mv vmlinux.orig vmlinux'
 echo "%endif"
  
+if ! $PREBUILT; then
 echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
 echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
 echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=*vmlinux* --exclude=*.o --exclude=*.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
@@ -124,6 +125,7 @@
 echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
 echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
+fi
  
 echo ""
 echo "%clean"
  
@@ -151,10 +153,12 @@
 echo '%defattr (-, root, root)'
 echo "/usr/include"
 echo ""
+if ! $PREBUILT; then
 echo "%files devel"
 echo '%defattr (-, root, root)'
 echo "/usr/src/kernels/$KERNELRELEASE"
 echo "/lib/modules/$KERNELRELEASE/build"
 echo "/lib/modules/$KERNELRELEASE/source"
 echo ""
+fi
...	...	@@ -96,4 +96,7 @@
96	96
97	97	# Kconfig presets
98	98	all.config
	99	+
	100	+# Kdevelop4
	101	+*.kdev4
...	...	@@ -8,7 +8,7 @@
8	8	// Confidence: High
9	9	// Copyright: (C) 2014 Himangi Saraogi. GPLv2.
10	10	// Comments:
11		-// Options: --no-includes, --include-headers
	11	+// Options: --no-includes --include-headers
12	12
13	13	virtual patch
14	14	virtual context
...	...	@@ -117,6 +117,7 @@
117	117	echo 'mv vmlinux.orig vmlinux'
118	118	echo "%endif"
119	119
	120	+if ! $PREBUILT; then
120	121	echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
121	122	echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE"
122	123	echo "EXCLUDES=\"$RCS_TAR_IGNORE --exclude .tmp_versions --exclude=vmlinux --exclude=.o --exclude=.ko --exclude=*.cmd --exclude=Documentation --exclude=firmware --exclude .config.old --exclude .missing-syscalls.d\""
...	...	@@ -124,6 +125,7 @@
124	125	echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
125	126	echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
126	127	echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
	128	+fi
127	129
128	130	echo ""
129	131	echo "%clean"
130	132
...	...	@@ -151,10 +153,12 @@
151	153	echo '%defattr (-, root, root)'
152	154	echo "/usr/include"
153	155	echo ""
	156	+if ! $PREBUILT; then
154	157	echo "%files devel"
155	158	echo '%defattr (-, root, root)'
156	159	echo "/usr/src/kernels/$KERNELRELEASE"
157	160	echo "/lib/modules/$KERNELRELEASE/build"
158	161	echo "/lib/modules/$KERNELRELEASE/source"
159	162	echo ""
	163	+fi