fix to bug #1099, updates to Upstream-Status and distro_tracking_fields.inc

PATCH Applied Dexuan Cui 3 participants 8 messages Jun 29, 2011

lore

Share & tools

lore

Dexuan Cui

author

2011-06-29 13:13 UTC #0 lore raw

cover fix to bug #1099, updates to Upstream-Status and distro_tracking_fields.inc

The following changes since commit a4f3e006e1f2fd93f156012af2a05adccf41d065:

u-boot-mkimage: bump version to 2011.03 (2011-06-28 17:13:19 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dcui/master
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/master

Dexuan Cui (3):
grub: add -fno-reorder-functions into STAGE2_COMPILE
lttng-ust: change the patch's Upstream-Status to Accepted. distro_tracking_fields.inc: update RECIPE_MANUAL_CHECK_DATE for
screen and tcf-agent

 .../conf/distro/include/distro_tracking_fields.inc |    3 +-
 .../grub/grub-0.97/no-reorder-functions.patch      |   31 ++++++++++++++++++++
 meta/recipes-bsp/grub/grub_0.97.bb                 |    5 ++-
 .../lttng/lttng-ust/uclibc-sched_getcpu.patch      |    2 +-
 4 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch

Signature · 1 line

1.7.6

Dexuan Cui

author

2011-06-29 13:13 UTC #1 lore raw

PATCH 1/3 grub: add -fno-reorder-functions into STAGE2_COMPILE

This is used to work around a gcc-4.6's bug about the option.

[YOCTO #1099]

Signed-off-by Dexuan Cui <[email protected]>

---
 .../grub/grub-0.97/no-reorder-functions.patch      |   31 ++++++++++++++++++++
 meta/recipes-bsp/grub/grub_0.97.bb                 |    5 ++-
 2 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch

meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch new file +31 -0

new file mode 100644
index 0000000..70037e4
@@ -0,0 +1,31 @@
+Upstream-Status: Inappropriate [disable feature]
+
+After the commit "tcmode-default: switch to gcc 4.6.0 for x86, x86-64 & arm",
+we got bug 1099 (http://bugzilla.yoctoproject.org/show_bug.cgi?id=1099):
+
+Running "install --stage2=/ssd/boot/grub/stage2 /boot/grub/stage1(hd0)
+     /boot/grub/stage2 p /boot/grub/menu list" failed
+Error 6: Mismatched or corrupt version of stage1/stage2
+
+This turned out to be a gcc's bug. See
+https://bugs.gentoo.org/show_bug.cgi?id=360513
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39333
+
+Upstream gcc seems uninterested in the bug, so at present we can disable the
+option as a workaround. Thanks Ryan Hill for the investigation and the
+workaround patch.
+
+Dexuan Cui <[email protected]>
+Wed Jun 29 20:21:39 CST 2011
+
+--- grub-0.97/stage2/Makefile.am.orig
++++ grub-0.97/stage2/Makefile.am
+@@ -79,7 +79,7 @@
+ HERCULES_FLAGS =
+ endif
+ 
+-STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-builtin -nostdinc \
++STAGE2_COMPILE = $(STAGE2_CFLAGS) -fno-reorder-functions -fno-builtin -nostdinc \
+ 	$(NETBOOT_FLAGS) $(SERIAL_FLAGS) $(HERCULES_FLAGS)
+ 
+ STAGE1_5_LINK = -nostdlib -Wl,-N -Wl,-Ttext -Wl,2000

meta/recipes-bsp/grub/grub_0.97.bb +3 -2

index 131d942..ffacb61 100644
@@ -11,10 +11,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \
                     file://grub/main.c;beginline=3;endline=9;md5=22a5f28d2130fff9f2a17ed54be90ed6"
 
 RDEPENDS_${PN} = "diffutils"
-PR = "r3"
+PR = "r6"
 
 SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz; \
-	   file://autohell.patch;apply=yes "
+            file://no-reorder-functions.patch \
+            file://autohell.patch "
 
 SRC_URI[md5sum] = "cd3f3eb54446be6003156158d51f4884"
 SRC_URI[sha256sum] = "4e1d15d12dbd3e9208111d6b806ad5a9857ca8850c47877d36575b904559260b"

Signature · 1 line

1.7.6

Cui, Dexuan

author

2011-06-29 13:20 UTC #2 lore raw

Re: [PATCH 1/3] grub: add -fno-reorder-functions into STAGE2_COMPILE

meta/recipes-bsp/grub/grub_0.97.bb LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b \ · line 14

Quoted 12 lines · Dexuan

This is used to work around a gcc-4.6's bug about the option.
[YOCTO #1099]
meta/recipes-bsp/grub/grub_0.97.bb +1 -1
index 131d942..ffacb61 100644
 RDEPENDS_${PN} = "diffutils"
-PR = "r3"
+PR = "r6"

Sorry, PR should be "r4" here... I used "r6" in my debugging. I forgot to clean this up when I sent the patch.

I've re-pushed my branch.
Please use the new commit:
http://git.pokylinux.org/cgit.cgi/poky-contrib/commit/?h=dcui/master&id=5c670ef29d828e76ae101fcfe9234732af759dfa

Thanks,
-- Dexuan

Phil Blundell

2011-06-29 13:24 UTC #3 lore raw

Re: [PATCH 1/3] grub: add -fno-reorder-functions into STAGE2_COMPILE

In reply to Dexuan Cui

meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch line 16

Quoted 7 lines · Dexuan Cui

meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch new file +7 -0

+This turned out to be a gcc's bug. See
+https://bugs.gentoo.org/show_bug.cgi?id=360513
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39333
+
+Upstream gcc seems uninterested in the bug, so at present we can disable the
+option as a workaround. Thanks Ryan Hill for the investigation and the
+workaround patch.

I'm not sure it's fair to say that upstream gcc is uninterested. It doesn't appear that anybody has been willing or able to produce a testcase which will allow the gcc people to debug the problem.

Richard Purdie

2011-06-29 14:08 UTC #4 lore raw

Re: [PATCH 1/3] grub: add -fno-reorder-functions into STAGE2_COMPILE

Quoted 12 lines · Phil Blundell

meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch line 16
Quoted 7 lines · Dexuan Cui
meta/recipes-bsp/grub/grub-0.97/no-reorder-functions.patch new file +7 -0
+This turned out to be a gcc's bug. See
+https://bugs.gentoo.org/show_bug.cgi?id=360513
+http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39333
+
+Upstream gcc seems uninterested in the bug, so at present we can disable the
+option as a workaround. Thanks Ryan Hill for the investigation and the
+workaround patch.
I'm not sure it's fair to say that upstream gcc is uninterested. It doesn't appear that anybody has been willing or able to produce a testcase which will allow the gcc people to debug the problem.

Agreed, it would be good if the gcc people could get a testcase to fix the problem. In the meantime I will take the workaround though.

Cheers,

RIchard

Dexuan Cui

author

2011-06-29 13:13 UTC #5 lore raw

PATCH 2/3 lttng-ust: change the patch's Upstream-Status to Accepted.

In reply to Dexuan Cui

Signed-off-by Dexuan Cui <[email protected]>

---
 .../lttng/lttng-ust/uclibc-sched_getcpu.patch      |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta/recipes-kernel/lttng/lttng-ust/uclibc-sched_getcpu.patch +1 -1

index a6aa6a7..f4ea196 100644
@@ -6,7 +6,7 @@ this header is not needed even in eglibc case so it can be removed
 
 Signed-off-by: Khem Raj <[email protected]>
 
-Upstream-Status: Submitted
+Upstream-Status: Accepted
 
 Index: ust-0.12/libust/tracer.h
 ===================================================================

Signature · 1 line

1.7.6

Dexuan Cui

author

2011-06-29 13:13 UTC #6 lore raw

PATCH 3/3 distro_tracking_fields.inc: update RECIPE_MANUAL_CHECK_DATE for screen and tcf-agent

In reply to Dexuan Cui

Signed-off-by Dexuan Cui <[email protected]>

---
 .../conf/distro/include/distro_tracking_fields.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

meta/conf/distro/include/distro_tracking_fields.inc +2 -1

index e9594cf..6699ab7 100644
@@ -1001,6 +1001,7 @@ RECIPE_MAINTAINER_pn-mdadm = "Dexuan Cui <[email protected]>"
 RECIPE_STATUS_pn-screen = "green"
 RECIPE_DEPENDENCY_CHECK_pn-screen = "not done"
 RECIPE_LATEST_VERSION_pn-screen = "4.0.3"
+RECIPE_MANUAL_CHECK_DATE_pn-screen = "June 29, 2011"
 RECIPE_NO_OF_PATCHES_pn-screen = "2"
 RECIPE_PATCH_pn-screen+screen_4.0.3-11+lenny1.diff.gz = "Debian's enhancement"
 RECIPE_PATCH_pn-screen+configure = "fix configure.in to make the build pass"

@@ -2773,7 +2774,7 @@ RECIPE_STATUS_pn-tcf-agent = "green"
 DISTRO_PN_ALIAS_pn-tcf-agent = "WindRiver upstream=http://www.eclipse.org/dsdp/tm/"
 RECIPE_DEPENDENCY_CHECK_pn-tcf-agent = "not done"
 RECIPE_LATEST_VERSION_pn-tcf-agent = "0.3.0+svnr1078"
-RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = "June 13, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-tcf-agent = "June 29, 2011"
 RECIPE_NO_UPDATE_REASON_pn-tcf-agent = "Do not upgrade to version: (998)? because upstraem hasn't defined a formal release tag."
 RECIPE_NO_OF_PATCHES_pn-tcf-agent = "2"
 RECIPE_PATCH_pn-tcf-agent+terminals_agent = "we might get the patch from git://git.yoctoproject.org/eclipse-poky.git in future"

Signature · 1 line

1.7.6

Richard Purdie

Applied

2011-06-29 14:08 UTC #7 lore raw

In reply to Dexuan Cui

Quoted 8 lines · Dexuan Cui

The following changes since commit a4f3e006e1f2fd93f156012af2a05adccf41d065:
u-boot-mkimage: bump version to 2011.03 (2011-06-28 17:13:19 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dcui/master
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/master

Quoted 5 lines

Dexuan Cui (3):
grub: add -fno-reorder-functions into STAGE2_COMPILE
lttng-ust: change the patch's Upstream-Status to Accepted. distro_tracking_fields.inc: update RECIPE_MANUAL_CHECK_DATE for
screen and tcf-agent

Merged to master, thanks.

Richard