SRC_URI updates and minor build fixes

PATCH In review Andre McCurdy 2 participants 14 messages Mar 21, 2018 – May 10, 2018

Share & tools

Andre McCurdy

author

2018-03-21 02:42 UTC #0 lore raw

cover SRC_URI updates and minor build fixes

Daisy has now (long since) left upstream maintenance and entered into community support. As a member of a community which still actively develops against this version of OE, I would like to propose the following updates.

Andre McCurdy (4):
gmp_4.2.1: fix build for MIPS
ncurses: fix build with gcc 5
binutils: fix build with gcc 5
mesa: fix SRC_URI

Khem Raj (1):
kernel.bbclass: Remove bashism

Krzysztof Sywula (1):
dtc: old SRC_URI died, changing to new working one

 meta/classes/kernel.bbclass                        |  2 +-
 .../ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch    | 53 +++++++++++++++++++
 meta/recipes-core/ncurses/ncurses_5.9.bb           |  1 +
 meta/recipes-devtools/binutils/binutils-2.24.inc   |  1 +
 ...86.c-Werror-logical-not-parentheses-error.patch | 61 ++++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa_9.2.5.bb           |  2 +-
 meta/recipes-kernel/dtc/dtc.inc                    |  2 +-
 .../avoid-h-asm-constraint-for-MIPS.patch          | 57 ++++++++++++++++++++
 meta/recipes-support/gmp/gmp_4.2.1.bb              |  1 +
 9 files changed, 177 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-core/ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch
 create mode 100644 meta/recipes-devtools/binutils/binutils/0001-Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch
 create mode 100644 meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch

Signature · 1 line

1.9.1

Andre McCurdy

author

2018-03-21 02:42 UTC #1 lore raw

PATCH 1/6 dtc: old SRC_URI died, changing to new working one

From: Krzysztof Sywula <[email protected]>

Signed-off-by Krzysztof Sywula <[email protected]>

Signed-off-by Richard Purdie <[email protected]>

(cherry picked from commit 131a17f014e6373dae526cc927588ccc0fedc38d)

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-kernel/dtc/dtc.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-kernel/dtc/dtc.inc +1 -1

index 3eca25f..3edba45 100644
@@ -6,7 +6,7 @@ DEPENDS = "flex-native bison-native"
 
 inherit autotools-brokensep
 
-SRC_URI = "git://www.jdl.com/software/dtc.git \
+SRC_URI = "git://git.kernel.org/pub/scm/utils/dtc/dtc.git \
            file://make_install.patch \
 	  "

Signature · 1 line

1.9.1

Andre McCurdy

author

2018-03-21 02:42 UTC #2 lore raw

PATCH 2/6 kernel.bbclass: Remove bashism

In reply to Andre McCurdy

From: Khem Raj <[email protected]>

Fixes build on systems using dash for default shell e.g.

errors like

run.do_strip.25842: [[: not found
| readelf: Error: Unable to read in 0x37 bytes of section headers | readelf: Error: Not an ELF file - it has the wrong magic bytes at the start

Change-Id I29cac15be44a02d75a3d6889b6ae9b2e19bf46af

Signed-off-by Khem Raj <[email protected]>

Signed-off-by Ross Burton <[email protected]>

(cherry picked from commit 6956ffdc6e9879e32360b6ee3a3d286618807485)

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/classes/kernel.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/classes/kernel.bbclass +1 -1

index 922752b..049f86b 100644
@@ -391,7 +391,7 @@ python split_kernel_packages () {
 
 do_strip() {
 	if [ -n "${KERNEL_IMAGE_STRIP_EXTRA_SECTIONS}" ]; then
-		if [[ "${KERNEL_IMAGETYPE}" != "vmlinux" ]]; then
+		if [ "${KERNEL_IMAGETYPE}" != "vmlinux" ]; then
 			bbwarn "image type will not be stripped (not supported): ${KERNEL_IMAGETYPE}"
 			return
 		fi

Signature · 1 line

1.9.1

Andre McCurdy

author

2018-03-21 02:42 UTC #3 lore raw

PATCH 3/6 gmp_4.2.1: fix build for MIPS

In reply to Andre McCurdy

The h asm constrain (to extract the high part of a multiplication result) has not been recognised since gcc 4.4:

https://gcc.gnu.org/gcc-4.4/changes.html

Drop the MIPS umul_ppmm() implementations which rely on "=h" and fall back to the older implementations (which use explicit mfhi and mflo instructions to move the high and low parts of the multiplication result into their destinations).

Signed-off-by Andre McCurdy <[email protected]>

Signed-off-by Ross Burton <[email protected]>

(cherry picked from commit f8b2eb5eb09a1314ef59e58df95e81c1c1ccf1f4)

Signed-off-by Andre McCurdy <[email protected]>

---
 .../avoid-h-asm-constraint-for-MIPS.patch          | 57 ++++++++++++++++++++++
 meta/recipes-support/gmp/gmp_4.2.1.bb              |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch

meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch new file +57 -0

new file mode 100644
index 0000000..6da0be9
@@ -0,0 +1,57 @@
+From d50686de0406a88ef9112f5252103f799982e84a Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <[email protected]>
+Date: Thu, 4 Feb 2016 14:00:00 -0800
+Subject: [PATCH] avoid h asm constraint for MIPS
+
+The h asm constrain (to extract the high part of a multiplication
+result) has not been recognised since gcc 4.4:
+
+  https://gcc.gnu.org/gcc-4.4/changes.html
+
+Drop the MIPS umul_ppmm() implementations which rely on "=h" and fall
+back to the older implementations (which use explicit mfhi and mflo
+instructions to move the high and low parts of the multiplication
+result into their destinations).
+
+Upstream-Status: Inappropriate [upstream has a different solution]
+
+Signed-off-by: Andre McCurdy <[email protected]>
+---
+ longlong.h | 10 ----------
+ 1 file changed, 10 deletions(-)
+
+diff --git a/longlong.h b/longlong.h
+index b53fbee..0193abb 100644
+--- a/longlong.h
++++ b/longlong.h
+@@ -1011,27 +1011,17 @@ extern UWtype __MPN(udiv_qrnnd) _PROTO ((UWtype *, UWtype, UWtype, UWtype));
+ #endif /* __m88000__ */
+ 
+ #if defined (__mips) && W_TYPE_SIZE == 32
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+-#define umul_ppmm(w1, w0, u, v) \
+-  __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+-#else
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("multu %2,%3\n\tmflo %0\n\tmfhi %1"				\
+ 	   : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
+-#endif
+ #define UMUL_TIME 10
+ #define UDIV_TIME 100
+ #endif /* __mips */
+ 
+ #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64
+-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7
+-#define umul_ppmm(w1, w0, u, v) \
+-  __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v))
+-#else
+ #define umul_ppmm(w1, w0, u, v) \
+   __asm__ ("dmultu %2,%3\n\tmflo %0\n\tmfhi %1"				\
+ 	   : "=d" (w0), "=d" (w1) : "d" (u), "d" (v))
+-#endif
+ #define UMUL_TIME 20
+ #define UDIV_TIME 140
+ #endif /* __mips */
+-- 
+1.9.1
+

meta/recipes-support/gmp/gmp_4.2.1.bb +1 -0

index 362aacf..baec709 100644
@@ -12,6 +12,7 @@ PR = "r2"
 SRC_URI = "${GNU_MIRROR}/gmp/${BP}.tar.bz2 \
            file://disable-stdc.patch \
            file://gmp_fix_for_automake-1.12.patch \
+           file://avoid-h-asm-constraint-for-MIPS.patch \
            "
 
 SRC_URI[md5sum] = "091c56e0e1cca6b09b17b69d47ef18e3"

Signature · 1 line

1.9.1

Andre McCurdy

author

2018-03-21 02:42 UTC #4 lore raw

PATCH 4/6 ncurses: fix build with gcc 5

In reply to Andre McCurdy

Use Gentoo version of backport of upstream patch:

https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch

Signed-off-by Andre McCurdy <[email protected]>

---
 .../ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch    | 53 ++++++++++++++++++++++
 meta/recipes-core/ncurses/ncurses_5.9.bb           |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-core/ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch

meta/recipes-core/ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch new file +53 -0

new file mode 100644
index 0000000..a52d830
@@ -0,0 +1,53 @@
+https://bugs.gentoo.org/545114
+
+extracted from the upstream change (which had many unrelated commits in one)
+
+From 97bb4678dc03e753290b39bbff30ba2825df9517 Mon Sep 17 00:00:00 2001
+From: "Thomas E. Dickey" <[email protected]>
+Date: Sun, 7 Dec 2014 03:10:09 +0000
+Subject: [PATCH] ncurses 5.9 - patch 20141206
+
++ modify MKlib_gen.sh to work around change in development version of
+  gcc introduced here:
+	  https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
+	  https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html
+  (reports by Marcus Shawcroft, Maohui Lei).
+
+Upstream-Status: Backport
+
+  https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/sys-libs/ncurses/files/ncurses-5.9-gcc-5.patch
+
+Signed-off-by: Sanchar Banerjee <[email protected]>
+Signed-off-by: Andre McCurdy <[email protected]>
+
+diff --git a/ncurses/base/MKlib_gen.sh b/ncurses/base/MKlib_gen.sh
+index d8cc3c9..b91398c 100755
+--- a/ncurses/base/MKlib_gen.sh
++++ b/ncurses/base/MKlib_gen.sh
+@@ -474,11 +474,22 @@ sed -n -f $ED1 \
+ 	-e 's/gen_$//' \
+ 	-e 's/  / /g' >>$TMP
+ 
++cat >$ED1 <<EOF
++s/  / /g
++s/^ //
++s/ $//
++s/P_NCURSES_BOOL/NCURSES_BOOL/g
++EOF
++
++# A patch discussed here:
++#	https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html
++# introduces spurious #line markers.  Work around that by ignoring the system's
++# attempt to define "bool" and using our own symbol here.
++sed -e 's/bool/P_NCURSES_BOOL/g' $TMP > $ED2
++cat $ED2 >$TMP
++
+ $preprocessor $TMP 2>/dev/null \
+-| sed \
+-	-e 's/  / /g' \
+-	-e 's/^ //' \
+-	-e 's/_Bool/NCURSES_BOOL/g' \
++| sed -f $ED1 \
+ | $AWK -f $AW2 \
+ | sed -f $ED3 \
+ | sed \

meta/recipes-core/ncurses/ncurses_5.9.bb +1 -0

index 6d23c0c..0644926 100644
@@ -4,6 +4,7 @@ PR = "${INC_PR}.1"
 
 SRC_URI += "file://tic-hang.patch \
             file://config.cache \
+            file://ncurses-5.9-gcc-5.patch \
 "
 
 SRC_URI[md5sum] = "8cb9c412e5f2d96bc6f459aa8c6282a1"

Signature · 1 line

1.9.1

Andre McCurdy

author

2018-03-21 02:42 UTC #5 lore raw

PATCH 5/6 binutils: fix build with gcc 5

In reply to Andre McCurdy

Patch backported from upstream:

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commitdiff;h=ac4eb736520174305bf6e691827f7473b858cff1

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-devtools/binutils/binutils-2.24.inc   |  1 +
 ...86.c-Werror-logical-not-parentheses-error.patch | 61 ++++++++++++++++++++++
 2 files changed, 62 insertions(+)
 create mode 100644 meta/recipes-devtools/binutils/binutils/0001-Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch

meta/recipes-devtools/binutils/binutils-2.24.inc +1 -0

index 63c9287..02d7ed7 100644
@@ -40,6 +40,7 @@ SRC_URI = "\
      file://binutils_CVE-2014-8503.patch \
      file://binutils_CVE-2014-8504.patch \
      file://binutils_CVE-2014-8737.patch \
+     file://0001-Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch \
      "
 
 SRC_URI[md5sum] = "e0f71a7b2ddab0f8612336ac81d9636b"

meta/recipes-devtools/binutils/binutils/0001-Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch new file +61 -0

61 lines not on this page · raw message

Signature · 1 line

1.9.1

Andre McCurdy

author

2018-03-21 02:42 UTC #6 lore raw

PATCH 6/6 mesa: fix SRC_URI

In reply to Andre McCurdy

Switch from ftp -> https and use older-versions path.

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-graphics/mesa/mesa_9.2.5.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-graphics/mesa/mesa_9.2.5.bb +1 -1

index 737ed1a..51a22f8 100644
@@ -1,6 +1,6 @@
 require ${BPN}.inc
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+SRC_URI = "https://mesa.freedesktop.org/archive/older-versions/9.x/${PV}/MesaLib-${PV}.tar.bz2 \
            file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
            file://0006-fix-out-of-tree-egl.patch \
            "

Signature · 1 line

1.9.1

Andre McCurdy

author

2018-05-08 01:22 UTC #7 lore raw

In reply to Andre McCurdy

Quoted 4 lines · Andre McCurdy

Daisy has now (long since) left upstream maintenance and entered into community support. As a member of a community which still actively develops against this version of OE, I would like to propose the following updates.

Ping.

Are these kind of updates OK? Or are there objections to the community trying to support historical releases? There are many millions of devices in the field that I know of which are still being actively developed and maintained on top of OE 1.6.

Quoted 29 lines

Andre McCurdy (4):
gmp_4.2.1: fix build for MIPS
ncurses: fix build with gcc 5
binutils: fix build with gcc 5
mesa: fix SRC_URI

Khem Raj (1):
kernel.bbclass: Remove bashism

Krzysztof Sywula (1):
dtc: old SRC_URI died, changing to new working one

 meta/classes/kernel.bbclass                        |  2 +-
 .../ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch    | 53 +++++++++++++++++++
 meta/recipes-core/ncurses/ncurses_5.9.bb           |  1 +
 meta/recipes-devtools/binutils/binutils-2.24.inc   |  1 +
 ...86.c-Werror-logical-not-parentheses-error.patch | 61 ++++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa_9.2.5.bb           |  2 +-
 meta/recipes-kernel/dtc/dtc.inc                    |  2 +-
 .../avoid-h-asm-constraint-for-MIPS.patch          | 57 ++++++++++++++++++++
 meta/recipes-support/gmp/gmp_4.2.1.bb              |  1 +
 9 files changed, 177 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-core/ncurses/ncurses-5.9/ncurses-5.9-gcc-5.patch
 create mode 100644 meta/recipes-devtools/binutils/binutils/0001-Fix-tc-i386.c-Werror-logical-not-parentheses-error.patch
 create mode 100644 meta/recipes-support/gmp/gmp-4.2.1/avoid-h-asm-constraint-for-MIPS.patch

--
1.9.1

Richard Purdie

2018-05-08 07:40 UTC #8 lore raw

Quoted 8 lines · Andre McCurdy

Quoted 6 lines · Andre McCurdy
Daisy has now (long since) left upstream maintenance and entered into
community support. As a member of a community which still actively develops against this version of OE, I would like to propose the following updates.

Quoted 7 lines

Ping.
Are these kind of updates OK? Or are there objections to the community
trying to support historical releases? There are many millions of devices in the field that I know of which are still being actively developed and maintained on top of OE 1.6.

We've discussed "long term" branches for a while. I suggest that we collect together people who are will to maintain such things and let them push to a namespace in poky-contrib initially, perhaps in other repos eventually where we collect these things together.

Perhaps poky-contrib extended-life/daisy?

If there is common agreement, a group of people could collaborate on such a branch too...

Cheers,

Richard

Andre McCurdy

author

2018-05-08 09:06 UTC #9 lore raw

Quoted 22 lines · Richard Purdie

Quoted 8 lines · Andre McCurdy
Quoted 6 lines · Andre McCurdy
Daisy has now (long since) left upstream maintenance and entered into
community support. As a member of a community which still actively develops against this version of OE, I would like to propose the following updates.
Quoted 7 lines
Ping.
Are these kind of updates OK? Or are there objections to the community
trying to support historical releases? There are many millions of devices in the field that I know of which are still being actively developed and maintained on top of OE 1.6.
We've discussed "long term" branches for a while. I suggest that we collect together people who are will to maintain such things and let them push to a namespace in poky-contrib initially, perhaps in other repos eventually where we collect these things together.

Quoted 4 lines

Perhaps poky-contrib extended-life/daisy?
If there is common agreement, a group of people could collaborate on such a branch too...

Although there are multiple groups still actively developing against OE 1.6 I fear I may be the only one who has any interest in doing so in public. Hoping for a "group of people" to show up and collaborate on a branch in poky-contrib may be asking for too much.

Richard Purdie

2018-05-08 09:15 UTC #10 lore raw

Quoted 11 lines · Andre McCurdy

Quoted 9 lines · Richard Purdie
We've discussed "long term" branches for a while. I suggest that we collect together people who are will to maintain such things and let
them push to a namespace in poky-contrib initially, perhaps in other
repos eventually where we collect these things together.
Perhaps poky-contrib extended-life/daisy?

Quoted 7 lines

Quoted 2 lines
If there is common agreement, a group of people could collaborate on such a branch too...
Although there are multiple groups still actively developing against OE 1.6 I fear I may be the only one who has any interest in doing so in public. Hoping for a "group of people" to show up and collaborate on a branch in poky-contrib may be asking for too much.

Maybe, maybe not. I'd happy enough for you to put these changes there, if others want to join in, great, if not I'm not sure we're in any worse position. I just wanted to highlight the possibility in the future...

Cheers,

Richard

Andre McCurdy

author

2018-05-08 22:07 UTC #11 lore raw

Quoted 20 lines · Richard Purdie

Quoted 11 lines · Andre McCurdy
Quoted 9 lines · Richard Purdie
We've discussed "long term" branches for a while. I suggest that we collect together people who are will to maintain such things and let
them push to a namespace in poky-contrib initially, perhaps in other
repos eventually where we collect these things together.
Perhaps poky-contrib extended-life/daisy?
Quoted 7 lines
Quoted 2 lines
If there is common agreement, a group of people could collaborate on such a branch too...
Although there are multiple groups still actively developing against OE 1.6 I fear I may be the only one who has any interest in doing so in public. Hoping for a "group of people" to show up and collaborate on a branch in poky-contrib may be asking for too much.

Quoted 4 lines

Maybe, maybe not. I'd happy enough for you to put these changes there, if others want to join in, great, if not I'm not sure we're in any worse position. I just wanted to highlight the possibility in the future...

Changes pushed to:

http://git.yoctoproject.org/cgit.cgi/poky-contrib/?h=armcc/extended-life/daisy

What happens next?

Richard Purdie

2018-05-09 11:10 UTC #12 lore raw

Quoted 34 lines · Andre McCurdy

Quoted 27 lines · Richard Purdie
Quoted 18 lines · Andre McCurdy
Quoted 10 lines · Richard Purdie
We've discussed "long term" branches for a while. I suggest that we
collect together people who are will to maintain such things and
let
them push to a namespace in poky-contrib initially, perhaps in other
repos eventually where we collect these things together.
Quoted 5 lines
Perhaps poky-contrib extended-life/daisy?
If there is common agreement, a group of people could collaborate
on such a branch too...
Quoted 7 lines
Although there are multiple groups still actively developing against
OE 1.6 I fear I may be the only one who has any interest in doing so
in public. Hoping for a "group of people" to show up and collaborate
on a branch in poky-contrib may be asking for too much.
Quoted 5 lines
Maybe, maybe not. I'd happy enough for you to put these changes there,
if others want to join in, great, if not I'm not sure we're in any worse position. I just wanted to highlight the possibility in the future...

Quoted 6 lines

Changes pushed to:
http://git.yoctoproject.org/cgit.cgi/poky-contrib/?h=armcc/extended
-life/daisy
What happens next?

Can you push to:

http://git.yoctoproject.org/cgit.cgi/poky-contrib/?h=extended-life/dais
y

? If not, we should give you access to do that (halstead can help), then we publise this on the arch list and see who else, if anyone has other extended-life branches they want to contribute to or work on together with others.

Cheers,

Richard

Andre McCurdy

author

2018-05-10 04:36 UTC #13 lore raw

Quoted 40 lines · Richard Purdie

Quoted 39 lines · Andre McCurdy
Quoted 27 lines · Richard Purdie
Quoted 18 lines · Andre McCurdy
Quoted 10 lines · Richard Purdie
We've discussed "long term" branches for a while. I suggest that we
collect together people who are will to maintain such things and
let
them push to a namespace in poky-contrib initially, perhaps in other
repos eventually where we collect these things together.
Quoted 5 lines
Perhaps poky-contrib extended-life/daisy?
If there is common agreement, a group of people could collaborate
on such a branch too...
Quoted 7 lines
Although there are multiple groups still actively developing against
OE 1.6 I fear I may be the only one who has any interest in doing so
in public. Hoping for a "group of people" to show up and collaborate
on a branch in poky-contrib may be asking for too much.
Quoted 5 lines
Maybe, maybe not. I'd happy enough for you to put these changes there,
if others want to join in, great, if not I'm not sure we're in any worse position. I just wanted to highlight the possibility in the future...
Changes pushed to:
http://git.yoctoproject.org/cgit.cgi/poky-contrib/?h=armcc/extended
-life/daisy

Quoted 6 lines

Quoted 1 line
What happens next?
Can you push to:
http://git.yoctoproject.org/cgit.cgi/poky-contrib/?h=extended-life/dais
y

Yes, I can today. Done.

Quoted 9 lines

? If not, we should give you access to do that (halstead can help), then we publise this on the arch list and see who else, if anyone has other extended-life branches they want to contribute to or work on together with others.
Cheers,
Richard