| Message ID | 20240822015200.2788239-1-guocai.he.cn@windriver.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [meta-oe,scarthgap] mariadb: File conflicts for multilib | expand |
On 8/21/24 9:52 PM, guocai he via lists.openembedded.org wrote: > From: Guocai He <guocai.he.cn@windriver.com> > > File conflicts between attempted installs of mariadb and lib32-mariadb do these changes need to go into Master first? - armin > > Signed-off-by: Guocai He <guocai.he.cn@windriver.com> > --- > meta-oe/recipes-dbs/mysql/mariadb.inc | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc > index 51dd4e8d4..32a6022ba 100644 > --- a/meta-oe/recipes-dbs/mysql/mariadb.inc > +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc > @@ -33,10 +33,12 @@ UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags" > > BINCONFIG_GLOB = "mysql_config" > > -inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig > +inherit cmake gettext binconfig update-rc.d systemd multilib_script multilib_header pkgconfig > > MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ > - ${PN}-setupdb:${bindir}/mariadb-install-db" > + ${PN}-setupdb:${bindir}/mariadb-install-db \ > + libmysqlclient-dev:${bindir}/mysql_config \ > + " > > INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" > INITSCRIPT_NAME:${PN}-server = "mysqld" > @@ -160,6 +162,7 @@ mariadb_sysroot_preprocess () { > > do_install() { > oe_runmake 'DESTDIR=${D}' install > + oe_multilib_header mysql/mariadb_version.h mysql/server/my_config.h mysql/server/private/config.h > > install -d ${D}/${sysconfdir}/init.d > install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/ > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#111898): https://lists.openembedded.org/g/openembedded-devel/message/111898 > Mute This Topic: https://lists.openembedded.org/mt/108031502/3616698 > Group Owner: openembedded-devel+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [akuster808@gmail.com] > -=-=-=-=-=-=-=-=-=-=-=- >
Yes,this changes need to check into master and scarthgap. It have been checked into master at Aug 22. Khem: it also need to check into scarthgap. Thanks very much. -guocai On 8/26/24 03:24, akuster808 wrote: > CAUTION: This email comes from a non Wind River email account! > Do not click links or open attachments unless you recognize the sender > and know the content is safe. > > On 8/21/24 9:52 PM, guocai he via lists.openembedded.org wrote: >> From: Guocai He <guocai.he.cn@windriver.com> >> >> File conflicts between attempted installs of mariadb and lib32-mariadb > > do these changes need to go into Master first? > > - armin >> >> Signed-off-by: Guocai He <guocai.he.cn@windriver.com> >> --- >> meta-oe/recipes-dbs/mysql/mariadb.inc | 7 +++++-- >> 1 file changed, 5 insertions(+), 2 deletions(-) >> >> diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc >> b/meta-oe/recipes-dbs/mysql/mariadb.inc >> index 51dd4e8d4..32a6022ba 100644 >> --- a/meta-oe/recipes-dbs/mysql/mariadb.inc >> +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc >> @@ -33,10 +33,12 @@ UPSTREAM_CHECK_URI = >> "https://github.com/MariaDB/server/tags" >> >> BINCONFIG_GLOB = "mysql_config" >> >> -inherit cmake gettext binconfig update-rc.d systemd multilib_script >> pkgconfig >> +inherit cmake gettext binconfig update-rc.d systemd multilib_script >> multilib_header pkgconfig >> >> MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ >> - ${PN}-setupdb:${bindir}/mariadb-install-db" >> + ${PN}-setupdb:${bindir}/mariadb-install-db \ >> + libmysqlclient-dev:${bindir}/mysql_config \ >> + " >> >> INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" >> INITSCRIPT_NAME:${PN}-server = "mysqld" >> @@ -160,6 +162,7 @@ mariadb_sysroot_preprocess () { >> >> do_install() { >> oe_runmake 'DESTDIR=${D}' install >> + oe_multilib_header mysql/mariadb_version.h >> mysql/server/my_config.h mysql/server/private/config.h >> >> install -d ${D}/${sysconfdir}/init.d >> install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/ >> >> -=-=-=-=-=-=-=-=-=-=-=- >> Links: You receive all messages sent to this group. >> View/Reply Online (#111898): >> https://lists.openembedded.org/g/openembedded-devel/message/111898 >> Mute This Topic: https://lists.openembedded.org/mt/108031502/3616698 >> Group Owner: openembedded-devel+owner@lists.openembedded.org >> Unsubscribe: >> https://lists.openembedded.org/g/openembedded-devel/unsub >> [akuster808@gmail.com] >> -=-=-=-=-=-=-=-=-=-=-=- >> >
diff --git a/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-oe/recipes-dbs/mysql/mariadb.inc index 51dd4e8d4..32a6022ba 100644 --- a/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -33,10 +33,12 @@ UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags" BINCONFIG_GLOB = "mysql_config" -inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig +inherit cmake gettext binconfig update-rc.d systemd multilib_script multilib_header pkgconfig MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ - ${PN}-setupdb:${bindir}/mariadb-install-db" + ${PN}-setupdb:${bindir}/mariadb-install-db \ + libmysqlclient-dev:${bindir}/mysql_config \ + " INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME:${PN}-server = "mysqld" @@ -160,6 +162,7 @@ mariadb_sysroot_preprocess () { do_install() { oe_runmake 'DESTDIR=${D}' install + oe_multilib_header mysql/mariadb_version.h mysql/server/my_config.h mysql/server/private/config.h install -d ${D}/${sysconfdir}/init.d install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/