On Thu, Apr 12, 2018 at 05:03:42PM +0200, Vincent Bernat wrote: > Hi! > > As the package is not currently usable with our kernel, or even the > one in stable, I am bumping the severity. Since you already worked a > lot on this, would you be interested to prepare an upload for 0.5.0? If > yes, we could sort out how to organize that.
Hello, Thanks for your initiative. Patch to update to 0.5.0 (as diff from the current version in Debian Sid) is attached. It's based on the upstream kpatch tarball from github with the following sha512 checksum: d7e45a4395a8c7632187ca5c8b837bad0d7583f66ce5f5d2b8f1acabf9ff2539d038a16986f9846818183f5c3268a613580a98ad72f3766e286e6273d57ddc78 kpatch_0.5.0.orig.tar.gz Regards Simon -- + privacy is necessary + using gnupg http://gnupg.org + public key id: 0x92FEFDB7E44C32F9
diff -u -r kpatch-0.3.2/debian/changelog kpatch-0.5.0/debian/changelog --- kpatch-0.3.2/debian/changelog 2017-04-01 21:33:40.000000000 +0200 +++ kpatch-0.5.0/debian/changelog 2018-04-13 15:56:07.615948149 +0200 @@ -1,3 +1,9 @@ +kpatch (0.5.0-0.1) unstable; urgency=medium + + * Package 0.5.0. + + -- Simon Ruderich <si...@ruderich.org> Fri, 13 Apr 2018 15:55:45 +0200 + kpatch (0.3.2-3.1) unstable; urgency=medium * Non-maintainer upload. diff -u -r kpatch-0.3.2/debian/control kpatch-0.5.0/debian/control --- kpatch-0.3.2/debian/control 2016-06-27 21:03:09.000000000 +0200 +++ kpatch-0.5.0/debian/control 2017-10-16 23:20:59.660634108 +0200 @@ -2,7 +2,7 @@ Section: kernel Priority: optional Maintainer: Chris J Arges <chris.j.ar...@canonical.com> -Build-Depends: debhelper (>= 9), libelf-dev, dkms +Build-Depends: debhelper (>= 9), libelf-dev, dkms, shellcheck Standards-Version: 3.9.8 Homepage: http://github.com/dynup/kpatch #Vcs-Git: git://anonscm.debian.org/collab-maint/kpatch.git @@ -10,8 +10,7 @@ Package: kpatch Architecture: linux-amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, kpatch-dkms, - linux-headers-amd64 | linux-headers-generic +Depends: ${shlibs:Depends}, ${misc:Depends}, binutils Description: Runtime tools for Kpatch kpatch is a Linux dynamic kernel patching tool which allows you to patch a running kernel without rebooting or restarting any processes. It enables @@ -22,7 +21,8 @@ Package: kpatch-dkms Architecture: linux-amd64 -Depends: ${shlibs:Depends}, ${misc:Depends}, dkms +Depends: ${shlibs:Depends}, ${misc:Depends}, dkms, + linux-headers-amd64 | linux-headers-generic Description: DKMS module for Kpatch This package contains the Kpatch module built with DKMS. It installs the source and makefiles into the appropriate locations in order to handle various kernel Only in kpatch-0.3.2/debian/patches: create-diff-object-fix-WARN-_ONCE-detection-on-newer.patch Only in kpatch-0.3.2/debian/patches: kmod-core-use-save_stack_trace_tsk-backport.patch diff -u -r kpatch-0.3.2/debian/patches/kpatch-build-adjust-dirs.patch kpatch-0.5.0/debian/patches/kpatch-build-adjust-dirs.patch --- kpatch-0.3.2/debian/patches/kpatch-build-adjust-dirs.patch 2016-02-18 17:46:39.000000000 +0100 +++ kpatch-0.5.0/debian/patches/kpatch-build-adjust-dirs.patch 2018-04-13 16:07:01.934186446 +0200 @@ -3,26 +3,37 @@ paths to adjust for this. In addition the debian packaging uses /usr/lib instead of /usr/libexec for internal binaries. Author: Chris J Arges <chris.j.ar...@canonical.com> -Last-Update: 2016-01-08 +Last-Update: 2018-04-14 ---- a/kpatch-build/kpatch-build -+++ b/kpatch-build/kpatch-build -@@ -99,14 +99,14 @@ - DATADIR="$(readlink -f $SCRIPTDIR/../kmod)" +Index: kpatch-0.5.0/kpatch-build/kpatch-build +=================================================================== +--- kpatch-0.5.0.orig/kpatch-build/kpatch-build ++++ kpatch-0.5.0/kpatch-build/kpatch-build +@@ -159,9 +159,9 @@ find_dirs() { + TOOLSDIR="$SCRIPTDIR" + DATADIR="$(readlink -f "$SCRIPTDIR/../kmod")" + PLUGINDIR="$(readlink -f "$SCRIPTDIR/gcc-plugins")" +- elif [[ -e "$SCRIPTDIR/../libexec/kpatch/create-diff-object" ]]; then ++ elif [[ -e "$SCRIPTDIR/../lib/kpatch/create-diff-object" ]]; then + # installation path +- TOOLSDIR="$(readlink -f "$SCRIPTDIR/../libexec/kpatch")" ++ TOOLSDIR="$(readlink -f "$SCRIPTDIR/../lib/kpatch")" + DATADIR="$(readlink -f "$SCRIPTDIR/../share/kpatch")" + PLUGINDIR="$TOOLSDIR" + else +@@ -174,12 +174,12 @@ find_core_symvers() { + if [[ -e "$SCRIPTDIR/create-diff-object" ]]; then + # git repo SYMVERSFILE="$DATADIR/core/Module.symvers" - return - elif [[ -e "$SCRIPTDIR/../libexec/kpatch/create-diff-object" ]]; then + elif [[ -e "$SCRIPTDIR/../lib/kpatch/create-diff-object" ]]; then # installation path -- TOOLSDIR="$(readlink -f $SCRIPTDIR/../libexec/kpatch)" -+ TOOLSDIR="$(readlink -f $SCRIPTDIR/../lib/kpatch)" - DATADIR="$(readlink -f $SCRIPTDIR/../share/kpatch)" - if [[ -e $SCRIPTDIR/../lib/kpatch/$ARCHVERSION/Module.symvers ]]; then - SYMVERSFILE="$(readlink -f $SCRIPTDIR/../lib/kpatch/$ARCHVERSION/Module.symvers)" + if [[ -e "$SCRIPTDIR/../lib/kpatch/$ARCHVERSION/Module.symvers" ]]; then + SYMVERSFILE="$(readlink -f "$SCRIPTDIR/../lib/kpatch/$ARCHVERSION/Module.symvers")" - elif [[ -e /lib/modules/$ARCHVERSION/extra/kpatch/Module.symvers ]]; then -- SYMVERSFILE="$(readlink -f /lib/modules/$ARCHVERSION/extra/kpatch/Module.symvers)" -+ elif [[ -e /lib/modules/$ARCHVERSION/updates/dkms/kpatch.Module.symvers ]]; then -+ SYMVERSFILE="$(readlink -f /lib/modules/$ARCHVERSION/updates/dkms/kpatch.Module.symvers)" - else - warn "unable to find Module.symvers for kpatch core module" - return 1 +- SYMVERSFILE="$(readlink -f "/lib/modules/$ARCHVERSION/extra/kpatch/Module.symvers")" ++ elif [[ -e "/lib/modules/$ARCHVERSION/updates/dkms/kpatch.Module.symvers" ]]; then ++ SYMVERSFILE="$(readlink -f "/lib/modules/$ARCHVERSION/updates/dkms/kpatch.Module.symvers")" + fi + fi + Only in kpatch-0.3.2/debian/patches: kpatch-build-works-without-kpatch-kmod.patch diff -u -r kpatch-0.3.2/debian/patches/series kpatch-0.5.0/debian/patches/series --- kpatch-0.3.2/debian/patches/series 2017-04-01 21:03:23.000000000 +0200 +++ kpatch-0.5.0/debian/patches/series 2017-10-16 23:16:04.875343657 +0200 @@ -1,4 +1 @@ kpatch-build-adjust-dirs.patch -kpatch-build-works-without-kpatch-kmod.patch -create-diff-object-fix-WARN-_ONCE-detection-on-newer.patch -kmod-core-use-save_stack_trace_tsk-backport.patch diff -u -r kpatch-0.3.2/debian/post-dkms.sh kpatch-0.5.0/debian/post-dkms.sh --- kpatch-0.3.2/debian/post-dkms.sh 2016-02-18 17:46:39.000000000 +0100 +++ kpatch-0.5.0/debian/post-dkms.sh 2017-08-12 12:56:28.000000000 +0200 @@ -1,4 +1,5 @@ #!/bin/bash module_version=$1 kernelver=$2 +mkdir -p /lib/modules/$kernelver/updates/dkms cp /var/lib/dkms/kpatch/$module_version/build/kmod/core/Module.symvers /lib/modules/$kernelver/updates/dkms/kpatch.Module.symvers
signature.asc
Description: PGP signature