Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+10
-21
+4
-9
scripts/coccicheck
+4
-9
scripts/coccicheck
···
9
9
# FLAGS="-ignore_unknown_options -very_quiet"
10
10
# OPTIONS=$*
11
11
12
-
if [ "$KBUILD_EXTMOD" = "" ] ; then
13
-
# Workaround for Coccinelle < 0.2.3
14
-
FLAGS="-I $srctree/include -very_quiet"
15
-
shift $(( $# - 1 ))
16
-
OPTIONS=$1
17
-
else
18
-
echo M= is not currently supported when C=1 or C=2
19
-
exit 1
20
-
fi
12
+
# Workaround for Coccinelle < 0.2.3
13
+
FLAGS="-I $srctree/include -very_quiet"
14
+
shift $(( $# - 1 ))
15
+
OPTIONS=$1
21
16
else
22
17
ONLINE=0
23
18
FLAGS="-very_quiet"
-6
scripts/depmod.sh
-6
scripts/depmod.sh
···
9
9
DEPMOD=$1
10
10
KERNELRELEASE=$2
11
11
12
-
if ! "$DEPMOD" -V 2>/dev/null | grep -q module-init-tools; then
13
-
echo "Warning: you may need to install module-init-tools" >&2
14
-
echo "See http://www.codemonkey.org.uk/docs/post-halloween-2.6.txt" >&2
15
-
sleep 1
16
-
fi
17
-
18
12
if ! test -r System.map -a -x "$DEPMOD"; then
19
13
exit 0
20
14
fi
+6
-6
scripts/package/builddeb
+6
-6
scripts/package/builddeb
···
238
238
fi
239
239
240
240
# Build header package
241
-
(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$)
242
-
(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$)
243
-
(cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)
241
+
(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > "$objtree/debian/hdrsrcfiles")
242
+
(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> "$objtree/debian/hdrsrcfiles")
243
+
(cd $objtree; find .config Module.symvers include scripts -type f >> "$objtree/debian/hdrobjfiles")
244
244
destdir=$kernel_headers_dir/usr/src/linux-headers-$version
245
245
mkdir -p "$destdir"
246
-
(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)
247
-
(cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)
248
-
rm -f /tmp/files$$ /tmp/objfiles$$
246
+
(cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
247
+
(cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
248
+
rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
249
249
arch=$(dpkg --print-architecture)
250
250
251
251
cat <<EOF >> debian/control