| Message ID | 20240807143318.439619-1-johan.oudinet@gmail.com |
|---|---|
| Headers | show |
| Series | Update Ejabberd and its dependencies | expand |
Hello Johan, Thanks for the patch series. On Wed, 7 Aug 2024 16:33:00 +0200 Johan Oudinet <johan.oudinet@gmail.com> wrote: > Johan Oudinet (18): > package/erlang-stun: renamed from erlang-p1-stun > package/erlang-fast-xml: renamed from erlang-p1-xml > package/erlang-xmpp: renamed from erlang-p1-xmpp I was a bit confused about these patches. I was wondering why the name of the package mattered, and why it was influencing where the files installed by this package are actually installed... If I understand correctly, it all comes from: $(2)_ERLANG_APP = $(subst -,_,$(patsubst erlang-%,%,$(patsubst host-%,%,$(1)))) which derives the ERLANG_APP name from the package name, so erlang-p1-stun becomes p1_stun. Is that correct? I think it's quite unique in Buildroot to do something like this. Other packages normally install their stuff into a location that isn't dependent on the package name chosen by Buildroot. That being said, I assume your changes are OK, but: - Why are we renaming only those 3 packages, and not the numerous other erlang-p1 packages ? - Can we separate the rename from the bump? - We should add Config.in.legacy entries matching the name of the old packages, so that the new packages get automatically selected Thanks! Thomas
Hello Thomas, On Wed, Aug 7, 2024 at 9:51 PM Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > On Wed, 7 Aug 2024 16:33:00 +0200 > Johan Oudinet <johan.oudinet@gmail.com> wrote: > > > Johan Oudinet (18): > > package/erlang-stun: renamed from erlang-p1-stun > > package/erlang-fast-xml: renamed from erlang-p1-xml > > package/erlang-xmpp: renamed from erlang-p1-xmpp > > I was a bit confused about these patches. I was wondering why the name > of the package mattered, and why it was influencing where the files > installed by this package are actually installed... > > If I understand correctly, it all comes from: > > $(2)_ERLANG_APP = $(subst -,_,$(patsubst erlang-%,%,$(patsubst host-%,%,$(1)))) > > which derives the ERLANG_APP name from the package name, so > erlang-p1-stun becomes p1_stun. Is that correct? That's correct. > > I think it's quite unique in Buildroot to do something like this. Other > packages normally install their stuff into a location that isn't > dependent on the package name chosen by Buildroot. > > That being said, I assume your changes are OK, but: > > - Why are we renaming only those 3 packages, and not the numerous other > erlang-p1 packages ? I tried to minimize the number of renaming and did it only for packages where there was at least one patch in another package that was here only because of the incorrect name. > > - Can we separate the rename from the bump? Yes, I can. > > - We should add Config.in.legacy entries matching the name of the old > packages, so that the new packages get automatically selected Ok. I completely forgot about this legacy file. Thanks for the reminder. I'll do the changes and submit a v2 of this patch series. Thanks.
Ejabberd has many dependencies. Update all of them to the versions needed by ejabberd 24.07. Take the opportunity to rename the erlang packages that were misnamed so far in order to remove some patches. Such patches were here only to fix the location of such packages in other packages that expect to find them in a different place. Johan Oudinet (18): package/erlang-stun: renamed from erlang-p1-stun package/erlang-fast-xml: renamed from erlang-p1-xml package/erlang-xmpp: renamed from erlang-p1-xmpp package/erlang-p1-utils: bump version to 1.0.26 package/erlang-p1-cache-tab: bump version to 1.0.31 package/erlang-p1-tls: bump version to 1.1.21 package/erlang-p1-stringprep: bump version to 1.0.30 package/erlang-fast-yaml: renamed from erlang-p1-yaml package/erlang-p1-yconf: bump version to 1.0.16 package/erlang-p1-oauth2: bump version to 0.6.14 package/erlang-p1-pkix: bump version to 1.0.10 package/erlang-eimp: bump version to 1.0.23 package/erlang-p1-mqtree: bump version to 1.0.17 package/erlang-jose: bump version to 1.11.10 package/erlang-p1-acme: bump version to 1.0.23 package/erlang-p1-sip: bump version to 1.0.54 package/erlang-p1-zlib: bump version to 1.0.13 package/ejabberd: bump version to 24.07 DEVELOPERS | 8 +- package/Config.in | 8 +- ...not-download-or-compile-dependencies.patch | 23 +- package/ejabberd/0002-fix-ejabberdctl.patch | 19 +- package/ejabberd/0003-correct-includes.patch | 1807 ----------------- package/ejabberd/Config.in | 8 +- package/ejabberd/S50ejabberd | 72 +- package/ejabberd/check-erlang-lib | 39 +- package/ejabberd/ejabberd.hash | 4 +- package/ejabberd/ejabberd.mk | 11 +- package/erlang-eimp/erlang-eimp.hash | 2 +- package/erlang-eimp/erlang-eimp.mk | 2 +- package/erlang-fast-xml/Config.in | 8 + .../erlang-fast-xml.hash} | 2 +- package/erlang-fast-xml/erlang-fast-xml.mk | 18 + .../Config.in | 6 +- .../erlang-fast-yaml.hash} | 2 +- package/erlang-fast-yaml/erlang-fast-yaml.mk | 20 + package/erlang-jose/erlang-jose.hash | 2 +- package/erlang-jose/erlang-jose.mk | 2 +- package/erlang-p1-acme/erlang-p1-acme.hash | 2 +- package/erlang-p1-acme/erlang-p1-acme.mk | 2 +- .../erlang-p1-cache-tab.hash | 2 +- .../erlang-p1-cache-tab.mk | 2 +- .../erlang-p1-mqtree/erlang-p1-mqtree.hash | 2 +- package/erlang-p1-mqtree/erlang-p1-mqtree.mk | 2 +- .../erlang-p1-oauth2/erlang-p1-oauth2.hash | 2 +- package/erlang-p1-oauth2/erlang-p1-oauth2.mk | 2 +- package/erlang-p1-pkix/erlang-p1-pkix.hash | 2 +- package/erlang-p1-pkix/erlang-p1-pkix.mk | 2 +- .../erlang-p1-sip/0001-correct-include.patch | 31 - package/erlang-p1-sip/Config.in | 2 +- package/erlang-p1-sip/erlang-p1-sip.hash | 2 +- package/erlang-p1-sip/erlang-p1-sip.mk | 4 +- .../erlang-p1-stringprep.hash | 2 +- .../erlang-p1-stringprep.mk | 2 +- package/erlang-p1-stun/erlang-p1-stun.mk | 14 - package/erlang-p1-tls/erlang-p1-tls.hash | 4 +- package/erlang-p1-tls/erlang-p1-tls.mk | 2 +- package/erlang-p1-utils/erlang-p1-utils.hash | 2 +- package/erlang-p1-utils/erlang-p1-utils.mk | 2 +- package/erlang-p1-xml/Config.in | 8 - package/erlang-p1-xml/erlang-p1-xml.mk | 18 - .../erlang-p1-xmpp/0001-fix-includes.patch | 16 - package/erlang-p1-xmpp/erlang-p1-xmpp.mk | 17 - package/erlang-p1-yaml/erlang-p1-yaml.mk | 20 - package/erlang-p1-yconf/Config.in | 2 +- package/erlang-p1-yconf/erlang-p1-yconf.hash | 2 +- package/erlang-p1-yconf/erlang-p1-yconf.mk | 4 +- package/erlang-p1-zlib/erlang-p1-zlib.hash | 2 +- package/erlang-p1-zlib/erlang-p1-zlib.mk | 2 +- .../{erlang-p1-stun => erlang-stun}/Config.in | 4 +- .../erlang-stun.hash} | 2 +- package/erlang-stun/erlang-stun.mk | 14 + .../{erlang-p1-xmpp => erlang-xmpp}/Config.in | 8 +- .../erlang-xmpp.hash} | 2 +- package/erlang-xmpp/erlang-xmpp.mk | 17 + 57 files changed, 218 insertions(+), 2070 deletions(-) delete mode 100644 package/ejabberd/0003-correct-includes.patch create mode 100644 package/erlang-fast-xml/Config.in rename package/{erlang-p1-yaml/erlang-p1-yaml.hash => erlang-fast-xml/erlang-fast-xml.hash} (50%) create mode 100644 package/erlang-fast-xml/erlang-fast-xml.mk rename package/{erlang-p1-yaml => erlang-fast-yaml}/Config.in (51%) rename package/{erlang-p1-stun/erlang-p1-stun.hash => erlang-fast-yaml/erlang-fast-yaml.hash} (50%) create mode 100644 package/erlang-fast-yaml/erlang-fast-yaml.mk delete mode 100644 package/erlang-p1-sip/0001-correct-include.patch delete mode 100644 package/erlang-p1-stun/erlang-p1-stun.mk delete mode 100644 package/erlang-p1-xml/Config.in delete mode 100644 package/erlang-p1-xml/erlang-p1-xml.mk delete mode 100644 package/erlang-p1-xmpp/0001-fix-includes.patch delete mode 100644 package/erlang-p1-xmpp/erlang-p1-xmpp.mk delete mode 100644 package/erlang-p1-yaml/erlang-p1-yaml.mk rename package/{erlang-p1-stun => erlang-stun}/Config.in (71%) rename package/{erlang-p1-xml/erlang-p1-xml.hash => erlang-stun/erlang-stun.hash} (51%) create mode 100644 package/erlang-stun/erlang-stun.mk rename package/{erlang-p1-xmpp => erlang-xmpp}/Config.in (70%) rename package/{erlang-p1-xmpp/erlang-p1-xmpp.hash => erlang-xmpp/erlang-xmpp.hash} (51%) create mode 100644 package/erlang-xmpp/erlang-xmpp.mk