build: replace 4.13 with 4.15

as well as artful with bionic, and reset KREL/PKGREL accordingly

diff --git a/Makefile b/Makefile
index 4f12c5815d342f4f28c853247cc0d875571fae13..00a6dcca5ed9bf7fa75eb19b856886361d4a65ca 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 RELEASE=5.1
 
 # also update pve-kernel-meta.git if either of these change
-KERNEL_VER=4.13.13
-KREL=6
+KERNEL_VER=4.15.3
+KREL=1
 
-PKGREL=42
+PKGREL=1
 
 EXTRAVERSION=-${KREL}-pve
 KVNAME=${KERNEL_VER}${EXTRAVERSION}
@@ -32,8 +32,8 @@ endif
 
 BUILD_DIR=build
 
-KERNEL_SRC=ubuntu-artful
-KERNEL_SRC_SUBMODULE=submodules/ubuntu-artful
+KERNEL_SRC=ubuntu-bionic
+KERNEL_SRC_SUBMODULE=submodules/ubuntu-bionic
 KERNEL_CFG_ORG=config-${KERNEL_VER}.org
 
 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
 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}
 

diff --git a/README b/README
index e1586acb5a64c8a70847baa1e7c954f464887b50..889d401c19b8617ba7835929bac456bf2456f60e 100644 (file)
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ KERNEL SOURCE:
 
 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:
 
@@ -40,7 +40,7 @@ pve-kernel-meta
 ---------------
 
 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
 

diff --git a/debian/control.in b/debian/control.in
index fa58872e27adcb4691da641d64ef4f2d9105b926..da7fcefc05c2a05cb058829fa1d205606d9f2faa 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -10,14 +10,14 @@ Build-Conflicts: pve-headers-@KVNAME@,
 Vcs-Git: git://git.proxmox.com/git/pve-kernel
 Vcs-Browser: https://git.proxmox.com/?p=pve-kernel.git
 
-Package: linux-tools-4.13
+Package: linux-tools-4.15
 Architecture: any
 Section: devel
 Priority: optional
 Depends: linux-base,
          ${misc: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
  version locked tools (such as perf and x86_energy_perf_policy)
 

diff --git a/debian/rules b/debian/rules
index 7a0d143ea1d63bf578c8d99913ac57482f20bd41..f4f567fea021412c3249c6678398ee8af5eaa4e2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -15,7 +15,7 @@ CHANGELOG_DATE:=$(shell dpkg-parsechangelog -SDate)
 
 PVE_KERNEL_PKG=pve-kernel-${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?
 PVE_CONFIG_OPTS= \
@@ -131,7 +131,7 @@ binary: install
 .tools_install_mark: .tools_compile_mark
        rm -rf debian/${LINUX_TOOLS_PKG}
        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 $@
 
 .headers_install_mark: .compile_mark .modules_compile_mark

diff --git a/debian/scripts/find-firmware.pl b/debian/scripts/find-firmware.pl
index dce8dc8161359db909e8a7a02c23fa0e50e03a29..b031037e747987cc542daafca76dda2a94669fd4 100755 (executable)
--- a/debian/scripts/find-firmware.pl
+++ b/debian/scripts/find-firmware.pl
@@ -8,7 +8,7 @@ die "no directory to scan" if !$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;