Rename package back to pve-kernel

This change renames the package again to pve-kernel. Instead, we now
differentiate the package based on the extra version (which is suffixed
with -edge).
This commit is contained in:
Fabian Mastenbroek 2021-04-18 11:30:19 +02:00
parent 5e900bd9f3
commit b3d615e84d
No known key found for this signature in database
GPG key ID: 405FC6F81F0A7B85
6 changed files with 20 additions and 20 deletions

View file

@ -77,8 +77,8 @@ jobs:
name: pve-edge-kernel ${{ steps.format_release.outputs.release }}
body: ${{ steps.format_release.outputs.changelog }}
files: |
artifacts/debs-generic/pve-edge-headers-*.deb
artifacts/debs-generic/pve-headers-*.deb
artifacts/debs-generic/linux-tools-*.deb
artifacts/debs-generic/pve-kernel-libc-*.deb
artifacts/debs-*/pve-edge-kernel-*.deb
artifacts/debs-*/pve-kernel-*.deb

View file

@ -6,7 +6,7 @@ KERNEL_MAJMIN=$(shell ./scripts/version.sh -n)
KERNEL_VER=$(shell ./scripts/version.sh -L)
KREL=1
EXTRAVERSION=-${KREL}
EXTRAVERSION=-${KREL}-edge
# Append Linux flavor name to EXTRAVERSION
ifdef PVE_BUILD_FLAVOR
@ -23,8 +23,8 @@ ifneq (${PVE_BUILD_TYPE},generic)
endif
KVNAME=${KERNEL_VER}${EXTRAVERSION}
PACKAGE=pve-edge-kernel-${KVNAME}
HDRPACKAGE=pve-edge-headers-${KVNAME}
PACKAGE=pve-kernel-${KVNAME}
HDRPACKAGE=pve-headers-${KVNAME}
ARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)

View file

@ -23,7 +23,7 @@ Select from the [Releases](https://github.com/fabianishere/pve-edge-kernel/relea
you want to install and download the appropriate deb package. Then, you can install the package as follows:
```sh
apt install ./pve-edge-kernel-VERSION-MARCH_VERSION_amd64.deb
apt install ./pve-kernel-VERSION-MARCH_VERSION_amd64.deb
```
## AppArmor issues

16
debian/changelog vendored
View file

@ -1,47 +1,47 @@
pve-edge-kernel (5.11.0-1) edge; urgency=medium
pve-kernel (5.11.0-1) edge; urgency=medium
* Update to Linux 5.11.
* Properly add module.lds to headers package.
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Thu, 18 Feb 2021 10:49:30 +0000
pve-edge-kernel (5.10.0-1) edge; urgency=medium
pve-kernel (5.10.0-1) edge; urgency=medium
* Update to Linux 5.10.
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Sun, 24 Jan 2021 12:53:48 +0000
pve-edge-kernel (5.9.0-1) edge; urgency=medium
pve-kernel (5.9.0-1) edge; urgency=medium
* Update to Linux 5.9.
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Thu, 12 Nov 2020 16:49:51 +0000
pve-edge-kernel (5.8.0-1) edge; urgency=medium
pve-kernel (5.8.0-1) edge; urgency=medium
* update to Linux 5.8 based on Ubuntu 5.8.0-12.13
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Sun, 9 Aug 2020 14:58:00 +0200
pve-edge-kernel (5.7.0-1) edge; urgency=medium
pve-kernel (5.7.0-1) edge; urgency=medium
* update to Linux 5.7 based on Ubuntu 5.7.0-5.6
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Mon, 1 Jun 2020 19:57:12 +0200
pve-edge-kernel (5.6.0-1) edge; urgency=medium
pve-kernel (5.6.0-1) edge; urgency=medium
* update to Linux 5.6.
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Sat, 2 May 2020 21:07:10 +0200
pve-edge-kernel (5.5.0-1) edge; urgency=medium
pve-kernel (5.5.0-1) edge; urgency=medium
* update to Linux 5.5.
-- Fabian Mastenbroek <mail.fabianm@gmail.com> Thu, 30 Apr 2020 18:30:30 +0200
pve-edge-kernel (5.4.30-1) edge; urgency=medium
pve-kernel (5.4.30-1) edge; urgency=medium
* update to Ubuntu-5.4.0-24.28

4
debian/rules vendored
View file

@ -10,8 +10,8 @@ include debian/rules.d/${DEB_BUILD_ARCH}.mk
CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)
PVE_KERNEL_PKG=pve-edge-kernel-${KVNAME}
PVE_HEADER_PKG=pve-edge-headers-${KVNAME}
PVE_KERNEL_PKG=pve-kernel-${KVNAME}
PVE_HEADER_PKG=pve-headers-${KVNAME}
PVE_USR_HEADER_PKG=pve-kernel-libc-dev
LINUX_TOOLS_PKG=linux-tools-${KERNEL_MAJMIN}
KERNEL_SRC_COPY=${KERNEL_SRC}_tmp

View file

@ -1,4 +1,4 @@
Source: pve-edge-kernel
Source: pve-kernel
Section: devel
Priority: optional
Maintainer: Fabian Mastenbroek <mail.fabianm@gmail.com>
@ -34,7 +34,7 @@ Build-Depends: asciidoc-base,
xmlto,
zlib1g-dev,
dwarves (>= 1.16)
Build-Conflicts: pve-edge-headers-@KVNAME@,
Build-Conflicts: pve-headers-@KVNAME@,
Vcs-Git: git://github.com/fabianishere/pve-edge-kernel.git
Vcs-Browser: https://github.com/fabianishere/pve-edge-kernel
@ -49,7 +49,7 @@ Description: Linux kernel version specific tools for version @KVMAJMIN@
This package provides the architecture dependent parts for kernel
version locked tools (such as perf and x86_energy_perf_policy)
Package: pve-edge-headers-@KVNAME@
Package: pve-headers-@KVNAME@
Section: devel
Priority: optional
Architecture: any
@ -59,7 +59,7 @@ Depends: coreutils | fileutils (>= 4.0),
Description: The Proxmox PVE Kernel Headers
This package contains the linux kernel headers
Package: pve-edge-kernel-@KVNAME@
Package: pve-kernel-@KVNAME@
Section: admin
Priority: optional
Architecture: any