diff options
| author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-23 19:31:04 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-23 19:31:04 -0400 |
| commit | 6316b0f6cdf23e4876b1466928646b16979cacc6 (patch) | |
| tree | 050ee1fe199b43f780ef514fab1b0cd3f0445901 /libre | |
| parent | 446c77e6214a21db7598cb5e9d26c828bffb79ea (diff) | |
| parent | 0d1d75a1154547666e1a80ab2c623798281d71c0 (diff) | |
| download | abslibre-6316b0f6cdf23e4876b1466928646b16979cacc6.tar.gz abslibre-6316b0f6cdf23e4876b1466928646b16979cacc6.tar.bz2 abslibre-6316b0f6cdf23e4876b1466928646b16979cacc6.zip | |
Merge branch 'master' of git://git.parabola.nu/abslibre/abslibre
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/linux-libre/PKGBUILD | 16 | ||||
| -rw-r--r-- | libre/riscv64-linux-gnu-linux-libre-api-headers/PKGBUILD | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b5e0eb8ae..99d0f3b63 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -226,17 +226,17 @@ _package() { msg2 "Installing hooks..." # sed expression for following substitutions if [ "$CARCH" = "armv7h" ]; then - local _subst=" + local subst=" s|/boot/vmlinuz-%PKGBASE%|$kernver|g s|%PKGBASE%|$pkgbase|g s|%KERNVER%|$kernver|g - s|%EXTRAMODULES%|$_extramodules|g + s|%EXTRAMODULES%|$extramodules|g " - elif [ "$CARCH" = "x86_64" ] || [ "$CARCH" = "i686" ]; then - local _subst=" + else + local subst=" s|%PKGBASE%|$pkgbase|g s|%KERNVER%|$kernver|g - s|%EXTRAMODULES%|$_extramodules|g + s|%EXTRAMODULES%|$extramodules|g " fi @@ -315,9 +315,9 @@ _package-headers() { msg2 "Removing documentation..." rm -r "$builddir/Documentation" - # parabola changes + # Parabola changes # - # since we don't want to diverge too much from arch's pkgbuild, we'll + # since we don't want to diverge too much from Arch's PKGBUILD, we'll # start marking our changes as such if [ "$CARCH" = "armv7h" ]; then for i in dove exynos omap2; do @@ -329,7 +329,7 @@ _package-headers() { cp -a arch/$KARCH/plat-$i/include "$pkgdir/usr/lib/modules/$kernver/build/arch/$KARCH/plat-$i/" done fi - # end of parabola changes + # end of Parabola changes msg2 "Removing broken symlinks..." find -L "$builddir" -type l -printf 'Removing %P\n' -delete diff --git a/libre/riscv64-linux-gnu-linux-libre-api-headers/PKGBUILD b/libre/riscv64-linux-gnu-linux-libre-api-headers/PKGBUILD index 2bf6cc49c..4bce4e423 100644 --- a/libre/riscv64-linux-gnu-linux-libre-api-headers/PKGBUILD +++ b/libre/riscv64-linux-gnu-linux-libre-api-headers/PKGBUILD @@ -4,7 +4,7 @@ _target_arch=riscv _target=riscv64-linux-gnu -pkgname=$_target-linux-api-headers +pkgname=$_target-linux-libre-api-headers _pkgver=4.16-gnu _srcver=${_pkgver%-*} |