diff options
| author | goekce | 2022-08-24 16:39:51 +0200 |
|---|---|---|
| committer | goekce | 2022-08-24 16:39:51 +0200 |
| commit | f38af18438a093e29ecbbbf621c653adc8d30e84 (patch) | |
| tree | 63b415b93f446d7fbaa0232270b3dfb921d90078 | |
| parent | 2e9a9cc6feba96a2b777b2ae175195d3247f4b2f (diff) | |
| download | aur-f38af18438a093e29ecbbbf621c653adc8d30e84.tar.gz | |
use `git am` to propagate patches to the submodule
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 19 |
2 files changed, 11 insertions, 12 deletions
@@ -1,7 +1,7 @@ pkgbase = xrt-git pkgdesc = Xilinx runtime for Ultrascale, Versal and MPSoC-based FPGAs - pkgver = r6630.23657d13b - pkgrel = 2 + pkgver = r6636.c0e57b76f + pkgrel = 1 url = https://xilinx.github.io/XRT/master/html/ arch = x86_64 license = Apache @@ -1,8 +1,8 @@ # Maintainer: Gökçe Aydos <aur2022@aydos.de> _name=xrt pkgbase=$_name-git -pkgver=r6630.23657d13b -pkgrel=2 +pkgver=r6636.c0e57b76f +pkgrel=1 pkgdesc="Xilinx runtime for Ultrascale, Versal and MPSoC-based FPGAs" arch=(x86_64) url='https://xilinx.github.io/XRT/master/html/' @@ -67,7 +67,11 @@ pkgver() { } prepare() { echo Patch $_name - git -C $_name apply $srcdir/xrt-fixes-for-current-kernels-and-gcc.patch + git -C $_name am $srcdir/xrt-fixes-for-current-kernels-and-gcc.patch + + echo Patch $_name/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma + git -C dma_ip_drivers \ + am $srcdir/dma-ip-drivers-fixes-for-current-kernels.patch # Submodule integration based on # https://wiki.archlinux.org/title/VCS_package_guidelines#Git_submodules @@ -76,12 +80,7 @@ prepare() { git -C $_name config \ submodule.src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma.url \ ../dma_ip_drivers - git -C $_name submodule update --force - # `--force` resets the branch and gets rid of the modifications. - - echo Patch $_name/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma - git -C $_name/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma \ - apply $srcdir/dma-ip-drivers-fixes-for-current-kernels.patch + git -C $_name submodule update } build() { cd $_name @@ -125,13 +124,13 @@ package_xrt-git() { } package_xrt-xocl-dkms-git() { pkgdesc="Drivers for Xilinx runtime (XRT)" + # Collect drivers local dest=$pkgdir/usr mkdir $dest cp -r $pkgdir/../src $dest cd $pkgdir - # AWS drivers not required rm -r usr/src/xrt-aws* |