Commit 8a9084a5 authored by Vitaly Lipatov's avatar Vitaly Lipatov

hasher: fix x86_64-i586 replacement

parent db7c63f2
...@@ -70,10 +70,10 @@ print_tmp_sourceslist() ...@@ -70,10 +70,10 @@ print_tmp_sourceslist()
fi fi
test -r "$SLIST" || fatal "'$SLIST' - sources.list path from $1 is missed" test -r "$SLIST" || fatal "'$SLIST' - sources.list path from $1 is missed"
if [ "$BUILDARCH" = "x86_64" ] ; then if [ "$BUILDARCH" = "x86_64" ] ; then
cat "$SLIST" | sed -e "s|i[56]86|$BUILDARCH|g" cat "$SLIST" | sed -e "s|\([ /]\)i[56]86|\1$BUILDARCH|g"
else else
# Note: drop biarch 32bit on real 32bit # Note: drop biarch 32bit on real 32bit
cat "$SLIST" | sed -e "s|x86_64|$BUILDARCH|g" | grep -v "x86_32" | grep -v "x86-i586" cat "$SLIST" | sed -e "s|x86_64\([ /]\)|$BUILDARCH\1|g" | grep -v "x86_32" | grep -v "x86_64-i586"
fi fi
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment