From 12eacebe4c8bb3fe9a30c3268788644029546067 Mon Sep 17 00:00:00 2001 From: Mikael Eriksson Date: Thu, 19 Feb 2015 12:05:34 +0100 Subject: [PATCH] Made KARCH global --- linux/trunk/PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/linux/trunk/PKGBUILD b/linux/trunk/PKGBUILD index bfe9dcc..5e3fc7b 100644 --- a/linux/trunk/PKGBUILD +++ b/linux/trunk/PKGBUILD @@ -34,6 +34,8 @@ validpgpkeys=( ) _kernelname=${pkgbase#linux} +_KARCH=x86 + prepare() { cd "${srcdir}/${_srcname}" @@ -100,8 +102,6 @@ _package() { cd "${srcdir}/${_srcname}" - KARCH=x86 - # get kernel version _kernver="$(make LOCALVERSION= kernelrelease)" _basekernel=${_kernver%%-*} @@ -109,7 +109,7 @@ _package() { mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install - cp arch/$KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" + cp arch/$_KARCH/boot/bzImage "${pkgdir}/boot/vmlinuz-${pkgbase}" # set correct depmod command for install cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" @@ -184,15 +184,15 @@ _package-headers() { chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/.tmp_versions" - mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel" + mkdir -p "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${_KARCH}/kernel" - cp arch/${KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" + cp arch/${_KARCH}/Makefile "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${_KARCH}/" if [ "${CARCH}" = "i686" ]; then - cp arch/${KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/" + cp arch/${_KARCH}/Makefile_32.cpu "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${_KARCH}/" fi - cp arch/${KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${KARCH}/kernel/" + cp arch/${_KARCH}/kernel/asm-offsets.s "${pkgdir}/usr/lib/modules/${_kernver}/build/arch/${_KARCH}/kernel/" # add docbook makefile install -D -m644 Documentation/DocBook/Makefile \ -- 2.3.0