erlang: stop shipping sasl in the base package

Package/erlang/install copies erts, kernel, sasl and stdlib into
/usr/lib/erlang/lib, and BuildModule builds erlang-sasl from the very
same sasl directory, so both packages own
usr/lib/erlang/lib/sasl-*/ebin/*.beam.

apk refuses to overwrite files owned by another package, so installing
erlang-sasl next to erlang fails:

  ERROR: erlang-sasl-28.5-r1: trying to overwrite
  usr/lib/erlang/lib/sasl-4.3.2/ebin/alarm_handler.beam
  owned by erlang-28.5-r1.

That also takes down erlang-os-mon and erlang-reltool, which depend on
erlang-sasl. The overlap dates back to the import from the old packages
feed and only surfaced once CI started run-testing the subpackages.

Leave sasl to erlang-sasl, which is what that subpackage is for. The
base package keeps bin/start_sasl.boot: it is inert while the runtime
boots via start_clean, and it is needed once erlang-sasl is installed.

Signed-off-by: Josef Schlehofer <redacted>

diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index ec707d3d4abb3dc4ca7b3eedbc999b01c9bebd4a..813d02fb623bd4d136d3970983fbeeb0dc69a3e1 100644 (file)
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=erlang
 PKG_VERSION:=28.5
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=otp_src_$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/erlang/otp/releases/download/OTP-$(PKG_VERSION)
@@ -379,7 +379,7 @@ define Package/erlang/install
                $(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/bin/$$$$f $(1)/usr/lib/erlang/bin/ ; \
        done
        $(INSTALL_DIR) $(1)/usr/lib/erlang/lib
-       for m in erts kernel sasl stdlib; do \
+       for m in erts kernel stdlib; do \
                $(CP) $(PKG_INSTALL_DIR)/usr/lib/erlang/lib/$$$$m-* $(1)/usr/lib/erlang/lib/ ; \
                rm -rf $(1)/usr/lib/erlang/lib/$$$$m-*/examples ; \
                rm -rf $(1)/usr/lib/erlang/lib/$$$$m-*/src ; \