summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorQuey-Liang Kao2016-06-29 11:53:13 +0800
committerQuey-Liang Kao2016-06-29 11:53:13 +0800
commitb5b495129ff12ea01e3391015e4ef65d491e2171 (patch)
treea5191d70afc0b1f0f1c7f8318e876fe86f19ddf0
parent4dd540695c1b20fcfb95a79a9b79a50d29b988ab (diff)
downloadaur-b5b495129ff12ea01e3391015e4ef65d491e2171.tar.gz
update no-libexec.patch
Note that, once CONFIG_LIVEPATCH is enable, the kpatch module is not applied. Please help test kpatch module.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
-rw-r--r--no-libexec.patch17
3 files changed, 16 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f720dd7be859..5e3232df36ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -11,7 +11,7 @@ pkgbase = kpatch-git
source = git+https://github.com/dynup/kpatch.git
source = no-libexec.patch
md5sums = SKIP
- md5sums = 06398d03cd37fe65136086c01ca56bd6
+ md5sums = c6182ee2867efdea9ff144a9f8ebdb06
pkgname = kpatch-git
diff --git a/PKGBUILD b/PKGBUILD
index c0d93e8a92ac..1fb2f2f39053 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ makedepends=('gcc' 'git')
source=("git+https://github.com/dynup/kpatch.git"
"no-libexec.patch")
md5sums=('SKIP'
- '06398d03cd37fe65136086c01ca56bd6')
+'c6182ee2867efdea9ff144a9f8ebdb06')
prepare() {
patch -p0 < $srcdir/no-libexec.patch
@@ -35,9 +35,6 @@ package() {
mv $pkgdir/usr/libexec/kpatch/* $pkgdir/usr/lib/kpatch/
rm -fr $pkgdir/usr/libexec $pkgdir/usr/local $pkgdir/usr/sbin $pkgdir/usr/libexec
-
- cp $srcdir/kpatch/kmod/Makefile $pkgdir/usr/share/kpatch/
- cp -r $srcdir/kpatch/kmod/core $pkgdir/usr/share/kpatch/
}
pkgver() {
diff --git a/no-libexec.patch b/no-libexec.patch
index 4349d8d884bb..f557783a9ee3 100644
--- a/no-libexec.patch
+++ b/no-libexec.patch
@@ -1,6 +1,8 @@
---- kpatch.clean/kpatch-build/kpatch-build 2016-06-24 22:34:07.566260644 +0800
-+++ kpatch/kpatch-build/kpatch-build 2016-06-24 22:34:28.806261101 +0800
-@@ -97,9 +98,9 @@
+diff --git a/kpatch-build/kpatch-build b/kpatch-build/kpatch-build
+index a57dd77..057259c 100755
+--- a/kpatch-build/kpatch-build
++++ b/kpatch-build/kpatch-build
+@@ -97,9 +97,9 @@ find_dirs() {
# git repo
TOOLSDIR="$SCRIPTDIR"
DATADIR="$(readlink -f $SCRIPTDIR/../kmod)"
@@ -12,3 +14,12 @@
DATADIR="$(readlink -f $SCRIPTDIR/../share/kpatch)"
else
return 1
+@@ -111,7 +111,7 @@ find_core_symvers() {
+ if [[ -e "$SCRIPTDIR/create-diff-object" ]]; then
+ # git repo
+ SYMVERSFILE="$DATADIR/core/Module.symvers"
+- elif [[ -e "$SCRIPTDIR/../libexec/kpatch/create-diff-object" ]]; then
++ elif [[ -e "$SCRIPTDIR/../lib/kpatch/create-diff-object" ]]; then
+ # installation path
+ if [[ -e $SCRIPTDIR/../lib/kpatch/$ARCHVERSION/Module.symvers ]]; then
+ SYMVERSFILE="$(readlink -f $SCRIPTDIR/../lib/kpatch/$ARCHVERSION/Module.symvers)"