Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f86d546b authored by Michal Marek's avatar Michal Marek
Browse files

Merge branch 'kbuild/rc-fixes' into kbuild/misc

Reason: Serialize changes to scripts/package/builddeb
parents 65b2576c 42f1c01b
Loading
Loading
Loading
Loading
+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
+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