From: Johan Oudinet <johan.oudinet@gmail.com>
To: buildroot@buildroot.org
Cc: Johan Oudinet <johan.oudinet@gmail.com>
Subject: [Buildroot] [PATCH 02/18] package/erlang-fast-xml: renamed from erlang-p1-xml
Date: Wed, 7 Aug 2024 16:33:02 +0200 [thread overview]
Message-ID: <20240807143318.439619-3-johan.oudinet@gmail.com> (raw)
In-Reply-To: <20240807143318.439619-1-johan.oudinet@gmail.com>
and bump version to 1.1.52. This package has been renamed to avoid
patching other packages that expect to find it in a fast_xml/
directory. Delete the corresponding patch in the erlang-p1-xmpp package.
Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
DEVELOPERS | 2 +-
package/Config.in | 2 +-
package/ejabberd/Config.in | 2 +-
package/ejabberd/ejabberd.mk | 2 +-
package/erlang-fast-xml/Config.in | 8 ++++++++
.../erlang-fast-xml.hash} | 2 +-
package/erlang-fast-xml/erlang-fast-xml.mk | 18 ++++++++++++++++++
package/erlang-p1-xml/Config.in | 8 --------
package/erlang-p1-xml/erlang-p1-xml.mk | 18 ------------------
package/erlang-p1-xmpp/0001-fix-includes.patch | 16 ----------------
package/erlang-p1-xmpp/Config.in | 2 +-
package/erlang-p1-xmpp/erlang-p1-xmpp.mk | 6 +++---
12 files changed, 35 insertions(+), 51 deletions(-)
create mode 100644 package/erlang-fast-xml/Config.in
rename package/{erlang-p1-xml/erlang-p1-xml.hash => erlang-fast-xml/erlang-fast-xml.hash} (50%)
create mode 100644 package/erlang-fast-xml/erlang-fast-xml.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
diff --git a/DEVELOPERS b/DEVELOPERS
index abd36c0c59..24841dcc6e 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -1656,6 +1656,7 @@ N: Johan Oudinet <johan.oudinet@gmail.com>
F: package/ejabberd/
F: package/erlang-base64url/
F: package/erlang-eimp/
+F: package/erlang-fast-xml/
F: package/erlang-goldrush/
F: package/erlang-idna/
F: package/erlang-jiffy/
@@ -1670,7 +1671,6 @@ F: package/erlang-p1-sip/
F: package/erlang-p1-stringprep/
F: package/erlang-p1-tls/
F: package/erlang-p1-utils/
-F: package/erlang-p1-xml/
F: package/erlang-p1-xmpp/
F: package/erlang-p1-yaml/
F: package/erlang-p1-yconf/
diff --git a/package/Config.in b/package/Config.in
index 7dc4f99ec2..4e2f992abe 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -673,6 +673,7 @@ if BR2_PACKAGE_ERLANG
menu "Erlang libraries/modules"
source "package/erlang-base64url/Config.in"
source "package/erlang-eimp/Config.in"
+ source "package/erlang-fast-xml/Config.in"
source "package/erlang-goldrush/Config.in"
source "package/erlang-idna/Config.in"
source "package/erlang-jiffy/Config.in"
@@ -687,7 +688,6 @@ menu "Erlang libraries/modules"
source "package/erlang-p1-stringprep/Config.in"
source "package/erlang-p1-tls/Config.in"
source "package/erlang-p1-utils/Config.in"
- source "package/erlang-p1-xml/Config.in"
source "package/erlang-p1-xmpp/Config.in"
source "package/erlang-p1-yaml/Config.in"
source "package/erlang-p1-yconf/Config.in"
diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in
index fb35a87306..295b0e7744 100644
--- a/package/ejabberd/Config.in
+++ b/package/ejabberd/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_EJABBERD
depends on BR2_PACKAGE_ERLANG
depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep
select BR2_PACKAGE_ERLANG_EIMP
+ select BR2_PACKAGE_ERLANG_FAST_XML
select BR2_PACKAGE_ERLANG_IDNA # runtime
select BR2_PACKAGE_ERLANG_JIFFY # runtime
select BR2_PACKAGE_ERLANG_JOSE # runtime
@@ -16,7 +17,6 @@ config BR2_PACKAGE_EJABBERD
select BR2_PACKAGE_ERLANG_P1_STRINGPREP
select BR2_PACKAGE_ERLANG_P1_TLS
select BR2_PACKAGE_ERLANG_P1_UTILS
- select BR2_PACKAGE_ERLANG_P1_XML
select BR2_PACKAGE_ERLANG_P1_XMPP
select BR2_PACKAGE_ERLANG_P1_YAML
select BR2_PACKAGE_ERLANG_P1_YCONF # runtime
diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk
index 1df8145496..e49560d3a7 100644
--- a/package/ejabberd/ejabberd.mk
+++ b/package/ejabberd/ejabberd.mk
@@ -12,7 +12,7 @@ EJABBERD_CPE_ID_VENDOR = process-one
EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \
erlang-lager erlang-p1-cache-tab erlang-p1-sip \
erlang-p1-stringprep erlang-stun erlang-p1-tls \
- erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \
+ erlang-p1-utils erlang-fast-xml erlang-p1-xmpp erlang-p1-yaml \
erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp
# 0001-Makefile.in-do-not-download-or-compile-dependencies.patch
diff --git a/package/erlang-fast-xml/Config.in b/package/erlang-fast-xml/Config.in
new file mode 100644
index 0000000000..04d6634fe8
--- /dev/null
+++ b/package/erlang-fast-xml/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_ERLANG_FAST_XML
+ bool "erlang-fast-xml"
+ select BR2_PACKAGE_ERLANG_P1_UTILS
+ select BR2_PACKAGE_EXPAT
+ help
+ XML utilities for Erlang
+
+ https://github.com/processone/fast_xml
diff --git a/package/erlang-p1-xml/erlang-p1-xml.hash b/package/erlang-fast-xml/erlang-fast-xml.hash
similarity index 50%
rename from package/erlang-p1-xml/erlang-p1-xml.hash
rename to package/erlang-fast-xml/erlang-fast-xml.hash
index 379ca7ef88..df5557080c 100644
--- a/package/erlang-p1-xml/erlang-p1-xml.hash
+++ b/package/erlang-fast-xml/erlang-fast-xml.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265 erlang-p1-xml-1.1.49.tar.gz
+sha256 2f705191a029ca7df7e62a6cd8622701da59a9e221f8514d2c2b1a5c1d23c739 erlang-fast-xml-1.1.52.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
diff --git a/package/erlang-fast-xml/erlang-fast-xml.mk b/package/erlang-fast-xml/erlang-fast-xml.mk
new file mode 100644
index 0000000000..a04e3f5e09
--- /dev/null
+++ b/package/erlang-fast-xml/erlang-fast-xml.mk
@@ -0,0 +1,18 @@
+################################################################################
+#
+# erlang-fast-xml
+#
+################################################################################
+
+ERLANG_FAST_XML_VERSION = 1.1.52
+ERLANG_FAST_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_FAST_XML_VERSION))
+ERLANG_FAST_XML_LICENSE = Apache-2.0
+ERLANG_FAST_XML_LICENSE_FILES = LICENSE.txt
+ERLANG_FAST_XML_DEPENDENCIES = expat erlang-p1-utils
+HOST_ERLANG_FAST_XML_DEPENDENCIES = host-expat host-erlang-p1-utils
+ERLANG_FAST_XML_INSTALL_STAGING = YES
+
+ERLANG_FAST_XML_USE_AUTOCONF = YES
+
+$(eval $(rebar-package))
+$(eval $(host-rebar-package))
diff --git a/package/erlang-p1-xml/Config.in b/package/erlang-p1-xml/Config.in
deleted file mode 100644
index 504501d912..0000000000
--- a/package/erlang-p1-xml/Config.in
+++ /dev/null
@@ -1,8 +0,0 @@
-config BR2_PACKAGE_ERLANG_P1_XML
- bool "erlang-p1-xml"
- select BR2_PACKAGE_ERLANG_P1_UTILS
- select BR2_PACKAGE_EXPAT
- help
- XML utilities for Erlang
-
- https://github.com/processone/xml
diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk
deleted file mode 100644
index eee2c74c03..0000000000
--- a/package/erlang-p1-xml/erlang-p1-xml.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-################################################################################
-#
-# erlang-p1-xml
-#
-################################################################################
-
-ERLANG_P1_XML_VERSION = 1.1.49
-ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION))
-ERLANG_P1_XML_LICENSE = Apache-2.0
-ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt
-ERLANG_P1_XML_DEPENDENCIES = expat erlang-p1-utils
-HOST_ERLANG_P1_XML_DEPENDENCIES = host-expat host-erlang-p1-utils
-ERLANG_P1_XML_INSTALL_STAGING = YES
-
-ERLANG_P1_XML_USE_AUTOCONF = YES
-
-$(eval $(rebar-package))
-$(eval $(host-rebar-package))
diff --git a/package/erlang-p1-xmpp/0001-fix-includes.patch b/package/erlang-p1-xmpp/0001-fix-includes.patch
deleted file mode 100644
index f02037fdc1..0000000000
--- a/package/erlang-p1-xmpp/0001-fix-includes.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Without this patch, rebar fails to find include file fxml.hrl.
-
-Signed-off-by: Christophe Romain <cromain@process-one.net>
-
-diff --git a/include/xmpp.hrl b/include/xmpp.hrl
-index afa5f61..678858e 100644
---- a/include/xmpp.hrl
-+++ b/include/xmpp.hrl
-@@ -25,7 +25,7 @@
- -include("ns.hrl").
- -include("jid.hrl").
- -include("xmpp_codec.hrl").
---include_lib("fast_xml/include/fxml.hrl").
-+-include_lib("p1_xml/include/fxml.hrl").
-
- -type stanza() :: iq() | presence() | message().
diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-p1-xmpp/Config.in
index c67dc832b7..9cd1a75198 100644
--- a/package/erlang-p1-xmpp/Config.in
+++ b/package/erlang-p1-xmpp/Config.in
@@ -4,8 +4,8 @@ comment "erlang-p1-xmpp needs a toolchain w/ C++"
config BR2_PACKAGE_ERLANG_P1_XMPP
bool "erlang-p1-xmpp"
depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep
+ select BR2_PACKAGE_ERLANG_FAST_XML
select BR2_PACKAGE_ERLANG_IDNA
- select BR2_PACKAGE_ERLANG_P1_XML
select BR2_PACKAGE_ERLANG_P1_STRINGPREP
select BR2_PACKAGE_ERLANG_P1_TLS
select BR2_PACKAGE_ERLANG_P1_UTILS
diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
index 2deb25b315..f8ec0b9823 100644
--- a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
+++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
@@ -9,9 +9,9 @@ ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION))
ERLANG_P1_XMPP_LICENSE = Apache-2.0
ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt
ERLANG_P1_XMPP_INSTALL_STAGING = YES
-ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \
- erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-p1-xml
-HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-p1-xml
+ERLANG_P1_XMPP_DEPENDENCIES = erlang-fast-xml erlang-p1-stringprep \
+ erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-fast-xml
+HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-fast-xml
$(eval $(rebar-package))
$(eval $(host-rebar-package))
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next prev parent reply other threads:[~2024-08-07 14:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 01/18] package/erlang-stun: renamed from erlang-p1-stun Johan Oudinet
2024-08-07 14:33 ` Johan Oudinet [this message]
2024-08-07 14:33 ` [Buildroot] [PATCH 03/18] package/erlang-xmpp: renamed from erlang-p1-xmpp Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 04/18] package/erlang-p1-utils: bump version to 1.0.26 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 05/18] package/erlang-p1-cache-tab: bump version to 1.0.31 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 06/18] package/erlang-p1-tls: bump version to 1.1.21 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 07/18] package/erlang-p1-stringprep: bump version to 1.0.30 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 08/18] package/erlang-fast-yaml: renamed from erlang-p1-yaml Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 09/18] package/erlang-p1-yconf: bump version to 1.0.16 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 10/18] package/erlang-p1-oauth2: bump version to 0.6.14 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 11/18] package/erlang-p1-pkix: bump version to 1.0.10 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 12/18] package/erlang-eimp: bump version to 1.0.23 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 13/18] package/erlang-p1-mqtree: bump version to 1.0.17 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 14/18] package/erlang-jose: bump version to 1.11.10 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 15/18] package/erlang-p1-acme: bump version to 1.0.23 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 16/18] package/erlang-p1-sip: bump version to 1.0.54 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 17/18] package/erlang-p1-zlib: bump version to 1.0.13 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 18/18] package/ejabberd: bump version to 24.07 Johan Oudinet
2024-08-07 19:53 ` Thomas Petazzoni via buildroot
2024-08-07 19:51 ` [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Thomas Petazzoni via buildroot
2024-08-26 14:51 ` Johan Oudinet
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240807143318.439619-3-johan.oudinet@gmail.com \
--to=johan.oudinet@gmail.com \
--cc=buildroot@buildroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox