Commit 2fa427ff26166cca94d2a634a744fb546c902f76

Authored by Silvan Calarco
1 parent 68ad87406c
Exists in master

pck-update: stricter checks on buildreqs with explicit arch

Showing 1 changed file with 3 additions and 3 deletions Side-by-side Diff

plugins/pck-update.in
... ... @@ -1991,12 +1991,12 @@
1991 1991 # remove duplicates
1992 1992 buildreqs_to_install=(
1993 1993 $(for f in ${buildreqs_to_install[@]}; do
1994   - if [ "${f/.*}" != "${f}" ]; then
  1994 + if [ "${f/*.}" == "arm" -o "${f/*.}" == "x86_64" -o "${f/*.}" == "i586" ]; then
1995 1995 # if arch specified convert e.g. package.i586 to package@i586
1996 1996 echo ${f/./@}
1997   - elif [ "${BUILD_ARCH}" == "x86_64" ]; then
  1997 + elif [ "${BUILD_ARCH}" == "x86_64" -a "${target_cpu}" != "x86_64" ]; then
1998 1998 # x86_64: specifying arch is necessary (FIXME: problems with .noarch)
1999   - echo $f@$target_cpu
  1999 + echo $f@${target_cpu}
2000 2000 else
2001 2001 # classic behaviour
2002 2002 echo $f