diff options
| author | Michal Marek <mmarek@suse.cz> | 2012-02-25 02:53:30 +0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-02-25 02:53:34 +0400 |
| commit | f86d546bea349d5535738983544fdf16bcf5e6d8 (patch) | |
| tree | 36930907c9cd3e4a60610c43ff2a8bc1c8c6dd8c | |
| parent | 65b2576c9d3970e5c19aad5d2b56372ba56186a9 (diff) | |
| parent | 42f1c01b79d54a00012c553b95fc7fe266d82394 (diff) | |
| download | linux-f86d546bea349d5535738983544fdf16bcf5e6d8.tar.xz | |
Merge branch 'kbuild/rc-fixes' into kbuild/misc
Reason: Serialize changes to scripts/package/builddeb
| -rwxr-xr-x | scripts/depmod.sh | 6 | ||||
| -rw-r--r-- | scripts/package/builddeb | 12 |
2 files changed, 6 insertions, 12 deletions
diff --git a/scripts/depmod.sh b/scripts/depmod.sh index a27235685949..2ae481703141 100755 --- a/scripts/depmod.sh +++ b/scripts/depmod.sh @@ -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 diff --git a/scripts/package/builddeb b/scripts/package/builddeb index f6cbc3ddb68b..3c6c0b14c807 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -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 |