Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ modules.order
# Debian directory (make deb-pkg)
#
#/debian/
/debian/build/
/debian/files

#
# Snap directory (make snap-pkg)
Expand Down
5 changes: 3 additions & 2 deletions debian.master/changelog
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
linux (5.11.0-20.21) hirsute; urgency=medium
linux (5.11.0-7620.21) hirsute; urgency=medium

[ Kleber Sacilotto de Souza ]
* hirsute/linux: 5.11.0-20.21 -proposed tracker (LP: #1930854)

* ath11k WIFI not working in proposed kernel 5.11.0-19-generic (LP: #1930637)
- bus: mhi: core: Download AMSS image from appropriate function

-- Kleber Sacilotto de Souza <kleber.souza@canonical.com> Fri, 04 Jun 2021 14:18:54 +0200
-- Jeremy Soller <jeremy@system76.com> Tue, 22 Jun 2021 10:35:46 -0600

linux (5.11.0-19.20) hirsute; urgency=medium

Expand Down
10 changes: 0 additions & 10 deletions debian.master/config/amd64/config.flavour.lowlatency

This file was deleted.

2 changes: 1 addition & 1 deletion debian.master/control.d/linux-libc-dev.stub
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: linux-libc-dev
Architecture: amd64 armhf arm64 i386 ppc64el riscv64 s390x
Architecture: amd64 armhf arm64 ppc64el riscv64 s390x
Depends: ${misc:Depends}
Conflicts: linux-kernel-headers
Replaces: linux-kernel-headers
Expand Down
2 changes: 1 addition & 1 deletion debian.master/control.d/vars.generic
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ arch="amd64 armhf arm64 ppc64el s390x"
supported="Generic"
target="Geared toward desktop and server systems."
desc="=HUMAN= SMP"
bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf] | grub-ieee1275 [ppc64el]"
bootloader="kernelstub [amd64] | grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-efi-arm64 [arm64] | grub-efi-arm [armhf] | grub-ieee1275 [ppc64el]"
provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64]"
6 changes: 0 additions & 6 deletions debian.master/control.d/vars.lowlatency

This file was deleted.

80 changes: 80 additions & 0 deletions debian.master/control.stub.in
Original file line number Diff line number Diff line change
Expand Up @@ -155,3 +155,83 @@ Depends: ${misc:Depends}, python3
Description: Linux kernel VM host tools
This package provides kernel tools useful for VM hosts.

# linux-meta {

Package: SRCPKGNAME-headers-generic
Build-Profiles: <!stage1>
Architecture: amd64 armhf arm64 powerpc ppc64el s390x
Section: kernel
Depends:
${misc:Depends},
linux-headers-PKGVER-ABINUM-generic (= ${source:Version})
Description: Generic Linux kernel headers
This package will always depend on the latest generic kernel headers
available.

Package: SRCPKGNAME-image-generic
Build-Profiles: <!stage1>
Architecture: amd64 armhf arm64 powerpc ppc64el s390x
Section: kernel
Depends:
${misc:Depends},
linux-image-PKGVER-ABINUM-generic (= ${source:Version}),
linux-modules-extra-PKGVER-ABINUM-generic (= ${source:Version}) [amd64 arm64 powerpc ppc64el s390x],
linux-firmware,
intel-microcode [amd64],
amd64-microcode [amd64]
Recommends: thermald [amd64]
Description: Generic Linux kernel image
This package will always depend on the latest generic kernel image
available.

Package: SRCPKGNAME-tools-generic
Build-Profiles: <!stage1>
Architecture: amd64 armhf arm64 powerpc ppc64el s390x
Section: kernel
Provides: linux-tools
Depends:
${misc:Depends},
linux-tools-PKGVER-ABINUM-generic (= ${source:Version})
Description: Generic Linux kernel tools
This package will always depend on the latest generic kernel tools
available.

Package: SRCPKGNAME-cloud-tools-generic
Build-Profiles: <!stage1>
Architecture: amd64
Section: kernel
Provides: linux-cloud-tools
Depends:
${misc:Depends},
linux-cloud-tools-PKGVER-ABINUM-generic (= ${source:Version})
Description: Generic Linux kernel cloud tools
This package will always depend on the latest generic kernel cloud tools
available.

Package: SRCPKGNAME-generic
Build-Profiles: <!stage1>
Architecture: amd64 armhf arm64 powerpc ppc64el s390x
Section: kernel
Depends:
${misc:Depends},
SRCPKGNAME-image-generic (= ${binary:Version}),
SRCPKGNAME-headers-generic (= ${binary:Version})
Description: Complete Generic Linux kernel and headers
This package will always depend on the latest complete generic Linux kernel
and headers.

# } linux-meta

# linux-system76 {

Package: SRCPKGNAME-system76
Build-Profiles: <!stage1>
Architecture: amd64
Section: kernel
Depends:
${misc:Depends},
SRCPKGNAME-generic (= ${binary:Version})
Description: System76 recommended Linux kernel
This package depends upon the recommended kernel for System76 users.

# } linux-system76
2 changes: 0 additions & 2 deletions debian.master/d-i/kernel-versions
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# arch version flavour installedname suffix bdep
amd64 - generic - - -

i386 - generic - - -

armhf - generic - - -
armhf - generic-lpae - - -

Expand Down
1 change: 0 additions & 1 deletion debian.master/d-i/package-list
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
Package: kernel-image
Provides: ext3-modules, ext4-modules, squashfs-modules
Provides_amd64: efi-modules, ext3-modules, ext4-modules, squashfs-modules
Provides_i386: efi-modules, ext3-modules, ext4-modules, squashfs-modules
Provides_ppc64el: ext3-modules, ext4-modules, fat-modules, squashfs-modules
Provides_s390x: ext3-modules, ext4-modules, ppp-modules, squashfs-modules
Description: kernel image and system map
Expand Down
2 changes: 1 addition & 1 deletion debian.master/etc/getabis
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ package_prefixes linux-buildinfo

getall armhf generic
getall armhf generic-lpae
getall amd64 generic lowlatency
getall amd64 generic
getall arm64 generic generic-64k
getall ppc64el generic
getall s390x generic
4 changes: 2 additions & 2 deletions debian.master/rules.d/amd64.mk
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ human_arch = 64 bit x86
build_arch = x86
header_arch = $(build_arch)
defconfig = defconfig
flavours = generic lowlatency
flavours = generic
build_image = bzImage
kernel_file = arch/$(build_arch)/boot/bzImage
install_file = vmlinuz
vdso = vdso_install
no_dumpfile = true
uefi_signed = true
uefi_signed = false
do_tools_usbip = true
do_tools_cpupower = true
do_tools_perf = true
Expand Down
18 changes: 0 additions & 18 deletions debian.master/rules.d/i386.mk

This file was deleted.

Loading