diff options
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | scripts/coccinelle/misc/bugon.cocci | 2 | ||||
-rwxr-xr-x | scripts/package/mkspec | 4 |
3 files changed, 8 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index e213b27f3921..ce57b79670a5 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -96,3 +96,6 @@ x509.genkey | |||
96 | 96 | ||
97 | # Kconfig presets | 97 | # Kconfig presets |
98 | all.config | 98 | all.config |
99 | |||
100 | # Kdevelop4 | ||
101 | *.kdev4 | ||
diff --git a/scripts/coccinelle/misc/bugon.cocci b/scripts/coccinelle/misc/bugon.cocci index 556456ca761c..3b7eec24fb5a 100644 --- a/scripts/coccinelle/misc/bugon.cocci +++ b/scripts/coccinelle/misc/bugon.cocci | |||
@@ -8,7 +8,7 @@ | |||
8 | // Confidence: High | 8 | // Confidence: High |
9 | // Copyright: (C) 2014 Himangi Saraogi. GPLv2. | 9 | // Copyright: (C) 2014 Himangi Saraogi. GPLv2. |
10 | // Comments: | 10 | // Comments: |
11 | // Options: --no-includes, --include-headers | 11 | // Options: --no-includes --include-headers |
12 | 12 | ||
13 | virtual patch | 13 | virtual patch |
14 | virtual context | 14 | virtual context |
diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 13957602f7ca..d9ab94b17de0 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec | |||
@@ -117,6 +117,7 @@ echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2" | |||
117 | echo 'mv vmlinux.orig vmlinux' | 117 | echo 'mv vmlinux.orig vmlinux' |
118 | echo "%endif" | 118 | echo "%endif" |
119 | 119 | ||
120 | if ! $PREBUILT; then | ||
120 | echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}" | 121 | echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}" |
121 | echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE" | 122 | echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE" |
122 | 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\"" | 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 @@ echo "tar "'$EXCLUDES'" -cf- . | (cd "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNEL | |||
124 | echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE" | 125 | echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE" |
125 | echo "ln -sf /usr/src/kernels/$KERNELRELEASE build" | 126 | echo "ln -sf /usr/src/kernels/$KERNELRELEASE build" |
126 | echo "ln -sf /usr/src/kernels/$KERNELRELEASE source" | 127 | echo "ln -sf /usr/src/kernels/$KERNELRELEASE source" |
128 | fi | ||
127 | 129 | ||
128 | echo "" | 130 | echo "" |
129 | echo "%clean" | 131 | echo "%clean" |
@@ -151,9 +153,11 @@ echo "%files headers" | |||
151 | echo '%defattr (-, root, root)' | 153 | echo '%defattr (-, root, root)' |
152 | echo "/usr/include" | 154 | echo "/usr/include" |
153 | echo "" | 155 | echo "" |
156 | if ! $PREBUILT; then | ||
154 | echo "%files devel" | 157 | echo "%files devel" |
155 | echo '%defattr (-, root, root)' | 158 | echo '%defattr (-, root, root)' |
156 | echo "/usr/src/kernels/$KERNELRELEASE" | 159 | echo "/usr/src/kernels/$KERNELRELEASE" |
157 | echo "/lib/modules/$KERNELRELEASE/build" | 160 | echo "/lib/modules/$KERNELRELEASE/build" |
158 | echo "/lib/modules/$KERNELRELEASE/source" | 161 | echo "/lib/modules/$KERNELRELEASE/source" |
159 | echo "" | 162 | echo "" |
163 | fi | ||