pull request 20111214
cover pull request 20111214
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
Steffen
The following changes since commit 9826895e30baa597a5ec433cc0ebd52f5f6c8796:
Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded sledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenance
Stefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc
combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.x
recipes/icedtea/icedtea6-native.inc | 9 ++++- recipes/live555/live555_20110314.bb | 8 ---- recipes/live555/live555_20111120.bb | 7 ++++ recipes/llvm/llvm2.7/include-fixes.patch | 55 ++++++++++++++++++++++++++++++ recipes/llvm/llvm2.7_2.7.bb | 3 +- recipes/openjdk/openjdk-6-common.inc | 9 ++++- 6 files changed, 80 insertions(+), 11 deletions(-) delete mode 100644 recipes/live555/live555_20110314.bb create mode 100644 recipes/live555/live555_20111120.bb create mode 100644 recipes/llvm/llvm2.7/include-fixes.patch
Signature · 1 line
1.7.7
PATCH 1/5 llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combinations
From: Stefan Schmidt <[email protected]>
Its seems there is a stricter header checking again which results in errors like this:
error: 'ptrdiff_t' does not name a type
This happens on my Debian SID system. Adding the needed includes fixes the build.
--- recipes/llvm/llvm2.7/include-fixes.patch | 55 ++++++++++++++++++++++++++++++ recipes/llvm/llvm2.7_2.7.bb | 3 +- 2 files changed, 57 insertions(+), 1 deletions(-) create mode 100644 recipes/llvm/llvm2.7/include-fixes.patch
recipes/llvm/llvm2.7/include-fixes.patch new file +55 -0
@@ -0,0 +1,55 @@ +Fixes stricter includes which result in failures like this: +error: 'ptrdiff_t' does not name a type + +Upstream-Status: Unknown, not submitted as 2.7 is very old + +Signed-off-by: Stefan Schmidt <[email protected]> + +Index: llvm-2.7/include/llvm/ADT/SmallVector.h +=================================================================== +--- llvm-2.7.orig/include/llvm/ADT/SmallVector.h 2011-05-08 17:07:09.000000000 +0200 ++++ llvm-2.7/include/llvm/ADT/SmallVector.h 2011-05-08 17:07:25.000000000 +0200 +@@ -19,6 +19,7 @@ + #include <cassert> + #include <cstring> + #include <memory> ++#include <stddef.h> + + #ifdef _MSC_VER + namespace std { +Index: llvm-2.7/include/llvm/ADT/ilist.h +=================================================================== +--- llvm-2.7.orig/include/llvm/ADT/ilist.h 2011-05-08 20:24:57.000000000 +0200 ++++ llvm-2.7/include/llvm/ADT/ilist.h 2011-05-08 20:25:12.000000000 +0200 +@@ -40,6 +40,7 @@ + + #include <cassert> + #include <iterator> ++#include <stddef.h> + + namespace llvm { + +Index: llvm-2.7/include/llvm/Use.h +=================================================================== +--- llvm-2.7.orig/include/llvm/Use.h 2011-05-08 20:28:21.000000000 +0200 ++++ llvm-2.7/include/llvm/Use.h 2011-05-08 20:28:37.000000000 +0200 +@@ -28,6 +28,7 @@ + #include "llvm/Support/Casting.h" + #include "llvm/ADT/PointerIntPair.h" + #include <iterator> ++#include <stddef.h> + + namespace llvm { + +Index: llvm-2.7/include/llvm/ADT/DenseMap.h +=================================================================== +--- llvm-2.7.orig/include/llvm/ADT/DenseMap.h 2011-05-08 20:32:11.000000000 +0200 ++++ llvm-2.7/include/llvm/ADT/DenseMap.h 2011-05-08 20:32:21.000000000 +0200 +@@ -23,6 +23,7 @@ + #include <utility> + #include <cassert> + #include <cstring> ++#include <stddef.h> + + namespace llvm { +
recipes/llvm/llvm2.7_2.7.bb +2 -1
@@ -1,6 +1,6 @@ require llvm.inc -PR = "r9" +PR = "r10" DEPENDS = "llvm-common llvm2.7-native"
@@ -15,6 +15,7 @@ SRC_URI += "\ file://r104652-VFPLoadStoreMultiple.patch \ file://r104653-BFC-BFI.patch \ file://rawMOVLRPC.patch \ + file://include-fixes.patch \ " LLVM_RELEASE = "2.7"
Signature · 1 line
1.7.7
PATCH 2/5 llvm2.7_2.7.bb: Update patch to use c++ include style.
From: Stefan Schmidt <[email protected]>
As henning suggested on we should use a c++ style include here instead. Thus changing to #include <cstddef>
--- recipes/llvm/llvm2.7/include-fixes.patch | 8 ++++---- recipes/llvm/llvm2.7_2.7.bb | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
recipes/llvm/llvm2.7/include-fixes.patch +4 -4
@@ -13,7 +13,7 @@ Index: llvm-2.7/include/llvm/ADT/SmallVector.h #include <cassert> #include <cstring> #include <memory> -+#include <stddef.h> ++#include <cstddef> #ifdef _MSC_VER namespace std {
@@ -25,7 +25,7 @@ Index: llvm-2.7/include/llvm/ADT/ilist.h #include <cassert> #include <iterator> -+#include <stddef.h> ++#include <cstddef> namespace llvm {
@@ -37,7 +37,7 @@ Index: llvm-2.7/include/llvm/Use.h #include "llvm/Support/Casting.h" #include "llvm/ADT/PointerIntPair.h" #include <iterator> -+#include <stddef.h> ++#include <cstddef> namespace llvm {
@@ -49,7 +49,7 @@ Index: llvm-2.7/include/llvm/ADT/DenseMap.h #include <utility> #include <cassert> #include <cstring> -+#include <stddef.h> ++#include <cstddef> namespace llvm {
recipes/llvm/llvm2.7_2.7.bb +1 -1
@@ -1,6 +1,6 @@ require llvm.inc -PR = "r10" +PR = "r11" DEPENDS = "llvm-common llvm2.7-native"
Signature · 1 line
1.7.7
PATCH 4/5 icedtea6-native: fix problem on build hosts with linux kernel 3.x
In reply to Steffen SledzFrom: Steffen Sledz <[email protected]>
see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7072341
--- recipes/icedtea/icedtea6-native.inc | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
recipes/icedtea/icedtea6-native.inc +8 -1
@@ -1,7 +1,7 @@ DESCRIPTION = "Harness to build the source code from OpenJDK using Free Software build tools" HOMEPAGE = "http://icedtea.classpath.org" LICENSE = "GPL with Classpath Exception" -INC_PR = "r4" +INC_PR = "r5" DEPENDS = "virtual/javac-native classpath-tools-native \ virtual/java-native classpath-native \
@@ -108,6 +108,13 @@ do_configure_append() { -e"s|g++\$(GCC_SUFFIX)|${CXX}|" \ $F done + + for F in openjdk/hotspot/make/linux/Makefile openjdk-ecj/hotspot/make/linux/Makefile ; + do + sed -i \ + -e"s|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%|" \ + $F + done } EXTRA_OEMAKE = ' \
Signature · 1 line
1.7.7
PATCH 3/5 live555: replace version 20110314 with 20111120
In reply to Steffen Sledz--- recipes/live555/live555_20110314.bb | 8 -------- recipes/live555/live555_20111120.bb | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 recipes/live555/live555_20110314.bb create mode 100644 recipes/live555/live555_20111120.bb
recipes/live555/live555_20110314.bb deleted +0 -8
@@ -1,8 +0,0 @@ -require live555.inc - -PR = "${INC_PR}.0" - -SRC_URI[md5sum] = "ff65b2c598e970b4b6c8219a1811de00" -SRC_URI[sha256sum] = "c6ce050a7f9f69901e6f7f81a6745c82d9419e3904a753b2d5db1139caaf6738" - -
recipes/live555/live555_20111120.bb new file +7 -0
@@ -0,0 +1,7 @@ +require live555.inc + +PR = "${INC_PR}.0" + +SRC_URI[md5sum] = "8e5ebefdf7d12ca9cfd7175ff3d7eef2" +SRC_URI[sha256sum] = "695cf22d43516f082e26ee9eb8373a0ae3b4ed472f1e224b51d881219f694f2e" +
Signature · 1 line
1.7.7
PATCH 5/5 openjdk: fix problem on build hosts with linux kernel 3.x
In reply to Steffen Sledzsee http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7072341
--- recipes/openjdk/openjdk-6-common.inc | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-)
recipes/openjdk/openjdk-6-common.inc +8 -1
@@ -10,7 +10,7 @@ ICEDTEA = "NEEDS TO BE SET" S = "${WORKDIR}/${ICEDTEA}" B = "${S}/build" -INC_PR = "r11" +INC_PR = "r12" SRC_URI = "\ ${ICEDTEA_URI} \
@@ -208,6 +208,13 @@ do_configure_prepend() { do_configure_append() { oe_runmake patch-ecj + + for F in ${WORKDIR}/openjdk-src-dir/hotspot/make/linux/Makefile ${WORKDIR}/icedtea6-1.8.5/build/openjdk-ecj/hotspot/make/linux/Makefile ${WORKDIR}/icedtea6-1.8.5/build/openjdk/hotspot/make/linux/Makefile ; + do + sed -i \ + -e"s|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 2.7%|SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%|" \ + $F + done } # Work around broken variable quoting in oe-stable 2009 and provide the variable
Signature · 1 line
1.7.7
Quoted 22 lines · Steffen Sledz
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded sledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.x
Only 1 2 and 3 made it to the ML. 1 and 2 are fine. For 3, we should grab the old file (someone must have a copy) and stick that on sources.openembedded.org.
Signature · 1 line
Tom
Quoted 23 lines · Tom Rini
Quoted 22 lines · Steffen Sledz
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded sledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.
Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
I take it back, gmail playing tricks on me.\
Signature · 1 line
Tom
Am 14.12.2011 19:07, schrieb Tom Rini:
Quoted 23 lines · Steffen Sledz
Quoted 22 lines
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembeddedsledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc
combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.
Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
Please have a second look. They all should be there.
Quoted 3 lines
1 and 2 are fine. For 3, we should
grab the old file (someone must have a copy) and stick that on sources.openembedded.org.
The version replacement is not just for the well known live555 download problem. It fixes some other problems too. Also the version introduced by this patch is already uploaded to sources.openembedded.org and the angstrom mirrors.
Regards,
Steffen
Signature · 7 lines
DResearch Fahrzeugelektronik GmbH Otto-Schmirgal-Str. 3, 10319 Berlin, Germany Tel: +49 30 515932-237 mailto:[email protected] Fax: +49 30 515932-299 Geschäftsführer: Dr. Michael Weber, Werner Mögle; Amtsgericht Berlin Charlottenburg; HRB 130120 B; Ust.-IDNr. DE273952058
Quoted 31 lines · Steffen Sledz
Am 14.12.2011 19:07, schrieb Tom Rini:
Quoted 23 lines · Steffen Sledz
Quoted 22 lines
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembeddedsledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc
combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
Quoted 7 lines
Please have a second look. They all should be there.
Quoted 3 lines
1 and 2 are fine. For 3, we should
grab the old file (someone must have a copy) and stick that on sources.openembedded.org.The version replacement is not just for the well known live555 download problem. It fixes some other problems too. Also the version introduced by this patch is already uploaded to sources.openembedded.org and the angstrom mirrors.
Ping!
Signature · 7 lines
DResearch Fahrzeugelektronik GmbH Otto-Schmirgal-Str. 3, 10319 Berlin, Germany Tel: +49 30 515932-237 mailto:[email protected] Fax: +49 30 515932-299 Geschäftsführer: Dr. Michael Weber, Werner Mögle; Amtsgericht Berlin Charlottenburg; HRB 130120 B; Ust.-IDNr. DE273952058
Quoted 34 lines · Steffen Sledz
Quoted 33 lines · Steffen Sledz
Am 14.12.2011 19:07, schrieb Tom Rini:
Quoted 23 lines · Steffen Sledz
Quoted 22 lines
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded sledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
Please have a second look. They all should be there.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
1 and 2 are fine. For 3, we should
grab the old file (someone must have a copy) and stick that on sources.openembedded.org.The version replacement is not just for the well known live555 download problem. It fixes some other problems too. Also the version introduced by this patch is already uploaded to sources.openembedded.org and the angstrom mirrors.
Ping!
Sorry for the delay. Especially since I'm now going to ask you to rebase the branch. Here's what I get after merging your request:
$ git log --oneline origin.. b6cc3be87 Merge branch 'sledz/maintenance' of git://git.openembedded.org/openemb eda1aaf openjdk: fix problem on build hosts with linux kernel 3.x 4500148 icedtea6-native: fix problem on build hosts with linux kernel 3.x cb5b2fb live555: replace version 20110314 with 20111120 3904feb llvm2.7_2.7.bb: Update patch to use c++ include style. a992bc4 llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combination 9826895 Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ebb70fd gypsy: update to latest upstream version 0.8, and remove version 0.7 69186cf gypsy: move generic SRC_URI part to gypsy.inc 7f9e803 gypsy: fix packaging of DBus starter script 45b8af8 rsyslog: change path for config includes to /etc/rsyslog.d 77a5200 Revert "gypsy: fix packaging of DBus starter script" 105f8ae Revert "gypsy: move generic SRC_URI part to gypsy.inc" 701d1cb Revert "gypsy: update to latest upstream version 0.8, and remove version 593bb51 Revert "rsyslog: change path for config includes to /etc/rsyslog.d" de3065d gypsy: update to latest upstream version 0.8, and remove version 0.7 dbb8899 gypsy: move generic SRC_URI part to gypsy.inc 9bef377 gypsy: fix packaging of DBus starter script 772286e Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ef52795 rsyslog: change path for config includes to /etc/rsyslog.d
I'm sure it's all unintentional.
Signature · 1 line
Tom
Quoted 67 lines · Tom Rini
Quoted 34 lines · Steffen Sledz
Quoted 33 lines · Steffen Sledz
Am 14.12.2011 19:07, schrieb Tom Rini:
Quoted 23 lines · Steffen Sledz
Quoted 22 lines
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembeddedsledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc
combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
Please have a second look. They all should be there.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
1 and 2 are fine. For 3, we should
grab the old file (someone must have a copy) and stick that on sources.openembedded.org.The version replacement is not just for the well known live555 download problem. It fixes some other problems too. Also the version introduced by this patch is already uploaded to sources.openembedded.org and the angstrom mirrors.
Ping!
Sorry for the delay. Especially since I'm now going to ask you to rebase the branch. Here's what I get after merging your request:
$ git log --oneline origin.. b6cc3be87 Merge branch 'sledz/maintenance' of git://git.openembedded.org/openemb eda1aaf openjdk: fix problem on build hosts with linux kernel 3.x 4500148 icedtea6-native: fix problem on build hosts with linux kernel 3.x cb5b2fb live555: replace version 20110314 with 20111120 3904feb llvm2.7_2.7.bb: Update patch to use c++ include style. a992bc4 llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combination 9826895 Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ebb70fd gypsy: update to latest upstream version 0.8, and remove version 0.7 69186cf gypsy: move generic SRC_URI part to gypsy.inc 7f9e803 gypsy: fix packaging of DBus starter script 45b8af8 rsyslog: change path for config includes to /etc/rsyslog.d 77a5200 Revert "gypsy: fix packaging of DBus starter script" 105f8ae Revert "gypsy: move generic SRC_URI part to gypsy.inc" 701d1cb Revert "gypsy: update to latest upstream version 0.8, and remove version 593bb51 Revert "rsyslog: change path for config includes to /etc/rsyslog.d" de3065d gypsy: update to latest upstream version 0.8, and remove version 0.7 dbb8899 gypsy: move generic SRC_URI part to gypsy.inc 9bef377 gypsy: fix packaging of DBus starter script 772286e Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ef52795 rsyslog: change path for config includes to /etc/rsyslog.d
Quoted 1 line
I'm sure it's all unintentional.
The pull request contains the last five commits only ("The following changes since commit 9826895e30baa597a5ec433cc0ebd52f5f6c8796").
Maybe i need some help in using git here. How should i prepare my branch to fulfil your requirements?
Regards,
Steffen
Signature · 7 lines
DResearch Fahrzeugelektronik GmbH Otto-Schmirgal-Str. 3, 10319 Berlin, Germany Tel: +49 30 515932-237 mailto:[email protected] Fax: +49 30 515932-299 Geschäftsführer: Dr. Michael Weber, Werner Mögle; Amtsgericht Berlin Charlottenburg; HRB 130120 B; Ust.-IDNr. DE273952058
Quoted 68 lines · Steffen Sledz
Quoted 67 lines · Tom Rini
Quoted 34 lines · Steffen Sledz
Quoted 33 lines · Steffen Sledz
Am 14.12.2011 19:07, schrieb Tom Rini:
Quoted 23 lines · Steffen Sledz
Quoted 22 lines
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded sledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
Please have a second look. They all should be there.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
1 and 2 are fine. For 3, we should
grab the old file (someone must have a copy) and stick that on sources.openembedded.org.The version replacement is not just for the well known live555 download problem. It fixes some other problems too. Also the version introduced by this patch is already uploaded to sources.openembedded.org and the angstrom mirrors.
Ping!
Sorry for the delay. Especially since I'm now going to ask you to rebase the branch. Here's what I get after merging your request:
$ git log --oneline origin.. b6cc3be87 Merge branch 'sledz/maintenance' of git://git.openembedded.org/openemb eda1aaf openjdk: fix problem on build hosts with linux kernel 3.x 4500148 icedtea6-native: fix problem on build hosts with linux kernel 3.x cb5b2fb live555: replace version 20110314 with 20111120 3904feb llvm2.7_2.7.bb: Update patch to use c++ include style. a992bc4 llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combination 9826895 Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ebb70fd gypsy: update to latest upstream version 0.8, and remove version 0.7 69186cf gypsy: move generic SRC_URI part to gypsy.inc 7f9e803 gypsy: fix packaging of DBus starter script 45b8af8 rsyslog: change path for config includes to /etc/rsyslog.d 77a5200 Revert "gypsy: fix packaging of DBus starter script" 105f8ae Revert "gypsy: move generic SRC_URI part to gypsy.inc" 701d1cb Revert "gypsy: update to latest upstream version 0.8, and remove version 593bb51 Revert "rsyslog: change path for config includes to /etc/rsyslog.d" de3065d gypsy: update to latest upstream version 0.8, and remove version 0.7 dbb8899 gypsy: move generic SRC_URI part to gypsy.inc 9bef377 gypsy: fix packaging of DBus starter script 772286e Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ef52795 rsyslog: change path for config includes to /etc/rsyslog.d
Quoted 5 lines
Quoted 1 line
I'm sure it's all unintentional.
The pull request contains the last five commits only ("The following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796").Maybe i need some help in using git here. How should i prepare my branch to fulfil your requirements?
Are others using your branch? If not, git push <name of your writable OE remote> :sledz/maintenance to delete your current branch, git rebase -i origin/2011.03-maintenance (and remove the commits you no longer want) then git push <name of writeable OE remote> local-branch:sledz/maintenance. If others are using your branch, skip the first step and for the second step do a git checkout -b clean-push origin/sledz/maintenance, then do the rebase in that branch and push to sledz/pull-request-some-date-spec
Signature · 1 line
Tom
Quoted 73 lines · Tom Rini
Quoted 72 lines · Steffen Sledz
Quoted 67 lines · Tom Rini
Quoted 34 lines · Steffen Sledz
Quoted 33 lines · Steffen Sledz
Am 14.12.2011 19:07, schrieb Tom Rini:
Quoted 23 lines · Steffen Sledz
Quoted 22 lines
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembeddedsledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc
combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
Please have a second look. They all should be there.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
1 and 2 are fine. For 3, we should
grab the old file (someone must have a copy) and stick that on sources.openembedded.org.The version replacement is not just for the well known live555 download problem. It fixes some other problems too. Also the version introduced by this patch is already uploaded to sources.openembedded.org and the angstrom mirrors.
Ping!
Sorry for the delay. Especially since I'm now going to ask you to rebase the branch. Here's what I get after merging your request:
$ git log --oneline origin.. b6cc3be87 Merge branch 'sledz/maintenance' of git://git.openembedded.org/openemb eda1aaf openjdk: fix problem on build hosts with linux kernel 3.x 4500148 icedtea6-native: fix problem on build hosts with linux kernel 3.x cb5b2fb live555: replace version 20110314 with 20111120 3904feb llvm2.7_2.7.bb: Update patch to use c++ include style. a992bc4 llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combination 9826895 Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ebb70fd gypsy: update to latest upstream version 0.8, and remove version 0.7 69186cf gypsy: move generic SRC_URI part to gypsy.inc 7f9e803 gypsy: fix packaging of DBus starter script 45b8af8 rsyslog: change path for config includes to /etc/rsyslog.d 77a5200 Revert "gypsy: fix packaging of DBus starter script" 105f8ae Revert "gypsy: move generic SRC_URI part to gypsy.inc" 701d1cb Revert "gypsy: update to latest upstream version 0.8, and remove version 593bb51 Revert "rsyslog: change path for config includes to /etc/rsyslog.d" de3065d gypsy: update to latest upstream version 0.8, and remove version 0.7 dbb8899 gypsy: move generic SRC_URI part to gypsy.inc 9bef377 gypsy: fix packaging of DBus starter script 772286e Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ef52795 rsyslog: change path for config includes to /etc/rsyslog.dQuoted 1 line
I'm sure it's all unintentional.
The pull request contains the last five commits only ("The following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796").
Quoted 7 lines
Quoted 1 line
Maybe i need some help in using git here. How should i prepare my branch to fulfil your requirements?
Are others using your branch? If not, git push <name of your writable OE remote> :sledz/maintenance to delete your current branch, git rebase -i origin/2011.03-maintenance (and remove the commits you no longer want) then git push <name of writeable OE remote> local-branch:sledz/maintenance.
Sorry, but i need some more guidance here. Everytime i think i made it another problem drives me crazy. :(
Assuming i've a fresh local clone created with
git clone [email protected]:openembedded
What are the exact next stepts?
I tried
git checkout sledz/maintenance
git rebase -i origin/2011.03-maintenance # unwanted commits removed
git push origin sledz/maintenance
The last results in
To [email protected]:openembedded
! [rejected] sledz/maintenance -> sledz/maintenance (non-fast-forward)
error: failed to push some refs to '[email protected]:openembedded' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details.
Quoted 4 lines
If others are using your branch, skip
the first step and for the second step do a git checkout -b clean-push origin/sledz/maintenance, then do the rebase in that branch and push to sledz/pull-request-some-date-spec
Signature · 7 lines
DResearch Fahrzeugelektronik GmbH Otto-Schmirgal-Str. 3, 10319 Berlin, Germany Tel: +49 30 515932-237 mailto:[email protected] Fax: +49 30 515932-299 Geschäftsführer: Dr. Michael Weber, Werner Mögle; Amtsgericht Berlin Charlottenburg; HRB 130120 B; Ust.-IDNr. DE273952058
Quoted 96 lines · Steffen Sledz
Quoted 73 lines · Tom Rini
Quoted 72 lines · Steffen Sledz
Quoted 67 lines · Tom Rini
Quoted 34 lines · Steffen Sledz
Quoted 33 lines · Steffen Sledz
Am 14.12.2011 19:07, schrieb Tom Rini:
Quoted 23 lines · Steffen Sledz
Quoted 22 lines
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded sledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
Please have a second look. They all should be there.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
1 and 2 are fine. For 3, we should
grab the old file (someone must have a copy) and stick that on sources.openembedded.org.The version replacement is not just for the well known live555 download problem. It fixes some other problems too. Also the version introduced by this patch is already uploaded to sources.openembedded.org and the angstrom mirrors.
Ping!
Sorry for the delay. Especially since I'm now going to ask you to rebase the branch. Here's what I get after merging your request:
$ git log --oneline origin.. b6cc3be87 Merge branch 'sledz/maintenance' of git://git.openembedded.org/openemb eda1aaf openjdk: fix problem on build hosts with linux kernel 3.x 4500148 icedtea6-native: fix problem on build hosts with linux kernel 3.x cb5b2fb live555: replace version 20110314 with 20111120 3904feb llvm2.7_2.7.bb: Update patch to use c++ include style. a992bc4 llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combination 9826895 Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ebb70fd gypsy: update to latest upstream version 0.8, and remove version 0.7 69186cf gypsy: move generic SRC_URI part to gypsy.inc 7f9e803 gypsy: fix packaging of DBus starter script 45b8af8 rsyslog: change path for config includes to /etc/rsyslog.d 77a5200 Revert "gypsy: fix packaging of DBus starter script" 105f8ae Revert "gypsy: move generic SRC_URI part to gypsy.inc" 701d1cb Revert "gypsy: update to latest upstream version 0.8, and remove version 593bb51 Revert "rsyslog: change path for config includes to /etc/rsyslog.d" de3065d gypsy: update to latest upstream version 0.8, and remove version 0.7 dbb8899 gypsy: move generic SRC_URI part to gypsy.inc 9bef377 gypsy: fix packaging of DBus starter script 772286e Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ef52795 rsyslog: change path for config includes to /etc/rsyslog.dQuoted 1 line
I'm sure it's all unintentional.
The pull request contains the last five commits only ("The following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796").Quoted 7 lines
Quoted 1 line
Maybe i need some help in using git here. How should i prepare my branch to fulfil your requirements?
Are others using your branch? If not, git push <name of your writable OE remote> :sledz/maintenance to delete your current branch, git rebase -i origin/2011.03-maintenance (and remove the commits you no longer want) then git push <name of writeable OE remote> local-branch:sledz/maintenance.
Sorry, but i need some more guidance here. Everytime i think i made it another problem drives me crazy. :(
Assuming i've a fresh local clone created with
git clone [email protected]:openembedded
What are the exact next stepts?
I tried
git checkout sledz/maintenance
git rebase -i origin/2011.03-maintenance # unwanted commits removed git push origin sledz/maintenance
Quoted 8 lines
The last results in
To [email protected]:openembedded
! [rejected] sledz/maintenance -> sledz/maintenance (non-fast-forward)
error: failed to push some refs to '[email protected]:openembedded' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details.
You either need to do the git push [email protected]:openembedded :sledz/maintenance (to delete the old one) and if that fails (it used to be that only admins could delete branches, just push instead to sledz/pull-request-19dec2011 or so :)
Signature · 1 line
Tom
Am 19.12.2011 18:40, schrieb Tom Rini:
Quoted 106 lines · Steffen Sledz
Quoted 96 lines · Tom Rini
Quoted 73 lines · Steffen Sledz
Quoted 72 lines · Tom Rini
Quoted 67 lines · Steffen Sledz
Quoted 34 lines · Steffen Sledz
Quoted 33 lines
Am 14.12.2011 19:07, schrieb Tom Rini:
Quoted 23 lines · Steffen Sledz
Quoted 22 lines
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembeddedsledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc
combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
Please have a second look. They all should be there.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
1 and 2 are fine. For 3, we should
grab the old file (someone must have a copy) and stick that on sources.openembedded.org.The version replacement is not just for the well known live555 download problem. It fixes some other problems too. Also the version introduced by this patch is already uploaded to sources.openembedded.org and the angstrom mirrors.
Ping!
Sorry for the delay. Especially since I'm now going to ask you to rebase the branch. Here's what I get after merging your request:
$ git log --oneline origin.. b6cc3be87 Merge branch 'sledz/maintenance' of git://git.openembedded.org/openemb eda1aaf openjdk: fix problem on build hosts with linux kernel 3.x 4500148 icedtea6-native: fix problem on build hosts with linux kernel 3.x cb5b2fb live555: replace version 20110314 with 20111120 3904feb llvm2.7_2.7.bb: Update patch to use c++ include style. a992bc4 llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combination 9826895 Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ebb70fd gypsy: update to latest upstream version 0.8, and remove version 0.7 69186cf gypsy: move generic SRC_URI part to gypsy.inc 7f9e803 gypsy: fix packaging of DBus starter script 45b8af8 rsyslog: change path for config includes to /etc/rsyslog.d 77a5200 Revert "gypsy: fix packaging of DBus starter script" 105f8ae Revert "gypsy: move generic SRC_URI part to gypsy.inc" 701d1cb Revert "gypsy: update to latest upstream version 0.8, and remove version 593bb51 Revert "rsyslog: change path for config includes to /etc/rsyslog.d" de3065d gypsy: update to latest upstream version 0.8, and remove version 0.7 dbb8899 gypsy: move generic SRC_URI part to gypsy.inc 9bef377 gypsy: fix packaging of DBus starter script 772286e Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ef52795 rsyslog: change path for config includes to /etc/rsyslog.dQuoted 1 line
I'm sure it's all unintentional.
The pull request contains the last five commits only ("The following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796").Quoted 7 lines
Quoted 1 line
Maybe i need some help in using git here. How should i prepare my branch to fulfil your requirements?
Are others using your branch? If not, git push <name of your writable OE remote> :sledz/maintenance to delete your current branch, git rebase -i origin/2011.03-maintenance (and remove the commits you no longer want) then git push <name of writeable OE remote> local-branch:sledz/maintenance.
Sorry, but i need some more guidance here. Everytime i think i made it another problem drives me crazy. :(
Assuming i've a fresh local clone created with
git clone [email protected]:openembedded
What are the exact next stepts?
I tried
git checkout sledz/maintenance
git rebase -i origin/2011.03-maintenance # unwanted commits removed
git push origin sledz/maintenanceQuoted 8 lines
The last results in
To [email protected]:openembedded
! [rejected] sledz/maintenance -> sledz/maintenance (non-fast-forward)
error: failed to push some refs to '[email protected]:openembedded' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details.
Quoted 5 lines
You either need to do the git push [email protected]:openembedded :sledz/maintenance (to delete the old one) and if that fails (it used to be that only admins could delete branches, just push instead to sledz/pull-request-19dec2011 or so :)
Could not delete the remote branch (admins only).
Please pull from branch sledz/pull.
Thanx,
Steffen
Signature · 7 lines
DResearch Fahrzeugelektronik GmbH Otto-Schmirgal-Str. 3, 10319 Berlin, Germany Tel: +49 30 515932-237 mailto:[email protected] Fax: +49 30 515932-299 Geschäftsführer: Dr. Michael Weber, Werner Mögle; Amtsgericht Berlin Charlottenburg; HRB 130120 B; Ust.-IDNr. DE273952058
Tom Rini
AppliedQuoted 113 lines · Steffen Sledz
Am 19.12.2011 18:40, schrieb Tom Rini:
Quoted 106 lines · Steffen Sledz
Quoted 96 lines · Tom Rini
Quoted 73 lines · Steffen Sledz
Quoted 72 lines · Tom Rini
Quoted 67 lines · Steffen Sledz
Quoted 34 lines · Steffen Sledz
Quoted 33 lines
Am 14.12.2011 19:07, schrieb Tom Rini:
Quoted 23 lines · Steffen Sledz
Quoted 22 lines
Hi Tom,
please pull these 5 commits cherry-picked from oe.dev. All of them are bugfixes and tested in our own environment.
Thx,
SteffenThe following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796:Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/maintenance (2011-12-09 14:06:08 +0100)
are available in the git repository at:
git://git.openembedded.org/openembeddedsledz/maintenance
http://cgit.openembedded.org/cgit.cgi/openembedded/log/?h=sledz/maintenanceStefan Schmidt (2):
llvm2.7_2.7: Add patch for build errors on newer gcc / glibc
combinations
llvm2.7_2.7.bb: Update patch to use c++ include style.Quoted 6 lines
Quoted 4 lines
Steffen Sledz (3):
live555: replace version 20110314 with 20111120
icedtea6-native: fix problem on build hosts with linux kernel 3.x
openjdk: fix problem on build hosts with linux kernel 3.xOnly 1 2 and 3 made it to the ML.
Please have a second look. They all should be there.
Quoted 7 lines
Quoted 5 lines
Quoted 3 lines
1 and 2 are fine. For 3, we should
grab the old file (someone must have a copy) and stick that on sources.openembedded.org.The version replacement is not just for the well known live555 download problem. It fixes some other problems too. Also the version introduced by this patch is already uploaded to sources.openembedded.org and the angstrom mirrors.
Ping!
Sorry for the delay. Especially since I'm now going to ask you to rebase the branch. Here's what I get after merging your request:
$ git log --oneline origin.. b6cc3be87 Merge branch 'sledz/maintenance' of git://git.openembedded.org/openemb eda1aaf openjdk: fix problem on build hosts with linux kernel 3.x 4500148 icedtea6-native: fix problem on build hosts with linux kernel 3.x cb5b2fb live555: replace version 20110314 with 20111120 3904feb llvm2.7_2.7.bb: Update patch to use c++ include style. a992bc4 llvm2.7_2.7: Add patch for build errors on newer gcc / glibc combination 9826895 Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ebb70fd gypsy: update to latest upstream version 0.8, and remove version 0.7 69186cf gypsy: move generic SRC_URI part to gypsy.inc 7f9e803 gypsy: fix packaging of DBus starter script 45b8af8 rsyslog: change path for config includes to /etc/rsyslog.d 77a5200 Revert "gypsy: fix packaging of DBus starter script" 105f8ae Revert "gypsy: move generic SRC_URI part to gypsy.inc" 701d1cb Revert "gypsy: update to latest upstream version 0.8, and remove version 593bb51 Revert "rsyslog: change path for config includes to /etc/rsyslog.d" de3065d gypsy: update to latest upstream version 0.8, and remove version 0.7 dbb8899 gypsy: move generic SRC_URI part to gypsy.inc 9bef377 gypsy: fix packaging of DBus starter script 772286e Merge remote-tracking branch 'upstream/2011.03-maintenance' into sledz/m ef52795 rsyslog: change path for config includes to /etc/rsyslog.dQuoted 1 line
I'm sure it's all unintentional.
The pull request contains the last five commits only ("The following changes since commit
9826895e30baa597a5ec433cc0ebd52f5f6c8796").Quoted 7 lines
Quoted 1 line
Maybe i need some help in using git here. How should i prepare my branch to fulfil your requirements?
Are others using your branch? If not, git push <name of your writable OE remote> :sledz/maintenance to delete your current branch, git rebase -i origin/2011.03-maintenance (and remove the commits you no longer want) then git push <name of writeable OE remote> local-branch:sledz/maintenance.
Sorry, but i need some more guidance here. Everytime i think i made it another problem drives me crazy. :(
Assuming i've a fresh local clone created with
git clone [email protected]:openembedded
What are the exact next stepts?
I tried
git checkout sledz/maintenance
git rebase -i origin/2011.03-maintenance # unwanted commits removed
git push origin sledz/maintenanceQuoted 8 lines
The last results in
To [email protected]:openembedded
! [rejected] sledz/maintenance -> sledz/maintenance (non-fast-forward)
error: failed to push some refs to '[email protected]:openembedded' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes (e.g. 'git pull') before pushing again. See the 'Note about fast-forwards' section of 'git push --help' for details.Quoted 5 lines
You either need to do the git push [email protected]:openembedded :sledz/maintenance (to delete the old one) and if that fails (it used to be that only admins could delete branches, just push instead to sledz/pull-request-19dec2011 or so :)
Quoted 3 lines
Could not delete the remote branch (admins only).
Please pull from branch sledz/pull.
Applied, thanks.
Signature · 1 line
Tom