c/pve-kernel-qoup
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: replace 4.13 with 4.15

Browse Source 
as well as artful with bionic, and reset KREL/PKGREL accordingly
This commit is contained in:
Fabian Grünbichler 2018-03-09 14:22:07 +01:00
parent fbecbc3be2
commit 1e99f45be0
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -1,10 +1,10 @@
RELEASE=5.1 RELEASE=5.1
# also update pve-kernel-meta.git if either of these change # also update pve-kernel-meta.git if either of these change
KERNEL_VER=4.13.13 KERNEL_VER=4.15.3
KREL=6 KREL=1
PKGREL=42 PKGREL=1
EXTRAVERSION=-${KREL}-pve EXTRAVERSION=-${KREL}-pve
KVNAME=${KERNEL_VER}${EXTRAVERSION} KVNAME=${KERNEL_VER}${EXTRAVERSION}
@ -32,8 +32,8 @@ endif
BUILD_DIR=build BUILD_DIR=build
KERNEL_SRC=ubuntu-artful KERNEL_SRC=ubuntu-bionic
KERNEL_SRC_SUBMODULE=submodules/ubuntu-artful KERNEL_SRC_SUBMODULE=submodules/ubuntu-bionic
KERNEL_CFG_ORG=config-${KERNEL_VER}.org KERNEL_CFG_ORG=config-${KERNEL_VER}.org
E1000EDIR=e1000e-3.3.6 E1000EDIR=e1000e-3.3.6
@ -59,7 +59,7 @@ DIRS=KERNEL_SRC E1000EDIR IGBDIR IXGBEDIR SPLDIR ZFSDIR MODULES
DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb DST_DEB=${PACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb HDR_DEB=${HDRPACKAGE}_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
LINUX_TOOLS_DEB=linux-tools-4.13_${KERNEL_VER}-${PKGREL}_${ARCH}.deb LINUX_TOOLS_DEB=linux-tools-4.15_${KERNEL_VER}-${PKGREL}_${ARCH}.deb
DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB} DEBS=${DST_DEB} ${HDR_DEB} ${LINUX_TOOLS_DEB}

4
README
View File

@ -3,7 +3,7 @@ KERNEL SOURCE:
We currently use the Ubuntu kernel sources, available from: We currently use the Ubuntu kernel sources, available from:
http://kernel.ubuntu.com/git/ubuntu/ubuntu-artful.git/ http://kernel.ubuntu.com/git/ubuntu/ubuntu-bionic.git/
Ubuntu will maintain those kernels till: Ubuntu will maintain those kernels till:
@ -40,7 +40,7 @@ pve-kernel-meta
--------------- ---------------
depends on latest kernel and header package within a certain kernel series, depends on latest kernel and header package within a certain kernel series,
e.g., pve-kernel-4.13 / pve-headers-4.13 e.g., pve-kernel-4.15 / pve-headers-4.15
git clone git://git.proxmox.com/git/pve-kernel-meta.git git clone git://git.proxmox.com/git/pve-kernel-meta.git

4
debian/control.in vendored
View File

@ -10,14 +10,14 @@ Build-Conflicts: pve-headers-@KVNAME@,
Vcs-Git: git://git.proxmox.com/git/pve-kernel Vcs-Git: git://git.proxmox.com/git/pve-kernel
Vcs-Browser: https://git.proxmox.com/?p=pve-kernel.git Vcs-Browser: https://git.proxmox.com/?p=pve-kernel.git
Package: linux-tools-4.13 Package: linux-tools-4.15
Architecture: any Architecture: any
Section: devel Section: devel
Priority: optional Priority: optional
Depends: linux-base, Depends: linux-base,
${misc:Depends}, ${misc:Depends},
${shlibs:Depends}, ${shlibs:Depends},
Description: Linux kernel version specific tools for version 4.13 Description: Linux kernel version specific tools for version 4.15
This package provides the architecture dependent parts for kernel This package provides the architecture dependent parts for kernel
version locked tools (such as perf and x86_energy_perf_policy) version locked tools (such as perf and x86_energy_perf_policy)

4
debian/rules vendored
View File

@ -15,7 +15,7 @@ CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)
PVE_KERNEL_PKG=pve-kernel-${KVNAME} PVE_KERNEL_PKG=pve-kernel-${KVNAME}
PVE_HEADER_PKG=pve-headers-${KVNAME} PVE_HEADER_PKG=pve-headers-${KVNAME}
LINUX_TOOLS_PKG=linux-tools-4.13 LINUX_TOOLS_PKG=linux-tools-4.15
# TODO: split for archs, move to files? # TODO: split for archs, move to files?
PVE_CONFIG_OPTS= \ PVE_CONFIG_OPTS= \
@ -131,7 +131,7 @@ binary: install
.tools_install_mark: .tools_compile_mark .tools_install_mark: .tools_compile_mark
rm -rf debian/${LINUX_TOOLS_PKG} rm -rf debian/${LINUX_TOOLS_PKG}
mkdir -p debian/${LINUX_TOOLS_PKG}/usr/bin mkdir -p debian/${LINUX_TOOLS_PKG}/usr/bin
install -m 755 ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/perf debian/${LINUX_TOOLS_PKG}/usr/bin/perf_4.13 install -m 755 ${BUILD_DIR}/${KERNEL_SRC}/tools/perf/perf debian/${LINUX_TOOLS_PKG}/usr/bin/perf_4.15
touch $@ touch $@
.headers_install_mark: .compile_mark .modules_compile_mark .headers_install_mark: .compile_mark .modules_compile_mark

2
debian/scripts/find-firmware.pl vendored
View File

@ -8,7 +8,7 @@ die "no directory to scan" if !$dir;
die "no such directory" if ! -d $dir; die "no such directory" if ! -d $dir;
die "strange directory name" if $dir !~ m|^(.*/)?(4.13.\d+\-\d+\-pve)(/+)?$|; die "strange directory name" if $dir !~ m|^(.*/)?(4.15.\d+\-\d+\-pve)(/+)?$|;
my $apiver = $2; my $apiver = $2;