On Mon, Dec 19, 2011 at 8:22 AM, Steffen Sledz <[email protected]> wrote: > On 19.12.2011 15:39, Tom Rini wrote: >> On Mon, Dec 19, 2011 at 12:17 AM, Steffen Sledz <[email protected]> >> wrote: >>> On 15.12.2011 07:37, Steffen Sledz wrote: >>>> Am 14.12.2011 19:07, schrieb Tom Rini: >>>>> On Wed, Dec 14, 2011 at 4:40 AM, Steffen Sledz <[email protected]> >>>>> wrote: >>>>>> 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 >>>>> >>>>> Only 1 2 and 3 made it to the ML. >>>> >>>> Please have a second look. They all should be there. >>>> >>>>> 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. > > 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 -- Tom _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
