Commit 1e73fde5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild 

three kbuild fixes for 3.3:
 - make deb-pkg symlink race fix.
 - make coccicheck fix.
 - Dropping the check for modutils.  This is not a regression, but
   allows the module-init-tools replacement kmod work with the 3.3
   kernel.

* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
  coccicheck: change handling of C={1,2} when M= is set
  builddeb: Don't create files in /tmp with predictable names
  kbuild: do not check for ancient modutils tools
parents a32744d4 42f1c01b

scripts/coccicheck

+4 −9
Original line number Diff line number Diff line
@@ -9,15 +9,10 @@ if [ "$C" = "1" -o "$C" = "2" ]; then 
#    FLAGS="-ignore_unknown_options -very_quiet"

#    OPTIONS=$*



    if [ "$KBUILD_EXTMOD" = "" ] ; then

# Workaround for Coccinelle < 0.2.3

	FLAGS="-I $srctree/include -very_quiet"

	shift $(( $# - 1 ))

	OPTIONS=$1

    else

	echo M= is not currently supported when C=1 or C=2

	exit 1

    fi

else

    ONLINE=0

    FLAGS="-very_quiet"

scripts/depmod.sh

+0 −6
Original line number Diff line number Diff line
@@ -9,12 +9,6 @@ fi 
DEPMOD=$1

KERNELRELEASE=$2



if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then

	echo "Warning: you may need to install module-init-tools" >&2

	echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2

	sleep 1

fi



if ! test -r System.map -a -x "$DEPMOD"; then

	exit 0

fi

scripts/package/builddeb

+6 −6
Original line number Diff line number Diff line
@@ -238,14 +238,14 @@ EOF 
fi



# Build header package

(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$)

(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$)

(cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)

(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")

(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")

(cd $objtree; find .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")

destdir=$kernel_headers_dir/usr/src/linux-headers-$version

mkdir -p "$destdir"

(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)

(cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)

rm -f /tmp/files$$ /tmp/objfiles$$

(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)

(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)

rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"

arch=$(dpkg --print-architecture)



cat <<EOF >> debian/control

CRA Git | Maintained and supported by SUSTech CRA and CCSE