GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-29 10:01:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
This commit is contained in:
Linus Torvalds 2014-12-20 13:33:03 -08:00
commit 787140ad6b
3 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -96,3 +96,6 @@ x509.genkey
# Kconfig presets # Kconfig presets
all.config all.config
# Kdevelop4
*.kdev4

2
scripts/coccinelle/misc/bugon.cocci
View file

@ -8,7 +8,7 @@
// Confidence: High // Confidence: High
// Copyright: (C) 2014 Himangi Saraogi. GPLv2. // Copyright: (C) 2014 Himangi Saraogi. GPLv2.
// Comments: // Comments:
// Options: --no-includes, --include-headers // Options: --no-includes --include-headers
virtual patch virtual patch
virtual context virtual context

4
scripts/package/mkspec
View file

@ -117,6 +117,7 @@ echo 'mv vmlinux.bz2 $RPM_BUILD_ROOT'"/boot/vmlinux-$KERNELRELEASE.bz2"
echo 'mv vmlinux.orig vmlinux' echo 'mv vmlinux.orig vmlinux'
echo "%endif" echo "%endif"
if ! $PREBUILT; then
echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}" echo 'rm -f $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE/{build,source}"
echo "mkdir -p "'$RPM_BUILD_ROOT'"/usr/src/kernels/$KERNELRELEASE" 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\"" 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
echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE" echo 'cd $RPM_BUILD_ROOT'"/lib/modules/$KERNELRELEASE"
echo "ln -sf /usr/src/kernels/$KERNELRELEASE build" echo "ln -sf /usr/src/kernels/$KERNELRELEASE build"
echo "ln -sf /usr/src/kernels/$KERNELRELEASE source" echo "ln -sf /usr/src/kernels/$KERNELRELEASE source"
fi
echo "" echo ""
echo "%clean" echo "%clean"
@ -151,9 +153,11 @@ echo "%files headers"
echo '%defattr (-, root, root)' echo '%defattr (-, root, root)'
echo "/usr/include" echo "/usr/include"
echo "" echo ""
if ! $PREBUILT; then
echo "%files devel" echo "%files devel"
echo '%defattr (-, root, root)' echo '%defattr (-, root, root)'
echo "/usr/src/kernels/$KERNELRELEASE" echo "/usr/src/kernels/$KERNELRELEASE"
echo "/lib/modules/$KERNELRELEASE/build" echo "/lib/modules/$KERNELRELEASE/build"
echo "/lib/modules/$KERNELRELEASE/source" echo "/lib/modules/$KERNELRELEASE/source"
echo "" echo ""
fi