| Message ID | 1352796133-956-6-git-send-email-kraxel@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 13 November 2012 08:42, Gerd Hoffmann <kraxel@redhat.com> wrote: > Patch by Eric Johnson. > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Does this need a Signed-off-by: from Eric? It's a pretty trivial patch but I guess it would be nice... thanks -- PMM > --- > configure | 7 ++++--- > 1 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/configure b/configure > index e7ca78b..fb5f002 100755 > --- a/configure > +++ b/configure > @@ -3953,9 +3953,6 @@ if test "$target_softmmu" = "yes" ; then > if test "$smartcard_nss" = "yes" ; then > echo "subdir-$target: subdir-libcacard" >> $config_host_mak > fi > - if test "$pixman" = "internal" ; then > - echo "subdir-$target: subdir-pixman" >> $config_host_mak > - fi > case "$target_arch2" in > i386|x86_64) > echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak > @@ -4153,6 +4150,10 @@ echo "QEMU_INCLUDES+=$includes" >> $config_target_mak > > done # for target in $targets > > +if [ "$pixman" = "internal" ]; then > + echo "config-host.h: subdir-pixman" >> $config_host_mak > +fi > + > # build tree in object directory in case the source is not in the current directory > DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32" > DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" > -- > 1.7.1 > >
It's OK to add. Signed-off-by: Eric Johnson <ericj@mips.com> I wasn't sure how to submit a patch to an unsubmitted patch. I haven't had a chance to review the patch submission doc to see if that is covered. It would still be useful info. I intend to recreate and supply my local sed replacement of $(BUILD_DIR) and $(SRC_PATH) in $(QEMU_CFLAGS) patch to configure for patch 1 in this series to address Stefan's feedback. I had done that patch locally prior to noticing Blue's and Gerd's patches on the list. And discarded since trying Gerd's patch. It is trivial to recreate. -Eric > -----Original Message----- > From: Peter Maydell [mailto:peter.maydell@linaro.org] > Sent: Tuesday, November 13, 2012 10:30 AM > To: Gerd Hoffmann > Cc: qemu-devel@nongnu.org; Johnson, Eric > Subject: Re: [Qemu-devel] [PATCH 5/6] pixman: build internal version early > > On 13 November 2012 08:42, Gerd Hoffmann <kraxel@redhat.com> wrote: > > Patch by Eric Johnson. > > > > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > > Does this need a Signed-off-by: from Eric? It's a pretty > trivial patch but I guess it would be nice... > > thanks > -- PMM > > > --- > > configure | 7 ++++--- > > 1 files changed, 4 insertions(+), 3 deletions(-) > > > > diff --git a/configure b/configure > > index e7ca78b..fb5f002 100755 > > --- a/configure > > +++ b/configure > > @@ -3953,9 +3953,6 @@ if test "$target_softmmu" = "yes" ; then > > if test "$smartcard_nss" = "yes" ; then > > echo "subdir-$target: subdir-libcacard" >> $config_host_mak > > fi > > - if test "$pixman" = "internal" ; then > > - echo "subdir-$target: subdir-pixman" >> $config_host_mak > > - fi > > case "$target_arch2" in > > i386|x86_64) > > echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak > > @@ -4153,6 +4150,10 @@ echo "QEMU_INCLUDES+=$includes" >> > $config_target_mak > > > > done # for target in $targets > > > > +if [ "$pixman" = "internal" ]; then > > + echo "config-host.h: subdir-pixman" >> $config_host_mak > > +fi > > + > > # build tree in object directory in case the source is not in the > current directory > > DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32" > > DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas" > > -- > > 1.7.1 > > > >
On 11/13/12 19:41, Johnson, Eric wrote: > It's OK to add. > Signed-off-by: Eric Johnson <ericj@mips.com> Updated patch. > I wasn't sure how to submit a patch to an unsubmitted patch. As usual: "git commit -s" + "git format-patch" + "git send-email", especially as this one stands on its own and has no dependency on the unsubmitted patch, but it is fine for incremental fixes too. Then I can simply "git am -s" the patch and either carry it on as is or squash in the incremental fix on a case-by-case basis. I tend to carry patches as is, but in some cases squashing can be better for bisectability. cheers, Gerd
> -----Original Message----- > From: Gerd Hoffmann [mailto:kraxel@redhat.com] > Sent: Wednesday, November 14, 2012 4:42 AM [...] > On 11/13/12 19:41, Johnson, Eric wrote: [...] > > I wasn't sure how to submit a patch to an unsubmitted patch. > > As usual: "git commit -s" + "git format-patch" + "git send-email", > especially as this one stands on its own and has no dependency on the > unsubmitted patch, but it is fine for incremental fixes too. Thanks. I found portability issues with my simple sed replacement that I could not resolve to my satisfaction. The patch you made to deal with \$(BUILD_DIR) and \$(SRC_PATH) is cleaner and simpler anyway. -Eric
diff --git a/configure b/configure index e7ca78b..fb5f002 100755 --- a/configure +++ b/configure @@ -3953,9 +3953,6 @@ if test "$target_softmmu" = "yes" ; then if test "$smartcard_nss" = "yes" ; then echo "subdir-$target: subdir-libcacard" >> $config_host_mak fi - if test "$pixman" = "internal" ; then - echo "subdir-$target: subdir-pixman" >> $config_host_mak - fi case "$target_arch2" in i386|x86_64) echo "CONFIG_HAVE_CORE_DUMP=y" >> $config_target_mak @@ -4153,6 +4150,10 @@ echo "QEMU_INCLUDES+=$includes" >> $config_target_mak done # for target in $targets +if [ "$pixman" = "internal" ]; then + echo "config-host.h: subdir-pixman" >> $config_host_mak +fi + # build tree in object directory in case the source is not in the current directory DIRS="tests tests/tcg tests/tcg/cris tests/tcg/lm32" DIRS="$DIRS pc-bios/optionrom pc-bios/spapr-rtas"
Patch by Eric Johnson. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- configure | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)