Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
kbuild: Fixup deb-pkg target to generate separate firmware deb
+22
-2
+22
-2
scripts/package/builddeb
+22
-2
scripts/package/builddeb
···
15
15
version=$KERNELRELEASE
16
16
revision=`cat .version`
17
17
tmpdir="$objtree/debian/tmp"
18
+
fwdir="$objtree/debian/fwtmp"
18
19
packagename=linux-$version
20
+
fwpackagename=linux-firmware-image
19
21
20
22
if [ "$ARCH" == "um" ] ; then
21
23
packagename=user-mode-linux-$version
22
24
fi
23
25
24
26
# Setup the directory structure
25
-
rm -rf "$tmpdir"
27
+
rm -rf "$tmpdir" "$fwdir"
26
28
mkdir -p "$tmpdir/DEBIAN" "$tmpdir/lib" "$tmpdir/boot"
29
+
mkdir -p "$fwdir/DEBIAN" "$fwdir/lib"
27
30
if [ "$ARCH" == "um" ] ; then
28
31
mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/share/doc/$packagename" "$tmpdir/usr/bin"
29
32
fi
···
110
107
111
108
Package: $packagename
112
109
Provides: kernel-image-$version, linux-image-$version
110
+
Suggests: $fwpackagename
113
111
Architecture: any
114
112
Description: Linux kernel, version $version
115
113
This package contains the Linux kernel, modules and corresponding other
···
122
118
chown -R root:root "$tmpdir"
123
119
chmod -R go-w "$tmpdir"
124
120
121
+
# Do we have firmware? Move it out of the way and build it into a package.
122
+
if [ -e "$tmpdir/lib/firmware" ]; then
123
+
mv "$tmpdir/lib/firmware" "$fwdir/lib/"
124
+
125
+
cat <<EOF >> debian/control
126
+
127
+
Package: $fwpackagename
128
+
Architecture: all
129
+
Description: Linux kernel firmware, version $version
130
+
This package contains firmware from the Linux kernel, version $version
131
+
EOF
132
+
133
+
dpkg-gencontrol -isp -p$fwpackagename -P"$fwdir"
134
+
dpkg --build "$fwdir" ..
135
+
fi
136
+
125
137
# Perform the final magic
126
-
dpkg-gencontrol -isp
138
+
dpkg-gencontrol -isp -p$packagename
127
139
dpkg --build "$tmpdir" ..
128
140
129
141
exit 0