kgess-mirror/debian-linux
1
0
Fork 0
mirror of https://salsa.debian.org/kernel-team/linux.git synced 2026-01-11 20:07:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'split-image-di' into 'debian/latest'

Browse source 
Split modules out of kernel-image udeb

See merge request kernel-team/linux!1747
This commit is contained in:
Bastian Blank 2025-12-15 15:03:32 +00:00
commit b17d3624d1
40 changed files with 140 additions and 164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
debian/bin/gencontrol.py vendored
View file

@ -357,6 +357,12 @@ linux-signed-{vars['arch']} (@signedtemplate_sourceversion@) {dist}; urgency={ur
packages_own = []
build_installer = (
config.name_featureset == 'none'
and not self.disable_installer
and config.packages.installer
)
if not self.disable_signed:
build_signed = config.build.enable_signed
else:
@ -455,6 +461,11 @@ linux-signed-{vars['arch']} (@signedtemplate_sourceversion@) {dist}; urgency={ur
self.bundle.add('image-extra-dev', ruleid, makeflags, vars, arch=arch)
)
if build_installer:
packages_own.extend(
bundle_signed.add('image-di', ruleid, makeflags, vars, arch=arch)
)
# In a quick build, only build the test flavour.
if config.defs_flavour.is_test:
for package in packages_own:
@ -498,10 +509,11 @@ linux-signed-{vars['arch']} (@signedtemplate_sourceversion@) {dist}; urgency={ur
["$(MAKE) -f debian/rules.real %s %s" %
(merged_config, makeflags)])
# The test flavour is known to not work at all with kernel-wedge. Also
# we misshandle pkg.linux.quick for it.
if (
config.name_featureset == 'none'
and not self.disable_installer
and config.packages.installer
build_installer
and not config.defs_flavour.is_test
):
with tempfile.TemporaryDirectory(prefix='linux-gencontrol') as config_dir:
base_path = pathlib.Path('debian/installer').absolute()
@ -540,39 +552,12 @@ linux-signed-{vars['arch']} (@signedtemplate_sourceversion@) {dist}; urgency={ur
for package_base in udeb_packages_base
]
makeflags_local = makeflags.copy()
makeflags_local['IMAGE_PACKAGE_NAME'] = udeb_packages[0].name
bundle_signed.add_packages(
self.bundle.add_packages(
udeb_packages,
(config.name_debianarch, config.name_featureset, config.name_flavour),
makeflags_local, arch=arch,
makeflags, arch=arch,
)
if build_signed:
# XXX This is a hack to exclude the udebs from
# the package list while still being able to
# convince debhelper and kernel-wedge to go
# part way to building them.
udeb_packages = [
dataclasses.replace(
package_base,
# kernel-wedge currently chokes on Build-Profiles so add it now
build_profiles=PackageBuildprofile.parse(
'<pkg.linux.udeb-unsigned-test-build !noudeb'
' !pkg.linux.nokernel !pkg.linux.quick>',
),
meta_rules_target='installer-test',
)
for package_base in udeb_packages_base
]
self.bundle.add_packages(
udeb_packages,
(config.name_debianarch, config.name_featureset, config.name_flavour),
makeflags_local, arch=arch, check_packages=False,
)
def process_changelog(self) -> None:
version = self.version = self.changelog[0].version

1
debian/changelog vendored
View file

@ -31,6 +31,7 @@ linux (6.18.1-1~exp1) UNRELEASED; urgency=medium
* Install vdso files if available.
* Move dtb into modules directory.
* Convert doc to symlink in linux-libc-dev-*-cross.
* Split modules out of kernel-image udeb.
[ Salvatore Bonaccorso ]
* [amd64] drivers/accel/amdxdna: Enable DRM_ACCEL_AMDXDNA as module

2
debian/config/amd64/defines.toml vendored
View file

@ -31,6 +31,8 @@ name = 'test'
config = ['config.test', 'amd64/config.test']
[flavour.defs]
is_test = true
[flavour.packages]
installer = true
[[featureset]]
name = 'none'

2
debian/config/arm64/defines.toml vendored
View file

@ -36,6 +36,8 @@ name = 'test'
config = ['config.test', 'arm64/config.test']
[flavour.defs]
is_test = true
[flavour.packages]
installer = true
[[featureset]]
name = 'none'

3
debian/installer/modules/alpha-generic/base-modules vendored Normal file
View file

@ -0,0 +1,3 @@
#include <base-modules>
srm_env

3
debian/installer/modules/alpha-generic/kernel-image vendored
View file

@ -1,3 +0,0 @@
#include <kernel-image>
srm_env

2
debian/installer/modules/amd64/kernel-image → debian/installer/modules/amd64/base-modules vendored
View file

@ -1,4 +1,4 @@
#include <kernel-image>
#include <base-modules>
# ACPI drivers
fan

2
debian/installer/modules/arm64/kernel-image → debian/installer/modules/arm64/base-modules vendored
View file

@ -1,4 +1,4 @@
#include <kernel-image>
#include <base-modules>
# Multifunction devices
drivers/mfd/**

2
debian/installer/modules/armhf-armmp/kernel-image → debian/installer/modules/armhf-armmp/base-modules vendored
View file

@ -1,4 +1,4 @@
#include <kernel-image>
#include <base-modules>
# GPIO
gpio-da9052 ?

0
debian/installer/modules/kernel-image → debian/installer/modules/base-modules vendored
View file

1
debian/installer/modules/hppa-parisc64/base-modules vendored Normal file
View file

@ -0,0 +1 @@
#include <base-modules>

1
debian/installer/modules/hppa-parisc64/kernel-image vendored
View file

@ -1 +0,0 @@
#include "../hppa/kernel-image"

1
debian/installer/modules/hppa/base-modules vendored Normal file
View file

@ -0,0 +1 @@
#include <base-modules>

1
debian/installer/modules/hppa/kernel-image vendored
View file

@ -1 +0,0 @@
#include <kernel-image>

1
debian/installer/modules/loong64/base-modules vendored Normal file
View file

@ -0,0 +1 @@
#include <base-modules>

1
debian/installer/modules/loong64/kernel-image vendored
View file

@ -1 +0,0 @@
#include <kernel-image>

1
debian/installer/modules/m68k/base-modules vendored Normal file
View file

@ -0,0 +1 @@
#include <base-modules>

1
debian/installer/modules/m68k/kernel-image vendored
View file

@ -1 +0,0 @@
#include <kernel-image>

1
debian/installer/modules/mips/base-modules vendored Normal file
View file

@ -0,0 +1 @@
#include <base-modules>

1
debian/installer/modules/mips/kernel-image vendored
View file

@ -1 +0,0 @@
#include <kernel-image>

2
debian/installer/modules/powerpc-powerpc64/kernel-image → debian/installer/modules/powerpc-powerpc64/base-modules vendored
View file

@ -1,4 +1,4 @@
#include "../powerpc/kernel-image"
#include <base-modules>
# PowerMac fan control support
i2c-powermac ?

2
debian/installer/modules/powerpc/base-modules vendored Normal file
View file

@ -0,0 +1,2 @@
#include <base-modules>
bestcomm-core ?

2
debian/installer/modules/powerpc/kernel-image vendored
View file

@ -1,2 +0,0 @@
#include <kernel-image>
bestcomm-core ?

1
debian/installer/modules/ppc64el/base-modules vendored Normal file
View file

@ -0,0 +1 @@
#include <base-modules>

1
debian/installer/modules/ppc64el/kernel-image vendored
View file

@ -1 +0,0 @@
#include "../ppc64/kernel-image"

2
debian/installer/modules/riscv64/kernel-image → debian/installer/modules/riscv64/base-modules vendored
View file

@ -1,4 +1,4 @@
#include <kernel-image>
#include <base-modules>
# Multifunction devices
drivers/mfd/**

2
debian/installer/modules/s390x/base-modules vendored Normal file
View file

@ -0,0 +1,2 @@
#include <base-modules>
vmcp ?

2
debian/installer/modules/s390x/kernel-image vendored
View file

@ -1,2 +0,0 @@
#include <kernel-image>
vmcp ?

1
debian/installer/modules/sh4-sh7751r/base-modules vendored Normal file
View file

@ -0,0 +1 @@
#include <base-modules>

1
debian/installer/modules/sh4-sh7751r/kernel-image vendored
View file

@ -1 +0,0 @@
#include <kernel-image>

1
debian/installer/modules/sh4-sh7785lcr/base-modules vendored Normal file
View file

@ -0,0 +1 @@
#include <base-modules>

1
debian/installer/modules/sh4-sh7785lcr/kernel-image vendored
View file

@ -1 +0,0 @@
#include <kernel-image>

1
debian/installer/modules/sparc64/base-modules vendored Normal file
View file

@ -0,0 +1 @@
#include <base-modules>

1
debian/installer/modules/sparc64/kernel-image vendored
View file

@ -1 +0,0 @@
#include <kernel-image>

117
debian/installer/package-list vendored
View file

@ -2,7 +2,8 @@
# "-di" are appended to the package names. Section can be left out. So can
# architecture, which is derived from the files in the modules directory.
#
Package: kernel-image
Package: base-modules
Depends: kernel-image
Provides_amd64: efi-modules
Provides_arm64: drm-core-modules, mmc-core-modules, mtd-core-modules, efi-modules
Provides_armmp: mmc-core-modules, mtd-core-modules, efi-modules
@ -20,13 +21,11 @@ Provides_powerpc64:
Provides_riscv64: mtd-core-modules, efi-modules
Provides_sh4: fb-modules, input-modules, nic-shared-modules, uinput-modules, usb-modules
Priority: standard
Description: Linux kernel image and core modules for the Debian installer
This package contains the kernel image and core modules for the Debian
installer boot images. It does _not_ provide a usable kernel for your full
Debian system.
Description: Base drivers
This packages contains some base drivers for the kernel.
Package: nic-modules
Depends: kernel-image, nic-shared-modules, mtd-core-modules
Depends: base-modules, nic-shared-modules, mtd-core-modules
Provides: nic-extra-modules
Priority: standard
Description: NIC drivers
@ -34,64 +33,64 @@ Description: NIC drivers
for the kernel.
Package: nic-wireless-modules
Depends: kernel-image, nic-shared-modules, usb-modules, mmc-core-modules, pcmcia-modules, rfkill-modules, crypto-modules
Depends: base-modules, nic-shared-modules, usb-modules, mmc-core-modules, pcmcia-modules, rfkill-modules, crypto-modules
Priority: standard
Description: Wireless NIC drivers
This package contains wireless NIC drivers for the kernel.
Includes crypto modules only needed for wireless (WEP, WPA).
Package: nic-shared-modules
Depends: kernel-image
Depends: base-modules
Priority: standard
Description: Shared NIC drivers
This package contains NIC drivers needed by combinations of nic-modules,
nic-pcmcia-modules, nic-usb-modules and nic-wireless-modules.
Package: serial-modules
Depends: kernel-image, pcmcia-modules
Depends: base-modules, pcmcia-modules
Priority: optional
Description: Serial drivers
This package contains serial drivers for the kernel.
Package: usb-serial-modules
Depends: kernel-image, usb-modules
Depends: base-modules, usb-modules
Priority: optional
Description: USB serial drivers
This package contains USB serial drivers for the kernel.
Package: ppp-modules
Depends: kernel-image, serial-modules
Depends: base-modules, serial-modules
Priority: optional
Description: PPP drivers
This package contains PPP drivers for the kernel.
Package: pata-modules
Depends: kernel-image, ata-modules
Depends: base-modules, ata-modules
Priority: standard
Priority_armhf: optional
Description: PATA drivers
This package contains PATA drivers for the kernel.
Package: cdrom-core-modules
Depends: kernel-image, scsi-core-modules
Depends: base-modules, scsi-core-modules
Priority: standard
Description: CDROM support
This package contains core CDROM support for the kernel.
Package: firewire-core-modules
Depends: kernel-image, scsi-core-modules
Depends: base-modules, scsi-core-modules
Priority: standard
Description: Core FireWire drivers
This package contains core FireWire drivers for the kernel.
Package: scsi-core-modules
Depends: kernel-image
Depends: base-modules
Priority: standard
Description: Core SCSI subsystem
This package contains the core SCSI subsystem for the kernel.
Package: scsi-modules
Depends: kernel-image, scsi-core-modules, cdrom-core-modules, ata-modules
Depends: base-modules, scsi-core-modules, cdrom-core-modules, ata-modules
Priority: standard
Description: SCSI drivers
This package contains SCSI drivers for the kernel.
@ -103,19 +102,19 @@ Description: SCSI drivers for converged NICs
This package contains SCSI drivers that depend on net drivers.
Package: loop-modules
Depends: kernel-image
Depends: base-modules
Priority: standard
Description: Loopback filesystem support
This package contains loopback filesystem support for the kernel.
Package: btrfs-modules
Depends: kernel-image, md-modules
Depends: base-modules, md-modules
Priority: optional
Description: BTRFS filesystem support
This package contains the BTRFS filesystem module for the kernel.
Package: ext4-modules
Depends: kernel-image
Depends: base-modules
Provides: ext2-modules, ext3-modules
Priority: standard
Description: ext2/ext3/ext4 filesystem support
@ -123,247 +122,247 @@ Description: ext2/ext3/ext4 filesystem support
also supports ext2 and ext3.
Package: isofs-modules
Depends: kernel-image, cdrom-core-modules
Depends: base-modules, cdrom-core-modules
Priority: standard
Description: ISOFS filesystem support
This package contains the ISOFS filesystem module for the kernel.
Package: jffs2-modules
Depends: kernel-image, mtd-modules
Depends: base-modules, mtd-modules
Priority: optional
Description: JFFS2 filesystem support
This package contains the JFFS2 filesystem module for the kernel.
Package: jfs-modules
Depends: kernel-image
Depends: base-modules
Priority: standard
Description: JFS filesystem support
This package contains the JFS filesystem module for the kernel.
Package: ufs-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: UFS filesystem support
This package contains the UFS filesystem module for the kernel.
Package: xfs-modules
Depends: kernel-image
Depends: base-modules
Priority: standard
Description: XFS filesystem support
This package contains the XFS filesystem module for the kernel.
Package: fat-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Priority_amd64: standard
Description: FAT filesystem support
This package contains the FAT and VFAT filesystem modules for the kernel.
Package: hfs-modules
Depends: kernel-image, cdrom-core-modules
Depends: base-modules, cdrom-core-modules
Priority: optional
Description: HFS filesystem support
This package contains the HFS and HFS+ filesystem modules for the kernel.
Package: affs-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: Amiga filesystem support
This package contains the Amiga filesystem module for the kernel.
Package: minix-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: Minix filesystem support
This package contains the Minix filesystem module for the kernel.
Package: nfs-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: NFS filesystem support
This package contains the NFS filesystem module for the kernel.
Package: squashfs-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: squashfs modules
This package contains squashfs modules.
Package: udf-modules
Depends: kernel-image, cdrom-core-modules
Depends: base-modules, cdrom-core-modules
Priority: optional
Description: UDF modules
This package contains the UDF filesystem module.
Package: f2fs-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: f2fs filesystem support
This package contains the f2fs (Flash-Friendly Filesystem) module.
Package: md-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: RAID and LVM support
This package contains RAID and LVM modules for the kernel.
Package: multipath-modules
Depends: kernel-image, md-modules, scsi-core-modules
Depends: base-modules, md-modules, scsi-core-modules
Priority: optional
Description: Multipath support
This package contains DM-Multipath modules for the kernel.
Package: usb-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: USB support
This package contains core USB drivers for the kernel.
Package: usb-storage-modules
Depends: kernel-image, scsi-core-modules, usb-modules
Depends: base-modules, scsi-core-modules, usb-modules
Priority: standard
Description: USB storage support
This package contains the USB storage driver for the kernel.
Package: pcmcia-storage-modules
Depends: kernel-image, cdrom-core-modules, pcmcia-modules, ata-modules
Depends: base-modules, cdrom-core-modules, pcmcia-modules, ata-modules
Priority: standard
Description: PCMCIA storage drivers
This package contains PCMCIA storage drivers for the kernel.
Package: drm-core-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: Frame buffer support
This package contains core DRM modules for the kernel.
Package: fb-modules
Depends: kernel-image, drm-core-modules, input-modules
Depends: base-modules, drm-core-modules, input-modules
Priority: optional
Priority_hppa: standard
Description: Frame buffer support
This package contains Frame buffer drivers for the kernel.
Package: input-modules
Depends: kernel-image, usb-modules, rfkill-modules
Depends: base-modules, usb-modules, rfkill-modules
Priority: optional
Description: Input devices support
This package contains input device drivers for the kernel.
Package: nic-pcmcia-modules
Depends: kernel-image, nic-shared-modules, nic-wireless-modules, pcmcia-modules, mmc-core-modules
Depends: base-modules, nic-shared-modules, nic-wireless-modules, pcmcia-modules, mmc-core-modules
Priority: standard
Description: Common PCMCIA NIC drivers
This package contains common PCMCIA NIC drivers for the kernel.
Package: pcmcia-modules
Depends: kernel-image
Depends: base-modules
Priority: standard
Description: Common PCMCIA drivers
This package contains common PCMCIA drivers for the kernel.
Package: nic-usb-modules
Depends: kernel-image, nic-shared-modules, nic-wireless-modules, usb-modules
Depends: base-modules, nic-shared-modules, nic-wireless-modules, usb-modules
Priority: standard
Description: USB NIC drivers
This package contains USB network adapter drivers for the kernel.
Package: sata-modules
Depends: kernel-image, scsi-core-modules, ata-modules
Depends: base-modules, scsi-core-modules, ata-modules
Priority: standard
Description: SATA drivers
This package contains SATA drivers for the kernel.
Package: crypto-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: crypto modules
This package contains crypto modules.
Package: crypto-dm-modules
Depends: kernel-image, md-modules
Depends: base-modules, md-modules
Priority: optional
Description: devicemapper crypto module
This package contains the devicemapper crypto (dm-crypt) module.
Package: ata-modules
Depends: kernel-image, scsi-core-modules
Depends: base-modules, scsi-core-modules
Priority: optional
Description: ATA disk modules
This package contains core ATA disk modules used by both PATA and SATA
disk drivers.
Package: mmc-core-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: MMC/SD/SDIO core modules
This package contains core modules for MMC/SD/SDIO support.
Package: mmc-modules
Depends: kernel-image, mmc-core-modules, usb-modules
Depends: base-modules, mmc-core-modules, usb-modules
Priority: optional
Description: MMC/SD card modules
This package contains modules needed to support MMC (multimedia) and
SD cards.
Package: nbd-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: Network Block Device modules
This package contains the modules required for support of the Network Block
Device
Package: speakup-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: speakup modules
This package contains speakup modules.
Package: uinput-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: uinput support
This package contains the uinput module.
Package: sound-modules
Depends: kernel-image, usb-modules, pcmcia-modules, firewire-core-modules, input-modules
Depends: base-modules, usb-modules, pcmcia-modules, firewire-core-modules, input-modules
Priority: optional
Description: sound support
This package contains sound modules.
Package: mtd-modules
Depends: kernel-image, mtd-core-modules
Depends: base-modules, mtd-core-modules
Priority: optional
Description: MTD driver modules
This package contains MTD driver modules.
Package: mtd-core-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: MTD core
This package contains the MTD core.
Package: rfkill-modules
Depends: kernel-image
Depends: base-modules
Priority: optional
Description: rfkill modules
This package contains the rfkill module.
Package: hypervisor-modules
Depends: kernel-image
Depends: base-modules
Priority: standard
Description: IBM 64bit hypervisor console modules
Contains drivers for the hypervisor console, used as console for linux
running in logical partitions of IBM hardware supporting it.
Package: dasd-modules
Depends: kernel-image
Depends: base-modules
Priority: standard
Description: dasd modules
This package contains dasd modules.
Package: dasd-extra-modules
Depends: kernel-image, dasd-modules
Depends: base-modules, dasd-modules
Priority: optional
Description: optional dasd DIAG support
This package contains the module for dasd DIAG support. The udeb is

37
debian/rules.real vendored
View file

@ -488,6 +488,14 @@ binary_image-dbg: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
$(dh_binary_post)
build_image-di:
binary_image-di: DH_INSTALL_ARGS = --sourcedir=$(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)/output/image
binary_image-di: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
binary_image-di:
$(dh_binary_pre)
$(dh_binary_post)
build_signed-template:
binary_signed-template: GEN_DIR = debian/generated.signed-$(ARCH)
@ -517,23 +525,13 @@ binary_signed-template:
$(dh_binary_post)
build_installer:
build_installer-test:
binary_installer binary_installer-test: export KW_DEFCONFIG_DIR=debian/installer
binary_installer binary_installer-test: export KW_CONFIG_DIR=debian/installer
binary_installer binary_installer-test: export SOURCEDIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)/output/image
binary_installer binary_installer-test: REAL_VERSION = $(ABINAME)$(LOCALVERSION)
binary_installer: DH_OPTIONS_IMAGE = -p$(IMAGE_PACKAGE_NAME) --sourcedir=$(SOURCEDIR)
binary_installer: export KW_DEFCONFIG_DIR=debian/installer
binary_installer: export KW_CONFIG_DIR=debian/installer
binary_installer: export SOURCEDIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)/output/image
binary_installer: REAL_VERSION = $(ABINAME)$(LOCALVERSION)
binary_installer: $(STAMPS_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
$(dh_binary_pre)
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_install boot/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_install lib/modules/$(REAL_VERSION)/modules.builtin
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_install lib/modules/$(REAL_VERSION)/modules.order
ifeq ($(ENABLE_DTB),True)
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_install lib/modules/$(REAL_VERSION)/dtb
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_link lib/modules/$(REAL_VERSION)/dtb usr/lib/linux-image-$(REAL_VERSION)
endif
kernel-wedge copy-modules $(ABINAME) $(FLAVOUR) $(REAL_VERSION)
kernel-wedge find-dups $(REAL_VERSION)
kernel-wedge find-unpackaged $(REAL_VERSION) $(REAL_VERSION)
@ -542,17 +540,6 @@ endif
dh_gencontrol
dh_builddeb -- $(BUILDDEB_ARGS)
binary_installer-test: export DEB_BUILD_PROFILES += pkg.linux.udeb-unsigned-test-build
binary_installer-test:
if [ -n "$$(dh_listpackages)" ]; then \
dh_testdir; \
dh_prep; \
kernel-wedge copy-modules $(ABINAME) $(FLAVOUR) $(REAL_VERSION); \
kernel-wedge find-dups $(REAL_VERSION); \
kernel-wedge find-unpackaged $(REAL_VERSION) $(REAL_VERSION); \
kernel-wedge check $$(dh_listpackages); \
fi
build_source:
binary_source: BUILDDEB_ARGS = -Zxz -z0

3
debian/salsa-ci.yml vendored
View file

@ -9,8 +9,6 @@ variables:
DEB_BUILD_PROFILES: pkg.linux.quick
# We have to bump the version in source preparation, not later
SALSA_CI_DISABLE_VERSION_BUMP: 'true'
# Currently broken in quick build
DEBIAN_KERNEL_DISABLE_INSTALLER: 'true'
# Output is limited to 4 MiB total, so use 'terse'.
# Current runners have 2 CPUs but have slow I/O so 'parallel=4' is
# a bit faster.
@ -332,6 +330,7 @@ build-signed:
- ${WORKING_DIR}/linux-headers-*-common_*_all.deb
- ${WORKING_DIR}/linux-image-*_${BUILD_ARCH}.deb
- ${WORKING_DIR}/linux-kbuild-*_${BUILD_ARCH}.deb
- ${WORKING_DIR}/kernel-image-*_${BUILD_ARCH}.udeb
exclude:
- ${WORKING_DIR}/linux-image-*-unsigned_*_${BUILD_ARCH}.deb
needs:

31
debian/signing_templates/rules.real vendored
View file

@ -83,35 +83,16 @@ binary_image:
$(dh_binary_pre)
$(dh_binary_post)
binary_image-di: DH_INSTALL_ARGS = --sourcedir=$(BUILD_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
binary_image-di: $(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
binary_image-di:
$(dh_binary_pre)
$(dh_binary_post)
build_meta:
binary_meta:
$(dh_binary_pre)
$(dh_binary_post)
build_installer:
binary_installer: REAL_VERSION = $(ABINAME)$(LOCALVERSION)
binary_installer: export KW_DEFCONFIG_DIR=debian/installer
binary_installer: export KW_CONFIG_DIR=debian/installer
binary_installer: export SOURCEDIR = $(BUILD_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
binary_installer: DH_OPTIONS_IMAGE = -p$(IMAGE_PACKAGE_NAME) --sourcedir=$(SOURCEDIR)
binary_installer: $(STAMPS_DIR)/install_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
binary_installer:
$(dh_binary_pre)
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_install boot/$(IMAGE_INSTALL_STEM)-$(REAL_VERSION)
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_install lib/modules/$(REAL_VERSION)/modules.builtin
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_install lib/modules/$(REAL_VERSION)/modules.order
ifeq ($(ENABLE_DTB),True)
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_install lib/modules/$(REAL_VERSION)/dtb
DH_OPTIONS="$(DH_OPTIONS_IMAGE)" dh_link lib/modules/$(REAL_VERSION)/dtb usr/lib/linux-image-$(REAL_VERSION)
endif
kernel-wedge copy-modules $(ABINAME) $(FLAVOUR) $(REAL_VERSION)
kernel-wedge find-dups $(REAL_VERSION)
kernel-wedge find-unpackaged $(REAL_VERSION) $(REAL_VERSION)
kernel-wedge check $$(dh_listpackages)
dh_fixperms
dh_gencontrol -- $(GENCONTROL_ARGS)
dh_builddeb -- $(BUILDDEB_ARGS)
.PHONY: build_% binary_%

17
debian/templates/image-di.control.in vendored Normal file
View file

@ -0,0 +1,17 @@
Package: kernel-image-@abiname@@localversion@-di
Meta-Rules-Target: image-di
Build-Profiles: <!noudeb !pkg.linux.nokernel>
Section: debian-installer
Priority: standard
Package-Type: udeb
Build-Depends:
# used by debian/rules.real to build udebs
kernel-wedge (>= 2.105~),
# used by kernel-wedge (only on Linux, thus not declared as a dependency)
kmod,
Provides: kernel-image
Kernel-Version: @abiname@@localversion@
Description: Linux kernel image and core modules for the Debian installer
This package contains the kernel image and core modules for the Debian
installer boot images. It does _not_ provide a usable kernel for your full
Debian system.

3
debian/templates/image-di.install.j2 vendored Normal file
View file

@ -0,0 +1,3 @@
boot/vmlinu?-{{abiname}}{{localversion}}
lib/modules/{{abiname}}{{localversion}}/modules.builtin lib/modules/{{abiname}}{{localversion}}
lib/modules/{{abiname}}{{localversion}}/modules.order lib/modules/{{abiname}}{{localversion}}