| Message ID | a9e27a3340744ae0233852ec320e0039be8c828e.1479966991.git.sam.bobroff@au1.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
Hi Sam, On Thu, Nov 24, 2016 at 04:56:42PM +1100, Sam Bobroff wrote: > Fixes next commit d634d9dda7f3c328d63469cb628c79da49a09e89. > > Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com> > --- > Baruch, > > I've rebased the patch onto next, I'm not sure what other changes to > make. Does it look OK now? (Will it get squashed in next?) The Buildroot maintainers do not rebase/amend next. When there is an issue with an applied commit, either in next or master, post a but fix patch. Hence the commit log should be more detailed. Also, you may mention the commit the introduced the bug as you did, but not 'next'. The next branch will soon merge into master, but the commit log will not change. baruch > package/qemu/qemu.mk | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk > index ae4e0ad..45fc0fa 100644 > --- a/package/qemu/qemu.mk > +++ b/package/qemu/qemu.mk > @@ -35,7 +35,7 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p > # mips64el mips64el > # powerpc ppc > # powerpc64 ppc64 > -# powerpc64le ppc64 (ppc64 supports little-endian) > +# powerpc64le ppc64le > # sh2a not supported > # sh4 sh4 > # sh4eb sh4eb > @@ -61,7 +61,7 @@ ifeq ($(HOST_QEMU_ARCH),powerpc64) > HOST_QEMU_ARCH = ppc64 > endif > ifeq ($(HOST_QEMU_ARCH),powerpc64le) > -HOST_QEMU_ARCH = ppc64 > +HOST_QEMU_ARCH = ppc64le > endif > ifeq ($(HOST_QEMU_ARCH),sh4a) > HOST_QEMU_ARCH = sh4
Hello, On Thu, 24 Nov 2016 13:20:13 +0200, Baruch Siach wrote: > On Thu, Nov 24, 2016 at 04:56:42PM +1100, Sam Bobroff wrote: > > Fixes next commit d634d9dda7f3c328d63469cb628c79da49a09e89. > > > > Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com> > > --- > > Baruch, > > > > I've rebased the patch onto next, I'm not sure what other changes to > > make. Does it look OK now? (Will it get squashed in next?) > > The Buildroot maintainers do not rebase/amend next. When there is an issue > with an applied commit, either in next or master, post a but fix patch. Hence > the commit log should be more detailed. Also, you may mention the commit the > introduced the bug as you did, but not 'next'. The next branch will soon merge > into master, but the commit log will not change. Sam: I thought your initial patch was not a bug fix, but a feature addition, which is why I applied it to the "next" branch. However, I see in the autobuilders failures of the host-qemu package for powerpc64, and I believe those would be fixed by your patch. Could you confirm it's the case? If it is, then I'll cherry-pick the original patch (+ this additional fix) into the master branch. Thanks! Thomas
On Thu, Nov 24, 2016 at 01:28:59PM +0100, Thomas Petazzoni wrote: > Hello, > > On Thu, 24 Nov 2016 13:20:13 +0200, Baruch Siach wrote: > > > On Thu, Nov 24, 2016 at 04:56:42PM +1100, Sam Bobroff wrote: > > > Fixes next commit d634d9dda7f3c328d63469cb628c79da49a09e89. > > > > > > Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com> > > > --- > > > Baruch, > > > > > > I've rebased the patch onto next, I'm not sure what other changes to > > > make. Does it look OK now? (Will it get squashed in next?) > > > > The Buildroot maintainers do not rebase/amend next. When there is an issue > > with an applied commit, either in next or master, post a but fix patch. Hence > > the commit log should be more detailed. Also, you may mention the commit the > > introduced the bug as you did, but not 'next'. The next branch will soon merge > > into master, but the commit log will not change. > > Sam: I thought your initial patch was not a bug fix, but a feature > addition, which is why I applied it to the "next" branch. However, I > see in the autobuilders failures of the host-qemu package for > powerpc64, and I believe those would be fixed by your patch. Could you > confirm it's the case? If it is, then I'll cherry-pick the original > patch (+ this additional fix) into the master branch. Yes, that's the case. My fixup patch isn't in next yet and I'm going to post a v2 with the right sort of changelog shortly; that should be the one you want (unless it needs a v3!). Cheers, Sam.
Hello, On Thu, 24 Nov 2016 16:56:42 +1100, Sam Bobroff wrote: > Fixes next commit d634d9dda7f3c328d63469cb628c79da49a09e89. > > Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com> > --- > Baruch, Applied to next. Thomas
diff --git a/package/qemu/qemu.mk b/package/qemu/qemu.mk index ae4e0ad..45fc0fa 100644 --- a/package/qemu/qemu.mk +++ b/package/qemu/qemu.mk @@ -35,7 +35,7 @@ HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-p # mips64el mips64el # powerpc ppc # powerpc64 ppc64 -# powerpc64le ppc64 (ppc64 supports little-endian) +# powerpc64le ppc64le # sh2a not supported # sh4 sh4 # sh4eb sh4eb @@ -61,7 +61,7 @@ ifeq ($(HOST_QEMU_ARCH),powerpc64) HOST_QEMU_ARCH = ppc64 endif ifeq ($(HOST_QEMU_ARCH),powerpc64le) -HOST_QEMU_ARCH = ppc64 +HOST_QEMU_ARCH = ppc64le endif ifeq ($(HOST_QEMU_ARCH),sh4a) HOST_QEMU_ARCH = sh4
Fixes next commit d634d9dda7f3c328d63469cb628c79da49a09e89. Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com> --- Baruch, I've rebased the patch onto next, I'm not sure what other changes to make. Does it look OK now? (Will it get squashed in next?) Cheers, Sam. package/qemu/qemu.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)