@@ -1657,6 +1657,7 @@ F: package/ejabberd/
F: package/erlang-base64url/
F: package/erlang-eimp/
F: package/erlang-fast-xml/
+F: package/erlang-fast-yaml/
F: package/erlang-goldrush/
F: package/erlang-idna/
F: package/erlang-jiffy/
@@ -1671,7 +1672,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-yaml/
F: package/erlang-p1-yconf/
F: package/erlang-p1-zlib/
F: package/erlang-stun/
@@ -674,6 +674,7 @@ 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-fast-yaml/Config.in"
source "package/erlang-goldrush/Config.in"
source "package/erlang-idna/Config.in"
source "package/erlang-jiffy/Config.in"
@@ -688,7 +689,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-yaml/Config.in"
source "package/erlang-p1-yconf/Config.in"
source "package/erlang-p1-zlib/Config.in"
source "package/erlang-stun/Config.in"
@@ -4,6 +4,7 @@ config BR2_PACKAGE_EJABBERD
depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep
select BR2_PACKAGE_ERLANG_EIMP
select BR2_PACKAGE_ERLANG_FAST_XML
+ select BR2_PACKAGE_ERLANG_FAST_YAML
select BR2_PACKAGE_ERLANG_IDNA # runtime
select BR2_PACKAGE_ERLANG_JIFFY # runtime
select BR2_PACKAGE_ERLANG_JOSE # runtime
@@ -17,7 +18,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_YAML
select BR2_PACKAGE_ERLANG_P1_YCONF # runtime
select BR2_PACKAGE_ERLANG_P1_ZLIB
select BR2_PACKAGE_ERLANG_STUN
@@ -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-fast-xml erlang-xmpp erlang-p1-yaml \
+ erlang-p1-utils erlang-fast-xml erlang-xmpp erlang-fast-yaml \
erlang-p1-zlib host-erlang-p1-utils host-erlang-xmpp
# 0001-Makefile.in-do-not-download-or-compile-dependencies.patch
similarity index 51%
rename from package/erlang-p1-yaml/Config.in
rename to package/erlang-fast-yaml/Config.in
@@ -1,8 +1,8 @@
-config BR2_PACKAGE_ERLANG_P1_YAML
- bool "erlang-p1-yaml"
+config BR2_PACKAGE_ERLANG_FAST_YAML
+ bool "erlang-fast-yaml"
select BR2_PACKAGE_ERLANG_P1_UTILS
select BR2_PACKAGE_LIBYAML
help
Erlang wrapper for libyaml C library
- https://github.com/processone/p1_yaml
+ https://github.com/processone/fast_yaml
similarity index 50%
rename from package/erlang-p1-yaml/erlang-p1-yaml.hash
rename to package/erlang-fast-yaml/erlang-fast-yaml.hash
@@ -1,3 +1,3 @@
# Locally calculated
-sha256 6794470ef35fb3985c4e9aa0ed8d3a0b44e7a5c7bf4c5a1efbeca42060db6806 erlang-p1-yaml-1.0.36.tar.gz
+sha256 a8d632d97282cfdf54a0172df59d8641f37de690dd886d0b2e4ef0d4ff876077 erlang-fast-yaml-1.0.37.tar.gz
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
new file mode 100644
@@ -0,0 +1,20 @@
+################################################################################
+#
+# erlang-fast-yaml
+#
+################################################################################
+
+ERLANG_FAST_YAML_VERSION = 1.0.37
+ERLANG_FAST_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_FAST_YAML_VERSION))
+ERLANG_FAST_YAML_LICENSE = Apache-2.0
+ERLANG_FAST_YAML_LICENSE_FILES = LICENSE.txt
+ERLANG_FAST_YAML_DEPENDENCIES = libyaml erlang-p1-utils
+
+define ERLANG_FAST_YAML_REMOVE_PATHS
+ $(SED) "s/ -I\/usr\/local\/include//" $(@D)/rebar.config
+ $(SED) "s/ -L\/usr\/local\/lib//" $(@D)/rebar.config
+endef
+
+ERLANG_FAST_YAML_POST_PATCH_HOOKS = ERLANG_FAST_YAML_REMOVE_PATHS
+
+$(eval $(rebar-package))
deleted file mode 100644
@@ -1,20 +0,0 @@
-################################################################################
-#
-# erlang-p1-yaml
-#
-################################################################################
-
-ERLANG_P1_YAML_VERSION = 1.0.36
-ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION))
-ERLANG_P1_YAML_LICENSE = Apache-2.0
-ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt
-ERLANG_P1_YAML_DEPENDENCIES = libyaml erlang-p1-utils
-
-define ERLANG_P1_YAML_REMOVE_PATHS
- $(SED) "s/ -I\/usr\/local\/include//" $(@D)/rebar.config
- $(SED) "s/ -L\/usr\/local\/lib//" $(@D)/rebar.config
-endef
-
-ERLANG_P1_YAML_POST_PATCH_HOOKS = ERLANG_P1_YAML_REMOVE_PATHS
-
-$(eval $(rebar-package))
@@ -1,5 +1,5 @@
config BR2_PACKAGE_ERLANG_P1_YCONF
bool "erlang-p1-yconf"
- select BR2_PACKAGE_ERLANG_P1_YAML
+ select BR2_PACKAGE_ERLANG_FAST_YAML
help
YAML configuration processor.
@@ -8,6 +8,6 @@ ERLANG_P1_YCONF_VERSION = 1.0.15
ERLANG_P1_YCONF_SITE = $(call github,processone,yconf,$(ERLANG_P1_YCONF_VERSION))
ERLANG_P1_YCONF_LICENSE = Apache-2.0
ERLANG_P1_YCONF_LICENSE_FILES = LICENSE
-ERLANG_P1_YCONF_DEPENDENCIES = erlang-p1-yaml
+ERLANG_P1_YCONF_DEPENDENCIES = erlang-fast-yaml
$(eval $(rebar-package))
and bump version to 1.0.37. The upstream project has been renamed from p1_yaml to fast_yaml. Use the same name so packages that depends on it, find its content in the fast_yaml/ directory. 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 +- .../Config.in | 6 +++--- .../erlang-fast-yaml.hash} | 2 +- package/erlang-fast-yaml/erlang-fast-yaml.mk | 20 +++++++++++++++++++ package/erlang-p1-yaml/erlang-p1-yaml.mk | 20 ------------------- package/erlang-p1-yconf/Config.in | 2 +- package/erlang-p1-yconf/erlang-p1-yconf.mk | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) rename package/{erlang-p1-yaml => erlang-fast-yaml}/Config.in (51%) rename package/{erlang-p1-yaml/erlang-p1-yaml.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-yaml/erlang-p1-yaml.mk