Skip to contentSkip to conversation

package/sg3_utils: fix uclinux build

PATCH New Yann E. MORIN 3 participants 4 messages Aug 14, 2016 – Aug 16, 2016

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 package/sg3_utils: fix uclinux build

sg3_utils grep for '^linux' as the host OS to decide if we are targetting Linux.

However, on noMMU targets, the host OS can be 'uclinux' instead of just plain 'linux', which make sg3_util confused and thus it forgets to include soem source fiels in the build, resulting in link failures.

Fix that by ammending the regexp that recognises Linux. WE now need to run autoreconf.

Fixes:

    http://autobuild.buildroot.org/results/79a/79a572f67bafa6a007256a5f22529c2daabd5733/
    http://autobuild.buildroot.org/results/4f7/4f7ea4bb4c4c12ceb9cd08bfb6720386f5bdea0b/
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/sg3_utils/0001-support-uclinux-as-a-linux.patch | 16 ++++++++++++++++
 package/sg3_utils/sg3_utils.mk                          |  3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 package/sg3_utils/0001-support-uclinux-as-a-linux.patch
package/sg3_utils/0001-support-uclinux-as-a-linux.patch new file +16 -0
new file mode 100644
index 0000000..99937e5
@@ -0,0 +1,16 @@
+Recognise uclinuc as a linux
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+diff -durN sg3_utils-1.42.orig/configure.ac sg3_utils-1.42/configure.ac
+--- sg3_utils-1.42.orig/configure.ac	2015-10-21 01:10:59.000000000 +0200
++++ sg3_utils-1.42/configure.ac	2016-08-14 19:30:37.841766149 +0200
+@@ -71,7 +71,7 @@
+ 
+ # Define platform-specific symbol.
+ AM_CONDITIONAL(OS_FREEBSD, [echo $host_os | grep 'freebsd' > /dev/null])
+-AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null])
++AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep -E '^(uc)?linux' > /dev/null])
+ AM_CONDITIONAL(OS_OSF, [echo $host_os | grep '^osf' > /dev/null])
+ AM_CONDITIONAL(OS_SOLARIS, [echo $host_os | grep '^solaris' > /dev/null])
+ AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
package/sg3_utils/sg3_utils.mk +3 -0
index 36cb32e..e7af83a 100644
@@ -14,6 +14,9 @@ SG3_UTILS_LICENSE += GPLv2+
 endif
 SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
 
+# Patching configure.ac
+SG3_UTILS_AUTORECONF = YES
+
 # install the libsgutils2 library
 SG3_UTILS_INSTALL_STAGING = YES
Signature · 1 line
2.7.4
#1 lore raw

PATCH 1/1 package/sg3_utils: fix uclinux build

Quoted 8 lines · Yann E. MORIN

sg3_utils grep for '^linux' as the host OS to decide if we are targetting Linux.

However, on noMMU targets, the host OS can be 'uclinux' instead of just plain 'linux', which make sg3_util confused and thus it forgets to include soem source fiels in the build, resulting in link failures.

Fix that by ammending the regexp that recognises Linux. WE now need to

Hey hey, no need to shout :-)

Quoted 19 lines

run autoreconf.

Fixes:

    http://autobuild.buildroot.org/results/79a/79a572f67bafa6a007256a5f22529c2daabd5733/
    http://autobuild.buildroot.org/results/4f7/4f7ea4bb4c4c12ceb9cd08bfb6720386f5bdea0b/
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/sg3_utils/0001-support-uclinux-as-a-linux.patch | 16 ++++++++++++++++
 package/sg3_utils/sg3_utils.mk                          |  3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 package/sg3_utils/0001-support-uclinux-as-a-linux.patch
package/sg3_utils/0001-support-uclinux-as-a-linux.patch new file +0 -0
new file mode 100644
index 0000000..99937e5

package/sg3_utils/0001-support-uclinux-as-a-linux.patch line 1

Quoted 1 line
package/sg3_utils/0001-support-uclinux-as-a-linux.patch new file +1 -0
@@ -0,0 +1,16 @@
+Recognise uclinuc as a linux

uclinuc -> uclinux

Upstream status?

Just spelling mistakes, so:

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 30 lines
package/sg3_utils/0001-support-uclinux-as-a-linux.patch new file +15 -0
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+diff -durN sg3_utils-1.42.orig/configure.ac sg3_utils-1.42/configure.ac
+--- sg3_utils-1.42.orig/configure.ac	2015-10-21 01:10:59.000000000 +0200
++++ sg3_utils-1.42/configure.ac	2016-08-14 19:30:37.841766149 +0200
+@@ -71,7 +71,7 @@
+ 
+ # Define platform-specific symbol.
+ AM_CONDITIONAL(OS_FREEBSD, [echo $host_os | grep 'freebsd' > /dev/null])
+-AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null])
++AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep -E '^(uc)?linux' > /dev/null])
+ AM_CONDITIONAL(OS_OSF, [echo $host_os | grep '^osf' > /dev/null])
+ AM_CONDITIONAL(OS_SOLARIS, [echo $host_os | grep '^solaris' > /dev/null])
+ AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
package/sg3_utils/sg3_utils.mk +3 -0
index 36cb32e..e7af83a 100644
@@ -14,6 +14,9 @@ SG3_UTILS_LICENSE += GPLv2+
 endif
 SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
 
+# Patching configure.ac
+SG3_UTILS_AUTORECONF = YES
+
 # install the libsgutils2 library
 SG3_UTILS_INSTALL_STAGING = YES
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
author
#2 lore raw

PATCH 1/1 package/sg3_utils: fix uclinux build

Arnout, All,

On 2016-08-14 22:09 +0200, Arnout Vandecappelle spake thusly:

Quoted 11 lines · Yann E. MORIN
Quoted 8 lines

sg3_utils grep for '^linux' as the host OS to decide if we are targetting Linux.

However, on noMMU targets, the host OS can be 'uclinux' instead of just plain 'linux', which make sg3_util confused and thus it forgets to include soem source fiels in the build, resulting in link failures.

Fix that by ammending the regexp that recognises Linux. WE now need to

Hey hey, no need to shout :-)

Yes, my pinky is too slow to release the shift key. ;-)

Quoted 13 lines
Quoted 13 lines

run autoreconf.

Fixes:

    http://autobuild.buildroot.org/results/79a/79a572f67bafa6a007256a5f22529c2daabd5733/
    http://autobuild.buildroot.org/results/4f7/4f7ea4bb4c4c12ceb9cd08bfb6720386f5bdea0b/
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/sg3_utils/0001-support-uclinux-as-a-linux.patch | 16 ++++++++++++++++
 package/sg3_utils/sg3_utils.mk                          |  3 +++
 2 files changed, 19 insertions(+)
 create mode 100644 package/sg3_utils/0001-support-uclinux-as-a-linux.patch
Quoted 9 lines

package/sg3_utils/0001-support-uclinux-as-a-linux.patch line 1

Quoted 7 lines
package/sg3_utils/0001-support-uclinux-as-a-linux.patch new file +1 -0
new file mode 100644
index 0000000..99937e5
@@ -0,0 +1,16 @@
+Recognise uclinuc as a linux

uclinuc -> uclinux

'x' and 'c' are too close to each other. ;-)

Quoted 1 line

Upstream status?

Working on it. ;-)

Quoted 3 lines

Just spelling mistakes, so:

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Thanks!

Regards,
Yann E. MORIN.

Quoted 42 lines

Regards,
Arnout

Quoted 30 lines
package/sg3_utils/0001-support-uclinux-as-a-linux.patch new file +15 -0
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+diff -durN sg3_utils-1.42.orig/configure.ac sg3_utils-1.42/configure.ac
+--- sg3_utils-1.42.orig/configure.ac	2015-10-21 01:10:59.000000000 +0200
++++ sg3_utils-1.42/configure.ac	2016-08-14 19:30:37.841766149 +0200
+@@ -71,7 +71,7 @@
+ 
+ # Define platform-specific symbol.
+ AM_CONDITIONAL(OS_FREEBSD, [echo $host_os | grep 'freebsd' > /dev/null])
+-AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null])
++AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep -E '^(uc)?linux' > /dev/null])
+ AM_CONDITIONAL(OS_OSF, [echo $host_os | grep '^osf' > /dev/null])
+ AM_CONDITIONAL(OS_SOLARIS, [echo $host_os | grep '^solaris' > /dev/null])
+ AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null])
package/sg3_utils/sg3_utils.mk +3 -0
index 36cb32e..e7af83a 100644
@@ -14,6 +14,9 @@ SG3_UTILS_LICENSE += GPLv2+
 endif
 SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE
 
+# Patching configure.ac
+SG3_UTILS_AUTORECONF = YES
+
 # install the libsgutils2 library
 SG3_UTILS_INSTALL_STAGING = YES
Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
#3 lore raw

PATCH 1/1 package/sg3_utils: fix uclinux build

In reply to Yann E. MORIN
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Yann" == Yann E MORIN <[email protected]> writes:

sg3_utils grep for '^linux' as the host OS to decide if we are targetting Linux.

However, on noMMU targets, the host OS can be 'uclinux' instead of just plain 'linux', which make sg3_util confused and thus it forgets to include soem source fiels in the build, resulting in link failures.

Quoted 8 lines

Fix that by ammending the regexp that recognises Linux. WE now need to run autoreconf.

Fixes:

    http://autobuild.buildroot.org/results/79a/79a572f67bafa6a007256a5f22529c2daabd5733/
    http://autobuild.buildroot.org/results/4f7/4f7ea4bb4c4c12ceb9cd08bfb6720386f5bdea0b/
Signed-off-by "Yann E. MORIN" <[email protected]>

Committed after fixing the typospointed out by Arnout, thanks.

Signature · 1 line
Bye, Peter Korsgaard