From b85aacbc1619c8b14b9521ec21dc1e348e17f18c Mon Sep 17 00:00:00 2001 From: Vyacheslav Barinov Date: Mon, 18 Jan 2016 10:51:29 +0300 Subject: [PATCH] --ignorearch added for rpm Without the flag build will only work for native build roots but not for OBS cross-builds Change-Id: If24f0675ea01e925792480944736ddc468a0ff55 Signed-off-by: Vyacheslav Barinov --- packaging/gcc-aarch64.spec | 2 +- packaging/gcc-armv7l.spec | 2 +- packaging/gcc.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packaging/gcc-aarch64.spec b/packaging/gcc-aarch64.spec index 9a754bf..21c904e 100644 --- a/packaging/gcc-aarch64.spec +++ b/packaging/gcc-aarch64.spec @@ -632,7 +632,7 @@ pushd ${HOME} for pkg in gmp mpfr mpc isl cloog-isl; do sh -c "rpmbuild ${RPMBUILD_CMDLINE} /home/abuild/rpmbuild/SOURCES/${pkg}.spec" RPM_NAME=$(find '/home/abuild/rpmbuild/RPMS' -name "${pkg}-*.rpm" -not -name '*.src.rpm' -not -name '*debug*') - sudo rpm -i ${RPM_NAME} + sudo rpm -i --ignorearch ${RPM_NAME} find '/home/abuild/rpmbuild/' -name "${pkg}*.rpm" -delete done popd diff --git a/packaging/gcc-armv7l.spec b/packaging/gcc-armv7l.spec index 4763720..9bc314d 100644 --- a/packaging/gcc-armv7l.spec +++ b/packaging/gcc-armv7l.spec @@ -632,7 +632,7 @@ pushd ${HOME} for pkg in gmp mpfr mpc isl cloog-isl; do sh -c "rpmbuild ${RPMBUILD_CMDLINE} /home/abuild/rpmbuild/SOURCES/${pkg}.spec" RPM_NAME=$(find '/home/abuild/rpmbuild/RPMS' -name "${pkg}-*.rpm" -not -name '*.src.rpm' -not -name '*debug*') - sudo rpm -i ${RPM_NAME} + sudo rpm -i --ignorearch ${RPM_NAME} find '/home/abuild/rpmbuild/' -name "${pkg}*.rpm" -delete done popd diff --git a/packaging/gcc.spec b/packaging/gcc.spec index d067a3c..e6263b1 100644 --- a/packaging/gcc.spec +++ b/packaging/gcc.spec @@ -629,7 +629,7 @@ pushd ${HOME} for pkg in gmp mpfr mpc isl cloog-isl; do sh -c "rpmbuild ${RPMBUILD_CMDLINE} /home/abuild/rpmbuild/SOURCES/${pkg}.spec" RPM_NAME=$(find '/home/abuild/rpmbuild/RPMS' -name "${pkg}-*.rpm" -not -name '*.src.rpm' -not -name '*debug*') - sudo rpm -i ${RPM_NAME} + sudo rpm -i --ignorearch ${RPM_NAME} find '/home/abuild/rpmbuild/' -name "${pkg}*.rpm" -delete done popd -- 2.7.4