summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Stukalov2019-12-24 17:19:23 +0100
committerAlexey Stukalov2019-12-24 18:21:03 +0100
commitfe7a19ebd1a9a221adaa15bd65c76eec40026b9d (patch)
tree44f79d2ca5ac04453480b3018da51d04c56b9b81
parent808155add01cf28bfdecb4f42baeebba1b48ed97 (diff)
downloadaur-fe7a19ebd1a9a221adaa15bd65c76eec40026b9d.tar.gz
fix dkms build
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD15
-rw-r--r--dkms.conf13
-rw-r--r--jbb_version.h2
4 files changed, 21 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3816cdd59a90..222ada4507f5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,12 +7,16 @@ pkgbase = tsmclient
license = proprietary
makedepends = libarchive
makedepends = patchelf
+ depends = gcc-libs
+ depends = zlib
optdepends = jre8-openjdk: support for dsmj java gui
options = !strip
source = https://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v8r1/Linux/LinuxX86/BA/v819/8.1.9.0-TIV-TSMBAC-LinuxX86.tar
source = dkms.conf
+ source = jbb_version.h
sha1sums = 8651fb42f596e360c51fe521d70bb19a57d3be82
- sha1sums = ad89fff3d6096ba25d973e7e27ee3ce10e2fe57f
+ sha1sums = 9ebfc76be666a44675f0d8e25a37dbe36242c725
+ sha1sums = 46b7b0a46ee50a49d33fd23e0b0a682f162eda65
pkgname = tsmclient-service
pkgdesc = IBM Tivoli Storage Manager Client and Systemd Service
diff --git a/PKGBUILD b/PKGBUILD
index 279286e39efe..bf2360b1ba24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -34,10 +34,12 @@ _ver_minor="${_ver_2#*.}"
source=(
https://public.dhe.ibm.com/storage/tivoli-storage-management/maintenance/client/v${_ver_major}r${_ver_minor}/Linux/LinuxX86/BA/v${_ver_3_nd}/${pkgver}-TIV-TSMBAC-LinuxX86.tar
dkms.conf
+ jbb_version.h
)
sha1sums=('8651fb42f596e360c51fe521d70bb19a57d3be82'
- 'ad89fff3d6096ba25d973e7e27ee3ce10e2fe57f')
+ '9ebfc76be666a44675f0d8e25a37dbe36242c725'
+ '46b7b0a46ee50a49d33fd23e0b0a682f162eda65')
prepare() {
cd "$srcdir/"
@@ -88,14 +90,13 @@ package_tsmclient-dkms() {
depends=('dkms')
pkgdesc="IBM Tivoli Storage Manager Client Journal-based Backup Kernel Module"
- cd "$srcdir"/jbb_gpl
-
- install -d -m 0755 "${pkgdir}"/usr/src/${pkgbase}-${pkgver}
- install -D -m 0644 "${srcdir}"/dkms.conf "${pkgdir}"/usr/src/${pkgbase}-${pkgver}/dkms.conf
- install -m0644 Makefile *.c *.h "${pkgdir}"/usr/src/${pkgbase}-${pkgver}/
+ dkmsdir="${pkgdir}"/usr/src/${pkgbase}-${pkgver}
+ install -d -m 0755 ${dkmsdir}
+ install -D -m 0644 "${srcdir}"/{dkms.conf,jbb_version.h} ${dkmsdir}/
+ install -m 0644 "${srcdir}"/jbb_gpl/{Makefile,*.c,*.h} ${dkmsdir}/
sed \
-e "s/@PKGBASE@/${pkgbase}/" \
-e "s/@PKGVER@/${pkgver}/" \
- -i "${pkgdir}"/usr/src/${pkgbase}-${pkgver}/dkms.conf
+ -i ${dkmsdir}/{dkms.conf,jbb_version.h}
}
diff --git a/dkms.conf b/dkms.conf
index e2e33332e12b..d97aa3d68367 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,8 +1,7 @@
-PACKAGE_NAME=@PKGBASE@
-PACKAGE_VERSION=@PKGVER@
+PACKAGE_NAME="@PKGBASE@"
+PACKAGE_VERSION="@PKGVER@"
-MAKE[0]="make RELNUM=@PKGVER@"
-
-BUILT_MODULE_NAME="filepath"
-DEST_MODULE_LOCATION="/kernel"
-AUTOINSTALL=yes
+MAKE[0]="FP_CFLAGS+=\"-D_KERNEL\" make -C ${kernel_source_dir} M=${dkms_tree}/${PACKAGE_NAME}/${PACKAGE_VERSION}/build modules RELNUM=${PACKAGE_VERSION}"
+BUILT_MODULE_NAME[0]="filepath"
+DEST_MODULE_LOCATION[0]="/kernel"
+AUTOINSTALL="yes"
diff --git a/jbb_version.h b/jbb_version.h
new file mode 100644
index 000000000000..bb0abff2aacd
--- /dev/null
+++ b/jbb_version.h
@@ -0,0 +1,2 @@
+#define JBB_VERSION "@PKGVER@"
+