Skip to content

Commit f40f657

Browse files
author
Da Xue
committed
packaging: debian: generate metapackages
1 parent f0a5efd commit f40f657

File tree

2 files changed

+35
-15
lines changed

2 files changed

+35
-15
lines changed

scripts/package/builddeb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,11 @@ install_libc_headers () {
184184

185185
rm -f debian/files
186186

187+
set -x
187188
packages_enabled=$(dh_listpackages)
189+
sourcename=${KDEB_SOURCENAME:-linux-upstream}
190+
metasuffix=${sourcename#linux-}
191+
set +x
188192

189193
for package in ${packages_enabled}
190194
do
@@ -207,10 +211,14 @@ do
207211
case ${package} in
208212
*-dbg)
209213
create_package ${package} debian/linux-image-dbg;;
214+
linux-image-$metasuffix)
215+
create_package ${package} debian/linux-images-meta;;
210216
linux-image-*|user-mode-linux-*)
211217
create_package ${package} debian/linux-image;;
212218
linux-libc-dev)
213219
create_package ${package} debian/linux-libc-dev;;
220+
linux-headers-$metasuffix)
221+
create_package ${package} debian/linux-headers-meta;;
214222
linux-headers-*)
215223
create_package ${package} debian/linux-headers;;
216224
esac

scripts/package/mkdebian

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,8 @@ gen_source ()
125125
rm -rf debian
126126
mkdir debian
127127

128+
set -x
129+
128130
email=${DEBEMAIL-$EMAIL}
129131

130132
# use email string directly if it contains <email>
@@ -153,6 +155,7 @@ else
153155
packageversion=$(${srctree}/scripts/setlocalversion --no-local ${srctree})-$($srctree/init/build-version)
154156
fi
155157
sourcename=${KDEB_SOURCENAME:-linux-upstream}
158+
metasuffix=${sourcename#linux-}
156159

157160
if [ "$ARCH" = "um" ] ; then
158161
packagename=user-mode-linux
@@ -218,33 +221,42 @@ Rules-Requires-Root: no
218221
Build-Depends: bc, debhelper, rsync, kmod, cpio, bison, flex $extra_build_depends
219222
Homepage: https://www.kernel.org/
220223
224+
Package: $packagename-$metasuffix
225+
Section: kernel
226+
Priority: optional
227+
Architecture: $debarch
228+
Provides: linux-image-generic, wireguard-modules
229+
Depends: $packagename-$version
230+
Description: Libre Computer Linux $metasuffix (meta-package)
231+
221232
Package: $packagename-$version
233+
Section: kernel
234+
Priority: optional
222235
Architecture: $debarch
223-
Description: Linux kernel, version $version
236+
Description: Libre Computer Linux $version for $debarch
224237
This package contains the Linux kernel, modules and corresponding other
225-
files, version: $version.
238+
files, version: $metasuffix $version.
226239
EOF
227240

228241
if [ "${SRCARCH}" != um ]; then
229-
cat <<EOF >> debian/control
230-
231-
Package: linux-libc-dev
232-
Section: devel
233-
Provides: linux-kernel-headers
234-
Architecture: $debarch
235-
Description: Linux support headers for userspace development
236-
This package provides userspaces headers from the Linux kernel. These headers
237-
are used by the installed headers for GNU glibc and other system libraries.
238-
Multi-Arch: same
239-
EOF
240242

241243
if is_enabled CONFIG_MODULES; then
242244
cat <<EOF >> debian/control
243245
246+
Package: linux-headers-$metasuffix
247+
Section: kernel
248+
Priority: optional
249+
Architecture: $debarch
250+
Provides: linux-headers-generic
251+
Depends: linux-headers-$version
252+
Description: Libre Computer Linux Headers $metasuffix (meta-package)
253+
244254
Package: linux-headers-$version
255+
Section: kernel
256+
Priority: optional
245257
Architecture: $debarch
246-
Description: Linux kernel headers for $version on $debarch
247-
This package provides kernel header files for $version on $debarch
258+
Description: Libre Computer Linux Headers $version for $debarch
259+
This package provides kernel header files for $metasuffix $version
248260
.
249261
This is useful for people who need to build external modules
250262
EOF

0 commit comments

Comments
 (0)