From 3e4c1bbbd3d37df2f4ea89545fa8c0f53c770a05 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 21 Jul 2009 23:24:49 +0200 Subject: [PATCH] add arch=any support --- lib/initcpio/install/arch_core_install | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/initcpio/install/arch_core_install b/lib/initcpio/install/arch_core_install index 26d9a6eae..82a87b5ee 100644 --- a/lib/initcpio/install/arch_core_install +++ b/lib/initcpio/install/arch_core_install @@ -69,9 +69,15 @@ install () for COPY in ${SEARCHSVN};do if ! [ "$(echo ${COPY} | awk -F/ '{print $3}')" = "" ]; then source "${COPY}/PKGBUILD" - cp /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz ${TEMPDIR}/core-$(uname -m)/pkg/ - echo "$(echo ${COPY}| awk -F/ '{print $2}')/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt - repo-add ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz || return 1 + if [ "$(echo ${arch} | grep 'any')" ]; then + cp /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-any.pkg.tar.gz ${TEMPDIR}/core-$(uname -m)/pkg/ + echo "$(echo ${COPY}| awk -F/ '{print $2}')/${pkgname}-${pkgver}-${pkgrel}-any.pkg.tar.gz" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt + repo-add ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-any.pkg.tar.gz || return 1 + else + cp /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz ${TEMPDIR}/core-$(uname -m)/pkg/ + echo "$(echo ${COPY}| awk -F/ '{print $2}')/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz" >> ${TEMPDIR}/core-$(uname -m)/pkg/packages.txt + repo-add ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz /var/cache/pacman/pkg/${pkgname}-${pkgver}-${pkgrel}-$(uname -m).pkg.tar.gz || return 1 + fi fi done rm ${TEMPDIR}/core-$(uname -m)/pkg/core.db.tar.gz.old