Fixed separate build of linux-vfio-headers package

Applied patch from https://bugs.archlinux.org/task/43885 to fix the
undefined KARCH variable.
This commit is contained in:
Dan Ziemba 2015-07-02 23:32:25 -04:00
parent cd8b35e59b
commit 2bc8cf05ec

View File

@ -37,6 +37,8 @@ validpgpkeys=(
) )
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
_KARCH=x86
prepare() { prepare() {
cd "${srcdir}/${_srcname}" cd "${srcdir}/${_srcname}"
@ -109,8 +111,6 @@ _package() {
cd "${srcdir}/${_srcname}" cd "${srcdir}/${_srcname}"
KARCH=x86
# get kernel version # get kernel version
_kernver="$(make LOCALVERSION= kernelrelease)" _kernver="$(make LOCALVERSION= kernelrelease)"
_basekernel=${_kernver%%-*} _basekernel=${_kernver%%-*}
@ -118,7 +118,7 @@ _package() {
mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot} mkdir -p "${pkgdir}"/{lib/modules,lib/firmware,boot}
make LOCALVERSION= INSTALL_MOD_PATH="${pkgdir}" modules_install 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 # set correct depmod command for install
cp -f "${startdir}/${install}" "${startdir}/${install}.pkg" cp -f "${startdir}/${install}" "${startdir}/${install}.pkg"
@ -193,15 +193,15 @@ _package-headers() {
chmod og-w -R "${pkgdir}/usr/lib/modules/${_kernver}/build/scripts" 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/.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 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 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 # add docbook makefile
install -D -m644 Documentation/DocBook/Makefile \ install -D -m644 Documentation/DocBook/Makefile \