From b4ab39d64dabd1569d9fee2db1ad6f443a88292f Mon Sep 17 00:00:00 2001 From: Konstantin Demin Date: Tue, 29 Oct 2024 05:12:06 +0300 Subject: [PATCH] adjust package relations a bit --- debian/config/defines.toml | 2 +- debian/templates/source.control.in | 3 +++ debian/templates/tools-unversioned.control.in | 8 +++++--- debian/templates/tools-versioned.control.in | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/debian/config/defines.toml b/debian/config/defines.toml index accb049..747e6d2 100644 --- a/debian/config/defines.toml +++ b/debian/config/defines.toml @@ -89,7 +89,7 @@ compiler = 'gcc-14' [relations.image] depends = [ - 'initramfs-tools (>= 0.120+deb8u2) | linux-initramfs-tool', + 'initramfs-tools | linux-initramfs-tool', ] recommends = [ 'apparmor', diff --git a/debian/templates/source.control.in b/debian/templates/source.control.in index d7451c1..8a4cacb 100644 --- a/debian/templates/source.control.in +++ b/debian/templates/source.control.in @@ -30,6 +30,9 @@ Build-Depends-Arch: cpio , # used by upstream to compress kernel xz-utils , + bzip2 , + lzop , + zstd , # used by upstream to build genksyms, kconfig, and perf bison , bison , diff --git a/debian/templates/tools-unversioned.control.in b/debian/templates/tools-unversioned.control.in index f6a06c8..e8a08dd 100644 --- a/debian/templates/tools-unversioned.control.in +++ b/debian/templates/tools-unversioned.control.in @@ -66,20 +66,22 @@ Architecture: alpha amd64 arm64 armel armhf hppa i386 loong64 mips mips64 mips64 Build-Depends: asciidoctor , gcc-multilib [amd64 mips64 mips64el mips64r6 mips64r6el ppc64 s390x sparc64] , + g++-multilib [amd64 mips64 mips64el mips64r6 mips64r6el ppc64 s390x sparc64] , libaudit-dev, libbabeltrace-dev, libdebuginfod-dev, libdw-dev, libnewt-dev, libnuma-dev, - libopencsd-dev (>= 1.1.1), + libopencsd-dev, libperl-dev, libpython3-dev, - libtraceevent-dev (>= 1:1.5), + libtraceevent-dev, libunwind-dev [amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc ppc64 ppc64el sh4], libzstd-dev, python3-dev:any, python3-setuptools, + systemtap-sdt-dev, Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, ${python3:Depends} Provides: linux-tools-@version@ Conflicts: linux-tools-@version@ @@ -142,7 +144,7 @@ Package: rtla Meta-Rules-Target: rtla Build-Profiles: Architecture: amd64 arm64 armhf i386 x32 -Build-Depends: libtracefs-dev (>= 1.3), libtraceevent-dev (>= 1:1.5), python3-docutils +Build-Depends: libtracefs-dev, libtraceevent-dev, python3-docutils Depends: ${shlibs:Depends} Section: devel Description: Real-Time Linux Analysis tools diff --git a/debian/templates/tools-versioned.control.in b/debian/templates/tools-versioned.control.in index 91e126f..1e3ba7a 100644 --- a/debian/templates/tools-versioned.control.in +++ b/debian/templates/tools-versioned.control.in @@ -2,7 +2,7 @@ Package: linux-kbuild-@abiname@ Meta-Rules-Target: kbuild Build-Profiles: Architecture: linux-any -Depends: ${shlibs:Depends}, ${misc:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends}, build-essential Multi-Arch: foreign Description: Kbuild infrastructure for Linux @abiname@ This package provides the kbuild infrastructure for the headers packages for Linux kernel version @version@.