From bd230f81302efe6f2ba4f3f53c715dad36e1eb1e Mon Sep 17 00:00:00 2001 From: Dan Ziemba Date: Sun, 5 Jul 2015 15:23:37 -0400 Subject: [PATCH] Revert "Fixed separate build of linux-vfio-headers package" This reverts commit 2bc8cf05ec665606ab433229db35262e339446ed. --- PKGBUILD | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 250711a..528dc7c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -41,8 +41,6 @@ validpgpkeys=( ) _kernelname=${pkgbase#linux} -_KARCH=x86 - prepare() { cd "${srcdir}/${_srcname}" @@ -120,6 +118,8 @@ _package() { cd "${srcdir}/${_srcname}" + KARCH=x86 + # get kernel version _kernver="$(make LOCALVERSION= kernelrelease)" _basekernel=${_kernver%%-*} @@ -127,7 +127,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" @@ -202,15 +202,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 \