summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO11
-rw-r--r--PKGBUILD19
-rw-r--r--sysmacros.patch10
3 files changed, 30 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ee1d19385ba9..5281c07ae2e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dtrace-utils
pkgdesc = DTrace-utils contains the Userspace portion of the DTrace port to Linux
- pkgver = 1.0.2
- pkgrel = 1
+ pkgver = 1.0.4
+ pkgrel = 2
url = https://github.com/oracle/dtrace-utils
arch = x86_64
license = UPL
@@ -11,14 +11,17 @@ pkgbase = dtrace-utils
makedepends = libelf
makedepends = kernel-uek-devel
makedepends = dtrace-utils-devel
+ makedepends = libdtrace-ctf
depends = elfutils
depends = zlib
depends = sudo
depends = git
- source = https://github.com/oracle/dtrace-utils/archive/1.0.2.tar.gz
+ source = http://yum.oracle.com/repo/OracleLinux/OL7/UEKR5/x86_64/getPackageSource/dtrace-utils-1.0.4-1.el7.src.rpm
source = third_arg.patch
- md5sums = c344a52504d1124b2e2188dda344b43e
+ source = sysmacros.patch
+ md5sums = 7cea7a438ab8c8c689094c901ad2cb38
md5sums = 48b69bae8daf29415f45c3a22c3f4d7f
+ md5sums = 5fbb6aaae1b2b2fd4f63282ff9304dcd
pkgname = dtrace-utils
diff --git a/PKGBUILD b/PKGBUILD
index d80e65e578b5..23d29deff8c0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
# Maintainer: Bailey Kasin <bailey@gingertechnology.net>
pkgname=dtrace-utils
-pkgver=1.0.2
-pkgrel=1
+pkgver=1.0.4
+pkgrel=2
pkgdesc="DTrace-utils contains the Userspace portion of the DTrace port to Linux"
arch=('x86_64')
url="https://github.com/oracle/dtrace-utils"
@@ -20,19 +20,26 @@ makedepends=(
'libelf'
'kernel-uek-devel'
'dtrace-utils-devel'
+ 'libdtrace-ctf'
)
source=(
- 'https://github.com/oracle/dtrace-utils/archive/1.0.2.tar.gz'
+ 'http://yum.oracle.com/repo/OracleLinux/OL7/UEKR5/x86_64/getPackageSource/dtrace-utils-1.0.4-1.el7.src.rpm'
'third_arg.patch'
+ 'sysmacros.patch'
)
md5sums=(
- 'c344a52504d1124b2e2188dda344b43e'
+ '7cea7a438ab8c8c689094c901ad2cb38'
'48b69bae8daf29415f45c3a22c3f4d7f'
+ '5fbb6aaae1b2b2fd4f63282ff9304dcd'
)
prepare() {
- cd $pkgname-$pkgver
+ cd "$srcdir"
+ tar xvf dtrace-utils-1.0.4.tar.bz2
+
+ cd "$srcdir/$pkgname-$pkgver"
patch -p0 < "${srcdir}/third_arg.patch"
+ patch -p0 < "${srcdir}/sysmacros.patch"
}
build() {
@@ -40,7 +47,7 @@ build() {
cd "$srcdir/$pkgname-$pkgver"
mkdir ../linux
- cp -r /usr/src/kernels/4.14.35-1818.0.9.el7uek.x86_64/include/uapi/linux/dtrace ../linux/
+ cp -r /usr/src/kernels/4.14.35-1818.3.3.el7uek.x86_64/include/uapi/linux/dtrace ../linux/
make HDRPREFIX="$srcdir/"
}
diff --git a/sysmacros.patch b/sysmacros.patch
new file mode 100644
index 000000000000..010fe44a4a67
--- /dev/null
+++ b/sysmacros.patch
@@ -0,0 +1,10 @@
+--- libproc/Psymtab.c 2018-08-10 15:32:48.000000000 -0700
++++ libproc/Psymtab-fix.c 2018-11-07 23:03:44.737430025 -0800
+@@ -23,6 +23,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/ptrace.h>
++#include <sys/sysmacros.h>
+ #include <port.h>
+ #include <setjmp.h>
+