| Message ID | 1510165263-7599-1-git-send-email-giulio.benetti@micronovasrl.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [v2,1/2] qt5 add qmake.conf.in for eglfs | expand |
Giulio, On 11/08/2017 11:21 AM, Giulio Benetti wrote: > EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch > EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf) > > Starting from qmake.conf.in, > generate qmake.conf substituting @EGLFS_DEVICE@ with eglfs_viv or eglfs_mali > according to Package selection > --- Tip: In the future, put 3 dashes right here so the revision notes, and any notes in general you want to include in the email, are not included in the final commit log. You can apply the generated email yourself to a clean tree and see that anything below the 3 dashes is dropped. > Changes v1 -> v2: > > * Moved qmake.conf to qmake.conf.in > * Added @EGLFS_DEVICE@ placeholder into qmake.conf.in > * Modified QT5BASE_CONFIGURE_QMAKE_CONFIG to use sed > > Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> > --- ... Josh
Hi, > Il giorno 08 nov 2017, alle ore 19:42, Joshua Henderson <joshua.henderson@microchip.com> ha scritto: > > Giulio, > >> On 11/08/2017 11:21 AM, Giulio Benetti wrote: >> EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch >> EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf) >> >> Starting from qmake.conf.in, >> generate qmake.conf substituting @EGLFS_DEVICE@ with eglfs_viv or eglfs_mali >> according to Package selection >> > > --- > > Tip: In the future, put 3 dashes right here so the revision notes, and any notes > in general you want to include in the email, are not included in the final > commit log. You can apply the generated email yourself to a clean tree and see > that anything below the 3 dashes is dropped. Ok, I didn’t know about that. Thank you very much! > >> Changes v1 -> v2: >> >> * Moved qmake.conf to qmake.conf.in >> * Added @EGLFS_DEVICE@ placeholder into qmake.conf.in >> * Modified QT5BASE_CONFIGURE_QMAKE_CONFIG to use sed >> >> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> >> --- > > ... > > Josh
Need to re-submit patch? Giulio > Il giorno 08 nov 2017, alle ore 19:52, Giulio Benetti <giulio.benetti@micronovasrl.com> ha scritto: > > Hi, > >> Il giorno 08 nov 2017, alle ore 19:42, Joshua Henderson <joshua.henderson@microchip.com> ha scritto: >> >> Giulio, >> >>> On 11/08/2017 11:21 AM, Giulio Benetti wrote: >>> EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch >>> EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf) >>> >>> Starting from qmake.conf.in, >>> generate qmake.conf substituting @EGLFS_DEVICE@ with eglfs_viv or eglfs_mali >>> according to Package selection >>> >> >> --- >> >> Tip: In the future, put 3 dashes right here so the revision notes, and any notes >> in general you want to include in the email, are not included in the final >> commit log. You can apply the generated email yourself to a clean tree and see >> that anything below the 3 dashes is dropped. > > Ok, I didn’t know about that. > Thank you very much! > >> >>> Changes v1 -> v2: >>> >>> * Moved qmake.conf to qmake.conf.in >>> * Added @EGLFS_DEVICE@ placeholder into qmake.conf.in >>> * Modified QT5BASE_CONFIGURE_QMAKE_CONFIG to use sed >>> >>> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> >>> --- >> >> ... >> >> Josh
Giulio, On 11/08/2017 11:52 AM, Giulio Benetti wrote: > Hi, > >> Il giorno 08 nov 2017, alle ore 19:42, Joshua Henderson <joshua.henderson@microchip.com> ha scritto: >> >> Giulio, >> >>> On 11/08/2017 11:21 AM, Giulio Benetti wrote: >>> EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch >>> EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf) >>> >>> Starting from qmake.conf.in, >>> generate qmake.conf substituting @EGLFS_DEVICE@ with eglfs_viv or eglfs_mali >>> according to Package selection >>> >> >> --- >> >> Tip: In the future, put 3 dashes right here so the revision notes, and any notes >> in general you want to include in the email, are not included in the final >> commit log. You can apply the generated email yourself to a clean tree and see >> that anything below the 3 dashes is dropped. > > Ok, I didn’t know about that. > Thank you very much! > You might want to look into git notes and git format-patch --notes to automate it and keep notes separate. Maybe wait a bit before submitting a new patch just for this right now, unless requested. Josh
Hi, Il 08/11/2017 21:03, Joshua Henderson ha scritto: > Giulio, > > On 11/08/2017 11:52 AM, Giulio Benetti wrote: >> Hi, >> >>> Il giorno 08 nov 2017, alle ore 19:42, Joshua Henderson <joshua.henderson@microchip.com> ha scritto: >>> >>> Giulio, >>> >>>> On 11/08/2017 11:21 AM, Giulio Benetti wrote: >>>> EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch >>>> EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf) >>>> >>>> Starting from qmake.conf.in, >>>> generate qmake.conf substituting @EGLFS_DEVICE@ with eglfs_viv or eglfs_mali >>>> according to Package selection >>>> >>> >>> --- >>> >>> Tip: In the future, put 3 dashes right here so the revision notes, and any notes >>> in general you want to include in the email, are not included in the final >>> commit log. You can apply the generated email yourself to a clean tree and see >>> that anything below the 3 dashes is dropped. >> >> Ok, I didn’t know about that. >> Thank you very much! >> > > You might want to look into git notes and git format-patch --notes to automate it and > keep notes separate. Maybe wait a bit before submitting a new patch just for this > right now, unless requested. > > Josh > Thank you very much for hint. I will follow it for sure and let's wait for Maintainers about patchset.
Hi Giulio, On 08-11-17 19:21, Giulio Benetti wrote: > EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch > EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf) > > Starting from qmake.conf.in, > generate qmake.conf substituting @EGLFS_DEVICE@ with eglfs_viv or eglfs_mali > according to Package selection The commit message is still not entirely clear. Howe about this: qt5: correct eglfs support in qmake.conf.in Setting EGLFS_DEVICE_INTEGRATION at the end of qmake.conf like is done by commit 0c219ddb8a doesn't work correctly: it has to be set before the include(../common/linux_device_post.conf) Instead of appending to the file, change it into a qmake.conf.in template file that contains an EGLFS_DEVICE_INTEGRATION assignment and update it with sed. > > Changes v1 -> v2: > > * Moved qmake.conf to qmake.conf.in > * Added @EGLFS_DEVICE@ placeholder into qmake.conf.in > * Modified QT5BASE_CONFIGURE_QMAKE_CONFIG to use sed > > Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> > --- > package/qt5/qt5base/{qmake.conf => qmake.conf.in} | 2 ++ > package/qt5/qt5base/qt5base.mk | 12 +++++++++--- > 2 files changed, 11 insertions(+), 3 deletions(-) > rename package/qt5/qt5base/{qmake.conf => qmake.conf.in} (95%) > > diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf.in > similarity index 95% > rename from package/qt5/qt5base/qmake.conf > rename to package/qt5/qt5base/qmake.conf.in > index 8b6debe..fb698b9 100644 > --- a/package/qt5/qt5base/qmake.conf > +++ b/package/qt5/qt5base/qmake.conf.in > @@ -24,5 +24,7 @@ QMAKE_CFLAGS_ISYSTEM = > # Architecturespecific configuration > include(arch.conf) > > +EGLFS_DEVICE_INTEGRATION = @EGLFS_DEVICE@ > + > include(../common/linux_device_post.conf) > load(qt_config) > diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk > index b3f9c79..d58a58a 100644 > --- a/package/qt5/qt5base/qt5base.mk > +++ b/package/qt5/qt5base/qt5base.mk > @@ -243,8 +243,13 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus > ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy) > # use vivante backend > define QT5BASE_CONFIGURE_QMAKE_CONFIG > - echo "EGLFS_DEVICE_INTEGRATION = eglfs_viv" >> \ > - $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf > + sed 's/@EGLFS_DEVICE@/eglfs_viv/g' $(QT5BASE_PKGDIR)/qmake.conf.in > \ > + $(QT5BASE_PKGDIR)/qmake.conf What I meant is to write directly to the target file, so $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf > +endef > +else > +define QT5BASE_CONFIGURE_QMAKE_CONFIG > + sed '/@EGLFS_DEVICE@/,+1d' $(QT5BASE_PKGDIR)/qmake.conf.in > \ > + $(QT5BASE_PKGDIR)/qmake.conf > endef > endif > > @@ -263,9 +268,10 @@ endef > endif > > define QT5BASE_CONFIGURE_CMDS > + $(QT5BASE_CONFIGURE_QMAKE_CONFIG) > $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ > $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf So remove this > - $(QT5BASE_CONFIGURE_QMAKE_CONFIG) > + $(RM) $(QT5BASE_PKGDIR)/qmake.conf And this. Regards, Arnout > $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ > $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h > $(QT5BASE_CONFIGURE_CONFIG_FILE) >
Hi Arnout, Il 08/11/2017 23:30, Arnout Vandecappelle ha scritto: > Hi Giulio, > > On 08-11-17 19:21, Giulio Benetti wrote: >> EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch >> EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf) >> >> Starting from qmake.conf.in, >> generate qmake.conf substituting @EGLFS_DEVICE@ with eglfs_viv or eglfs_mali >> according to Package selection > > The commit message is still not entirely clear. Howe about this: > > qt5: correct eglfs support in qmake.conf.in > > Setting EGLFS_DEVICE_INTEGRATION at the end of qmake.conf like is done by commit > 0c219ddb8a doesn't work correctly: it has to be set before the > include(../common/linux_device_post.conf) > > Instead of appending to the file, change it into a qmake.conf.in template file > that contains an EGLFS_DEVICE_INTEGRATION assignment and update it with sed. Thank you for the example, it is precious to me. > >> >> Changes v1 -> v2: >> >> * Moved qmake.conf to qmake.conf.in >> * Added @EGLFS_DEVICE@ placeholder into qmake.conf.in >> * Modified QT5BASE_CONFIGURE_QMAKE_CONFIG to use sed >> >> Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> >> --- >> package/qt5/qt5base/{qmake.conf => qmake.conf.in} | 2 ++ >> package/qt5/qt5base/qt5base.mk | 12 +++++++++--- >> 2 files changed, 11 insertions(+), 3 deletions(-) >> rename package/qt5/qt5base/{qmake.conf => qmake.conf.in} (95%) >> >> diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf.in >> similarity index 95% >> rename from package/qt5/qt5base/qmake.conf >> rename to package/qt5/qt5base/qmake.conf.in >> index 8b6debe..fb698b9 100644 >> --- a/package/qt5/qt5base/qmake.conf >> +++ b/package/qt5/qt5base/qmake.conf.in >> @@ -24,5 +24,7 @@ QMAKE_CFLAGS_ISYSTEM = >> # Architecturespecific configuration >> include(arch.conf) >> >> +EGLFS_DEVICE_INTEGRATION = @EGLFS_DEVICE@ >> + >> include(../common/linux_device_post.conf) >> load(qt_config) >> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk >> index b3f9c79..d58a58a 100644 >> --- a/package/qt5/qt5base/qt5base.mk >> +++ b/package/qt5/qt5base/qt5base.mk >> @@ -243,8 +243,13 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus >> ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy) >> # use vivante backend >> define QT5BASE_CONFIGURE_QMAKE_CONFIG >> - echo "EGLFS_DEVICE_INTEGRATION = eglfs_viv" >> \ >> - $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf >> + sed 's/@EGLFS_DEVICE@/eglfs_viv/g' $(QT5BASE_PKGDIR)/qmake.conf.in > \ >> + $(QT5BASE_PKGDIR)/qmake.conf > > What I meant is to write directly to the target file, so > $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf I wanted to do the same, but directory "linux-buildroot-g++" doesn't exists, so sed failed. But it makes more sense to "mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/" at the beginning and make it behaving like you've written down, so.... > >> +endef >> +else >> +define QT5BASE_CONFIGURE_QMAKE_CONFIG >> + sed '/@EGLFS_DEVICE@/,+1d' $(QT5BASE_PKGDIR)/qmake.conf.in > \ >> + $(QT5BASE_PKGDIR)/qmake.conf >> endef >> endif >> >> @@ -263,9 +268,10 @@ endef >> endif >> >> define QT5BASE_CONFIGURE_CMDS >> + $(QT5BASE_CONFIGURE_QMAKE_CONFIG) >> $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ >> $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf I remove this > > So remove this > >> - $(QT5BASE_CONFIGURE_QMAKE_CONFIG) >> + $(RM) $(QT5BASE_PKGDIR)/qmake.conf and this > > And this. > > > Regards, > Arnout > >> $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ >> $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h >> $(QT5BASE_CONFIGURE_CONFIG_FILE) >> >
diff --git a/package/qt5/qt5base/qmake.conf b/package/qt5/qt5base/qmake.conf.in similarity index 95% rename from package/qt5/qt5base/qmake.conf rename to package/qt5/qt5base/qmake.conf.in index 8b6debe..fb698b9 100644 --- a/package/qt5/qt5base/qmake.conf +++ b/package/qt5/qt5base/qmake.conf.in @@ -24,5 +24,7 @@ QMAKE_CFLAGS_ISYSTEM = # Architecturespecific configuration include(arch.conf) +EGLFS_DEVICE_INTEGRATION = @EGLFS_DEVICE@ + include(../common/linux_device_post.conf) load(qt_config) diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk index b3f9c79..d58a58a 100644 --- a/package/qt5/qt5base/qt5base.mk +++ b/package/qt5/qt5base/qt5base.mk @@ -243,8 +243,13 @@ QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST)$(BR2_PACKAGE_IMX_GPU_VIV),yy) # use vivante backend define QT5BASE_CONFIGURE_QMAKE_CONFIG - echo "EGLFS_DEVICE_INTEGRATION = eglfs_viv" >> \ - $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf + sed 's/@EGLFS_DEVICE@/eglfs_viv/g' $(QT5BASE_PKGDIR)/qmake.conf.in > \ + $(QT5BASE_PKGDIR)/qmake.conf +endef +else +define QT5BASE_CONFIGURE_QMAKE_CONFIG + sed '/@EGLFS_DEVICE@/,+1d' $(QT5BASE_PKGDIR)/qmake.conf.in > \ + $(QT5BASE_PKGDIR)/qmake.conf endef endif @@ -263,9 +268,10 @@ endef endif define QT5BASE_CONFIGURE_CMDS + $(QT5BASE_CONFIGURE_QMAKE_CONFIG) $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf - $(QT5BASE_CONFIGURE_QMAKE_CONFIG) + $(RM) $(QT5BASE_PKGDIR)/qmake.conf $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h $(QT5BASE_CONFIGURE_CONFIG_FILE)
EGLFS_DEVICE_INTEGRATION = eglfs_* doesn't work correctly with previous patch EGLFS_DEVICE_INTEGRATION = eglfs_viv/eglfs_* must be written before include(../common/linux_device_post.conf) Starting from qmake.conf.in, generate qmake.conf substituting @EGLFS_DEVICE@ with eglfs_viv or eglfs_mali according to Package selection Changes v1 -> v2: * Moved qmake.conf to qmake.conf.in * Added @EGLFS_DEVICE@ placeholder into qmake.conf.in * Modified QT5BASE_CONFIGURE_QMAKE_CONFIG to use sed Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com> --- package/qt5/qt5base/{qmake.conf => qmake.conf.in} | 2 ++ package/qt5/qt5base/qt5base.mk | 12 +++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) rename package/qt5/qt5base/{qmake.conf => qmake.conf.in} (95%)