From 89eea072e673e50daa832ef11587a165cd9deaeb Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 23 Aug 2018 19:33:10 -0300 Subject: linux-libre: use extramodules var instead of _extramodules in _package() And use a specific subs for armv7h, and the normal one for all the rest Also use capital for some comments Signed-off-by: David P --- libre/linux-libre/PKGBUILD | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index b5e0eb8ae..e7bd5522d 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -230,13 +230,13 @@ _package() { 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 + 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 -- cgit v1.2.3 From bf4de8f0e04f27ebfe699841881c52923d4523a1 Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 23 Aug 2018 19:51:44 -0300 Subject: linux-libre: another variable change ... Signed-off-by: David P --- libre/linux-libre/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libre') diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index e7bd5522d..99d0f3b63 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -226,14 +226,14 @@ _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 " else - local _subst=" + local subst=" s|%PKGBASE%|$pkgbase|g s|%KERNVER%|$kernver|g s|%EXTRAMODULES%|$extramodules|g -- cgit v1.2.3 From 0d1d75a1154547666e1a80ab2c623798281d71c0 Mon Sep 17 00:00:00 2001 From: David P Date: Thu, 23 Aug 2018 20:13:29 -0300 Subject: riscv64-linux-gnu-linux-libre-api-headers: change pkgname Signed-off-by: David P --- libre/riscv64-linux-gnu-linux-libre-api-headers/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libre') 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%-*} -- cgit v1.2.3