diff options
Diffstat (limited to 'user/qemu/12-12-Fix-configure-for-s390-qemu-on-alpine.patch')
| -rw-r--r-- | user/qemu/12-12-Fix-configure-for-s390-qemu-on-alpine.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/user/qemu/12-12-Fix-configure-for-s390-qemu-on-alpine.patch b/user/qemu/12-12-Fix-configure-for-s390-qemu-on-alpine.patch new file mode 100644 index 000000000..38b32da2a --- /dev/null +++ b/user/qemu/12-12-Fix-configure-for-s390-qemu-on-alpine.patch @@ -0,0 +1,56 @@ +From patchwork Fri Jan 19 16:42:59 2018 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [12/12] Fix configure for s390 qemu on alpine +X-Patchwork-Submitter: Christian Borntraeger <borntraeger@de.ibm.com> +X-Patchwork-Id: 863654 +Message-Id: <1516380179-12737-1-git-send-email-borntraeger@de.ibm.com> +To: qemu-s390x@nongnu.org, qemu-devel@nongnu.org, + Peter Maydell <peter.maydell@linaro.org>, + Paolo Bonzini <pbonzini@redhat.com> +Cc: Christian Borntraeger <borntraeger@de.ibm.com>, + Alice Frosi <alice@linux.vnet.ibm.com>, + Alice Frosi <alice@linux.vnet.ibm.comx> +Date: Fri, 19 Jan 2018 17:42:59 +0100 +From: Christian Borntraeger <borntraeger@de.ibm.com> +List-Id: <qemu-devel.nongnu.org> + +From: Alice Frosi <alice@linux.vnet.ibm.comx> + +In alpine docker image the qemu-system-s390x build is broken and +it throws this error: +qemu-system-s390x: Initialization of device s390-ipl failed: could not +load bootloader 's390-ccw.img' + +The grep command of busybox uses regex. This fails on binary data +(e.g. stops on every \0), so it does not identify the string +BiGeNdIaN in the test case big/little. Therefore, it assumes +that the architecture is little endian. + +This fix solves the grep problem by printing the content of +TMPO with strings + +Signed-off-by: Alice Frosi <alice@linux.vnet.ibm.com> +Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com> +[some changes to patch description, add -a option to strings] +--- + configure | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure b/configure +index 6d8c996..383b14e 100755 +--- a/configure ++++ b/configure +@@ -1906,9 +1906,9 @@ int main(int argc, char *argv[]) { + EOF + + if compile_object ; then +- if grep -q BiGeNdIaN $TMPO ; then ++ if strings -a $TMPO | grep -q BiGeNdIaN ; then + bigendian="yes" +- elif grep -q LiTtLeEnDiAn $TMPO ; then ++ elif strings -a $TMPO | grep -q LiTtLeEnDiAn ; then + bigendian="no" + else + echo big/little test failed |