Erlang ver. 26.2.5.16

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>

otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Do not format man-pages and do not install miscellaneous
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in
-index 05d7b5679f..cbac9956bc 100644
+index 42af9c87dc..c017e0a4ed 100644
 --- a/erts/etc/common/Makefile.in
 +++ b/erts/etc/common/Makefile.in
-@@ -504,10 +504,6 @@ endif
+@@ -552,10 +552,6 @@ endif
  ifneq ($(INSTALL_TOP_BIN),)
  	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
  endif
@@ -21,10 +21,10 @@ index 05d7b5679f..cbac9956bc 100644
  	$(INSTALL_DIR) "$(RELEASE_PATH)/erts-$(VSN)/src"
  	$(INSTALL_DATA) $(INSTALL_SRC) "$(RELEASE_PATH)/erts-$(VSN)/src"
 diff --git a/erts/etc/unix/Install.src b/erts/etc/unix/Install.src
-index e4b842877c..382561821f 100644
+index b00dd09f1a..2147774f50 100644
 --- a/erts/etc/unix/Install.src
 +++ b/erts/etc/unix/Install.src
-@@ -141,14 +141,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
+@@ -143,14 +143,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
  cp -p ../releases/%I_SYSTEM_VSN%/no_dot_erlang.boot .
  cp -p $Name.boot start.boot
  cp -p ../releases/%I_SYSTEM_VSN%/$Name.script start.script

otp-0002-Remove-rpath.patch

@@ -5,28 +5,15 @@ Subject: [PATCH] Remove rpath
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 562758227b..6e5726dde0 100644
+index aedc9e7a13..b27c2aa01b 100644
 --- a/lib/crypto/c_src/Makefile.in
 +++ b/lib/crypto/c_src/Makefile.in
-@@ -113,7 +113,7 @@ TEST_ENGINE_LIB = $(LIBDIR)/otp_test_engine$(TYPEMARKER).@DED_EXT@
- DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
+@@ -147,7 +147,7 @@ endif
+ endif
  
- ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
+ ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
 -SSL_DED_LD_RUNTIME_LIBRARY_PATH = @SSL_DED_LD_RUNTIME_LIBRARY_PATH@
 +SSL_DED_LD_RUNTIME_LIBRARY_PATH =
  CRYPTO_LINK_LIB=$(SSL_DED_LD_RUNTIME_LIBRARY_PATH) -L$(SSL_LIBDIR) -l$(SSL_CRYPTO_LIBNAME)
  EXTRA_FLAGS = -DHAVE_DYNAMIC_CRYPTO_LIB
  else
-diff --git a/lib/crypto/priv/Makefile b/lib/crypto/priv/Makefile
-index ff9d3e1dc9..d3aba77808 100644
---- a/lib/crypto/priv/Makefile
-+++ b/lib/crypto/priv/Makefile
-@@ -61,7 +61,7 @@ OBJS = $(OBJDIR)/crypto.o
- # ----------------------------------------------------
- 
- $(SO_NIFLIB): $(OBJS)
--	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) -Wl,-R$(SO_SSL_LIBDIR) \
-+	$(SO_LD) $(SO_LDFLAGS) -L$(SO_SSL_LIBDIR) \
- 	-o $@ $^ -lcrypto
- 
- $(DLL_NIFLIB): $(OBJS)

otp-0003-Do-not-install-C-sources.patch

@@ -14,10 +14,10 @@ https://bugzilla.redhat.com/818419
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile
-index 1f714df357..95835d6ed2 100644
+index 82a6b6e87a..5f2fe8ba7d 100644
 --- a/lib/asn1/c_src/Makefile
 +++ b/lib/asn1/c_src/Makefile
-@@ -136,8 +136,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+@@ -137,8 +137,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
  release_spec: opt
  	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
  	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
@@ -26,56 +26,31 @@ index 1f714df357..95835d6ed2 100644
  
  release_docs_spec:
  
-diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
-index 6e5726dde0..a1d9ae442e 100644
---- a/lib/crypto/c_src/Makefile.in
-+++ b/lib/crypto/c_src/Makefile.in
-@@ -224,16 +224,11 @@ docs:
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
--	$(INSTALL_DATA) $(NIF_MAKEFILE) "$(RELSYSDIR)/priv/obj"
--	$(INSTALL_PROGRAM) $(CRYPTO_OBJS) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_PROGRAM) $(NIF_LIB) "$(RELSYSDIR)/priv/lib"
- ifeq ($(DYNAMIC_CRYPTO_LIB),yes)
--	$(INSTALL_PROGRAM) $(CALLBACK_OBJS) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_PROGRAM) $(CALLBACK_LIB) "$(RELSYSDIR)/priv/lib"
- endif
--	$(INSTALL_PROGRAM) $(TEST_ENGINE_OBJS) "$(RELSYSDIR)/priv/obj"
- 	$(INSTALL_PROGRAM) $(TEST_ENGINE_LIB) "$(RELSYSDIR)/priv/lib"
- 
- release_docs_spec:
 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index ba0164ea51..9ccbbee1b3 100644
+index fa1ea3cd39..b977b6afe5 100644
 --- a/lib/erl_interface/src/Makefile.in
 +++ b/lib/erl_interface/src/Makefile.in
-@@ -848,14 +848,14 @@ ifneq ($(EXE_TARGETS),)
- 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
+@@ -715,13 +715,11 @@ ifeq (@DYNAMIC_LIB@, yes)
  endif
+ 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
  	$(INSTALL_DATA) $(EXTRA)        "$(RELSYSDIR)/src"
 -	$(INSTALL_DATA) connect/*.[ch]  "$(RELSYSDIR)/src/connect"
 -	$(INSTALL_DATA) decode/*.[ch]   "$(RELSYSDIR)/src/decode"
 -	$(INSTALL_DATA) encode/*.[ch]   "$(RELSYSDIR)/src/encode"
 -	$(INSTALL_DATA) epmd/*.[ch]     "$(RELSYSDIR)/src/epmd"
 -	$(INSTALL_DATA) misc/*.[ch]     "$(RELSYSDIR)/src/misc"
--	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
--	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"
+-	$(INSTALL_DATA) global/*.[ch]   "$(RELSYSDIR)/src/global"
 -	$(INSTALL_DATA) prog/*.[ch]     "$(RELSYSDIR)/src/prog"
 +	$(INSTALL_DATA) connect/*.h  "$(RELSYSDIR)/src/connect"
 +	$(INSTALL_DATA) decode/*.h   "$(RELSYSDIR)/src/decode"
 +	$(INSTALL_DATA) encode/*.h   "$(RELSYSDIR)/src/encode"
 +	$(INSTALL_DATA) epmd/*.h     "$(RELSYSDIR)/src/epmd"
 +	$(INSTALL_DATA) misc/*.h     "$(RELSYSDIR)/src/misc"
-+	$(INSTALL_DATA) registry/*.h "$(RELSYSDIR)/src/registry"
-+	$(INSTALL_DATA) legacy/*.h   "$(RELSYSDIR)/src/legacy"
-+	$(INSTALL_DATA) prog/*.h     "$(RELSYSDIR)/src/prog"
  
  release_docs:
  
 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index cd409fa54f..c65e817385 100644
+index 3649e2c392..d8c5c68b99 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
 @@ -251,7 +251,7 @@ release_spec: opt
@@ -88,7 +63,7 @@ index cd409fa54f..c65e817385 100644
  endif
  
 diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index 294d832797..173f660f26 100644
+index d1b26743a6..cf8faae1f5 100644
 --- a/lib/odbc/c_src/Makefile.in
 +++ b/lib/odbc/c_src/Makefile.in
 @@ -129,11 +129,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
@@ -116,16 +91,3 @@ index 27b156a2c9..f11ff303b6 100644
  	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
  	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
  
-diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
-index 0cd760b137..b2d7cf94c9 100644
---- a/lib/tools/c_src/Makefile.in
-+++ b/lib/tools/c_src/Makefile.in
-@@ -189,8 +189,6 @@ include ../vsn.mk
- RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN)
- 
- release_spec: all
--	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
--	$(INSTALL_DATA) $(EMEM_SRCS) $(EMEM_HEADERS) "$(RELSYSDIR)/c_src"
- ifneq ($(PROGS),)
- 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
- 	$(INSTALL_PROGRAM) $(PROGS) "$(RELSYSDIR)/bin"

otp-0004-Do-not-install-Java-sources.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Do not install Java sources
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-index ee616f3d7e..fdd28e79b3 100644
+index 089cf4ab1a..404654a437 100644
 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
 +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-@@ -120,8 +120,6 @@ release release_docs release_tests release_html:
+@@ -123,8 +123,6 @@ release release_docs release_tests release_html:
  	$(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec
  
  release_spec: opt

otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch

@@ -6,10 +6,10 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile
-index 8e9a4c333c..33b32b09b9 100644
+index 8e3882bfdc..ea999cf9c7 100644
 --- a/lib/os_mon/doc/src/Makefile
 +++ b/lib/os_mon/doc/src/Makefile
-@@ -36,11 +36,16 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
+@@ -31,11 +31,16 @@ APPLICATION=os_mon
  # Target Specs
  # ----------------------------------------------------
  XML_APPLICATION_FILES = ref_man.xml
@@ -28,20 +28,20 @@ index 8e9a4c333c..33b32b09b9 100644
  XML_REF6_FILES = os_mon_app.xml
  
 diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
-index 923a31f290..5963351b0f 100644
+index e28fb12548..ee32f3946f 100644
 --- a/lib/os_mon/src/Makefile
 +++ b/lib/os_mon/src/Makefile
 @@ -34,7 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
  # ----------------------------------------------------
  # Target Specs
  # ----------------------------------------------------
--MODULES= disksup memsup cpu_sup os_mon os_sup os_mon_sysinfo nteventlog
+-MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo nteventlog
 +ifeq ($(findstring win32,$(TARGET)),win32)
 +NTEVENTLOG=nteventlog
 +else
 +NTEVENTLOG=
 +endif
-+MODULES= disksup memsup cpu_sup os_mon  os_sup os_mon_sysinfo \
++MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
 +	 $(NTEVENTLOG)
  
  INCLUDE=../include

otp-0006-Add-extra-search-directory.patch

@@ -5,10 +5,10 @@ Subject: [PATCH] Add extra search directory
 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
 
 diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl
-index 126de66d13..ad926ea1da 100644
+index 7327636751..2e92e77598 100644
 --- a/lib/kernel/src/code_server.erl
 +++ b/lib/kernel/src/code_server.erl
-@@ -79,11 +79,17 @@ init(Ref, Parent, [Root,Mode]) ->
+@@ -90,11 +90,17 @@ init(Ref, Parent, [Root,Mode]) ->
      IPath =
  	case Mode of
  	    interactive ->

otp-0006-Do-not-install-erlang-sources.patch

@@ -1,774 +0,0 @@
-From: Hans Ulrich Niedermann <hun@n-dimensional.de>
-Date: Mon, 21 Mar 2011 15:41:49 +0100
-Subject: [PATCH] Do not install erlang sources
-
-Don't install *.erl, *.xrl, *.yrl, and *.asn1 files at all.
-
-Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
-Signed-off-by: Hans Ulrich Niedermann <hun@n-dimensional.de>
-
-diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile
-index d2153f23e1..1eb33a5922 100644
---- a/erts/preloaded/src/Makefile
-+++ b/erts/preloaded/src/Makefile
-@@ -121,8 +121,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: $(APP_TARGET)
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(BEAM_FILES) $(STUBS_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile
-index a6ff72898c..35d4530f32 100644
---- a/lib/asn1/src/Makefile
-+++ b/lib/asn1/src/Makefile
-@@ -155,7 +155,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA)  $(ERL_FILES) $(HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
- 	$(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples"
- 
-diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile
-index a20de14e0e..3ef8516521 100644
---- a/lib/common_test/src/Makefile
-+++ b/lib/common_test/src/Makefile
-@@ -150,7 +150,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-diff --git a/lib/common_test/test_server/Makefile b/lib/common_test/test_server/Makefile
-index f015064b39..57f96d2929 100644
---- a/lib/common_test/test_server/Makefile
-+++ b/lib/common_test/test_server/Makefile
-@@ -86,9 +86,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_tests_spec: opt
- 	$(INSTALL_DIR) "$(RELEASE_PATH)/test_server"
--	$(INSTALL_DATA) $(TS_ERL_FILES) $(TS_HRL_FILES) \
-+	$(INSTALL_DATA) $(TS_HRL_FILES) \
- 		$(TS_TARGET_FILES) \
--		$(AUTOCONF_FILES) $(CONFIG) \
-+		$(CONFIG) \
- 		"$(RELEASE_PATH)/test_server"
- 	$(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server"
- 
-diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile
-index e42032c3ae..501ed4d3d6 100644
---- a/lib/compiler/src/Makefile
-+++ b/lib/compiler/src/Makefile
-@@ -179,8 +179,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
--		$(YRL_FILE) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
-+		"$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
-index 1753ba4f36..2cd09475e8 100644
---- a/lib/crypto/src/Makefile
-+++ b/lib/crypto/src/Makefile
-@@ -81,8 +81,6 @@ docs:
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \
- 		$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile
-index 118cb6b758..86722d8767 100644
---- a/lib/debugger/src/Makefile
-+++ b/lib/debugger/src/Makefile
-@@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(TOOLBOX_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile
-index bddd761705..f0c2e7c35b 100644
---- a/lib/dialyzer/src/Makefile
-+++ b/lib/dialyzer/src/Makefile
-@@ -160,7 +160,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(EXTRA_FILES) \
-+	$(INSTALL_DATA) $(HRL_FILES) $(EXTRA_FILES) \
- 		"$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
-diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile
-index d6854cfd27..fab5f3dec3 100644
---- a/lib/diameter/src/Makefile
-+++ b/lib/diameter/src/Makefile
-@@ -257,11 +257,8 @@ release_spec: opt
- 	$(MAKE) $(EXAMPLE_DIRS:%/=release_examples_%)
- 
- $(TARGET_DIRS:%/=release_src_%): release_src_%:
--	$(INSTALL_DIR) "$(RELSYSDIR)/src/$*"
--	$(INSTALL_DATA) $(filter $*/%, $(TARGET_MODULES:%=%.erl) \
--	                               $(INTERNAL_HRLS)) \
--	                $(filter $*/%, compiler/$(DICT_YRL).yrl) \
--	                "$(RELSYSDIR)/src/$*"
-+	$(INSTALL_DATA) $(filter $*/%, $(INTERNAL_HRLS)) \
-+	                "$(RELSYSDIR)/src/$*" || true
- 
- $(EXAMPLE_DIRS:%/=release_examples_%): release_examples_%:
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/$*"
-diff --git a/lib/edoc/src/Makefile b/lib/edoc/src/Makefile
-index ea2f45dc4c..84af08eb67 100644
---- a/lib/edoc/src/Makefile
-+++ b/lib/edoc/src/Makefile
-@@ -87,7 +87,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(SOURCES) $(HRL_FILES) $(YRL_FILE) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 
- release_docs_spec:
- 
-diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile
-index b79a537424..d0b231e5fc 100644
---- a/lib/eldap/src/Makefile
-+++ b/lib/eldap/src/Makefile
-@@ -98,13 +98,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
--	$(INSTALL_DATA) $(ASN1_HRL) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
--	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
--	$(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1"
-+	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
--	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 
- release_docs_spec:
- 
-diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
-index 82d051e9bb..950fdbe177 100644
---- a/lib/erl_docgen/src/Makefile
-+++ b/lib/erl_docgen/src/Makefile
-@@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile
-index b6347d8b6d..a695d2cc2d 100644
---- a/lib/et/src/Makefile
-+++ b/lib/et/src/Makefile
-@@ -109,7 +109,6 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
-diff --git a/lib/eunit/src/Makefile b/lib/eunit/src/Makefile
-index 3510d3cc93..9179e9b4c2 100644
---- a/lib/eunit/src/Makefile
-+++ b/lib/eunit/src/Makefile
-@@ -120,7 +120,6 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(PARSE_TRANSFORM_BIN) $(OBJECTS) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(PARSE_TRANSFORM) $(SOURCES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
-diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
-index affbb10ff6..44598beff2 100644
---- a/lib/hipe/cerl/Makefile
-+++ b/lib/hipe/cerl/Makefile
-@@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/cerl"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/cerl"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/cerl"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile
-index d883eecf36..3119bc4638 100644
---- a/lib/hipe/flow/Makefile
-+++ b/lib/hipe/flow/Makefile
-@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/flow"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow"
-+	$(INSTALL_DATA) $(HRL_FILES) $(INC_FILES) "$(RELSYSDIR)/flow"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile
-index b220bc16a0..d4073277be 100644
---- a/lib/hipe/icode/Makefile
-+++ b/lib/hipe/icode/Makefile
-@@ -120,7 +120,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/icode"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/icode"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/icode"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile
-index 5e8f2076db..06d3f2684d 100644
---- a/lib/hipe/llvm/Makefile
-+++ b/lib/hipe/llvm/Makefile
-@@ -104,7 +104,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) $(RELSYSDIR)/llvm
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(RELSYSDIR)/llvm
-+	$(INSTALL_DATA) $(HRL_FILES) $(RELSYSDIR)/llvm
- 	$(INSTALL_DIR) $(RELSYSDIR)/ebin
- 	$(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin
- 
-diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile
-index 8ef31dbb46..80d28819f2 100644
---- a/lib/hipe/main/Makefile
-+++ b/lib/hipe/main/Makefile
-@@ -118,7 +118,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DATA) ../vsn.mk "$(RELSYSDIR)"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/main"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/main"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/main"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile
-index e5033e444b..74a444b386 100644
---- a/lib/hipe/misc/Makefile
-+++ b/lib/hipe/misc/Makefile
-@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/misc"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/misc"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/misc"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile
-index 67485875a6..f83a2bb9e2 100644
---- a/lib/hipe/rtl/Makefile
-+++ b/lib/hipe/rtl/Makefile
-@@ -108,7 +108,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/rtl"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/rtl"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/rtl"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile
-index 20b1c3bf50..40c642a441 100644
---- a/lib/hipe/util/Makefile
-+++ b/lib/hipe/util/Makefile
-@@ -50,7 +50,6 @@ HIPE_MODULES =
- endif
- MODULES = hipe_timing hipe_dot hipe_digraph hipe_dsets $(HIPE_MODULES)
- 
--HRL_FILES=
- ERL_FILES= $(MODULES:%=%.erl)
- TARGET_FILES= $(MODULES:%=$(EBIN)/%.$(EMULATOR))
- DOC_FILES= $(MODULES:%=$(DOCS)/%.html)
-@@ -104,8 +103,6 @@ $(DOCS)/%.html:%.erl
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/util"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/util"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile
-index a1c1f36b70..f2eb86f7ac 100644
---- a/lib/inets/src/http_client/Makefile
-+++ b/lib/inets/src/http_client/Makefile
-@@ -92,7 +92,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_client"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_client"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_client"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile
-index 8248e37c44..1f1b23184b 100644
---- a/lib/inets/src/http_lib/Makefile
-+++ b/lib/inets/src/http_lib/Makefile
-@@ -90,7 +90,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_lib"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_lib"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_lib"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/inets/src/http_server/Makefile b/lib/inets/src/http_server/Makefile
-index 9848fd4b35..387475febb 100644
---- a/lib/inets/src/http_server/Makefile
-+++ b/lib/inets/src/http_server/Makefile
-@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/http_server"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/http_server"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/http_server"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/inets/src/inets_app/Makefile b/lib/inets/src/inets_app/Makefile
-index ec1ae70305..88c084ef58 100644
---- a/lib/inets/src/inets_app/Makefile
-+++ b/lib/inets/src/inets_app/Makefile
-@@ -116,7 +116,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/inets_app"
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/inets_app"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/inets_app"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
-diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
-index 2d2b84c206..9d67cb0c01 100644
---- a/lib/kernel/src/Makefile
-+++ b/lib/kernel/src/Makefile
-@@ -231,7 +231,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
-diff --git a/lib/megaco/src/app/Makefile b/lib/megaco/src/app/Makefile
-index ab45548099..5c7a7f0be9 100644
---- a/lib/megaco/src/app/Makefile
-+++ b/lib/megaco/src/app/Makefile
-@@ -114,7 +114,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/app"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/app"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile
-index b9643669f6..5b5a4cf482 100644
---- a/lib/megaco/src/binary/Makefile
-+++ b/lib/megaco/src/binary/Makefile
-@@ -176,7 +176,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/binary"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(ASN1_FILES) "$(RELSYSDIR)/src/binary"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/binary"
- 
- 
- release_docs_spec:
-diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile
-index 869b516b05..fa7d774d84 100644
---- a/lib/megaco/src/engine/Makefile
-+++ b/lib/megaco/src/engine/Makefile
-@@ -102,7 +102,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/engine"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/engine"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
- 
- 
-diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index c65e817385..3bc4dea207 100644
---- a/lib/megaco/src/flex/Makefile.in
-+++ b/lib/megaco/src/flex/Makefile.in
-@@ -248,7 +248,6 @@ release_spec: opt
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/flex"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/priv/lib"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/include"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
- 	$(INSTALL_DATA) $(FLEX_FILES) "$(RELSYSDIR)/src/flex"
-diff --git a/lib/megaco/src/tcp/Makefile b/lib/megaco/src/tcp/Makefile
-index d07db3fa4b..7f421d24cc 100644
---- a/lib/megaco/src/tcp/Makefile
-+++ b/lib/megaco/src/tcp/Makefile
-@@ -94,7 +94,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tcp"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/tcp"
- 
- 
- release_docs_spec:
-diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile
-index 8e7e82b276..2a118d24e3 100644
---- a/lib/megaco/src/text/Makefile
-+++ b/lib/megaco/src/text/Makefile
-@@ -135,7 +135,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(BEAM_TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/text"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_YRL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/text"
- 
- 
- release_docs_spec:
-diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile
-index 028a63e98e..9e11e9bfb2 100644
---- a/lib/megaco/src/udp/Makefile
-+++ b/lib/megaco/src/udp/Makefile
-@@ -94,7 +94,7 @@ release_spec: opt
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/udp"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/udp"
- 
- 
- release_docs_spec:
-diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile
-index 7d316df263..60fdefb5d0 100644
---- a/lib/mnesia/src/Makefile
-+++ b/lib/mnesia/src/Makefile
-@@ -134,7 +134,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile
-index f9f239db37..dd061f29f4 100644
---- a/lib/observer/src/Makefile
-+++ b/lib/observer/src/Makefile
-@@ -150,7 +150,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
- 	$(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples"
-diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile
-index 7ca59495ed..a52ade2fe3 100644
---- a/lib/odbc/src/Makefile
-+++ b/lib/odbc/src/Makefile
-@@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXT_HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
-index 5963351b0f..22c41137d0 100644
---- a/lib/os_mon/src/Makefile
-+++ b/lib/os_mon/src/Makefile
-@@ -105,7 +105,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile
-index ba206904ec..281cc8657c 100644
---- a/lib/parsetools/src/Makefile
-+++ b/lib/parsetools/src/Makefile
-@@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-diff --git a/lib/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
-index 1fef168463..e5411b903b 100644
---- a/lib/public_key/asn1/Makefile
-+++ b/lib/public_key/asn1/Makefile
-@@ -96,8 +96,8 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
--	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_ERLS) $(ASN_HRLS) $(ASN_CONFIGS) \
--		 $(GEN_ERLS) "$(RELSYSDIR)/asn1"
-+	$(INSTALL_DATA) $(ASN_ASNS) $(ASN_HRLS) $(ASN_CONFIGS) \
-+		 "$(RELSYSDIR)/asn1"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 
-diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile
-index e61390bce3..6ed6c2cf9f 100644
---- a/lib/public_key/src/Makefile
-+++ b/lib/public_key/src/Makefile
-@@ -109,8 +109,6 @@ $(APPUP_TARGET):	$(APPUP_SRC) ../vsn.mk
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile
-index 4bddee4664..c714255548 100644
---- a/lib/reltool/src/Makefile
-+++ b/lib/reltool/src/Makefile
-@@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-diff --git a/lib/runtime_tools/src/Makefile b/lib/runtime_tools/src/Makefile
-index 76286c5499..d921f9f294 100644
---- a/lib/runtime_tools/src/Makefile
-+++ b/lib/runtime_tools/src/Makefile
-@@ -99,8 +99,6 @@ docs:
- include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
-diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile
-index 16a42caf11..674364281d 100644
---- a/lib/sasl/src/Makefile
-+++ b/lib/sasl/src/Makefile
-@@ -94,7 +94,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
-diff --git a/lib/snmp/src/agent/Makefile b/lib/snmp/src/agent/Makefile
-index 1bde1ca972..acc42385f3 100644
---- a/lib/snmp/src/agent/Makefile
-+++ b/lib/snmp/src/agent/Makefile
-@@ -140,7 +140,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/agent"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/agent"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		"$(RELSYSDIR)/ebin"
-diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
-index 6f2b8a4077..bd062a6473 100644
---- a/lib/snmp/src/app/Makefile
-+++ b/lib/snmp/src/app/Makefile
-@@ -132,7 +132,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/app"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/app"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/app"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		"$(RELSYSDIR)/ebin"
-diff --git a/lib/snmp/src/compile/Makefile b/lib/snmp/src/compile/Makefile
-index d9678669a5..ff9dff95d9 100644
---- a/lib/snmp/src/compile/Makefile
-+++ b/lib/snmp/src/compile/Makefile
-@@ -125,7 +125,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/compiler"
--	$(INSTALL_DATA) $(ESCRIPT_SRC) $(PARSER_SRC) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/compiler"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(EBIN_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/bin"
-diff --git a/lib/snmp/src/manager/Makefile b/lib/snmp/src/manager/Makefile
-index 57ff08c160..d51f627ca5 100644
---- a/lib/snmp/src/manager/Makefile
-+++ b/lib/snmp/src/manager/Makefile
-@@ -123,7 +123,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/manager"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/manager"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/manager"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile
-index adc2c4858f..89ce954e99 100644
---- a/lib/snmp/src/misc/Makefile
-+++ b/lib/snmp/src/misc/Makefile
-@@ -112,7 +112,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/misc"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src/misc"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/misc"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
-diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile
-index 2b96020678..3e692d25b2 100644
---- a/lib/ssh/src/Makefile
-+++ b/lib/ssh/src/Makefile
-@@ -148,7 +148,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
- 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-diff --git a/lib/ssl/src/Makefile b/lib/ssl/src/Makefile
-index 03c39b4722..4a8fc58a18 100644
---- a/lib/ssl/src/Makefile
-+++ b/lib/ssl/src/Makefile
-@@ -190,7 +190,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
- 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-diff --git a/lib/stdlib/src/Makefile b/lib/stdlib/src/Makefile
-index 9d8a5f98f9..e5afdcfa27 100644
---- a/lib/stdlib/src/Makefile
-+++ b/lib/stdlib/src/Makefile
-@@ -216,7 +216,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) erl_parse.yrl "$(RELSYSDIR)/src"
- 	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
-diff --git a/lib/syntax_tools/src/Makefile b/lib/syntax_tools/src/Makefile
-index c21d2f49c8..03dbc74ef7 100644
---- a/lib/syntax_tools/src/Makefile
-+++ b/lib/syntax_tools/src/Makefile
-@@ -100,8 +100,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(OBJECTS) "$(RELSYSDIR)/ebin"
--	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(SOURCES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include"
- 
-diff --git a/lib/tftp/src/Makefile b/lib/tftp/src/Makefile
-index 029bd731bd..85c633b4f0 100644
---- a/lib/tftp/src/Makefile
-+++ b/lib/tftp/src/Makefile
-@@ -101,7 +101,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(BEHAVIOUR_TARGET_FILES) $(TARGET_FILES) $(APP_TARGET) \
- 	$(APPUP_TARGET) "$(RELSYSDIR)/ebin"
-diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
-index cc5bee9a8f..7dfa55cb41 100644
---- a/lib/tools/src/Makefile
-+++ b/lib/tools/src/Makefile
-@@ -109,7 +109,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- 
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(HRL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
- 		"$(RELSYSDIR)/ebin"
-diff --git a/lib/wx/src/Makefile b/lib/wx/src/Makefile
-index 52f4008e0a..dc297f1d55 100644
---- a/lib/wx/src/Makefile
-+++ b/lib/wx/src/Makefile
-@@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES)
- include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt 
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src/gen"
--	$(INSTALL_DATA) $(GEN_HRL) $(GEN_FILES) "$(RELSYSDIR)/src/gen"
-+	$(INSTALL_DATA) $(GEN_HRL) "$(RELSYSDIR)/src/gen"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
-diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile
-index 51d9190797..1ab65bd2ed 100644
---- a/lib/xmerl/src/Makefile
-+++ b/lib/xmerl/src/Makefile
-@@ -218,9 +218,7 @@ release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) $(APP_SRC) $(APPUP_SRC) "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) xmerl_xpath_parse.yrl "$(RELSYSDIR)/src"
--	$(INSTALL_DATA) xmerl_b64Bin.yrl "$(RELSYSDIR)/src"
-+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
- 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
- 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
- 

otp-0007-Avoid-forking-sed-to-get-basename.patch

@@ -4,14 +4,14 @@ Subject: [PATCH] Avoid forking sed to get basename.
 
 
 diff --git a/erts/etc/unix/erl.src.src b/erts/etc/unix/erl.src.src
-index 959c099e8f..861b8bcbf1 100644
+index 536fa139d9..4dcffbc4c8 100644
 --- a/erts/etc/unix/erl.src.src
 +++ b/erts/etc/unix/erl.src.src
-@@ -21,7 +21,7 @@
- ROOTDIR="%FINAL_ROOTDIR%"
- BINDIR=$ROOTDIR/erts-%VSN%/bin
+@@ -49,7 +49,7 @@ else
+ fi
+ BINDIR="$ROOTDIR/erts-%VSN%/bin"
  EMU=%EMULATOR%%EMULATOR_NUMBER%
--PROGNAME=`echo $0 | sed 's/.*\///'`
+-PROGNAME=`basename "$0"`
 +PROGNAME=${0##*/}
  export EMU
  export ROOTDIR

otp-0008-Load-man-pages-from-system-wide-directory.patch

@@ -7,10 +7,10 @@ Patch allows one to use standard man path with erl -man command.
 as required by Debian policy.)
 
 diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
-index f634f650e0..ccc4ba6c9a 100644
+index 888df87e35..14272f06c6 100644
 --- a/erts/etc/common/erlexec.c
 +++ b/erts/etc/common/erlexec.c
-@@ -720,8 +720,10 @@ int main(int argc, char **argv)
+@@ -716,8 +716,10 @@ int main(int argc, char **argv)
  			error("-man not supported on Windows");
  #else
  			argv[i] = "man";

otp-0009-Add-GDB-tools.patch

@@ -0,0 +1,464 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Thu, 19 Jun 2025 13:17:52 +0200
+Subject: [PATCH] Add GDB tools
+
+* https://github.com/erlang/otp-gdb-tools
+* Commit 7b864f58c534699e4124e31ecfda86041b941037.
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/erts/etc/unix/gdb-tools/README.md b/erts/etc/unix/gdb-tools/README.md
+new file mode 100644
+index 0000000000..8a6cf92b1d
+--- /dev/null
++++ b/erts/etc/unix/gdb-tools/README.md
+@@ -0,0 +1,42 @@
++# Erlang/OTP GDB Tools
++
++This repository contains GDB tools that cannot
++be part of the main Erlang/OTP repository for licensing
++reasons. The tools are used when building and debugging
++Erlang/OTP with gdb and are installed as needed by the
++Erlang/OTP build system.
++
++Right now the only tool in this repository is the jit-reader
++which is a plugin to gdb that allows it to read the stack of
++Erlang processes when using the JIT. This allows commands
++such as `backtrace` to show Erlang stackframes. For example:
++
++```
++(gdb) bt
++#0  0x00007fffa40005ee in global::call_bif_shared ()
++#1  0x00007fffa411eaac in erl_eval:eval_lc1/7 () at erl_eval.erl:929
++#2  0x00007fffa411e7bc in erl_eval:eval_lc/7 () at erl_eval.erl:917
++#3  0x00007fffa4296528 in lists:map_1/2 () at lists.erl:2082
++#4  0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
++#5  0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
++#6  0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
++.....
++#98 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
++#99 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
++#100 0x00007fffa4296554 in lists:map_1/2 () at lists.erl:2082
++#101 0x00007fffa42963d4 in lists:map/2 () at lists.erl:2077
++#102 0x00007fffa411e45c in erl_eval:do_apply/7 () at erl_eval.erl:904
++#103 0x00007fffa45f4c58 in shell:exprs/7 () at shell.erl:893
++#104 0x00007fffa45f42c4 in shell:eval_exprs/7 () at shell.erl:849
++#105 0x00007fffa45f3dac in shell:eval_loop/4 () at shell.erl:834
++#106 0x00007fffa40024b8 in erts_beamasm:normal_exit/0-CodeInfoPrologue ()
++Backtrace stopped: previous frame inner to this frame (corrupt stack?)
++(gdb) 
++```
++
++## Updates of jit-reader
++
++When updating jit-reader you first need to update this repository
++and push the new version here. Then you need to run
++`./otp_build update_gdb_tools` in the Erlang/OTP repo for
++it to use the correct commit.
+diff --git a/erts/etc/unix/gdb-tools/jit-reader.c b/erts/etc/unix/gdb-tools/jit-reader.c
+new file mode 100644
+index 0000000000..3c39c5540d
+--- /dev/null
++++ b/erts/etc/unix/gdb-tools/jit-reader.c
+@@ -0,0 +1,386 @@
++#include <gdb/jit-reader.h>
++
++#include <stdlib.h>
++#include <stdio.h>
++#include <stdint.h>
++#include <string.h>
++
++/* Useful links
++ * - https://pwparchive.wordpress.com/2011/11/20/new-jit-interface-for-gdb/
++ * - https://sourceware.org/gdb/current/onlinedocs/gdb/Custom-Debug-Info.html
++ * - https://github.com/tetzank/asmjit-utilities
++ * - https://github.com/bminor/binutils-gdb/blob/master/gdb/testsuite/gdb.base/jitreader.c
++ */
++
++GDB_DECLARE_GPL_COMPATIBLE_READER
++
++#if 0
++#define HARD_DEBUG
++static FILE *log = NULL;
++#define LOG(...) do { fprintf(log, ##__VA_ARGS__); fflush(log); } while(0)
++#else
++#define LOG(...)
++#endif
++
++typedef enum {
++    X64_RBP = 6,  /* Frame pointer iff native frames are enabled */
++    X64_RSP = 7,  /* Stack pointer when using native stack */
++    X64_R12 = 12, /* Stack pointer when using non-native stack */
++    X64_R13 = 13, /* Current process */
++    X64_RIP = 16
++} X64Register;
++
++typedef enum {
++    /* Return address only */
++    ERTS_FRAME_LAYOUT_RA,
++    /* Frame pointer, return address */
++    ERTS_FRAME_LAYOUT_FP_RA
++} ErtsFrameLayout;
++
++struct emulator_info {
++    /* 0 = regular, 1 = frame pointers */
++    int frame_layout;
++    const void *normal_exit;
++};
++
++struct erlang_module_info {
++    uint64_t base_address;
++    uint32_t range_count;
++    uint32_t code_size;
++    /* Module name, including null terminator. */
++    uint16_t name_length;
++    char name[];
++    /* array of range_info structures */
++};
++
++struct range_info {
++    uint32_t start_offset;
++    uint32_t end_offset;
++    uint32_t line_count;
++    /* Range name, including null terminator. */
++    uint16_t name_length;
++    char name[];
++    /* array of line_info structures */
++};
++
++struct line_info {
++    uint32_t start_offset;
++    uint32_t line_number;
++    /* File name, including null terminator. */
++    uint16_t file_length;
++    char file[];
++};
++
++enum debug_info_header {
++    DEBUG_INFO_HEADER_EMULATOR = 0,
++    DEBUG_INFO_HEADER_MODULE = 1,
++};
++
++struct debug_info {
++    enum debug_info_header header;
++    union {
++        struct emulator_info emu;
++        struct erlang_module_info mod;
++    } payload;
++};
++
++typedef struct range {
++    GDB_CORE_ADDR start;
++    GDB_CORE_ADDR end;
++#ifdef HARD_DEBUG
++    char *name;
++#endif
++} range;
++
++typedef struct priv {
++    range *ranges;
++    int num_ranges;
++    ErtsFrameLayout frame_layout;
++    const void *normal_exit;
++} priv;
++
++static enum gdb_status read_module_info(struct gdb_reader_funcs *self,
++                                        struct gdb_symbol_callbacks *cb,
++                                        struct erlang_module_info *module_info) {
++    struct gdb_object *obj = cb->object_open(cb);
++    GDB_CORE_ADDR mod_start, mod_end;
++    char *symfile = (char*)module_info;
++    priv *priv = self->priv_data;
++
++    symfile += sizeof(*module_info) + module_info->name_length;
++
++    mod_start = module_info->base_address;
++    mod_end = mod_start + module_info->code_size;
++
++    priv->ranges = realloc(priv->ranges, (priv->num_ranges + 1) * sizeof(range));
++    priv->ranges[priv->num_ranges].start = mod_start;
++    priv->ranges[priv->num_ranges].end = mod_end;
++#ifdef HARD_DEBUG
++    priv->ranges[priv->num_ranges].name = strdup(module_info->name);
++#endif
++    priv->num_ranges += 1;
++
++    LOG("Add module `%s` (0x%lx, 0x%lx)\r\n",
++        module_info->name, mod_start, mod_end);
++
++    for (int range = 0; range < module_info->range_count; range++) {
++        struct range_info *range_info;
++        struct gdb_symtab *symtab;
++        GDB_CORE_ADDR begin, end;
++
++        range_info = (struct range_info *)symfile;
++        symfile += sizeof(*range_info) + range_info->name_length;
++
++        begin = mod_start + range_info->start_offset;
++        end = mod_start + range_info->end_offset;
++
++        LOG("Add range `%s` (0x%lx, 0x%lx), %u lines\r\n",
++            range_info->name,
++            begin, end,
++            range_info->line_count);
++
++        /* A bug in GDB < 9 forces us to open and close the symtab for each
++         * iteration. */
++        symtab = cb->symtab_open(cb, obj, module_info->name);
++        cb->block_open(cb, symtab, NULL, begin, end, range_info->name);
++        cb->symtab_close(cb, symtab);
++
++        for (int line = 0; line < range_info->line_count; line++) {
++            struct gdb_line_mapping line_mapping;
++            struct line_info *line_info;
++
++            line_info = (struct line_info *)symfile;
++            symfile += sizeof(*line_info) + line_info->file_length;
++
++            line_mapping.pc = mod_start + line_info->start_offset;
++            line_mapping.line = line_info->line_number;
++
++            LOG("\t%s:%u\r\n", line_info->file, line_info->line_number);
++
++            /* The symbol table must be opened and closed on every single line
++             * for file names to work properly, as there is no other way to
++             * tell GDB that a certain line belongs to a different file than
++             * the rest of the table. Sigh. */
++            symtab = cb->symtab_open(cb, obj, line_info->file);
++
++            cb->block_open(cb, symtab, NULL, line_mapping.pc, end,
++                           range_info->name);
++            cb->line_mapping_add(cb, symtab, 1, &line_mapping);
++            cb->symtab_close(cb, symtab);
++        }
++    }
++
++    cb->object_close(cb, obj);
++
++    return GDB_SUCCESS;
++}
++
++static enum gdb_status read_emulator_info(struct gdb_reader_funcs *self,
++                                          struct gdb_symbol_callbacks *cb,
++                                          struct emulator_info *emulator_info) {
++    priv *priv = self->priv_data;
++
++    priv->frame_layout = emulator_info->frame_layout;
++    priv->normal_exit = emulator_info->normal_exit;
++
++    LOG("initialize: frame layout = %i\r\n", priv->frame_layout);
++
++    return GDB_SUCCESS;
++}
++
++static enum gdb_status read_debug_info(struct gdb_reader_funcs *self,
++                                       struct gdb_symbol_callbacks *cb,
++                                       void *memory, long memory_sz) {
++    struct debug_info *debug_info = memory;
++
++    (void)memory_sz;
++
++    switch (debug_info->header) {
++    case DEBUG_INFO_HEADER_EMULATOR:
++        return read_emulator_info(self, cb, &debug_info->payload.emu);
++    case DEBUG_INFO_HEADER_MODULE:
++        return read_module_info(self, cb, &debug_info->payload.mod);
++    }
++
++    return GDB_FAIL;
++}
++
++static void regfree(struct gdb_reg_value *reg) {
++    free(reg);
++}
++
++static struct range *get_range(priv *priv, GDB_CORE_ADDR rip) {
++    for (int i = 0; i < priv->num_ranges; i++) {
++        if (rip >= priv->ranges[i].start && rip < priv->ranges[i].end) {
++            return &priv->ranges[i];
++        }
++    }
++
++    return NULL;
++}
++
++static enum gdb_status unwind(struct gdb_reader_funcs *self,
++                              struct gdb_unwind_callbacks *cb) {
++    GDB_CORE_ADDR rbp, rsp, rip;
++    struct range *range;
++    priv *priv;
++
++    rbp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RBP)->value;
++    rsp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RSP)->value;
++    rip = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RIP)->value;
++
++    priv = self->priv_data;
++    range = get_range(priv, rip);
++
++    /* Check that rip points to one of the addresses that we handle */
++    if (range) {
++        struct gdb_reg_value *prev_rbp, *prev_rsp, *prev_rip;
++
++        prev_rbp = malloc(sizeof(struct gdb_reg_value) + sizeof(char*));
++        prev_rsp = malloc(sizeof(struct gdb_reg_value) + sizeof(char*));
++        prev_rip = malloc(sizeof(struct gdb_reg_value) + sizeof(char*));
++
++        LOG("UNWIND match %s: rbp: 0x%lx rsp: 0x%lx rip: 0x%lx  \r\n",
++            range->name, rbp, rsp, rip);
++
++        prev_rbp->free = &regfree;
++        prev_rbp->defined = 1;
++        prev_rbp->size = sizeof(char*);
++        prev_rsp->free = &regfree;
++        prev_rsp->defined = 1;
++        prev_rsp->size = sizeof(char*);
++        prev_rip->free = &regfree;
++        prev_rip->defined = 1;
++        prev_rip->size = sizeof(char*);
++
++        if (priv->frame_layout == ERTS_FRAME_LAYOUT_FP_RA) {
++            /* Frame pointers are enabled, which means that rbp will point to
++             * where we stored the previous frames rbp. Also the previous
++             * frames address will be at rbp + 8 and the previous frames rsp
++             * will be rbp + 16.
++             *
++             *  0x00:                <- prev_rsp
++             *  0x08: prev call addr
++             *  0x10: prev rbp       <- curr rbp
++             *  0x18: current frame
++             *  0x20:                <- curr rip */
++            cb->target_read(rbp + 1 * sizeof(char*), &prev_rip->value,
++                            sizeof(char*));
++            cb->target_read(rbp + 0 * sizeof(char*), &prev_rbp->value,
++                            sizeof(char*));
++            *(GDB_CORE_ADDR*)prev_rsp->value = rbp + sizeof(char*[2]);
++        } else {
++            /* Normal frame layout, we need to scan the stack. */
++            cb->target_read(rsp, &prev_rip->value, sizeof(char*));
++
++            for (rsp += sizeof(char*); ; rsp += sizeof(char*)) {
++                cb->target_read(rsp, &prev_rip->value, sizeof(char*));
++
++                LOG("rsp: 0x%lx rip: 0x%lx\r\n",
++                    rsp, *(GDB_CORE_ADDR*)prev_rip->value);
++
++                /* Check if it is a cp */
++                if ((*(GDB_CORE_ADDR*)prev_rip->value & 0x3) == 0) {
++                    break;
++                }
++            }
++
++            *(GDB_CORE_ADDR*)prev_rsp->value = rsp;
++            *(GDB_CORE_ADDR*)prev_rbp->value = rsp - sizeof(char*);
++        }
++
++        if (*(GDB_CORE_ADDR*)prev_rip->value == (uintptr_t)priv->normal_exit) {
++            LOG("Normal exit\r\n");
++            *(GDB_CORE_ADDR*)prev_rsp->value = 0;
++            *(GDB_CORE_ADDR*)prev_rbp->value = 0;
++        } else {
++            LOG("UNWIND prev: rbp: 0x%lx rsp: 0x%lx rip: 0x%lx\r\n",
++                *(GDB_CORE_ADDR*)prev_rbp->value,
++                *(GDB_CORE_ADDR*)prev_rsp->value,
++                *(GDB_CORE_ADDR*)prev_rip->value);
++        }
++
++        cb->reg_set(cb, X64_RIP, prev_rip);
++        cb->reg_set(cb, X64_RSP, prev_rsp);
++        cb->reg_set(cb, X64_RBP, prev_rbp);
++
++        return GDB_SUCCESS;
++    }
++
++    LOG("UNWIND no match: rbp: 0x%lx rsp: 0x%lx rip: 0x%lx\r\n", rbp, rsp, rip);
++    return GDB_FAIL;
++}
++
++static struct gdb_frame_id get_frame_id(struct gdb_reader_funcs *self,
++                                        struct gdb_unwind_callbacks *cb){
++    struct gdb_frame_id frame = {0, 0};
++    GDB_CORE_ADDR rbp, rsp, rip;
++    struct range *range;
++    priv *priv;
++
++    rbp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RBP)->value;
++    rsp = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RSP)->value;
++    rip = *(GDB_CORE_ADDR*)cb->reg_get(cb, X64_RIP)->value;
++
++    priv = self->priv_data;
++    range = get_range(priv, rip);
++
++    LOG("FRAME: rip: 0x%lx rsp: 0x%lx rbp: 0x%lx \r\n", rip, rsp, rbp);
++
++    if (range) {
++        frame.code_address = rip;
++
++        if (priv->frame_layout == ERTS_FRAME_LAYOUT_FP_RA) {
++            frame.stack_address = rbp + sizeof(char*);
++        } else {
++            GDB_CORE_ADDR prev_rip;
++
++            for (rsp += sizeof(char*); ; rsp += sizeof(char*)) {
++                cb->target_read(rsp, &prev_rip, sizeof(char*));
++
++                LOG("rsp: 0x%lx rip: 0x%lx\r\n", rsp, prev_rip);
++
++                /* Check if it is a cp */
++                if ((prev_rip & 0x3) == 0) {
++                    break;
++                }
++            }
++
++            frame.stack_address = rsp;
++        }
++    }
++
++    LOG("FRAME: code_address: 0x%lx stack_address: 0x%lx\r\n",
++        frame.code_address, frame.stack_address);
++
++    return frame;
++}
++
++static void destroy(struct gdb_reader_funcs *self){
++    free(self);
++}
++
++struct gdb_reader_funcs *gdb_init_reader(void){
++    struct gdb_reader_funcs *funcs = malloc(sizeof(struct gdb_reader_funcs));
++    priv *priv_data = malloc(sizeof(priv));
++
++    priv_data->num_ranges = 1;
++    priv_data->ranges = malloc(sizeof(range));
++    priv_data->ranges[0].start = 0;
++    priv_data->ranges[0].end = 0;
++
++    funcs->reader_version = GDB_READER_INTERFACE_VERSION;
++    funcs->priv_data = priv_data;
++
++    funcs->read = read_debug_info;
++    funcs->unwind = unwind;
++    funcs->get_frame_id = get_frame_id;
++    funcs->destroy = destroy;
++
++#ifdef HARD_DEBUG
++    log = fopen("/tmp/jit-reader.log","w+");
++    if (!log) fprintf(stderr,"Could not open /tmp/jit-reader.log");
++#endif
++
++    return funcs;
++}
+diff --git a/erts/etc/unix/gdb-tools/jit-reader.mk b/erts/etc/unix/gdb-tools/jit-reader.mk
+new file mode 100644
+index 0000000000..8ef0bccec2
+--- /dev/null
++++ b/erts/etc/unix/gdb-tools/jit-reader.mk
+@@ -0,0 +1,9 @@
++EXTRA_LIBS = $(BINDIR)/jit-reader.so
++
++jit-reader: $(EXTRA_LIBS)
++
++$(OBJDIR)/jit-reader.o: $(GDB_TOOLS)/jit-reader.c $(GDB_TOOLS)/jit-reader.h
++	$(V_CC) $(DED_CFLAGS) -I$(ETC) -o $@ -c $<
++
++$(BINDIR)/jit-reader.so: $(OBJDIR)/jit-reader.o
++	$(V_LD) $(DED_LDFLAGS) -o $@ $^

otp-0010-erl_child_setup-reduce-number-of-calls-to-close.patch

@@ -1,57 +0,0 @@
-From: John Eckersberg <jeckersb@redhat.com>
-Date: Fri, 11 Oct 2019 13:06:20 -0400
-Subject: [PATCH] erl_child_setup: reduce number of calls to close()
-
-On systems without closefrom(), such as Linux, iterating over all
-possible file descriptors and calling close() for each is inefficient.
-This is markedly so when the maximum number of file descriptors has
-been tuned to a large number.
-
-Instead, walk the open descriptors under /dev/fd and close only those
-which are open.
-
-diff --git a/erts/emulator/sys/unix/erl_child_setup.c b/erts/emulator/sys/unix/erl_child_setup.c
-index 129861ebd5..7ddd753136 100644
---- a/erts/emulator/sys/unix/erl_child_setup.c
-+++ b/erts/emulator/sys/unix/erl_child_setup.c
-@@ -411,6 +411,7 @@ main(int argc, char *argv[])
-     int uds_fd = 3, max_fd = 3;
- #ifndef HAVE_CLOSEFROM
-     int i;
-+    DIR *dir;
- #endif
-     struct sigaction sa;
- 
-@@ -426,11 +427,29 @@ main(int argc, char *argv[])
- #if defined(HAVE_CLOSEFROM)
-     closefrom(4);
- #else
--    for (i = 4; i < max_files; i++)
-+    dir = opendir("/dev/fd");
-+    if (dir == NULL) { /* /dev/fd not available */
-+        for (i = 4; i < max_files; i++)
- #if defined(__ANDROID__)
--        if (i != system_properties_fd())
-+            if (i != system_properties_fd())
- #endif
--        (void) close(i);
-+            (void) close(i);
-+    } else {
-+        /* Iterate over fds obtained from /dev/fd */
-+        struct dirent *entry;
-+        int dir_fd = dirfd(dir);
-+
-+        while ((entry = readdir(dir)) != NULL) {
-+            i = atoi(entry->d_name);
-+#if defined(__ANDROID__)
-+            if (i != system_properties_fd())
-+#endif
-+            if (i >= 4 && i != dir_fd)
-+                (void) close(i);
-+        }
-+
-+        closedir(dir);
-+    }
- #endif
- 
-     if (pipe(sigchld_pipe) < 0) {

otp-make-subpackages.py

@@ -24,9 +24,7 @@ package_headers = {}
 package_noarch = [
 		"emacs-erlang",
 		"emacs-erlang-el",
-		"erlang-doc",
-		"xemacs-erlang",
-		"xemacs-erlang-el"]
+		"erlang-doc"]
 
 # These are additional Requires which cannot be picked up automatically (yet).
 # TODO these should be added automatically
@@ -44,8 +42,6 @@ package_additional_requires = {
 		# Stores files/links in /usr/share/java so has to depend on jpackage-utils
 		"erlang-jinterface": ["%{name}-erts%{?_isa} = %{version}-%{release}", "jpackage-utils"],
 		"erlang-wx": ["mesa-libGL", "mesa-libGLU"],
-		"xemacs-erlang": ["emacs-common-erlang = %{version}-%{release}", "xemacs(bin) >= %{_xemacs_version}"],
-		"xemacs-erlang-el": ["xemacs-erlang = %{version}-%{release}"]
 		}
 
 package_additional_buildrequires = {
@@ -70,8 +66,6 @@ package_additional_buildrequires = {
 		"erlang-jinterface": ["java-devel"],
 
 		"erlang-odbc": ["unixODBC-devel"],
-		"erlang-wx": ["wxGTK-devel"],
-		"xemacs-erlang": ["xemacs", "xemacs-packages-extra-el"],
 		}
 
 package_additional_obsoletes = {

sources

@@ -1 +1 @@
-SHA512 (otp-OTP-22.3.4.12.tar.gz) = e43402398028d6e9be8fcf284bf037e14273d875b5eb6d988832c4e4cd5493f7eeae9989db105a54fefac470696bc7b9e3b7943e91d24ff57517b4d82e257257
+SHA512 (otp-OTP-26.2.5.16.tar.gz) = 4e973be7e8ccad196d59759108a521535b0f046268eb0406f789a50f411fa27c9c11fcfb61a7218605bf1b32921bb52c52fc7c99917e1acfc0d3ed09437129b2