[U-Boot-Users] [PATCH] Add brackets to if condition in tools/setlocalversion
The long condition in the script causes all ColdFire platforms unable to compile correctly. By adding square brackets, all compile without error.
Signed-off-by: TsiChung Liew Tsi-Chung.Liew@freescale.com --- tools/setlocalversion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/setlocalversion b/tools/setlocalversion index 9bbdafd..2c27291 100755 --- a/tools/setlocalversion +++ b/tools/setlocalversion @@ -11,8 +11,8 @@ cd "${1:-.}" || usage # Check for git and a git repo. if head=`git rev-parse --verify HEAD 2>/dev/null`; then # Do we have an untagged version? - if git name-rev --tags HEAD | \ - grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then + if [git name-rev --tags HEAD | \ + grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null]; then git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}' fi
In message 1206056978-17675-1-git-send-email-Tsi-Chung.Liew@freescale.com you wrote:
The long condition in the script causes all ColdFire platforms unable to compile correctly. By adding square brackets, all compile without error.
Signed-off-by: TsiChung Liew Tsi-Chung.Liew@freescale.com
tools/setlocalversion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/setlocalversion b/tools/setlocalversion index 9bbdafd..2c27291 100755 --- a/tools/setlocalversion +++ b/tools/setlocalversion @@ -11,8 +11,8 @@ cd "${1:-.}" || usage # Check for git and a git repo. if head=`git rev-parse --verify HEAD 2>/dev/null`; then # Do we have an untagged version?
- if git name-rev --tags HEAD | \
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null; then
- if [git name-rev --tags HEAD | \
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' > /dev/null]; then git describe | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
Ummm... what exactly has this code, which is running natively in the shell on your development host, to do with a ColdFire cross-compile?
Note that the very same code is used in the Linux kernel.
If this code doesn't work for you, you also cannot compile any recent Linux kernel code?
Also, I don't understand what you do.
Unless you can provide a really good explanation why that should be needed I will reject this patch.
Best regards,
Wolfgang Denk
Wolfgang,
Please ignore "Add brackets to if condition in tools/setlocalversion" patch.
The u-boot for ColdFire was able to build prior to version 1.3.2. Until, I merged the local with the latest update. Whenever I tried to build a u-boot for any ColdFire platforms, the error message always end up in start.S
*** cpu/mcf5445x/start.s *** .global version_string Version_string: .ascii U_BOOT_VERSION ln 378 .ascii " (", __DATE__, " - ", __TIME__, ")" ln 379 .ascii CONFIG_IDENT_STRING, "\0" ln 380 (EOF)
*** error message *** start.S: Assembler messages: start.S:380 Error: unaligned opcodes detected in executable segment make[1]: *** [start.o] Error 1 make[1]: Leaving directory '...'
I reversed the patches from HEAD and found out it was the change in tools/setlocalversion. My first assumption was focused on the setlocalversion and by adding brackets to it solved the compiling error. I have not found out the actual cause of the issue yet. For the time being, please leave it be until I provide the update later.
Thanks.
Regards, TsiChung
-----Original Message----- From: wd@denx.de [mailto:wd@denx.de] Sent: Thursday, March 20, 2008 7:25 PM To: Liew Tsi Chung Cc: U-Boot-Users; Rigby John Subject: Re: [PATCH] Add brackets to if condition in tools/setlocalversion
In message 1206056978-17675-1-git-send-email-Tsi-Chung.Liew@freescale.com you wrote:
The long condition in the script causes all ColdFire platforms unable to compile correctly. By adding square brackets, all compile without error.
Signed-off-by: TsiChung Liew Tsi-Chung.Liew@freescale.com
tools/setlocalversion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/setlocalversion b/tools/setlocalversion index 9bbdafd..2c27291 100755 --- a/tools/setlocalversion +++ b/tools/setlocalversion @@ -11,8 +11,8 @@ cd "${1:-.}" || usage # Check for git and a git repo. if head=`git rev-parse --verify HEAD 2>/dev/null`; then # Do we have an untagged version?
- if git name-rev --tags HEAD | \
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' >
/dev/null; then
- if [git name-rev --tags HEAD | \
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' >
/dev/null];
+then git describe | awk -F- '{printf("-%05d-%s",
$(NF-1),$(NF))}'
fi
Ummm... what exactly has this code, which is running natively in the shell on your development host, to do with a ColdFire cross-compile?
Note that the very same code is used in the Linux kernel.
If this code doesn't work for you, you also cannot compile any recent Linux kernel code?
Also, I don't understand what you do.
Unless you can provide a really good explanation why that should be needed I will reject this patch.
Best regards,
Wolfgang Denk
What distro are you running? Some use dash for /bin/sh instead of bash. That may be your problem.
Liew Tsi Chung wrote:
Wolfgang,
Please ignore "Add brackets to if condition in tools/setlocalversion" patch.
The u-boot for ColdFire was able to build prior to version 1.3.2. Until, I merged the local with the latest update. Whenever I tried to build a u-boot for any ColdFire platforms, the error message always end up in start.S
*** cpu/mcf5445x/start.s *** .global version_string Version_string: .ascii U_BOOT_VERSION ln 378 .ascii " (", __DATE__, " - ", __TIME__, ")" ln 379 .ascii CONFIG_IDENT_STRING, "\0" ln 380 (EOF)
*** error message *** start.S: Assembler messages: start.S:380 Error: unaligned opcodes detected in executable segment make[1]: *** [start.o] Error 1 make[1]: Leaving directory '...'
I reversed the patches from HEAD and found out it was the change in tools/setlocalversion. My first assumption was focused on the setlocalversion and by adding brackets to it solved the compiling error. I have not found out the actual cause of the issue yet. For the time being, please leave it be until I provide the update later.
Thanks.
Regards, TsiChung
-----Original Message----- From: wd@denx.de [mailto:wd@denx.de] Sent: Thursday, March 20, 2008 7:25 PM To: Liew Tsi Chung Cc: U-Boot-Users; Rigby John Subject: Re: [PATCH] Add brackets to if condition in tools/setlocalversion
In message 1206056978-17675-1-git-send-email-Tsi-Chung.Liew@freescale.com you wrote:
The long condition in the script causes all ColdFire platforms unable to compile correctly. By adding square brackets, all compile without error.
Signed-off-by: TsiChung Liew Tsi-Chung.Liew@freescale.com
tools/setlocalversion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/setlocalversion b/tools/setlocalversion index 9bbdafd..2c27291 100755 --- a/tools/setlocalversion +++ b/tools/setlocalversion @@ -11,8 +11,8 @@ cd "${1:-.}" || usage # Check for git and a git repo. if head=`git rev-parse --verify HEAD 2>/dev/null`; then # Do we have an untagged version?
- if git name-rev --tags HEAD | \
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' >/dev/null; then
- if [git name-rev --tags HEAD | \
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' >/dev/null];
+then git describe | awk -F- '{printf("-%05d-%s",
$(NF-1),$(NF))}'
fi
Ummm... what exactly has this code, which is running natively in the shell on your development host, to do with a ColdFire cross-compile?
Note that the very same code is used in the Linux kernel.
If this code doesn't work for you, you also cannot compile any recent Linux kernel code?
Also, I don't understand what you do.
Unless you can provide a really good explanation why that should be needed I will reject this patch.
Best regards,
Wolfgang Denk
John,
Fedora 3 and Fedora 8, both are using bash.
Regards, TsiChung
-----Original Message----- From: Rigby John Sent: Monday, March 24, 2008 2:48 PM To: Liew Tsi Chung Cc: wd@denx.de; U-Boot-Users Subject: Re: [PATCH] Add brackets to if condition in tools/setlocalversion
What distro are you running? Some use dash for /bin/sh instead of bash. That may be your problem.
Liew Tsi Chung wrote:
Wolfgang,
Please ignore "Add brackets to if condition in
tools/setlocalversion"
patch.
The u-boot for ColdFire was able to build prior to version
1.3.2.
Until, I merged the local with the latest update. Whenever I tried to build a u-boot for any ColdFire platforms, the error message always end up in start.S
*** cpu/mcf5445x/start.s *** .global version_string Version_string: .ascii U_BOOT_VERSION ln 378 .ascii " (", __DATE__, " - ", __TIME__, ")" ln 379 .ascii CONFIG_IDENT_STRING, "\0" ln 380 (EOF)
*** error message *** start.S: Assembler messages: start.S:380 Error: unaligned opcodes detected in executable segment make[1]: *** [start.o] Error 1 make[1]: Leaving directory '...'
I reversed the patches from HEAD and found out it was the change
in
tools/setlocalversion. My first assumption was focused on the setlocalversion and by adding brackets to it solved the compiling
error.
I have not found out the actual cause of the issue yet. For the time being, please leave it be until I provide the update later.
Thanks.
Regards, TsiChung
-----Original Message----- From: wd@denx.de [mailto:wd@denx.de] Sent: Thursday, March 20, 2008 7:25 PM To: Liew Tsi Chung Cc: U-Boot-Users; Rigby John Subject: Re: [PATCH] Add brackets to if condition in tools/setlocalversion
In message 1206056978-17675-1-git-send-email-Tsi-Chung.Liew@freescale.com you wrote:
The long condition in the script causes all ColdFire platforms unable
to compile correctly. By adding square brackets, all compile without error.
Signed-off-by: TsiChung Liew Tsi-Chung.Liew@freescale.com
tools/setlocalversion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/setlocalversion b/tools/setlocalversion index 9bbdafd..2c27291 100755 --- a/tools/setlocalversion +++ b/tools/setlocalversion @@ -11,8 +11,8 @@ cd "${1:-.}" || usage # Check for git and a git repo. if head=`git rev-parse --verify HEAD 2>/dev/null`; then # Do we have an untagged version?
- if git name-rev --tags HEAD | \
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' >/dev/null; then
- if [git name-rev --tags HEAD | \
grep -E '^HEAD[[:space:]]+(.*~[0-9]*|undefined)$' >/dev/null];
+then git describe | awk -F- '{printf("-%05d-%s",
$(NF-1),$(NF))}'
fi
Ummm... what exactly has this code, which is running natively in the shell on your development host, to do with a ColdFire cross-compile?
Note that the very same code is used in the Linux kernel.
If this code doesn't work for you, you also cannot compile any recent Linux kernel code?
Also, I don't understand what you do.
Unless you can provide a really good explanation why that should be needed I will reject this patch.
Best regards,
Wolfgang Denk
participants (4)
-
John Rigby -
Liew Tsi Chung -
Tsi-Chung Liew
-
Wolfgang Denk