From fbb2321aa7470cd383b153ce7ae72aba451c7b6b Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 23 Sep 2015 15:33:41 -0300 Subject: linux-libre: add curly brackets to $CARCH --- libre-testing/linux-libre/PKGBUILD | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'libre-testing/linux-libre/PKGBUILD') diff --git a/libre-testing/linux-libre/PKGBUILD b/libre-testing/linux-libre/PKGBUILD index 6f658f9e3..5812b9dcb 100644 --- a/libre-testing/linux-libre/PKGBUILD +++ b/libre-testing/linux-libre/PKGBUILD @@ -26,7 +26,7 @@ arch=('i686' 'x86_64' 'armv7h') url="http://linux-libre.fsfla.org/" license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc') -if [ "$CARCH" = "armv7h" ]; then +if [ "${CARCH}" = "armv7h" ]; then makedepends+=('git' 'uboot-tools') fi options=('!strip') @@ -100,7 +100,7 @@ _replacesarchkernel=("${_replacesarchkernel[@]/\%/${_kernelname}}") _replacesoldkernels=("${_replacesoldkernels[@]/\%/${_kernelname}}") _replacesoldmodules=("${_replacesoldmodules[@]/\%/${_kernelname}}") -case "$CARCH" in +case "${CARCH}" in i686|x86_64) KARCH=x86;; armv7h) KARCH=arm;; esac @@ -204,11 +204,11 @@ _package() { provides=("${_replacesarchkernel[@]/%/=${_archpkgver}}") conflicts=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") replaces=("${_replacesarchkernel[@]}" "${_replacesoldkernels[@]}" "${_replacesoldmodules[@]}") - if [ "$CARCH" = "armv7h" && "${pkgbase}" != "linux-libre"]; then + if [ "${CARCH}" = "armv7h" && "${pkgbase}" != "linux-libre"]; then provides+=("${_replacesarchkernel%${_kernelname}}") conflicts+=("${_replacesarchkernel%${_kernelname}}") fi - if [ "$CARCH" != "armv7h" ]; then + if [ "${CARCH}" != "armv7h" ]; then backup=("etc/mkinitcpio.d/${pkgbase}.preset") fi install=linux.install @@ -240,7 +240,7 @@ _package() { -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" \ -i "${startdir}/${install}" - if [ "$CARCH" != "armv7h" ]; then + if [ "${CARCH}" != "armv7h" ]; then # install mkinitcpio preset file for kernel install -D -m644 "${srcdir}/linux.preset" "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset" sed \ @@ -255,7 +255,7 @@ _package() { rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build} # remove the firmware rm -rf "${pkgdir}/lib/firmware" - if [ "$CARCH" = "armv7h" ]; then + if [ "${CARCH}" = "armv7h" ]; then # gzip -9 all modules to save 100MB of space find "${pkgdir}" -name '*.ko' |xargs -P 2 -n 1 gzip -9 fi @@ -272,7 +272,7 @@ _package() { mkdir -p "${pkgdir}/usr" mv "${pkgdir}/lib" "${pkgdir}/usr/" - if [ "$CARCH" != "armv7h" ]; then + if [ "${CARCH}" != "armv7h" ]; then # add vmlinux install -D -m644 vmlinux "${pkgdir}/usr/lib/modules/${_kernver}/build/vmlinux" fi @@ -283,7 +283,7 @@ _package-headers() { provides=("${_replacesarchkernel[@]/%/-headers=${_archpkgver}}") conflicts=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") replaces=("${_replacesarchkernel[@]/%/-headers}" "${_replacesoldkernels[@]/%/-headers}") - if [ "$CARCH" = "armv7h" && "${pkgbase}" != "linux-libre"]; then + if [ "${CARCH}" = "armv7h" && "${pkgbase}" != "linux-libre"]; then provides+=("${_replacesarchkernel%${_kernelname}}-headers") conflicts+=("${_replacesarchkernel%${_kernelname}}-headers") fi @@ -308,7 +308,7 @@ _package-headers() { # copy arch includes for external modules mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}" cp -a arch/${KARCH}/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" - if [ "$CARCH" = "armv7h" ]; then + if [ "${CARCH}" = "armv7h" ]; then mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-omap2" cp -a arch/${KARCH}/mach-omap2/include "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-omap2/" mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/mach-mvebu" @@ -415,7 +415,7 @@ _package-docs() { provides=("${_replacesarchkernel[@]/%/-docs=${_archpkgver}}") conflicts=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") replaces=("${_replacesarchkernel[@]/%/-docs}" "${_replacesoldkernels[@]/%/-docs}") - if [ "$CARCH" = "armv7h" && "${pkgbase}" != "linux-libre"]; then + if [ "${CARCH}" = "armv7h" && "${pkgbase}" != "linux-libre"]; then provides+=("${_replacesarchkernel%${_kernelname}}-docs") conflicts+=("${_replacesarchkernel%${_kernelname}}-docs") fi @@ -503,7 +503,7 @@ _package-cubox() { pkgname=("${pkgbase}" "${pkgbase}-headers" "${pkgbase}-docs") -if [ "$CARCH" = "armv7h" ]; then +if [ "${CARCH}" = "armv7h" ]; then pkgname+=("${pkgbase}-smileplug" "${pkgbase}-mirabox" "${pkgbase}-ax3" "${pkgbase}-d3plug" "${pkgbase}-cubox") fi -- cgit v1.2.3