| Submitter | Samuel Stirtzel |
|---|---|
| Date | April 3, 2012, 3:13 p.m. |
| Message ID | <1333466031-3328-1-git-send-email-s.stirtzel@googlemail.com> |
| Download | mbox | patch |
| Permalink | /patch/25105/ |
| State | New, archived |
| Headers | show |
Comments
2012/4/3 Samuel Stirtzel <s.stirtzel@googlemail.com>: > Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> > --- > meta-oe/recipes-support/mysql/mysql5_5.1.40.inc | 34 +++++++++++++++++++---- > 1 files changed, 28 insertions(+), 6 deletions(-) > > diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc > index 865deb2..d436333 100644 > --- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc > +++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc > @@ -78,8 +78,8 @@ pkg_postrm_mysql5-server () { > } > > PACKAGES = "${PN}-dbg ${PN} \ > -libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-dbg \ > -libmysqlclient libmysqlclient-dev libmysqlclient-dbg \ > +libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ > +libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ > ${PN}-client ${PN}-server ${PN}-leftovers" > CONFFILES_${PN}-server += "${sysconfdir}/my.cnf" > > @@ -87,18 +87,40 @@ FILES_${PN} = " " > RDEPENDS_${PN} = "${PN}-client ${PN}-server" > ALLOW_EMPTY_${PN} = "1" > > -FILES_libmysqlclient = "${libdir}/libmysqlclient.so.*" > +FILES_libmysqlclient = "\ > +${libdir}/libmysqlclient.so.* \ > +${libdir}/plugin/*.so.*" > FILES_libmysqlclient-dev = " \ > ${includedir}/mysql/ \ > -${libdir}/lib* \ > -${libdir}/plugin/* \ > +${libdir}/libmysqlclient.so \ > +${libdir}/libmysqlclient.la \ > +${libdir}/plugin/*.so \ > +${libdir}/plugin/*.la \ > ${sysconfdir}/aclocal \ > ${bindir}/mysql_config" > +FILES_libmysqlclient-staticdev = "\ > +${libdir}/libmysqlclient.a \ > +${libdir}/libmysys.a \ > +${libdir}/libmyisam.a \ > +${libdir}/libmysqld.a \ > +${libdir}/libheap.a \ > +${libdir}/libvio.a \ > +${libdir}/libmystrings.a \ > +${libdir}/libdbug.a \ > +${libdir}/libmyisammrg.a \ > +${libdir}/plugin/ha_innodb_plugin.a \ > +${libdir}/plugin/ha_example.a \ > +${libdir}/plugin/ha_blackhole.a \ > +${libdir}/plugin/ha_federated.a \ > +${libdir}/plugin/ha_archive.a" > FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ > /usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" > > FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" > -FILES_libmysqlclient-r-dev = "${libdir}/libmysqlclient_r.*" > +FILES_libmysqlclient-r-dev = "\ > +${libdir}/libmysqlclient_r.so \ > +${libdir}/libmysqlclient_r.la" > +FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" > FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" > > FILES_${PN}-client = "\ > -- > 1.7.5.4 > Sorry sent the wrong patch version V2 will come soon.
Patch
diff --git a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc index 865deb2..d436333 100644 --- a/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc +++ b/meta-oe/recipes-support/mysql/mysql5_5.1.40.inc @@ -78,8 +78,8 @@ pkg_postrm_mysql5-server () { } PACKAGES = "${PN}-dbg ${PN} \ -libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-dbg \ -libmysqlclient libmysqlclient-dev libmysqlclient-dbg \ +libmysqlclient-r libmysqlclient-r-dev libmysqlclient-r-staticdev libmysqlclient-r-dbg \ +libmysqlclient libmysqlclient-dev libmysqlclient-staticdev libmysqlclient-dbg \ ${PN}-client ${PN}-server ${PN}-leftovers" CONFFILES_${PN}-server += "${sysconfdir}/my.cnf" @@ -87,18 +87,40 @@ FILES_${PN} = " " RDEPENDS_${PN} = "${PN}-client ${PN}-server" ALLOW_EMPTY_${PN} = "1" -FILES_libmysqlclient = "${libdir}/libmysqlclient.so.*" +FILES_libmysqlclient = "\ +${libdir}/libmysqlclient.so.* \ +${libdir}/plugin/*.so.*" FILES_libmysqlclient-dev = " \ ${includedir}/mysql/ \ -${libdir}/lib* \ -${libdir}/plugin/* \ +${libdir}/libmysqlclient.so \ +${libdir}/libmysqlclient.la \ +${libdir}/plugin/*.so \ +${libdir}/plugin/*.la \ ${sysconfdir}/aclocal \ ${bindir}/mysql_config" +FILES_libmysqlclient-staticdev = "\ +${libdir}/libmysqlclient.a \ +${libdir}/libmysys.a \ +${libdir}/libmyisam.a \ +${libdir}/libmysqld.a \ +${libdir}/libheap.a \ +${libdir}/libvio.a \ +${libdir}/libmystrings.a \ +${libdir}/libdbug.a \ +${libdir}/libmyisammrg.a \ +${libdir}/plugin/ha_innodb_plugin.a \ +${libdir}/plugin/ha_example.a \ +${libdir}/plugin/ha_blackhole.a \ +${libdir}/plugin/ha_federated.a \ +${libdir}/plugin/ha_archive.a" FILES_libmysqlclient-dbg = "${libdir}/plugin/.debug/ \ /usr/mysql-test/lib/My/SafeProcess/.debug/my_safe_process" FILES_libmysqlclient-r = "${libdir}/libmysqlclient_r.so.*" -FILES_libmysqlclient-r-dev = "${libdir}/libmysqlclient_r.*" +FILES_libmysqlclient-r-dev = "\ +${libdir}/libmysqlclient_r.so \ +${libdir}/libmysqlclient_r.la" +FILES_libmysqlclient-r-staticdev = "${libdir}/libmysqlclient_r.a" FILES_libmysqlclient-r-dbg = "${libdir}/plugin/.debuglibmysqlclient_r.so.*" FILES_${PN}-client = "\
Signed-off-by: Samuel Stirtzel <s.stirtzel@googlemail.com> --- meta-oe/recipes-support/mysql/mysql5_5.1.40.inc | 34 +++++++++++++++++++---- 1 files changed, 28 insertions(+), 6 deletions(-)