From ad1821c01a4f0060a8786c9c423f93697273b4ad Mon Sep 17 00:00:00 2001 From: Sunderland93 Date: Mon, 26 Feb 2024 13:55:15 +0400 Subject: [PATCH] Fix dependencies --- debian/bin/gencontrol.py | 2 +- debian/changelog | 6 ++++++ debian/templates/image.control.in | 13 ------------- debian/templates/image.lintian-overrides.j2 | 13 ------------- debian/templates/image.meta.control.in | 2 +- debian/templates/image.meta.maintscript.in | 2 +- 6 files changed, 9 insertions(+), 29 deletions(-) delete mode 100644 debian/templates/image.control.in delete mode 100644 debian/templates/image.lintian-overrides.j2 diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py index 23119d2..37b43f2 100755 --- a/debian/bin/gencontrol.py +++ b/debian/bin/gencontrol.py @@ -452,7 +452,7 @@ linux-signed-{vars['arch']} (@signedtemplate_sourceversion@) {dist}; urgency={ur ) assert len(packages_meta) == 1 packages_meta += ( - self.bundle.add('signed.headers.meta' or 'headers.meta', + self.bundle.add('headers.meta', ruleid, makeflags, vars, arch=arch) ) assert len(packages_meta) == 2 diff --git a/debian/changelog b/debian/changelog index 1ff566e..8f016d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +linux (6.6.15-10~tileos) bookworm; urgency=medium + + * Fix dependencies + + -- Aleksey Samoilov Mon, 26 Feb 2024 13:54:41 +0400 + linux (6.6.15-9~tileos) bookworm; urgency=medium * Build metapackages for unsigned kernel diff --git a/debian/templates/image.control.in b/debian/templates/image.control.in deleted file mode 100644 index 8998e61..0000000 --- a/debian/templates/image.control.in +++ /dev/null @@ -1,13 +0,0 @@ -Package: linux-image-@abiname@@localversion@ -Meta-Rules-Target: image -Build-Profiles: -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, -Depends: kmod, linux-base (>= 4.3~), ${misc:Depends} -Recommends: firmware-linux-free -Suggests: linux-doc-@version@, debian-kernel-handbook -Description: Linux @upstreamversion@ for @class@ - The Linux kernel @upstreamversion@ and modules for use on @longclass@. diff --git a/debian/templates/image.lintian-overrides.j2 b/debian/templates/image.lintian-overrides.j2 deleted file mode 100644 index 2bd64b4..0000000 --- a/debian/templates/image.lintian-overrides.j2 +++ /dev/null @@ -1,13 +0,0 @@ -# Some 32-bit architectures need 64-bit kernels and we still build -# these as the "wrong" architecture rather than mandating multiarch. -{% if arch in ['mips', 'mipsel'] %} -{{package}}: binary-from-other-architecture *boot/vmlinu* -{% endif %} -{% if arch in ['hppa', 'mips', 'mipsel', 'powerpc'] %} -{{package}}: binary-from-other-architecture *lib/modules/* -{% endif %} - -# vmlinux needs extra sections that would normally be stripped. -{% if arch in ['mips64el', 'mipsel', 'ppc64el'] %} -{{package}}: unstripped-binary-or-object *boot/vmlinu* -{% endif %} diff --git a/debian/templates/image.meta.control.in b/debian/templates/image.meta.control.in index f118d8a..1549bf1 100644 --- a/debian/templates/image.meta.control.in +++ b/debian/templates/image.meta.control.in @@ -1,6 +1,6 @@ Package: linux-image-lts@source_suffix@@localversion@ Meta-Rules-Target: meta -Meta-Rules-Makeflags-INSTALLDOCS_LINK_DOC: linux-image-@abiname@@localversion@ +Meta-Rules-Makeflags-INSTALLDOCS_LINK_DOC: linux-image-@abiname@@localversion@-unsigned Build-Profiles: Depends: linux-image-@abiname@@localversion@-unsigned (= ${binary:Version}), ${misc:Depends} Provides: linux-latest-modules-@abiname@@localversion@, wireguard-modules (= 1.0.0), virtualbox-guest-modules [amd64 i386] diff --git a/debian/templates/image.meta.maintscript.in b/debian/templates/image.meta.maintscript.in index f708b9c..d818c91 100644 --- a/debian/templates/image.meta.maintscript.in +++ b/debian/templates/image.meta.maintscript.in @@ -1 +1 @@ -dir_to_symlink /usr/share/doc/@package@ linux-image-@abiname@@localversion@ 5.7~rc5-1~exp1 @package@ +dir_to_symlink /usr/share/doc/@package@ linux-image-@abiname@@localversion@-unsigned 5.7~rc5-1~exp1 @package@