Message ID | f68ed559f85f1ea1be513dcea93d9b4dad6a8e3f.1379126215.git.hongxu.jia@windriver.com |
---|---|
State | New |
Headers | show |
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 1c1a8d1..c0dda5a 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb @@ -193,6 +193,16 @@ RDEPENDS_packagegroup-core-lsb-python = "\ python-misc \ " +def get_libqt3(d): + if 'qt3' in d.getVar('BBFILE_COLLECTIONS') or "": + return 'libqt-mt3' + + if 'linuxstdbase' in d.getVar('DISTROOVERRIDES') or "": + bb.warn('The meta-qt3 layer should be added, this layer provides Qt 3.x') + bb.warn('libraries. Its intended use is for passing LSB tests as Qt3 is') + bb.warn('a requirement for LSB') + return '' + SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ specified in the LSB Desktop specification" @@ -221,6 +231,7 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\ atk \ libasound \ ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ + ${@get_libqt3(d)} \ " RDEPENDS_packagegroup-core-lsb-runtime-add = "\
On 09/13/2013 07:40 PM, Hongxu Jia wrote: > The libqt-mt is tested by lsb-dist-checker and lsb-test-desktop, > and it locates in meta-qt3 layer. > So if meta-qt3 is not added, there should be a warning to call > attention; if added, it will add libqt-mt to RDEPENDS. > > [YOCTO #5153] > > Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> > --- > meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb > index 1c1a8d1..c0dda5a 100644 > --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb > +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb > @@ -193,6 +193,16 @@ RDEPENDS_packagegroup-core-lsb-python = "\ > python-misc \ > " > > +def get_libqt3(d): > + if 'qt3' in d.getVar('BBFILE_COLLECTIONS') or "": > + return 'libqt-mt3' > + I think this might cause unexpected behavoir for people who just happen to have qt3 in their bblayer, I would also wrap the linuxstdbase around the above line. Sorry for not being clear about the first time. Sau! > + if 'linuxstdbase' in d.getVar('DISTROOVERRIDES') or "": > + bb.warn('The meta-qt3 layer should be added, this layer provides Qt 3.x') > + bb.warn('libraries. Its intended use is for passing LSB tests as Qt3 is') > + bb.warn('a requirement for LSB') > + return '' > + > SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" > DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to support libraries \ > specified in the LSB Desktop specification" > @@ -221,6 +231,7 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\ > atk \ > libasound \ > ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ > + ${@get_libqt3(d)} \ > " > > RDEPENDS_packagegroup-core-lsb-runtime-add = "\ >
On 09/14/2013 01:07 PM, Saul Wold wrote: > On 09/13/2013 07:40 PM, Hongxu Jia wrote: >> The libqt-mt is tested by lsb-dist-checker and lsb-test-desktop, >> and it locates in meta-qt3 layer. >> So if meta-qt3 is not added, there should be a warning to call >> attention; if added, it will add libqt-mt to RDEPENDS. >> >> [YOCTO #5153] >> >> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >> --- >> meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 11 >> +++++++++++ >> 1 file changed, 11 insertions(+) >> >> diff --git >> a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb >> b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb >> index 1c1a8d1..c0dda5a 100644 >> --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb >> +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb >> @@ -193,6 +193,16 @@ RDEPENDS_packagegroup-core-lsb-python = "\ >> python-misc \ >> " >> >> +def get_libqt3(d): >> + if 'qt3' in d.getVar('BBFILE_COLLECTIONS') or "": >> + return 'libqt-mt3' >> + > I think this might cause unexpected behavoir for people who just > happen to have qt3 in their bblayer, I would also wrap the > linuxstdbase around the above line. > Alright, I will let linuxstdbase move up Thanks, Hongxu > Sorry for not being clear about the first time. > > Sau! > >> + if 'linuxstdbase' in d.getVar('DISTROOVERRIDES') or "": >> + bb.warn('The meta-qt3 layer should be added, this layer >> provides Qt 3.x') >> + bb.warn('libraries. Its intended use is for passing LSB >> tests as Qt3 is') >> + bb.warn('a requirement for LSB') >> + return '' >> + >> SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" >> DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to >> support libraries \ >> specified in the LSB Desktop specification" >> @@ -221,6 +231,7 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\ >> atk \ >> libasound \ >> ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", >> "", d)} \ >> + ${@get_libqt3(d)} \ >> " >> >> RDEPENDS_packagegroup-core-lsb-runtime-add = "\ >>
Hi Saul, I have updated the branch as your suggestion. git://git.pokylinux.org/poky-contrib hongxu/fix-lsb-libqt3 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=hongxu/fix-lsb-libqt3 +def get_libqt3(d): + if 'linuxstdbase' in d.getVar('DISTROOVERRIDES') or "": + if 'qt3' in d.getVar('BBFILE_COLLECTIONS') or "": + return 'libqt-mt3' + + bb.warn('The meta-qt3 layer should be added, this layer provides Qt 3.x') + bb.warn('libraries. Its intended use is for passing LSB tests as Qt3 is') + bb.warn('a requirement for LSB') + return '' + Thanks, Hongxu On 09/14/2013 01:07 PM, Saul Wold wrote: > On 09/13/2013 07:40 PM, Hongxu Jia wrote: >> The libqt-mt is tested by lsb-dist-checker and lsb-test-desktop, >> and it locates in meta-qt3 layer. >> So if meta-qt3 is not added, there should be a warning to call >> attention; if added, it will add libqt-mt to RDEPENDS. >> >> [YOCTO #5153] >> >> Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> >> --- >> meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 11 >> +++++++++++ >> 1 file changed, 11 insertions(+) >> >> diff --git >> a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb >> b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb >> index 1c1a8d1..c0dda5a 100644 >> --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb >> +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb >> @@ -193,6 +193,16 @@ RDEPENDS_packagegroup-core-lsb-python = "\ >> python-misc \ >> " >> >> +def get_libqt3(d): >> + if 'qt3' in d.getVar('BBFILE_COLLECTIONS') or "": >> + return 'libqt-mt3' >> + > I think this might cause unexpected behavoir for people who just > happen to have qt3 in their bblayer, I would also wrap the > linuxstdbase around the above line. > > Sorry for not being clear about the first time. > > Sau! > >> + if 'linuxstdbase' in d.getVar('DISTROOVERRIDES') or "": >> + bb.warn('The meta-qt3 layer should be added, this layer >> provides Qt 3.x') >> + bb.warn('libraries. Its intended use is for passing LSB >> tests as Qt3 is') >> + bb.warn('a requirement for LSB') >> + return '' >> + >> SUMMARY_packagegroup-core-lsb-desktop = "LSB Desktop" >> DESCRIPTION_packagegroup-core-lsb-desktop = "Packages required to >> support libraries \ >> specified in the LSB Desktop specification" >> @@ -221,6 +231,7 @@ RDEPENDS_packagegroup-core-lsb-desktop = "\ >> atk \ >> libasound \ >> ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", >> "", d)} \ >> + ${@get_libqt3(d)} \ >> " >> >> RDEPENDS_packagegroup-core-lsb-runtime-add = "\ >>
The libqt-mt is tested by lsb-dist-checker and lsb-test-desktop, and it locates in meta-qt3 layer. So if meta-qt3 is not added, there should be a warning to call attention; if added, it will add libqt-mt to RDEPENDS. [YOCTO #5153] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | 11 +++++++++++ 1 file changed, 11 insertions(+)