diff mbox series

[12/12] Fix configure for s390 qemu on alpine

Message ID 1516380179-12737-1-git-send-email-borntraeger@de.ibm.com
State New
Headers show
Series None | expand

Commit Message

Christian Borntraeger Jan. 19, 2018, 4:42 p.m. UTC
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(-)

Comments

Christian Borntraeger Jan. 19, 2018, 4:53 p.m. UTC | #1
ignore the 12/12, it is just one patch....

On 01/19/2018 05:42 PM, Christian Borntraeger wrote:
> 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
>
Christian Borntraeger Jan. 19, 2018, 5:45 p.m. UTC | #2
And the from email address is also wrong. (spurious x after .com)

On 01/19/2018 05:53 PM, Christian Borntraeger wrote:
> ignore the 12/12, it is just one patch....
> 
> On 01/19/2018 05:42 PM, Christian Borntraeger wrote:
>> 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
>>
> 
>
diff mbox series

Patch

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