Fix EPMD port assignment in IPv6 environment

See this PR for the details: * https://github.com/erlang/otp/pull/erlang/otp/pull/1487 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Fix DNS resolution if IPv4 is unavailable
2017-06-16 17:50:48 +03:00 · 2017-06-14 16:51:02 +03:00 · 2017-03-21 19:33:51 +03:00 · 2017-02-02 14:57:37 +03:00 · 2016-08-16 15:49:31 +03:00
27 changed files with 3301 additions and 2096 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,7 +1,69 @@
-/*.src.rpm
-/*~
-/otp-OTP-*.tar.gz
-/otp_doc_html_R*.tar.gz
-/otp_doc_man_R*.tar.gz
-/otp_src_R*.readme
-/otp_src_R*.tar.gz
+otp_src_R14A.tar.gz
+/otp_src_R14B.tar.gz
+/otp_doc_html_R14B.tar.gz
+/otp_doc_man_R14B.tar.gz
+/otp_doc_html_R14B01.tar.gz
+/otp_doc_man_R14B01.tar.gz
+/otp_src_R14B01.tar.gz
+/otp_doc_html_R14B02.tar.gz
+/otp_doc_man_R14B02.tar.gz
+/otp_src_R14B02.tar.gz
+/otp_src_R14B03.tar.gz
+/otp_doc_html_R14B03.tar.gz
+/otp_doc_man_R14B03.tar.gz
+/otp_src_R14B04.tar.gz
+/otp_doc_html_R14B04.tar.gz
+/otp_doc_man_R14B04.tar.gz
+/otp_doc_html_R15B.tar.gz
+/otp_doc_man_R15B.tar.gz
+/otp_src_R15B.tar.gz
+/otp_doc_html_R15B01.tar.gz
+/otp_doc_man_R15B01.tar.gz
+/otp_src_R15B01.tar.gz
+/otp_doc_html_R15B02.tar.gz
+/otp_doc_man_R15B02.tar.gz
+/otp_src_R15B02.tar.gz
+/otp_doc_html_R15B03-1.tar.gz
+/otp_doc_man_R15B03-1.tar.gz
+/otp_src_R15B03-1.readme
+/otp_src_R15B03-1.tar.gz
+/otp_doc_html_R16A_RELEASE_CANDIDATE.tar.gz
+/otp_doc_man_R16A_RELEASE_CANDIDATE.tar.gz
+/otp_src_R16A_RELEASE_CANDIDATE.tar.gz
+/otp_src_R16A_RELEASE_CANDIDATE.readme
+/otp_src_R16B.tar.gz
+/otp_doc_html_R16B.tar.gz
+/otp_doc_man_R16B.tar.gz
+/otp_src_R16B01.tar.gz
+/otp_doc_html_R16B01.tar.gz
+/otp_doc_man_R16B01.tar.gz
+/otp_src_R16B01.readme
+/otp_src_R16B02.tar.gz
+/otp_doc_html_R16B02.tar.gz
+/otp_doc_man_R16B02.tar.gz
+/otp_src_R16B02.readme
+/otp_src_R16B03.tar.gz
+/otp_doc_html_R16B03.tar.gz
+/otp_doc_man_R16B03.tar.gz
+/otp_src_R16B03.readme
+/otp_src_R16B03-1.readme
+/otp_doc_html_R16B03-1.tar.gz
+/otp_doc_man_R16B03-1.tar.gz
+/otp_src_R16B03-1.tar.gz
+/otp-OTP-17.2.1.tar.gz
+/otp-OTP-17.2.2.tar.gz
+/otp-OTP-17.3.3.tar.gz
+/otp-OTP-17.3.4.tar.gz
+/otp-OTP-17.4.tar.gz
+/otp-OTP-18.2.2.tar.gz
+/otp-OTP-18.2.3.tar.gz
+/otp-OTP-18.2.4.tar.gz
+/otp-OTP-18.3.tar.gz
+/otp-OTP-18.3.1.tar.gz
+/otp-OTP-18.3.2.tar.gz
+/otp-OTP-18.3.3.tar.gz
+/otp-OTP-18.3.4.tar.gz
+/otp-OTP-18.3.4.1.tar.gz
+/otp-OTP-18.3.4.2.tar.gz
+/otp-OTP-18.3.4.4.tar.gz
+/otp-OTP-18.3.4.5.tar.gz
--- a/epmd.socket
+++ b/epmd.socket
@ -2,7 +2,7 @@
 Description=Erlang Port Mapper Daemon Activation Socket

 [Socket]
-ListenStream=4369
+ListenStream=127.0.0.1:4369
 Accept=false

 [Install]
--- a/epmd@.socket
+++ b/epmd@.socket
@ -2,7 +2,7 @@
 Description=Erlang Port Mapper Daemon Activation Socket

 [Socket]
-ListenStream=%I
+ListenStream=%i:4369
 Accept=false

 [Install]
--- a/erlang.spec
+++ b/erlang.spec
--- a/otp-0001-Do-not-format-man-pages-and-do-not-install-miscellan.patch
+++ b/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 42af9c87dc..c017e0a4ed 100644
+index 8e55fa78c9..9512faa06e 100644
 --- a/erts/etc/common/Makefile.in
 +++ b/erts/etc/common/Makefile.in
-@@ -552,10 +552,6 @@ endif
+@@ -551,10 +551,6 @@ endif
 ifneq ($(INSTALL_TOP_BIN),)
 	$(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)"
 endif
@ -21,10 +21,10 @@ index 42af9c87dc..c017e0a4ed 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 b00dd09f1a..2147774f50 100644
+index 6634ae31d3..fa1895633e 100644
 --- a/erts/etc/unix/Install.src
 +++ b/erts/etc/unix/Install.src
-@@ -143,14 +143,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot .
+@@ -141,14 +141,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
--- a/otp-0002-Remove-rpath.patch
+++ b/otp-0002-Remove-rpath.patch
@ -5,15 +5,28 @@ 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 aedc9e7a13..b27c2aa01b 100644
+index e66c0ca916..574cdf5721 100644
 --- a/lib/crypto/c_src/Makefile.in
 +++ b/lib/crypto/c_src/Makefile.in
-@@ -147,7 +147,7 @@ endif
- endif
+@@ -90,7 +90,7 @@ endif
+ DYNAMIC_CRYPTO_LIB=@SSL_DYNAMIC_ONLY@
 
- ifeq ($(DYNAMIC_OR_WIN_CRYPTO_LIB),yes)
+ ifeq ($(DYNAMIC_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)
--- a/otp-0003-Do-not-install-C-sources.patch
+++ b/otp-0003-Do-not-install-C-sources.patch
@ -14,46 +14,86 @@ 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 82a6b6e87a..5f2fe8ba7d 100644
+index 2b72e1a214..0522562a1e 100644
 --- a/lib/asn1/c_src/Makefile
 +++ b/lib/asn1/c_src/Makefile
-@@ -137,8 +137,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
- release_spec: opt
- 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+@@ -143,8 +143,6 @@ release_spec: opt
+ ifneq ($(findstring ose,$(TARGET)),ose)
 	$(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib"
+ endif
 -	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
 -	$(INSTALL_DATA) *.c "$(RELSYSDIR)/c_src"
 
 release_docs_spec:
 
+diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in
+index 574cdf5721..428c3163f5 100644
+--- a/lib/crypto/c_src/Makefile.in
+++ b/lib/crypto/c_src/Makefile.in
+@@ -200,14 +200,10 @@ 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"
+ ifneq ($(findstring ose,$(TARGET)),ose)
+-	$(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
+ endif
 diff --git a/lib/erl_interface/src/Makefile.in b/lib/erl_interface/src/Makefile.in
-index fa1ea3cd39..b977b6afe5 100644
+index 777d709b1e..57917ae7ee 100644
 --- a/lib/erl_interface/src/Makefile.in
 +++ b/lib/erl_interface/src/Makefile.in
-@@ -715,13 +715,11 @@ ifeq (@DYNAMIC_LIB@, yes)
- endif
+@@ -905,14 +905,14 @@ ifneq ($(EXE_TARGETS),)
 	$(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin"
+ endif
 	$(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) global/*.[ch]   "$(RELSYSDIR)/src/global"
+-	$(INSTALL_DATA) registry/*.[ch] "$(RELSYSDIR)/src/registry"
+-	$(INSTALL_DATA) legacy/*.[ch]   "$(RELSYSDIR)/src/legacy"
 -	$(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/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in
+index b9f92a0925..9612f24f93 100644
+--- a/lib/ic/c_src/Makefile.in
+++ b/lib/ic/c_src/Makefile.in
+@@ -145,12 +145,10 @@ $(OBJDIR)/%.o: %.c
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+ 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/include"
+ 	$(INSTALL_DIR) "$(RELEASE_PATH)/usr/lib"
+-	$(INSTALL_DATA) ic.c ic_tmo.c "$(RELSYSDIR)/c_src"
+ 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(LIBRARY) "$(RELSYSDIR)/priv/lib"
+ 	$(INSTALL_DATA) $(IDL_FILES) $(H_FILES) "$(RELEASE_PATH)/usr/include"
 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in
-index 3649e2c392..d8c5c68b99 100644
+index 045b6d871a..39be02ad5e 100644
 --- a/lib/megaco/src/flex/Makefile.in
 +++ b/lib/megaco/src/flex/Makefile.in
-@@ -251,7 +251,7 @@ release_spec: opt
+@@ -271,7 +271,7 @@ release_spec: opt
 	$(INSTALL_DATA) $(ERL_FILES) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src/flex"
 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
 ifeq ($(ENABLE_MEGACO_FLEX_SCANNER),true)
@ -63,7 +103,7 @@ index 3649e2c392..d8c5c68b99 100644
 endif
 
 diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in
-index d1b26743a6..cf8faae1f5 100644
+index 685eb5d150..6c8a432fb0 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
@ -79,7 +119,7 @@ index d1b26743a6..cf8faae1f5 100644
 endif
 
 diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in
-index 27b156a2c9..f11ff303b6 100644
+index e9fc5f4139..ac9fb73abb 100644
 --- a/lib/os_mon/c_src/Makefile.in
 +++ b/lib/os_mon/c_src/Makefile.in
@@ -126,8 +126,6 @@ $(OBJDIR)/memsup.o: memsup.h
@ -91,3 +131,31 @@ index 27b156a2c9..f11ff303b6 100644
 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bin"
 	$(INSTALL_PROGRAM) $(TARGET_FILES) "$(RELSYSDIR)/priv/bin"
 
+diff --git a/lib/runtime_tools/c_src/Makefile.in b/lib/runtime_tools/c_src/Makefile.in
+index 448b8c62c2..860d5040b2 100644
+--- a/lib/runtime_tools/c_src/Makefile.in
+++ b/lib/runtime_tools/c_src/Makefile.in
+@@ -157,10 +157,8 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/lib"
+ ifneq ($(findstring ose,$(TARGET)),ose)
+-	$(INSTALL_PROGRAM) $(DYNTRACE_OBJS) "$(RELSYSDIR)/priv/obj"
+ 	$(INSTALL_PROGRAM) $(NIF_LIB) $(SOLIBS) "$(RELSYSDIR)/priv/lib"
+ endif
+ 
+diff --git a/lib/tools/c_src/Makefile.in b/lib/tools/c_src/Makefile.in
+index 66bba229f6..eea37fcab6 100644
+--- a/lib/tools/c_src/Makefile.in
+++ b/lib/tools/c_src/Makefile.in
+@@ -198,8 +198,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"
--- a/otp-0004-Do-not-install-Java-sources.patch
+++ b/otp-0004-Do-not-install-Java-sources.patch
@ -4,11 +4,24 @@ Subject: [PATCH] Do not install Java sources

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

+diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+index d9100cf267..6886c7132d 100644
+--- a/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+++ b/lib/ic/java_src/com/ericsson/otp/ic/Makefile
+@@ -113,8 +113,6 @@ docs:
+ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+-	$(INSTALL_DIR) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+-	$(INSTALL_DATA) $(JAVA_FILES) "$(RELSYSDIR)/java_src/com/ericsson/otp/ic"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv"
+ 	$(INSTALL_DATA) $(JAVA_DEST_ROOT)$(JARFILE) "$(RELSYSDIR)/priv"
+ 
 diff --git a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-index 089cf4ab1a..404654a437 100644
+index 1c8364e951..34b64a8ed8 100644
 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
 +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
-@@ -123,8 +123,6 @@ release release_docs release_tests release_html:
+@@ -120,8 +120,6 @@ release release_docs release_tests release_html:
 	$(V_at)$(MAKE) $(MFLAGS) RELEASE_PATH="$(RELEASE_PATH)" $(TARGET_MAKEFILE)  $@_spec
 
 release_spec: opt
--- a/otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch
+++ b/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 8e3882bfdc..ea999cf9c7 100644
+index 0c5acd9740..5f8f1e3920 100644
 --- a/lib/os_mon/doc/src/Makefile
 +++ b/lib/os_mon/doc/src/Makefile
-@@ -31,11 +31,16 @@ APPLICATION=os_mon
+@@ -36,12 +36,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN)
 # Target Specs
 # ----------------------------------------------------
 XML_APPLICATION_FILES = ref_man.xml
@ -21,32 +21,33 @@ index 8e3882bfdc..ea999cf9c7 100644
 XML_REF3_FILES = cpu_sup.xml \
 	disksup.xml \
 	memsup.xml \
+ 	os_mon_mib.xml \
 	os_sup.xml \
 -	nteventlog.xml
 +	$(NTEVENTLOG_DOCFILE)
 
- XML_REF6_FILES = os_mon_app.xml
+ XML_REF6_FILES = os_mon_app.xml 
 
 diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
-index e28fb12548..ee32f3946f 100644
+index 9aa068cb91..1003d24be9 100644
 --- a/lib/os_mon/src/Makefile
 +++ b/lib/os_mon/src/Makefile
-@@ -34,7 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
+@@ -34,8 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN)
 # ----------------------------------------------------
 # Target Specs
 # ----------------------------------------------------
-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_mon_mib os_sup os_mon_sysinfo \
+ MODULES= disksup memsup cpu_sup os_mon os_mon_mib os_sup os_mon_sysinfo \
+-	nteventlog
 +	 $(NTEVENTLOG)
 
 INCLUDE=../include
 CSRC=../c_src
-@@ -78,7 +84,11 @@ docs:
+@@ -79,7 +84,11 @@ docs:
 # ----------------------------------------------------
 
 $(APP_TARGET): $(APP_SRC) ../vsn.mk
--- a/otp-0006-Add-extra-search-directory.patch
+++ b/otp-0006-Add-extra-search-directory.patch
@ -1,32 +0,0 @@
-From: Peter Lemenkov <lemenkov@gmail.com>
-Date: Wed, 2 Aug 2017 16:12:19 +0300
-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 7327636751..2e92e77598 100644
--- a/lib/kernel/src/code_server.erl
-+++ b/lib/kernel/src/code_server.erl
-@@ -90,11 +90,17 @@ init(Ref, Parent, [Root,Mode]) ->
-     IPath =
- 	case Mode of
- 	    interactive ->
-		LibDir = filename:append(Root, "lib"),
-		{ok,Dirs} = erl_prim_loader:list_dir(LibDir),
-		Paths = make_path(LibDir, Dirs),
-+		F = fun(R) ->
-+			LD = filename:append(R, "lib"),
-+			case erl_prim_loader:list_dir(LD) of
-+				    error -> [];
-+				    {ok, D} -> make_path(LD, D)
-+			end
-+		    end,
-+		Paths = F(Root),
-+		SharedPaths = F("/usr/share/erlang"),
- 		UserLibPaths = get_user_lib_dirs(),
-		["."] ++ UserLibPaths ++ Paths;
-+		["."] ++ UserLibPaths ++ Paths ++ SharedPaths;
- 	    _ ->
- 		[]
- 	end,
--- a/otp-0006-Do-not-install-erlang-sources.patch
+++ b/otp-0006-Do-not-install-erlang-sources.patch
@ -0,0 +1,996 @@
+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 52034a0881..56d91b928b 100644
+--- a/erts/preloaded/src/Makefile
+++ b/erts/preloaded/src/Makefile
+@@ -86,8 +86,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 5b34017e9b..d4677d6b80 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 987345c679..f53546a9ec 100644
+--- a/lib/common_test/src/Makefile
+++ b/lib/common_test/src/Makefile
+@@ -144,7 +144,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/compiler/src/Makefile b/lib/compiler/src/Makefile
+index 299b2892fc..36a048bc85 100644
+--- a/lib/compiler/src/Makefile
+++ b/lib/compiler/src/Makefile
+@@ -172,8 +172,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/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile
+index b79f0ec1e5..30d1a1d3d9 100644
+--- a/lib/cosEvent/src/Makefile
+++ b/lib/cosEvent/src/Makefile
+@@ -203,7 +203,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) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile
+index da8dcf08b6..88b3993786 100644
+--- a/lib/cosEventDomain/src/Makefile
+++ b/lib/cosEventDomain/src/Makefile
+@@ -172,7 +172,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) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile
+index f9107ff48f..74d337d5f4 100644
+--- a/lib/cosFileTransfer/src/Makefile
+++ b/lib/cosFileTransfer/src/Makefile
+@@ -180,9 +180,7 @@ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+-	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+ release_docs_spec:
+diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile
+index 72b063fd1c..0fdb82ea33 100644
+--- a/lib/cosNotification/src/Makefile
+++ b/lib/cosNotification/src/Makefile
+@@ -371,8 +371,7 @@ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILES) $(YECC_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile
+index cd559e168f..bdf035e795 100644
+--- a/lib/cosProperty/src/Makefile
+++ b/lib/cosProperty/src/Makefile
+@@ -180,8 +180,7 @@ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile
+index 7a14db6974..4b5539851f 100644
+--- a/lib/cosTime/src/Makefile
+++ b/lib/cosTime/src/Makefile
+@@ -199,8 +199,7 @@ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(GEN_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(GEN_ERL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(HRL_FILES) $(IDL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile
+index 90e1e5130f..05826e0fab 100644
+--- a/lib/cosTransactions/src/Makefile
+++ b/lib/cosTransactions/src/Makefile
+@@ -174,7 +174,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) $(GEN_ERL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile
+index 6e4008e434..c2d00fc7f5 100644
+--- a/lib/crypto/src/Makefile
+++ b/lib/crypto/src/Makefile
+@@ -82,8 +82,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 f115f49d98..e7dc360a44 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 770af2140f..4f8a6d8f3a 100644
+--- a/lib/dialyzer/src/Makefile
+++ b/lib/dialyzer/src/Makefile
+@@ -152,7 +152,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 e0bbbdfe63..10771b2b4a 100644
+--- a/lib/diameter/src/Makefile
+++ b/lib/diameter/src/Makefile
+@@ -251,11 +251,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 4e5a4182da..c0bb0c32ec 100644
+--- a/lib/edoc/src/Makefile
+++ b/lib/edoc/src/Makefile
+@@ -88,7 +88,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 cd3c102f55..b55c513e90 100644
+--- a/lib/eldap/src/Makefile
+++ b/lib/eldap/src/Makefile
+@@ -99,10 +99,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ 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) "$(RELSYSDIR)/src"
+-	$(INSTALL_DIR) "$(RELSYSDIR)/asn1"
+-	$(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include"
+ 
+diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile
+index 7d41506dbd..3f3562fce1 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 461a52d480..1f2e885d3f 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 86a6d8831e..5732fd85f3 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/gs/src/Makefile b/lib/gs/src/Makefile
+index ff3080e20e..60337dd00d 100644
+--- a/lib/gs/src/Makefile
+++ b/lib/gs/src/Makefile
+@@ -109,8 +109,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ 
+ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(APP_SRC) $(ERL_FILES) $(HRL_FILES) $(GEN_HRL_FILES) \
+-		$(GSTK_GENERIC) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(HRL_FILES) $(GEN_HRL_FILES) \
+		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap"
+diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile
+index 0938010577..134ed7b602 100644
+--- a/lib/hipe/cerl/Makefile
+++ b/lib/hipe/cerl/Makefile
+@@ -102,7 +102,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 f0af6ac166..16b512e19a 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 a82e28c7d9..f364a53ca2 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 f6f6f6be1c..436992310e 100644
+--- a/lib/hipe/llvm/Makefile
+++ b/lib/hipe/llvm/Makefile
+@@ -103,7 +103,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 d44be2d9fa..ed81f103a8 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 be5c9bc2b6..d40b322461 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 1bf52fe312..5049beca5d 100644
+--- a/lib/hipe/rtl/Makefile
+++ b/lib/hipe/rtl/Makefile
+@@ -105,7 +105,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 4a78ad7a1b..1b1ce05cc5 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_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/ic/src/Makefile b/lib/ic/src/Makefile
+index a6da81a03b..60870be1ca 100644
+--- a/lib/ic/src/Makefile
+++ b/lib/ic/src/Makefile
+@@ -200,7 +200,7 @@ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/src"
+-	$(INSTALL_DATA) $(ERL_FILES) $(YRL_FILE) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/examples/c-client"
+ 	$(INSTALL_DATA) $(CCL_EX_FILES) "$(RELSYSDIR)/examples/c-client"
+diff --git a/lib/inets/src/ftp/Makefile b/lib/inets/src/ftp/Makefile
+index f8daa2b894..48e5d490c6 100644
+--- a/lib/inets/src/ftp/Makefile
+++ b/lib/inets/src/ftp/Makefile
+@@ -91,7 +91,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/ftp"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/ftp"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/ftp"
+ 	$(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 cb97b525f6..cb13dfbb4e 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 4a4eef9f24..c779c8ef16 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 1c05d454a5..88f9f62d3b 100644
+--- a/lib/inets/src/http_server/Makefile
+++ b/lib/inets/src/http_server/Makefile
+@@ -135,7 +135,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 7f51676dc5..093f4622aa 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/inets/src/tftp/Makefile b/lib/inets/src/tftp/Makefile
+index d5d94e1b78..5583064658 100644
+--- a/lib/inets/src/tftp/Makefile
+++ b/lib/inets/src/tftp/Makefile
+@@ -96,7 +96,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk
+ release_spec: opt
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/src/tftp"
+-	$(INSTALL_DATA) $(HRL_FILES) $(ERL_FILES) "$(RELSYSDIR)/src/tftp"
+	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/src/tftp"
+ 	$(INSTALL_DIR)  "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile
+index 57dacebde3..1cebd801be 100644
+--- a/lib/kernel/src/Makefile
+++ b/lib/kernel/src/Makefile
+@@ -200,7 +200,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 8f8e6ecded..9e0bc82329 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 711fbb7665..1db4593c6e 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 208942c3be..d5b721854d 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 39be02ad5e..8c6ba31cee 100644
+--- a/lib/megaco/src/flex/Makefile.in
+++ b/lib/megaco/src/flex/Makefile.in
+@@ -268,7 +268,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 0c546a881f..78f659a2e8 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 f4fc56a27d..1cc73fd7c3 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 7288c205f0..aefd9f3cfc 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 dae0df76f3..6294ae92ce 100644
+--- a/lib/mnesia/src/Makefile
+++ b/lib/mnesia/src/Makefile
+@@ -133,7 +133,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 2d42510b47..7579014d35 100644
+--- a/lib/observer/src/Makefile
+++ b/lib/observer/src/Makefile
+@@ -152,7 +152,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 51c9ed3d5c..50a4c1088c 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/orber/COSS/CosNaming/Makefile b/lib/orber/COSS/CosNaming/Makefile
+index 0eca8ddfab..18d9627c8c 100644
+--- a/lib/orber/COSS/CosNaming/Makefile
+++ b/lib/orber/COSS/CosNaming/Makefile
+@@ -145,8 +145,8 @@ release_spec: opt
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/COSS/CosNaming"
+-	$(INSTALL_DATA) $(ERL_FILES) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
+-	$(INSTALL_DATA) $(GEN_FILES) "$(RELSYSDIR)/COSS/CosNaming"
+	$(INSTALL_DATA) $(HRL_FILES) $(IDL_FILE) "$(RELSYSDIR)/COSS/CosNaming"
+	$(INSTALL_DATA) $(GEN_HRL_FILES) $(GEN_EXT_HRL_FILES) "$(RELSYSDIR)/COSS/CosNaming"
+ 
+ 
+ release_docs_spec:
+diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile
+index 30b74c490a..9c6708fdd3 100644
+--- a/lib/orber/src/Makefile
+++ b/lib/orber/src/Makefile
+@@ -253,7 +253,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) $(YRL_FILE) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+	$(INSTALL_DATA) $(GEN_HRL_FILES_LOC) $(INTERNAL_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(EXTERNAL_HRL_FILES) $(GEN_HRL_FILES_EXT) "$(RELSYSDIR)/include"
+ 
+diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile
+index 1003d24be9..1b1215456e 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/ose/src/Makefile b/lib/ose/src/Makefile
+index a89e9392e9..224d944d71 100644
+--- a/lib/ose/src/Makefile
+++ b/lib/ose/src/Makefile
+@@ -94,9 +94,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)/include"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ 
+diff --git a/lib/otp_mibs/src/Makefile b/lib/otp_mibs/src/Makefile
+index 03892cd43d..c3ad326faf 100644
+--- a/lib/otp_mibs/src/Makefile
+++ b/lib/otp_mibs/src/Makefile
+@@ -96,8 +96,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) $(TARGETS) "$(RELSYSDIR)/ebin"
+ 
+diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile
+index dbecdd24a5..1d45801b95 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/percept/src/Makefile b/lib/percept/src/Makefile
+index 9b963e0fae..deeb75c132 100644
+--- a/lib/percept/src/Makefile
+++ b/lib/percept/src/Makefile
+@@ -97,7 +97,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/public_key/asn1/Makefile b/lib/public_key/asn1/Makefile
+index 7474297b9b..a51065850b 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 786f244f85..0463c678f6 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 1fea41550c..a756470503 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 99b90f9ec5..25b3ebb671 100644
+--- a/lib/runtime_tools/src/Makefile
+++ b/lib/runtime_tools/src/Makefile
+@@ -97,8 +97,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 7ff6a03a50..a304900917 100644
+--- a/lib/sasl/src/Makefile
+++ b/lib/sasl/src/Makefile
+@@ -93,7 +93,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 89037b3ea8..01de885f0d 100644
+--- a/lib/snmp/src/agent/Makefile
+++ b/lib/snmp/src/agent/Makefile
+@@ -131,7 +131,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) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \
+ 		"$(RELSYSDIR)/ebin"
+diff --git a/lib/snmp/src/app/Makefile b/lib/snmp/src/app/Makefile
+index 7972d9549d..78a9f2b6ec 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 54f2e229b9..488faa4727 100644
+--- a/lib/snmp/src/compile/Makefile
+++ b/lib/snmp/src/compile/Makefile
+@@ -123,7 +123,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 382f83b78e..db50c264ad 100644
+--- a/lib/snmp/src/manager/Makefile
+++ b/lib/snmp/src/manager/Makefile
+@@ -114,7 +114,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) $(TARGET_FILES) "$(RELSYSDIR)/ebin"
+ # 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+diff --git a/lib/snmp/src/misc/Makefile b/lib/snmp/src/misc/Makefile
+index c71ecf994e..d17e699be0 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 b44c8eef35..8f8b58dcd7 100644
+--- a/lib/ssh/src/Makefile
+++ b/lib/ssh/src/Makefile
+@@ -135,7 +135,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 7a7a373487..419fa9e090 100644
+--- a/lib/ssl/src/Makefile
+++ b/lib/ssl/src/Makefile
+@@ -142,7 +142,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 9f4a446ea0..50ac11ec80 100644
+--- a/lib/stdlib/src/Makefile
+++ b/lib/stdlib/src/Makefile
+@@ -207,7 +207,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 2e91adf8af..0085fca025 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/test_server/src/Makefile b/lib/test_server/src/Makefile
+index 6a26ee2933..73364773db 100644
+--- a/lib/test_server/src/Makefile
+++ b/lib/test_server/src/Makefile
+@@ -124,7 +124,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) $(TS_HRL_FILES) "$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/include"
+ 	$(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include"
+diff --git a/lib/tools/src/Makefile b/lib/tools/src/Makefile
+index 9fcfb79628..b30b173e87 100644
+--- a/lib/tools/src/Makefile
+++ b/lib/tools/src/Makefile
+@@ -107,7 +107,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/typer/src/Makefile b/lib/typer/src/Makefile
+index 620ca21827..9c9390e103 100644
+--- a/lib/typer/src/Makefile
+++ b/lib/typer/src/Makefile
+@@ -102,9 +102,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) $(HRL_FILES) $(YRL_FILES) \
+-		"$(RELSYSDIR)/src"
+ 	$(INSTALL_DIR) "$(RELSYSDIR)/ebin"
+ 	$(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin"
+ 
+diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile
+index a5a8eaf5dc..be80ba74aa 100644
+--- a/lib/webtool/src/Makefile
+++ b/lib/webtool/src/Makefile
+@@ -88,8 +88,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) $(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 b345e34684..153a2707ad 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 f8f0320f46..099513e380 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"
+ 
--- a/otp-0007-Avoid-forking-sed-to-get-basename.patch
+++ b/otp-0007-Avoid-forking-sed-to-get-basename.patch
@ -1,31 +0,0 @@
-From: Jan Pazdziora <jpazdziora@redhat.com>
-Date: Thu, 10 May 2018 18:35:02 +0200
-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 536fa139d9..4dcffbc4c8 100644
--- a/erts/etc/unix/erl.src.src
-+++ b/erts/etc/unix/erl.src.src
-@@ -49,7 +49,7 @@ else
- fi
- BINDIR="$ROOTDIR/erts-%VSN%/bin"
- EMU=%EMULATOR%%EMULATOR_NUMBER%
-PROGNAME=`basename "$0"`
-+PROGNAME=${0##*/}
- export EMU
- export ROOTDIR
- export BINDIR
-diff --git a/erts/etc/unix/start_erl.src b/erts/etc/unix/start_erl.src
-index 34e0369710..62e613bba1 100644
--- a/erts/etc/unix/start_erl.src
-+++ b/erts/etc/unix/start_erl.src
-@@ -37,7 +37,7 @@ VSN=`awk '{print $2}' $DataFile`
- 
- BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin
- EMU=beam
-PROGNAME=`echo $0 | sed 's/.*\///'`
-+PROGNAME=${0##*/}
- export EMU
- export ROOTDIR
- export BINDIR
--- a/otp-0007-Split-off-webtool-dependency-from-tools.patch
+++ b/otp-0007-Split-off-webtool-dependency-from-tools.patch
@ -0,0 +1,40 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Sat, 8 Nov 2014 22:54:57 +0300
+Subject: [PATCH] Split off webtool dependency from tools
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/lib/tools/src/cover_web.erl b/lib/tools/src/cover_web.erl
+index ae8b3f25cf..539ca96b8e 100644
+--- a/lib/tools/src/cover_web.erl
+++ b/lib/tools/src/cover_web.erl
+@@ -51,14 +51,25 @@
+ %%%----------------------------------------------------------------------
+ %% Start webtool and webcover from erlang shell
+ start() ->
+-    webtool:start(),
+-    webtool:start_tools([],"app=webcover"),
+    try
+        % Disable automatic dependency picking up
+        erlang:apply(webtool, start, []),
+        erlang:apply(webtool, start_tools, [[],"app=webcover"])
+    catch
+        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
+    end,
+     ok.
+ 
+ %% Stop webtool and webcover from erlang shell
+ stop() ->
+-    webtool:stop_tools([],"app=webcover"),
+-    webtool:stop().
+    try
+        % Disable automatic dependency picking up
+        erlang:apply(webtool, stop_tools, [[],"app=webcover"]),
+        erlang:apply(webtool, stop, [])
+    catch
+        error:undef -> error_logger:error_msg("No erlang-webtool found.~nPlease install erlang-webtool package first.~n")
+    end,
+    ok.
+ 
+ 
+ 
--- a/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch
+++ b/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch
@ -0,0 +1,31 @@
+From: John Eckersberg <jeckersb@redhat.com>
+Date: Wed, 16 Dec 2015 11:03:42 -0500
+Subject: [PATCH] Add patch to crash dump on large distribution
+
+https://bugzilla.redhat.com/show_bug.cgi?id=1291822
+https://bugzilla.redhat.com/show_bug.cgi?id=1291855
+https://bugzilla.redhat.com/show_bug.cgi?id=1291856
+https://bugzilla.redhat.com/show_bug.cgi?id=1291857
+
+diff --git a/erts/emulator/beam/dist.c b/erts/emulator/beam/dist.c
+index 787241b960..069d80ac4b 100644
+--- a/erts/emulator/beam/dist.c
+++ b/erts/emulator/beam/dist.c
+@@ -1980,7 +1980,7 @@ dist_port_command(Port *prt, ErtsDistOutputBuf *obuf)
+     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
+ 
+     if (size > (Uint) INT_MAX)
+-	erts_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_DUMP_EXIT,
+ 		 "Absurdly large distribution output data buffer "
+ 		 "(%beu bytes) passed.\n",
+ 		 size);
+@@ -2020,7 +2020,7 @@ dist_port_commandv(Port *prt, ErtsDistOutputBuf *obuf)
+     ERTS_SMP_LC_ASSERT(erts_lc_is_port_locked(prt));
+ 
+     if (size > (Uint) INT_MAX)
+-	erts_exit(ERTS_ABORT_EXIT,
+	erts_exit(ERTS_DUMP_EXIT,
+ 		 "Absurdly large distribution output data buffer "
+ 		 "(%beu bytes) passed.\n",
+ 		 size);
--- a/otp-0008-Load-man-pages-from-system-wide-directory.patch
+++ b/otp-0008-Load-man-pages-from-system-wide-directory.patch
@ -1,25 +0,0 @@
-From: Francois-Denis Gonthier <neumann@lostwebsite.net>
-Date: Thu, 20 Sep 2018 15:01:18 +0300
-Subject: [PATCH] Load man-pages from system-wide directory
-
-Patch allows one to use standard man path with erl -man command.
-(Erlang manual pages are placed to /usr/share/man/ hierarchy
-as required by Debian policy.)
-
-diff --git a/erts/etc/common/erlexec.c b/erts/etc/common/erlexec.c
-index 888df87e35..14272f06c6 100644
--- a/erts/etc/common/erlexec.c
-+++ b/erts/etc/common/erlexec.c
-@@ -716,8 +716,10 @@ int main(int argc, char **argv)
- 			error("-man not supported on Windows");
- #else
- 			argv[i] = "man";
-			erts_snprintf(tmpStr, sizeof(tmpStr), "%s/man", rootdir);
-			set_env("MANPATH", tmpStr);
-+			/*
-+			* Conform to erlang-manpages content.
-+			*/
-+			putenv(strsave("MANSECT=3erl:1:5:7"));
- 			execvp("man", argv+i);
- 			error("Could not execute the 'man' command.");
- #endif
--- a/otp-0009-Add-GDB-tools.patch
+++ b/otp-0009-Add-GDB-tools.patch
@ -1,464 +0,0 @@
-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 $@ $^
--- a/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch
+++ b/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch
@ -0,0 +1,56 @@
+From: Alexey Lebedeff <alebedev@mirantis.com>
+Date: Tue, 29 Mar 2016 20:30:22 +0300
+Subject: [PATCH] Don't send unasked for systemd notifications
+
+Suppose we have some erlang system that uses systemd unit with
+Type=notify - so this should send startup confirmation itself. But if
+systemd-enabled epmd will be started as a first step of that system
+startup, empd startup confirmation will be misinterpeted by systemd. And
+our erlang service will be considered 'ready' to early. Also this will
+interefere with systemd MAINPID detection: systemd will be monitoring
+`epmd` process instead of `beam` one.
+
+For example, rabbitmq works around this issue by starting epmd using
+separate short-lived beam process, with NOTIFY_SOCKET environment
+variable reset - only in this way we could be sure that epmd will not
+interfere with rabbit startup sequence.
+
+This patch disables indiscriminate confirmation sending, and does it
+only when it was explicitly asked to do so.
+
+diff --git a/erts/epmd/src/epmd.c b/erts/epmd/src/epmd.c
+index 5513cb2d7e..4740ce8534 100644
+--- a/erts/epmd/src/epmd.c
+++ b/erts/epmd/src/epmd.c
+@@ -592,8 +592,10 @@ void epmd_cleanup_exit(EpmdVars *g, int exitval)
+       free(g->argv);
+   }
+ #ifdef HAVE_SYSTEMD_DAEMON
+-  sd_notifyf(0, "STATUS=Exited.\n"
+-                "ERRNO=%i", exitval);
+  if (g->is_systemd){
+    sd_notifyf(0, "STATUS=Exited.\n"
+               "ERRNO=%i", exitval);
+  }
+ #endif /* HAVE_SYSTEMD_DAEMON */
+   exit(exitval);
+ }
+diff --git a/erts/epmd/src/epmd_srv.c b/erts/epmd/src/epmd_srv.c
+index e1bac99ef9..59d59ad0f7 100644
+--- a/erts/epmd/src/epmd_srv.c
+++ b/erts/epmd/src/epmd_srv.c
+@@ -452,9 +452,11 @@ void run(EpmdVars *g)
+   num_sockets = bound;
+ #ifdef HAVE_SYSTEMD_DAEMON
+     }
+-    sd_notifyf(0, "READY=1\n"
+-                  "STATUS=Processing port mapping requests...\n"
+-                  "MAINPID=%lu", (unsigned long) getpid());
+    if (g->is_systemd) {
+      sd_notifyf(0, "READY=1\n"
+                    "STATUS=Processing port mapping requests...\n"
+                    "MAINPID=%lu", (unsigned long) getpid());
+    }
+ #endif /* HAVE_SYSTEMD_DAEMON */
+ 
+   dbg_tty_printf(g,2,"entering the main select() loop");
--- a/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch
+++ b/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch
@ -0,0 +1,69 @@
+From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= <egil@erlang.org>
+Date: Fri, 10 Jun 2016 16:40:38 +0200
+Subject: [PATCH] Fix decoding of LLONG_MIN in erl_decode
+
+Reported-by: Peter Lemenkov
+
+diff --git a/lib/erl_interface/src/legacy/erl_marshal.c b/lib/erl_interface/src/legacy/erl_marshal.c
+index a4216c9541..6a1b573d52 100644
+--- a/lib/erl_interface/src/legacy/erl_marshal.c
+++ b/lib/erl_interface/src/legacy/erl_marshal.c
+@@ -727,6 +727,13 @@ static ETERM *erl_decode_it(unsigned char **ext)
+ 	    ((*ext)[2]) << 8 |((*ext)[3]); 
+ 	*ext += 4;
+     big_cont:
+
+#ifdef _MSC_VER
+#define MAX_TO_NEGATE 0x8000000000000000Ui64
+#else
+#define MAX_TO_NEGATE 0x8000000000000000ULL
+#endif
+
+ 	sign = *(*ext)++; 
+ 	if (arity > 8)             
+ 	    goto big_truncate;
+@@ -763,23 +770,28 @@ static ETERM *erl_decode_it(unsigned char **ext)
+ 	    *ext += arity;
+ 	    return ep;
+ 	} else {
+-	    /* Fits in a long long */
+-	    int x;
+-	    long long l = 0LL;
+-
+-	    for(x = 0 ; x < arity ; x++) {
+-		l |= ((long long)(*ext)[x]) << ((long long)(8*x));
+-	    }
+-	    if (sign) {
+-		l = -l;
+-		if (l > 0) goto big_truncate;
+-	    }
+-
+-	    ERL_TYPE(ep) = ERL_LONGLONG;
+-	    ep->uval.llval.i = l;
+-	    *ext += arity;
+-	    return ep;
+            /* Fits in a signed long long */
+            int x;
+            unsigned long long l = 0LL;
+            long long sl;
+
+            for(x = 0 ; x < arity ; x++) {
+                l |= ((unsigned long long)(*ext)[x]) << ((unsigned long long)(8*x));
+            }
+
+            sl = (long long)l;
+
+            if (sign && l != MAX_TO_NEGATE) {
+                sl = -sl;
+                if (sl > 0) goto big_truncate;
+            }
+
+            ERL_TYPE(ep) = ERL_LONGLONG;
+            ep->uval.llval.i = sl;
+            *ext += arity;
+            return ep;
+ 	}
+#undef MAX_TO_NEGATE
+     big_truncate: 
+ 	/* truncate to: (+/-) 1 */
+ #ifdef DEBUG
--- a/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch
+++ b/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch
@ -0,0 +1,47 @@
+From: Peter Lemenkov <lemenkov@gmail.com>
+Date: Thu, 14 Jul 2016 17:51:16 +0300
+Subject: [PATCH] Respect -proto_dist switch while connection to EPMD
+
+Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
+
+diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
+index c6202dd796..ec2e3309c8 100644
+--- a/lib/kernel/src/erl_epmd.erl
+++ b/lib/kernel/src/erl_epmd.erl
+@@ -103,6 +103,10 @@ names(EpmdAddr) ->
+ 
+ register_node(Name, PortNo) ->
+     register_node(Name, PortNo, inet).
+register_node(Name, PortNo, inet_tcp) ->
+    register_node(Name, PortNo, inet);
+register_node(Name, PortNo, inet6_tcp) ->
+    register_node(Name, PortNo, inet6);
+ register_node(Name, PortNo, Family) ->
+     gen_server:call(erl_epmd, {register, Name, PortNo, Family}, infinity).
+ 
+diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
+index 64b28bb49b..ffbd5d5a21 100644
+--- a/lib/kernel/src/inet_tcp_dist.erl
+++ b/lib/kernel/src/inet_tcp_dist.erl
+@@ -73,7 +73,7 @@ gen_listen(Driver, Name) ->
+ 	{ok, Socket} ->
+ 	    TcpAddress = get_tcp_address(Driver, Socket),
+ 	    {_,Port} = TcpAddress#net_address.address,
+-	    case erl_epmd:register_node(Name, Port) of
+	    case erl_epmd:register_node(Name, Port, Driver) of
+ 		{ok, Creation} ->
+ 		    {ok, {Socket, TcpAddress, Creation}};
+ 		Error ->
+diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
+index 4c789793ec..7c6b14fcaf 100644
+--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
+@@ -116,7 +116,7 @@ handle_call({listen, Driver, Name}, _From, State) ->
+ 	    {ok, TcpAddress} = get_tcp_address(Socket),
+ 	    {ok, WorldTcpAddress} = get_tcp_address(World),
+ 	    {_,Port} = WorldTcpAddress#net_address.address,
+-	    case erl_epmd:register_node(Name, Port) of
+	    case erl_epmd:register_node(Name, Port, Driver) of
+ 		{ok, Creation} ->
+ 		    {reply, {ok, {Socket, TcpAddress, Creation}},
+ 		     State#state{listen={Socket, World}}};
--- a/otp-0012-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch
+++ b/otp-0012-erts-Fix-correct-link-flags-for-hipe_mkliterals.patch
@ -0,0 +1,45 @@
+From: Sverker Eriksson <sverker@erlang.org>
+Date: Wed, 9 Nov 2016 16:52:23 +0100
+Subject: [PATCH] erts: Fix correct link flags for hipe_mkliterals
+
+and no need for $(INCLUDED).
+
+diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in
+index a919f0e3ac..15e5609d08 100644
+--- a/erts/emulator/Makefile.in
+++ b/erts/emulator/Makefile.in
+@@ -53,6 +53,7 @@ CREATE_DIRS=
+ LDFLAGS=@LDFLAGS@
+ ARFLAGS=rc
+ OMIT_OMIT_FP=no
+TYPE_LIBS=
+ 
+ ifeq ($(TYPE),debug)
+ PURIFY =
+@@ -91,7 +92,7 @@ PURIFY =
+ TYPEMARKER = .gcov
+ TYPE_FLAGS = $(DEBUG_CFLAGS) -DERTS_GCOV -DNO_JUMP_TABLE -fprofile-arcs -ftest-coverage -O0 -DERTS_CAN_INLINE=0 -DERTS_INLINE=
+ ifneq ($(findstring solaris,$(TARGET)),solaris)
+-LIBS += -lgcov
+TYPE_LIBS = -lgcov
+ endif
+ ENABLE_ALLOC_TYPE_VARS += debug
+ else
+@@ -147,6 +148,8 @@ endif
+ endif
+ endif
+ 
+LIBS += $(TYPE_LIBS)
+
+ comma:=,
+ space:=
+ space+=
+@@ -956,7 +959,7 @@ $(OBJDIR)/%.o: hipe/%.c
+ 	$(V_CC) $(subst O2,O3, $(CFLAGS)) $(INCLUDES) -c $< -o $@
+ 
+ $(BINDIR)/hipe_mkliterals$(TF_MARKER):	$(OBJDIR)/hipe_mkliterals.o
+-	$(ld_verbose)$(CC) $(CFLAGS) $(INCLUDES) -o $@ $<
+	$(ld_verbose)$(CC) $(LDFLAGS) -o $@ $< $(TYPE_LIBS)
+ 
+ $(OBJDIR)/hipe_mkliterals.o:	$(HIPE_ASM) $(TTF_DIR)/erl_alloc_types.h $(DTRACE_HEADERS) \
+ 	$(TTF_DIR)/OPCODES-GENERATED $(TARGET)/TABLES-GENERATED
--- a/otp-0013-erts-Disable-fPIE-for-HiPE-on-x86_64.patch
+++ b/otp-0013-erts-Disable-fPIE-for-HiPE-on-x86_64.patch
@ -0,0 +1,32 @@
+From: Sverker Eriksson <sverker@erlang.org>
+Date: Tue, 8 Nov 2016 16:52:32 +0100
+Subject: [PATCH] erts: Disable -fPIE for HiPE on x86_64
+
+
+diff --git a/erts/configure.in b/erts/configure.in
+index 4ade3b3086..e99d22a0af 100644
+--- a/erts/configure.in
+++ b/erts/configure.in
+@@ -2887,6 +2887,22 @@ case $ARCH-$OPSYS in
+ 		;;
+ esac
+ 
+dnl Check to disable -fPIE and friends for HiPE on amd64
+if test X${enable_hipe} = Xyes && test X$ARCH = Xamd64; then
+   AC_TRY_COMPILE(, [#if defined(__pie__) || defined(__PIE__)
+		     #error -fPIE is enabled by default
+		     #endif],
+		    [AC_MSG_NOTICE([No -fPIE enabled by default])],
+		    [AC_MSG_WARN([Security feature -fPIE will be disabled for HiPE])
+		     STATIC_CFLAGS="-fno-PIE $STATIC_CFLAGS"
+		     saved_LDFLAGS=$LDFLAGS
+		     LDFLAGS="-no-pie $LDFLAGS"
+		     AC_TRY_LINK(,, [],
+			[AC_MSG_WARN([Linked does not accept option -no-pie])
+			 LDFLAGS=$saved_LDFLAGS])])
+
+fi
+
+ if test X${enable_fp_exceptions} = Xauto ; then
+    case $host_os in
+    	*linux*)
--- a/otp-0014-Fix-CVE-2016-10253.patch
+++ b/otp-0014-Fix-CVE-2016-10253.patch
@ -0,0 +1,318 @@
+From: Zephyr Pellerin <zv@nxvr.org>
+Date: Mon, 20 Mar 2017 15:36:41 -0700
+Subject: [PATCH] Fix CVE-2016-10253
+
+
+diff --git a/erts/emulator/pcre/pcre_compile.c b/erts/emulator/pcre/pcre_compile.c
+index d48126a55d..15a81fae56 100644
+--- a/erts/emulator/pcre/pcre_compile.c
+++ b/erts/emulator/pcre/pcre_compile.c
+@@ -2335,34 +2335,36 @@ for (;;)
+   }
+ }
+ 
+-
+-
+ /*************************************************
+-*    Scan compiled branch for non-emptiness      *
+-*************************************************/
+ *    Scan compiled branch for non-emptiness      *
+ *************************************************/
+ 
+ /* This function scans through a branch of a compiled pattern to see whether it
+-can match the empty string or not. It is called from could_be_empty()
+-below and from compile_branch() when checking for an unlimited repeat of a
+-group that can match nothing. Note that first_significant_code() skips over
+-backward and negative forward assertions when its final argument is TRUE. If we
+-hit an unclosed bracket, we return "empty" - this means we've struck an inner
+-bracket whose current branch will already have been scanned.
+-
+-Arguments:
+-  code        points to start of search
+-  endcode     points to where to stop
+-  utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
+-  cd          contains pointers to tables etc.
+-
+-Returns:      TRUE if what is matched could be empty
+   can match the empty string or not. It is called from could_be_empty()
+   below and from compile_branch() when checking for an unlimited repeat of a
+   group that can match nothing. Note that first_significant_code() skips over
+   backward and negative forward assertions when its final argument is TRUE. If we
+   hit an unclosed bracket, we return "empty" - this means we've struck an inner
+   bracket whose current branch will already have been scanned.
+
+   Arguments:
+   code        points to start of search
+   endcode     points to where to stop
+   utf         TRUE if in UTF-8 / UTF-16 / UTF-32 mode
+   cd          contains pointers to tables etc.
+   recurses    chain of recurse_check to catch mutual recursion
+
+   Returns:      TRUE if what is matched could be empty
+ */
+ 
+
+ static BOOL
+ could_be_empty_branch(const pcre_uchar *code, const pcre_uchar *endcode,
+-  BOOL utf, compile_data *cd)
+  BOOL utf, compile_data *cd, recurse_check *recurses)
+ {
+ register pcre_uchar c;
+recurse_check this_recurse;
+
+ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
+      code < endcode;
+      code = first_significant_code(code + PRIV(OP_lengths)[c], TRUE))
+@@ -2390,25 +2392,47 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
+ 
+   if (c == OP_RECURSE)
+     {
+-    const pcre_uchar *scode;
+    const pcre_uchar *scode = cd->start_code + GET(code, 1);
+    const pcre_uchar *endgroup = scode;
+     BOOL empty_branch;
+ 
+-    /* Test for forward reference */
+    /* Test for forward reference or uncompleted reference. This is disabled
+    when called to scan a completed pattern by setting cd->start_workspace to
+    NULL. */
+ 
+-    for (scode = cd->start_workspace; scode < cd->hwm; scode += LINK_SIZE)
+-      if ((int)GET(scode, 0) == (int)(code + 1 - cd->start_code)) return TRUE;
+    if (cd->start_workspace != NULL)
+      {
+      const pcre_uchar *tcode;
+      for (tcode = cd->start_workspace; tcode < cd->hwm; tcode += LINK_SIZE)
+        if ((int)GET(tcode, 0) == (int)(code + 1 - cd->start_code)) return TRUE;
+      if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
+      }
+ 
+-    /* Not a forward reference, test for completed backward reference */
+    /* If the reference is to a completed group, we need to detect whether this
+    is a recursive call, as otherwise there will be an infinite loop. If it is
+    a recursion, just skip over it. Simple recursions are easily detected. For
+    mutual recursions we keep a chain on the stack. */
+ 
+-    empty_branch = FALSE;
+-    scode = cd->start_code + GET(code, 1);
+-    if (GET(scode, 1) == 0) return TRUE;    /* Unclosed */
+    do endgroup += GET(endgroup, 1); while (*endgroup == OP_ALT);
+    if (code >= scode && code <= endgroup) continue;  /* Simple recursion */
+    else
+      {
+      recurse_check *r = recurses;
+      for (r = recurses; r != NULL; r = r->prev)
+        if (r->group == scode) break;
+      if (r != NULL) continue;   /* Mutual recursion */
+      }
+
+    /* Completed reference; scan the referenced group, remembering it on the
+    stack chain to detect mutual recursions. */
+ 
+-    /* Completed backwards reference */
+    empty_branch = FALSE;
+    this_recurse.prev = recurses;
+    this_recurse.group = scode;
+ 
+     do
+       {
+-      if (could_be_empty_branch(scode, endcode, utf, cd))
+      if (could_be_empty_branch(scode, endcode, utf, cd, &this_recurse))
+         {
+         empty_branch = TRUE;
+         break;
+@@ -2448,7 +2472,7 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
+   if (c == OP_BRA  || c == OP_BRAPOS ||
+       c == OP_CBRA || c == OP_CBRAPOS ||
+       c == OP_ONCE || c == OP_ONCE_NC ||
+-      c == OP_COND)
+      c == OP_COND || c == OP_SCOND)
+     {
+     BOOL empty_branch;
+     if (GET(code, 1) == 0) return TRUE;    /* Hit unclosed bracket */
+@@ -2464,8 +2488,8 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
+       empty_branch = FALSE;
+       do
+         {
+-        if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd))
+-          empty_branch = TRUE;
+        if (!empty_branch && could_be_empty_branch(code, endcode, utf, cd,
+          recurses)) empty_branch = TRUE;
+         code += GET(code, 1);
+         }
+       while (*code == OP_ALT);
+@@ -2522,34 +2546,57 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
+ 
+     /* Opcodes that must match a character */
+ 
+    case OP_ANY:
+    case OP_ALLANY:
+    case OP_ANYBYTE:
+
+     case OP_PROP:
+     case OP_NOTPROP:
+    case OP_ANYNL:
+
+    case OP_NOT_HSPACE:
+    case OP_HSPACE:
+    case OP_NOT_VSPACE:
+    case OP_VSPACE:
+     case OP_EXTUNI:
+
+     case OP_NOT_DIGIT:
+     case OP_DIGIT:
+     case OP_NOT_WHITESPACE:
+     case OP_WHITESPACE:
+     case OP_NOT_WORDCHAR:
+     case OP_WORDCHAR:
+-    case OP_ANY:
+-    case OP_ALLANY:
+-    case OP_ANYBYTE:
+
+     case OP_CHAR:
+     case OP_CHARI:
+     case OP_NOT:
+     case OP_NOTI:
+
+     case OP_PLUS:
+    case OP_PLUSI:
+     case OP_MINPLUS:
+-    case OP_POSPLUS:
+-    case OP_EXACT:
+    case OP_MINPLUSI:
+
+     case OP_NOTPLUS:
+    case OP_NOTPLUSI:
+     case OP_NOTMINPLUS:
+    case OP_NOTMINPLUSI:
+
+    case OP_POSPLUS:
+    case OP_POSPLUSI:
+     case OP_NOTPOSPLUS:
+    case OP_NOTPOSPLUSI:
+
+    case OP_EXACT:
+    case OP_EXACTI:
+     case OP_NOTEXACT:
+    case OP_NOTEXACTI:
+
+     case OP_TYPEPLUS:
+     case OP_TYPEMINPLUS:
+     case OP_TYPEPOSPLUS:
+     case OP_TYPEEXACT:
+
+     return FALSE;
+ 
+     /* These are going to continue, as they may be empty, but we have to
+@@ -2583,30 +2630,58 @@ for (code = first_significant_code(code + PRIV(OP_lengths)[*code], TRUE);
+     return TRUE;
+ 
+     /* In UTF-8 mode, STAR, MINSTAR, POSSTAR, QUERY, MINQUERY, POSQUERY, UPTO,
+-    MINUPTO, and POSUPTO may be followed by a multibyte character */
+    MINUPTO, and POSUPTO and their caseless and negative versions may be
+    followed by a multibyte character. */
+ 
+ #if defined SUPPORT_UTF && !defined COMPILE_PCRE32
+     case OP_STAR:
+     case OP_STARI:
+    case OP_NOTSTAR:
+    case OP_NOTSTARI:
+
+     case OP_MINSTAR:
+     case OP_MINSTARI:
+    case OP_NOTMINSTAR:
+    case OP_NOTMINSTARI:
+
+     case OP_POSSTAR:
+     case OP_POSSTARI:
+    case OP_NOTPOSSTAR:
+    case OP_NOTPOSSTARI:
+
+     case OP_QUERY:
+     case OP_QUERYI:
+    case OP_NOTQUERY:
+    case OP_NOTQUERYI:
+
+     case OP_MINQUERY:
+     case OP_MINQUERYI:
+    case OP_NOTMINQUERY:
+    case OP_NOTMINQUERYI:
+
+     case OP_POSQUERY:
+     case OP_POSQUERYI:
+    case OP_NOTPOSQUERY:
+    case OP_NOTPOSQUERYI:
+
+     if (utf && HAS_EXTRALEN(code[1])) code += GET_EXTRALEN(code[1]);
+     break;
+ 
+     case OP_UPTO:
+     case OP_UPTOI:
+    case OP_NOTUPTO:
+    case OP_NOTUPTOI:
+
+     case OP_MINUPTO:
+     case OP_MINUPTOI:
+    case OP_NOTMINUPTO:
+    case OP_NOTMINUPTOI:
+
+     case OP_POSUPTO:
+     case OP_POSUPTOI:
+    case OP_NOTPOSUPTO:
+    case OP_NOTPOSUPTOI:
+
+     if (utf && HAS_EXTRALEN(code[1 + IMM2_SIZE])) code += GET_EXTRALEN(code[1 + IMM2_SIZE]);
+     break;
+ #endif
+@@ -2632,7 +2707,6 @@ return TRUE;
+ }
+ 
+ 
+-
+ /*************************************************
+ *    Scan compiled regex for non-emptiness       *
+ *************************************************/
+@@ -2660,7 +2734,7 @@ could_be_empty(const pcre_uchar *code, const pcre_uchar *endcode,
+ {
+ while (bcptr != NULL && bcptr->current_branch >= code)
+   {
+-  if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd))
+  if (!could_be_empty_branch(bcptr->current_branch, endcode, utf, cd, NULL))
+     return FALSE;
+   bcptr = bcptr->outer;
+   }
+@@ -2668,7 +2742,6 @@ return TRUE;
+ }
+ 
+ 
+-
+ /*************************************************
+ *           Check for POSIX class syntax         *
+ *************************************************/
+@@ -5392,7 +5465,7 @@ for (;; ptr++)
+             pcre_uchar *scode = bracode;
+             do
+               {
+-              if (could_be_empty_branch(scode, ketcode, utf, cd))
+              if (could_be_empty_branch(scode, ketcode, utf, cd, NULL))
+                 {
+                 *bracode += OP_SBRA - OP_BRA;
+                 break;
+diff --git a/erts/emulator/pcre/pcre_internal.h b/erts/emulator/pcre/pcre_internal.h
+index af436bd99b..eb0db89619 100644
+--- a/erts/emulator/pcre/pcre_internal.h
+++ b/erts/emulator/pcre/pcre_internal.h
+@@ -2455,6 +2455,13 @@ typedef struct branch_chain {
+   pcre_uchar *current_branch;
+ } branch_chain;
+ 
+/* Structure for mutual recursion detection. */
+
+typedef struct recurse_check {
+    struct recurse_check *prev;
+    const pcre_uchar *group;
+} recurse_check;
+
+ /* Structure for items in a linked list that represents an explicit recursive
+ call within the pattern; used by pcre_exec(). */
+ 
--- a/otp-0015-Make-inet-gethostbyname-respect-resolver-option-inet.patch
+++ b/otp-0015-Make-inet-gethostbyname-respect-resolver-option-inet.patch
@ -0,0 +1,58 @@
+From: Daniel Sommermann <dcsommer@whatsapp.com>
+Date: Fri, 20 May 2016 15:47:16 -0700
+Subject: [PATCH] Make inet:gethostbyname respect resolver option `inet6`
+
+This makes the implementation text of inet:gethostbyname/1 identical to
+that of inet_res:gethostbyname/1. I also copied over the doc note about
+this resolver option.
+
+diff --git a/lib/kernel/doc/src/inet.xml b/lib/kernel/doc/src/inet.xml
+index 088d78c1d6..f38af7a06b 100644
+--- a/lib/kernel/doc/src/inet.xml
+++ b/lib/kernel/doc/src/inet.xml
+@@ -11,7 +11,7 @@
+       Licensed under the Apache License, Version 2.0 (the "License");
+       you may not use this file except in compliance with the License.
+       You may obtain a copy of the License at
+- 
+
+           http://www.apache.org/licenses/LICENSE-2.0
+ 
+       Unless required by applicable law or agreed to in writing, software
+@@ -184,7 +184,12 @@ fe80::204:acff:fe17:bf38
+       <name name="gethostbyname" arity="1"/>
+       <fsummary>Return a hostent record for the host with the given name</fsummary>
+       <desc>
+-        <p>Returns a <c>hostent</c> record given a hostname.</p>
+        <p>Returns a <c>hostent</c> record for the host with the specified
+          hostname.</p>
+        <p>If resolver option <c>inet6</c> is <c>true</c>,
+          an IPv6 address is looked up. If that fails,
+          the IPv4 address is looked up and returned on
+          IPv6-mapped IPv4 format.</p>
+       </desc>
+     </func>
+     <func>
+@@ -1288,4 +1293,3 @@ setcap cap_sys_admin,cap_sys_ptrace,cap_dac_read_search+epi beam.smp
+     </list>
+   </section>
+ </erlref>
+-
+diff --git a/lib/kernel/src/inet.erl b/lib/kernel/src/inet.erl
+index c1ae99ea24..713a9cf725 100644
+--- a/lib/kernel/src/inet.erl
+++ b/lib/kernel/src/inet.erl
+@@ -439,7 +439,12 @@ getstat(Socket,What) ->
+       Hostent :: hostent().
+ 
+ gethostbyname(Name) -> 
+-    gethostbyname_tm(Name, inet, false).
+    case inet_db:res_option(inet6) of
+	true ->
+	    gethostbyname_tm(Name, inet6, false);
+	false ->
+	    gethostbyname_tm(Name, inet, false)
+    end.
+ 
+ -spec gethostbyname(Hostname, Family) ->
+                            {ok, Hostent} | {error, posix()} when
--- a/otp-0016-Fix-erl_epmd-port_please-when-using-IPv6.patch
+++ b/otp-0016-Fix-erl_epmd-port_please-when-using-IPv6.patch
@ -0,0 +1,26 @@
+From: John Eckersberg <jeckersb@redhat.com>
+Date: Wed, 14 Jun 2017 12:32:17 -0400
+Subject: [PATCH] Fix erl_epmd:port_please when using IPv6
+
+This mirrors the behavior of inet:gethostbyname when no family or
+timeout is supplied.
+
+diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl
+index ec2e3309c8..07bfb451ae 100644
+--- a/lib/kernel/src/erl_epmd.erl
+++ b/lib/kernel/src/erl_epmd.erl
+@@ -79,7 +79,13 @@ port_please(Node, EpmdAddr, Timeout) ->
+ 
+ 
+ port_please1(Node,HostName, Timeout) ->
+-  case inet:gethostbyname(HostName, inet, Timeout) of
+  Family = case inet_db:res_option(inet6) of
+             true ->
+               inet6;
+             false ->
+               inet
+           end,
+  case inet:gethostbyname(HostName, Family, Timeout) of
+     {ok,{hostent, _Name, _ , _Af, _Size, [EpmdAddr | _]}} ->
+       get_port(Node, EpmdAddr, Timeout);
+     Else ->
--- a/otp-get-patches.sh
+++ b/otp-get-patches.sh
@ -17,6 +17,18 @@
 #
 # # start of autogenerated patch tag list
 # # end of autogenerated patch tag list
+# # start of autogenerated prep patch list
+# # end of autogenerated prep patch list
+#
+# The following special comment lines in the git commit messages
+# will be interpreted:
+#
+#    Fedora-Spec-Comment: This patch only applies to EL6 builds
+#    Fedora-Spec-Before: %if 0%?el6}
+#    Fedora-Spec-After: %endif
+#
+# If there is no "Fedora-Spec-Comment:" line, we will use
+# "Fedora specific patch".

 # Command line parsing
 otp_dir="${1:?'Fatal: otp git repo dir required'}"
@ -37,29 +49,44 @@ test -s "$tmpdir/patch-list.txt"

 # Process patch files
 echo "# start of autogenerated patch tag list" > "$tmpdir/patch-list-tags.txt"
+echo "# start of autogenerated prep patch list" > "$tmpdir/patch-list-prep.txt"
 n=1
 while read patch
 do
 	otppatch="$(dirname "$patch")/otp-$(basename "$patch")"
 	${SED-sed} -e '1d' -e '/^-- $/,$d' "$patch" > "$otppatch"
 	rm -f "$patch"
+	comment="$(sed -n 's/^Fedora-Spec-Comment:\s*//p' "$otppatch")"
+	if test "x$comment" = "x"; then comment="Fedora specific patch"; fi
+	echo "# ${comment}" >> "$tmpdir/patch-list-tags.txt"
+	echo "#   $(sed -n 's/^Subject: \[PATCH\] //p' "$otppatch")" >> "$tmpdir/patch-list-tags.txt"
 	echo "Patch$n: $(basename "$otppatch")" >> "$tmpdir/patch-list-tags.txt"
+	base="$(basename "$patch" ".patch" | sed 's/^00[0-9][0-9]-//')"
+	backupext=".$(echo -n "$base" | tr -c -s '[:alnum:]' '_')"
+	sed -n 's/^Fedora-Spec-Before:\s*//p' "$otppatch" >> "$tmpdir/patch-list-prep.txt"
+	echo "%patch$n -p1 -b ${backupext}" >> "$tmpdir/patch-list-prep.txt"
+	sed -n 's/^Fedora-Spec-After:\s*//p' "$otppatch" >> "$tmpdir/patch-list-prep.txt"
 	n=$(($n + 1))
 done < "$tmpdir/patch-list.txt"
 echo "# end of autogenerated patch tag list" >> "$tmpdir/patch-list-tags.txt"
+echo "# end of autogenerated prep patch list" >> "$tmpdir/patch-list-prep.txt"

 # Create updated spec file
 specfile="erlang.spec"
 newspec1="${tmpdir}/${specfile}.new1"
+newspec2="${tmpdir}/${specfile}.new2"
 sed '/^# start of autogenerated patch tag list$/,$d' "$specfile" > "$newspec1"
 cat "$tmpdir/patch-list-tags.txt" >> "$newspec1"
 sed '1,/^# end of autogenerated patch tag list/d' "$specfile" >> "$newspec1"
+sed '/^# start of autogenerated prep patch list$/,$d' "$newspec1" > "$newspec2"
+cat "$tmpdir/patch-list-prep.txt" >> "$newspec2"
+sed '1,/^# end of autogenerated prep patch list/d' "$newspec1" >> "$newspec2"

 # Actually put all changes into git index
 git rm -f otp-00*.patch
 mv "$tmpdir/otp-00"*.patch .
 git add otp-00*.patch
-mv -f "$newspec1" "$specfile"
+mv -f "$newspec2" "$specfile"
 git add "$specfile"

 rm -rf "$tmpdir"
--- a/otp-make-subpackages.py
+++ b/otp-make-subpackages.py
@ -24,7 +24,9 @@ package_headers = {}
 package_noarch = [
 		"emacs-erlang",
 		"emacs-erlang-el",
-		"erlang-doc"]
+		"erlang-doc",
+		"xemacs-erlang",
+		"xemacs-erlang-el"]

 # These are additional Requires which cannot be picked up automatically (yet).
 # TODO these should be added automatically
@ -42,6 +44,8 @@ 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 = {
@ -66,6 +70,8 @@ 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 = {
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (otp-OTP-26.2.5.16.tar.gz) = 4e973be7e8ccad196d59759108a521535b0f046268eb0406f789a50f411fa27c9c11fcfb61a7218605bf1b32921bb52c52fc7c99917e1acfc0d3ed09437129b2
+SHA512 (otp-OTP-18.3.4.5.tar.gz) = 359562801008c8623c24a26149ee2253474e24c3d2884acdfb4f15b4a284c9a5dbc02a9da80a4b344912239452d8742dd467ac47d452c72c16637dfe05021736
Author	SHA1	Message	Date
Peter Lemenkov	49876e747a	Fix EPMD port assignment in IPv6 environment See this PR for the details: * https://github.com/erlang/otp/pull/erlang/otp/pull/1487 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>	2017-06-16 17:50:48 +03:00
Peter Lemenkov	38c292c393	Fix DNS resolution if IPv4 is unavailable Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>	2017-06-14 16:51:02 +03:00
Peter Lemenkov	54d07c1552	CVE-2016-10253 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>	2017-03-21 19:33:51 +03:00
Peter Lemenkov	900c151e1e	Ver. 18.3.4.5 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>	2017-02-02 14:57:37 +03:00
Peter Lemenkov	65b5d88582	Ver. 18.3.4.4 Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>	2016-08-16 15:49:31 +03:00