diff --git a/.gitignore b/.gitignore index 17c7274..bdf9fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ otp_src_R14A.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-19.0.2.tar.gz diff --git a/erlang.spec b/erlang.spec index 8d5649d..e22de86 100644 --- a/erlang.spec +++ b/erlang.spec @@ -47,8 +47,6 @@ # observer blocks: # # * common_test -# * test_server -# * webtool # # So finally we have to disable the following plugins: # @@ -59,16 +57,14 @@ # megaco # observer # reltool (*) -# test_server # typer -# webtool # wx # %global __with_wxwidgets 1 Name: erlang -Version: 18.3.4.2 +Version: 19.0.2 Release: 1%{?dist} Summary: General-purpose programming language and runtime environment @@ -120,20 +116,8 @@ Patch5: otp-0005-Do-not-install-nteventlog-and-related-doc-files-on-n.patch # Do not install erlang sources Patch6: otp-0006-Do-not-install-erlang-sources.patch # Fedora specific patch -# Split off webtool dependency from tools -Patch7: otp-0007-Split-off-webtool-dependency-from-tools.patch -# Fedora specific patch -# Add patch to crash dump on large distribution -Patch8: otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch -# Fedora specific patch -# Don't send unasked for systemd notifications -Patch9: otp-0009-Don-t-send-unasked-for-systemd-notifications.patch -# Fedora specific patch -# Fix decoding of LLONG_MIN in erl_decode -Patch10: otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch -# Fedora specific patch # Respect -proto_dist switch while connection to EPMD -Patch11: otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch +Patch7: otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch # end of autogenerated patch tag list BuildRequires: flex @@ -209,7 +193,6 @@ Requires: %{name}-observer%{?_isa} = %{version}-%{release} Requires: %{name}-odbc%{?_isa} = %{version}-%{release} Requires: %{name}-orber%{?_isa} = %{version}-%{release} Requires: %{name}-os_mon%{?_isa} = %{version}-%{release} -Requires: %{name}-ose%{?_isa} = %{version}-%{release} Requires: %{name}-otp_mibs%{?_isa} = %{version}-%{release} Requires: %{name}-parsetools%{?_isa} = %{version}-%{release} Requires: %{name}-percept%{?_isa} = %{version}-%{release} @@ -224,17 +207,11 @@ Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-ssl%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} -%if %{__with_wxwidgets} -Requires: %{name}-test_server%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} Requires: %{name}-tools%{?_isa} = %{version}-%{release} %if %{__with_wxwidgets} Requires: %{name}-typer%{?_isa} = %{version}-%{release} %endif %{__with_wxwidgets} %if %{__with_wxwidgets} -Requires: %{name}-webtool%{?_isa} = %{version}-%{release} -%endif %{__with_wxwidgets} -%if %{__with_wxwidgets} Requires: %{name}-wx%{?_isa} = %{version}-%{release} %endif %{__with_wxwidgets} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} @@ -247,29 +224,6 @@ systems from Ericsson. ### BEGIN OF AUTOGENERATED LIST ### -%if %{__with_emacs} -%package -n emacs-erlang -Summary: Compiled elisp files for erlang-mode under GNU Emacs -Group: Applications/Editors -BuildRequires: emacs -BuildRequires: emacs-el -Requires: emacs-common-erlang = %{version}-%{release} -Requires: emacs(bin) >= %{_emacs_version} -BuildArch: noarch - -%description -n emacs-erlang -Erlang mode for GNU Emacs. - -%package -n emacs-erlang-el -Summary: Elisp source files for erlang-mode under GNU Emacs -Group: Applications/Editors -Requires: emacs-erlang = %{version}-%{release} -BuildArch: noarch - -%description -n emacs-erlang-el -Erlang mode for GNU Emacs (source lisp files). -%endif %{__with_emacs} - %package asn1 Summary: Provides support for Abstract Syntax Notation One Group: Development/Languages @@ -296,9 +250,10 @@ Requires: %{name}-sasl%{?_isa} = %{version}-%{release} Requires: %{name}-snmp%{?_isa} = %{version}-%{release} Requires: %{name}-ssh%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-test_server%{?_isa} = %{version}-%{release} +Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} Requires: %{name}-tools%{?_isa} = %{version}-%{release} Requires: %{name}-xmerl%{?_isa} = %{version}-%{release} +Obsoletes: erlang-test_server %description common_test A portable framework for automatic testing. @@ -530,14 +485,16 @@ Requires: lksctp-tools Provides: erlang(erl_drv_version) = 3.3 # See erts/emulator/beam/erl_nif.h or call erlang:system_info(nif_version). #Provides: erlang(erl_nif_version) = %%(%%{buildroot}/bin/erl -noshell -eval 'io:format(erlang:system_info(nif_version)).' -s erlang halt) -Provides: erlang(erl_nif_version) = 2.10 +Provides: erlang(erl_nif_version) = 2.11 Provides: bundled(pcre) = 8.33 Obsoletes: erlang-appmon Obsoletes: erlang-docbuilder Obsoletes: erlang-inviso +Obsoletes: erlang-ose Obsoletes: erlang-pman Obsoletes: erlang-toolbar Obsoletes: erlang-tv +Obsoletes: erlang-webtool %description erts Functionality necessary to run the Erlang System itself. @@ -740,15 +697,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description os_mon A monitor which allows inspection of the underlying operating system. -%package ose -Summary: A module for interacting with Enea OSE -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description ose -A module for interacting with Enea OSE. - %package otp_mibs Summary: SNMP management information base for Erlang/OTP nodes Group: Development/Languages @@ -900,42 +848,31 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} A utility used to handle abstract Erlang syntax trees, reading source files differently, pretty-printing syntax trees. -%if %{__with_wxwidgets} -%package test_server -Summary: The OTP Test Server -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-inets%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-observer%{?_isa} = %{version}-%{release} -Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -Requires: %{name}-syntax_tools%{?_isa} = %{version}-%{release} -Requires: %{name}-tools%{?_isa} = %{version}-%{release} - -%description test_server -The OTP Test Server. -%endif %{__with_wxwidgets} - %package tools Summary: A set of programming tools including a coverage analyzer etc Group: Development/Languages +%if %{__with_emacs} +BuildRequires: emacs +BuildRequires: emacs-el +BuildRequires: xemacs +BuildRequires: xemacs-packages-extra-el +%endif %{__with_emacs} Requires: %{name}-compiler%{?_isa} = %{version}-%{release} Requires: %{name}-erts%{?_isa} = %{version}-%{release} Requires: %{name}-inets%{?_isa} = %{version}-%{release} Requires: %{name}-kernel%{?_isa} = %{version}-%{release} Requires: %{name}-runtime_tools%{?_isa} = %{version}-%{release} Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} -# This is a weak dependency triggered by the "cover_web" application. -# Unfortunately Recommends/Suggests tags are supported only in Fedora 21+ and -# RHEL 8+ (eventually) -%if 0%{?fedora} >= 21 || 0%{?rhel} >= 8 -Suggests: %{name}-webtool%{?_isa} = %{version}-%{release} -%endif %if %{__with_emacs} -Provides: emacs-common-erlang = %{version}-%{release} +Requires: emacs-filesystem +Requires: xemacs-filesystem +Obsoletes: emacs-erlang +Obsoletes: emacs-erlang-el +Obsoletes: xemacs-erlang +Obsoletes: xemacs-erlang-el %endif %{__with_emacs} + %description tools A set of programming tools including a coverage analyzer etc. @@ -955,20 +892,6 @@ TYPe annotator for ERlang programs. %endif %{__with_wxwidgets} %if %{__with_wxwidgets} -%package webtool -Summary: A tool that simplifying the use of web based Erlang tools -Group: Development/Languages -Requires: %{name}-erts%{?_isa} = %{version}-%{release} -Requires: %{name}-inets%{?_isa} = %{version}-%{release} -Requires: %{name}-kernel%{?_isa} = %{version}-%{release} -Requires: %{name}-observer%{?_isa} = %{version}-%{release} -Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} - -%description webtool -A tool that simplifying the use of web based Erlang tools. -%endif %{__with_wxwidgets} - -%if %{__with_wxwidgets} %package wx Summary: A library for wxWidgets support in Erlang Group: Development/Languages @@ -993,29 +916,6 @@ Requires: %{name}-stdlib%{?_isa} = %{version}-%{release} %description xmerl Provides support for XML 1.0. -%if %{__with_emacs} -%package -n xemacs-erlang -Summary: Compiled elisp files for erlang-mode under XEmacs -Group: Applications/Editors -BuildRequires: xemacs -BuildRequires: xemacs-packages-extra-el -Requires: emacs-common-erlang = %{version}-%{release} -Requires: xemacs(bin) >= %{_xemacs_version} -BuildArch: noarch - -%description -n xemacs-erlang -Erlang mode for XEmacs. - -%package -n xemacs-erlang-el -Summary: Elisp source files for erlang-mode under XEmacs -Group: Applications/Editors -Requires: xemacs-erlang = %{version}-%{release} -BuildArch: noarch - -%description -n xemacs-erlang-el -Erlang mode for XEmacs (source lisp files). -%endif %{__with_emacs} - ### END OF AUTOGENERATED LIST ### %prep @@ -1028,11 +928,7 @@ Erlang mode for XEmacs (source lisp files). %patch4 -p1 -b .Do_not_install_Java_sources %patch5 -p1 -b .Do_not_install_nteventlog_and_related_doc_files_on_n %patch6 -p1 -b .Do_not_install_erlang_sources -%patch7 -p1 -b .Split_off_webtool_dependency_from_tools -%patch8 -p1 -b .Add_patch_to_crash_dump_on_large_distribution -%patch9 -p1 -b .Don_t_send_unasked_for_systemd_notifications -%patch10 -p1 -b .Fix_decoding_of_LLONG_MIN_in_erl_decode -%patch11 -p1 -b .Respect_proto_dist_switch_while_connection_to_EPMD +%patch7 -p1 -b .Respect_proto_dist_switch_while_connection_to_EPMD # end of autogenerated prep patch list # FIXME we should come up with a better solution @@ -1074,9 +970,7 @@ CFLAGS="${ERL_FLAGS}" CXXFLAGS="${ERL_FLAGS}" %configure --enable-shared-zlib -- --without-megaco \ --without-observer \ --without-reltool \ - --without-test_server \ --without-typer \ - --without-webtool \ --without-wx %endif %{__with_wxwidgets} @@ -1109,7 +1003,7 @@ cat > xemacs-erlang-init.el << EOF EOF mkdir xemacs-erlang cp lib/tools/emacs/*.el xemacs-erlang/ -rm -f xemacs-erlang/erlang-flymake.el +rm -f xemacs-erlang/erlang-flymake.el xemacs-erlang/erlang-test.el pushd xemacs-erlang %{_xemacs_bytecompile} *.el popd @@ -1575,11 +1469,11 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %dir %{_libdir}/erlang/erts-*/bin/ %{_libdir}/erlang/erts-*/bin/beam %{_libdir}/erlang/erts-*/bin/beam.smp -%{_libdir}/erlang/erts-*/bin/child_setup %{_libdir}/erlang/erts-*/bin/dyn_erl %{_libdir}/erlang/erts-*/bin/epmd %{_libdir}/erlang/erts-*/bin/erl %{_libdir}/erlang/erts-*/bin/erl.src +%{_libdir}/erlang/erts-*/bin/erl_child_setup %{_libdir}/erlang/erts-*/bin/erlc %{_libdir}/erlang/erts-*/bin/erlexec %{_libdir}/erlang/erts-*/bin/escript @@ -1606,6 +1500,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/erl_driver.* %{_libdir}/erlang/man/man3/erl_nif.* %{_libdir}/erlang/man/man3/erl_prim_loader.* +%{_libdir}/erlang/man/man3/erl_tracer.* %{_libdir}/erlang/man/man3/erlang.* %{_libdir}/erlang/man/man3/erts_alloc.* %{_libdir}/erlang/man/man3/init.* @@ -1684,7 +1579,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %if %{__with_tcltk} %files gs %dir %{_libdir}/erlang/lib/gs-*/ -%{_libdir}/erlang/lib/gs-*/contribs %{_libdir}/erlang/lib/gs-*/ebin %{_libdir}/erlang/lib/gs-*/priv %{_libdir}/erlang/lib/gs-*/src @@ -1878,15 +1772,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man6/os_mon.* %endif -%files ose -%dir %{_libdir}/erlang/lib/ose-*/ -%{_libdir}/erlang/lib/ose-*/ebin/ -%if %{with doc} -%{_libdir}/erlang/man/man3/ose.* -%{_libdir}/erlang/man/man3/ose_erl_driver.* -%{_libdir}/erlang/man/man6/ose.* -%endif - %files otp_mibs %{_libdir}/erlang/lib/otp_mibs-*/ %if %{with doc} @@ -1912,6 +1797,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/public_key-*/ %if %{with doc} %{_libdir}/erlang/man/man3/public_key.* +%{_libdir}/erlang/man/man6/public_key.* %endif %if %{__with_wxwidgets} @@ -1933,6 +1819,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/dbg.* %{_libdir}/erlang/man/man3/dyntrace.* %{_libdir}/erlang/man/man3/erts_alloc_config.* +%{_libdir}/erlang/man/man3/msacc.* %{_libdir}/erlang/man/man3/system_information.* %{_libdir}/erlang/man/man6/runtime_tools.* %endif @@ -1943,7 +1830,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/lib/sasl-*/src %if %{with doc} %{_libdir}/erlang/man/man3/alarm_handler.* -%{_libdir}/erlang/man/man3/overload.* %{_libdir}/erlang/man/man3/rb.* %{_libdir}/erlang/man/man3/release_handler.* %{_libdir}/erlang/man/man3/systools.* @@ -2080,6 +1966,7 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/gen_event.* %{_libdir}/erlang/man/man3/gen_fsm.* %{_libdir}/erlang/man/man3/gen_server.* +%{_libdir}/erlang/man/man3/gen_statem.* %{_libdir}/erlang/man/man3/io.* %{_libdir}/erlang/man/man3/io_lib.* %{_libdir}/erlang/man/man3/lib.* @@ -2131,22 +2018,11 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/prettypr.* %endif -%if %{__with_wxwidgets} -%files test_server -%{_libdir}/erlang/lib/test_server-*/ -%if %{with doc} -%{_libdir}/erlang/man/man3/test_server.* -%{_libdir}/erlang/man/man3/test_server_ctrl.* -%{_libdir}/erlang/man/man6/test_server.* -%endif -%endif %{__with_wxwidgets} - %files tools %dir %{_libdir}/erlang/lib/tools-*/ %{_libdir}/erlang/lib/tools-*/bin %{_libdir}/erlang/lib/tools-*/ebin %{_libdir}/erlang/lib/tools-*/emacs -%{_libdir}/erlang/lib/tools-*/priv %{_libdir}/erlang/lib/tools-*/src %if %{with doc} %{_libdir}/erlang/man/man3/cover.* @@ -2160,6 +2036,19 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/tags.* %{_libdir}/erlang/man/man3/xref.* %endif +%if %{__with_emacs} +%dir %{_emacs_sitelispdir}/erlang +%dir %{_xemacs_sitelispdir}/erlang +%doc %{_emacs_sitelispdir}/erlang/README +%doc %{_xemacs_sitelispdir}/erlang/README +%{_emacs_sitelispdir}/erlang/*.el +%{_emacs_sitelispdir}/erlang/*.elc +%{_emacs_sitestartdir}/erlang-init.el +%{_xemacs_sitelispdir}/erlang/*.el +%{_xemacs_sitelispdir}/erlang/*.elc +%{_xemacs_sitestartdir}/erlang-init.el +%endif %{__with_emacs} + %if %{__with_wxwidgets} %files typer @@ -2171,15 +2060,6 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %endif %{__with_wxwidgets} %if %{__with_wxwidgets} -%files webtool -%{_libdir}/erlang/lib/webtool-*/ -%if %{with doc} -%{_libdir}/erlang/man/man1/start_webtool.* -%{_libdir}/erlang/man/man3/webtool.* -%endif -%endif %{__with_wxwidgets} - -%if %{__with_wxwidgets} %files wx %dir %{_libdir}/erlang/lib/wx-*/ %{_libdir}/erlang/lib/wx-*/ebin @@ -2431,28 +2311,13 @@ useradd -r -g epmd -d /tmp -s /sbin/nologin \ %{_libdir}/erlang/man/man3/xmerl_xsd.* %endif -%if %{__with_emacs} -%files -n emacs-erlang -%dir %{_emacs_sitelispdir}/erlang -%doc %{_emacs_sitelispdir}/erlang/README -%{_emacs_sitelispdir}/erlang/*.elc -%{_emacs_sitestartdir}/erlang-init.el - -%files -n emacs-erlang-el -%{_emacs_sitelispdir}/erlang/*.el - -%files -n xemacs-erlang -%dir %{_xemacs_sitelispdir}/erlang -%doc %{_xemacs_sitelispdir}/erlang/README -%{_xemacs_sitelispdir}/erlang/*.elc -%{_xemacs_sitestartdir}/erlang-init.el - -%files -n xemacs-erlang-el -%{_xemacs_sitelispdir}/erlang/*.el -%endif %{__with_emacs} - %changelog +* Wed Jul 27 2016 Peter Lemenkov - 19.0.2-1 +- Ver. 19.0.2 +- The following packages were removed - ose, test_server (merged into common_test), webtool +- Merge (x)emacs subpackages into erlang-typer + * Tue Jul 26 2016 Peter Lemenkov - 18.3.4.2-1 - Ver. 18.3.4.2 diff --git 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 index 2602d40..0415370 100644 --- 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 diff --git a/erts/etc/common/Makefile.in b/erts/etc/common/Makefile.in -index 8e55fa7..9512faa 100644 +index cb053a1..024307b 100644 --- a/erts/etc/common/Makefile.in +++ b/erts/etc/common/Makefile.in -@@ -551,10 +551,6 @@ endif +@@ -492,10 +492,6 @@ endif ifneq ($(INSTALL_TOP_BIN),) $(INSTALL_PROGRAM) $(INSTALL_TOP_BIN) "$(RELEASE_PATH)" endif @@ -21,7 +21,7 @@ index 8e55fa7..9512faa 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 6634ae3..fa18956 100644 +index e71308e..ae2c9cf 100644 --- a/erts/etc/unix/Install.src +++ b/erts/etc/unix/Install.src @@ -141,14 +141,5 @@ cp -p ../releases/%I_SYSTEM_VSN%/start_*.boot . diff --git a/otp-0002-Remove-rpath.patch b/otp-0002-Remove-rpath.patch index 77418af..e1eac8f 100644 --- a/otp-0002-Remove-rpath.patch +++ b/otp-0002-Remove-rpath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Remove rpath Signed-off-by: Peter Lemenkov diff --git a/lib/crypto/c_src/Makefile.in b/lib/crypto/c_src/Makefile.in -index e66c0ca..574cdf5 100644 +index c62f25b..bb28704 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in @@ -90,7 +90,7 @@ endif diff --git a/otp-0003-Do-not-install-C-sources.patch b/otp-0003-Do-not-install-C-sources.patch index d4abd19..0f945b7 100644 --- a/otp-0003-Do-not-install-C-sources.patch +++ b/otp-0003-Do-not-install-C-sources.patch @@ -14,42 +14,41 @@ https://bugzilla.redhat.com/818419 Signed-off-by: Peter Lemenkov diff --git a/lib/asn1/c_src/Makefile b/lib/asn1/c_src/Makefile -index 2b72e1a..0522562 100644 +index 1f714df..95835d6 100644 --- a/lib/asn1/c_src/Makefile +++ b/lib/asn1/c_src/Makefile -@@ -143,8 +143,6 @@ release_spec: opt - ifneq ($(findstring ose,$(TARGET)),ose) +@@ -136,8 +136,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk + release_spec: opt + $(INSTALL_DIR) "$(RELSYSDIR)/priv/lib" $(INSTALL_PROGRAM) $(NIF_SHARED_OBJ_FILE) "$(RELSYSDIR)/priv/lib" - 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 574cdf5..428c316 100644 +index bb28704..165a2e0 100644 --- a/lib/crypto/c_src/Makefile.in +++ b/lib/crypto/c_src/Makefile.in -@@ -200,14 +200,10 @@ docs: +@@ -195,13 +195,9 @@ 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 777d709..57917ae 100644 +index 4f393e9..a9a7f7c 100644 --- a/lib/erl_interface/src/Makefile.in +++ b/lib/erl_interface/src/Makefile.in -@@ -905,14 +905,14 @@ ifneq ($(EXE_TARGETS),) +@@ -842,14 +842,14 @@ ifneq ($(EXE_TARGETS),) $(INSTALL_PROGRAM) $(EXE_TARGETS) "$(RELSYSDIR)/bin" endif $(INSTALL_DATA) $(EXTRA) "$(RELSYSDIR)/src" @@ -73,7 +72,7 @@ index 777d709..57917ae 100644 release_docs: diff --git a/lib/ic/c_src/Makefile.in b/lib/ic/c_src/Makefile.in -index b9f92a0..9612f24 100644 +index c0dad59..9a19028 100644 --- a/lib/ic/c_src/Makefile.in +++ b/lib/ic/c_src/Makefile.in @@ -145,12 +145,10 @@ $(OBJDIR)/%.o: %.c @@ -90,7 +89,7 @@ index b9f92a0..9612f24 100644 $(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 045b6d8..39be02a 100644 +index c37ad4d..09bf1ef 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -271,7 +271,7 @@ release_spec: opt @@ -103,7 +102,7 @@ index 045b6d8..39be02a 100644 endif diff --git a/lib/odbc/c_src/Makefile.in b/lib/odbc/c_src/Makefile.in -index 685eb5d..6c8a432 100644 +index 784e73c..568c5e4 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 @@ -119,7 +118,7 @@ index 685eb5d..6c8a432 100644 endif diff --git a/lib/os_mon/c_src/Makefile.in b/lib/os_mon/c_src/Makefile.in -index e9fc5f4..ac9fb73 100644 +index 27b156a..f11ff30 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 @@ -131,26 +130,11 @@ index e9fc5f4..ac9fb73 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 448b8c6..860d504 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 66bba22..eea37fc 100644 +index cfe9191..735cdaa 100644 --- a/lib/tools/c_src/Makefile.in +++ b/lib/tools/c_src/Makefile.in -@@ -198,8 +198,6 @@ include ../vsn.mk +@@ -190,8 +190,6 @@ include ../vsn.mk RELSYSDIR = $(RELEASE_PATH)/lib/tools-$(TOOLS_VSN) release_spec: all diff --git a/otp-0004-Do-not-install-Java-sources.patch b/otp-0004-Do-not-install-Java-sources.patch index d9ba9c4..694a23f 100644 --- a/otp-0004-Do-not-install-Java-sources.patch +++ b/otp-0004-Do-not-install-Java-sources.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Do not install Java sources Signed-off-by: Peter Lemenkov diff --git a/lib/ic/java_src/com/ericsson/otp/ic/Makefile b/lib/ic/java_src/com/ericsson/otp/ic/Makefile -index d9100cf..6886c71 100644 +index 21c38e5..eeba2e4 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: @@ -18,7 +18,7 @@ index d9100cf..6886c71 100644 $(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 1c8364e..34b64a8 100644 +index e55cfa6..5e3a0a5 100644 --- a/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile +++ b/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile @@ -120,8 +120,6 @@ release release_docs release_tests release_html: diff --git 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 index b0c843e..52bd6f0 100644 --- 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,7 +6,7 @@ Subject: [PATCH] Do not install nteventlog and related doc-files on non-win32 Signed-off-by: Peter Lemenkov diff --git a/lib/os_mon/doc/src/Makefile b/lib/os_mon/doc/src/Makefile -index 0c5acd9..5f8f1e3 100644 +index 91c7ae7..dc7bcf3 100644 --- a/lib/os_mon/doc/src/Makefile +++ b/lib/os_mon/doc/src/Makefile @@ -36,12 +36,17 @@ RELSYSDIR = $(RELEASE_PATH)/lib/$(APPLICATION)-$(VSN) @@ -29,7 +29,7 @@ index 0c5acd9..5f8f1e3 100644 XML_REF6_FILES = os_mon_app.xml diff --git a/lib/os_mon/src/Makefile b/lib/os_mon/src/Makefile -index 9aa068c..1003d24 100644 +index 3ff6320..29b53a8 100644 --- a/lib/os_mon/src/Makefile +++ b/lib/os_mon/src/Makefile @@ -34,8 +34,13 @@ RELSYSDIR = $(RELEASE_PATH)/lib/os_mon-$(VSN) diff --git a/otp-0006-Do-not-install-erlang-sources.patch b/otp-0006-Do-not-install-erlang-sources.patch index 2af76d2..564546a 100644 --- a/otp-0006-Do-not-install-erlang-sources.patch +++ b/otp-0006-Do-not-install-erlang-sources.patch @@ -8,10 +8,10 @@ Signed-off-by: Peter Lemenkov Signed-off-by: Hans Ulrich Niedermann diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile -index 52034a0..56d91b9 100644 +index 4a447d3..eac5ae5 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile -@@ -86,8 +86,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk +@@ -88,8 +88,6 @@ $(APP_TARGET): $(APP_SRC) $(ERL_TOP)/erts/vsn.mk include $(ERL_TOP)/make/otp_release_targets.mk release_spec: $(APP_TARGET) @@ -21,7 +21,7 @@ index 52034a0..56d91b9 100644 $(INSTALL_DATA) $(STATIC_TARGET_FILES) $(APP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/asn1/src/Makefile b/lib/asn1/src/Makefile -index 5b34017..d4677d6 100644 +index 38cf2d4..d4bb398 100644 --- a/lib/asn1/src/Makefile +++ b/lib/asn1/src/Makefile @@ -155,7 +155,7 @@ release_spec: opt @@ -34,10 +34,10 @@ index 5b34017..d4677d6 100644 $(INSTALL_DATA) $(EXAMPLES) "$(RELSYSDIR)/examples" diff --git a/lib/common_test/src/Makefile b/lib/common_test/src/Makefile -index 987345c..f53546a 100644 +index 0f9e044..5039444 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 +@@ -151,7 +151,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -46,11 +46,27 @@ index 987345c..f53546a 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" +diff --git a/lib/common_test/test_server/Makefile b/lib/common_test/test_server/Makefile +index f015064..57f96d2 100644 +--- a/lib/common_test/test_server/Makefile ++++ b/lib/common_test/test_server/Makefile +@@ -86,9 +86,9 @@ include $(ERL_TOP)/make/otp_release_targets.mk + + release_tests_spec: opt + $(INSTALL_DIR) "$(RELEASE_PATH)/test_server" +- $(INSTALL_DATA) $(TS_ERL_FILES) $(TS_HRL_FILES) \ ++ $(INSTALL_DATA) $(TS_HRL_FILES) \ + $(TS_TARGET_FILES) \ +- $(AUTOCONF_FILES) $(CONFIG) \ ++ $(CONFIG) \ + "$(RELEASE_PATH)/test_server" + $(INSTALL_SCRIPT) $(PROGRAMS) "$(RELEASE_PATH)/test_server" + diff --git a/lib/compiler/src/Makefile b/lib/compiler/src/Makefile -index 299b289..36a048b 100644 +index 518c89d..1bcd19c 100644 --- a/lib/compiler/src/Makefile +++ b/lib/compiler/src/Makefile -@@ -172,8 +172,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -174,8 +174,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -62,7 +78,7 @@ index 299b289..36a048b 100644 $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/cosEvent/src/Makefile b/lib/cosEvent/src/Makefile -index b79f0ec..30d1a1d 100644 +index 29d6223..cb43309 100644 --- a/lib/cosEvent/src/Makefile +++ b/lib/cosEvent/src/Makefile @@ -203,7 +203,7 @@ release_spec: opt @@ -75,7 +91,7 @@ index b79f0ec..30d1a1d 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosEventDomain/src/Makefile b/lib/cosEventDomain/src/Makefile -index da8dcf0..88b3993 100644 +index cdaf9e5..6e4e9b8 100644 --- a/lib/cosEventDomain/src/Makefile +++ b/lib/cosEventDomain/src/Makefile @@ -172,7 +172,7 @@ release_spec: opt @@ -88,7 +104,7 @@ index da8dcf0..88b3993 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosFileTransfer/src/Makefile b/lib/cosFileTransfer/src/Makefile -index f9107ff..74d337d 100644 +index b396710..2678c2a 100644 --- a/lib/cosFileTransfer/src/Makefile +++ b/lib/cosFileTransfer/src/Makefile @@ -180,9 +180,7 @@ release_spec: opt @@ -103,7 +119,7 @@ index f9107ff..74d337d 100644 release_docs_spec: diff --git a/lib/cosNotification/src/Makefile b/lib/cosNotification/src/Makefile -index 72b063f..0fdb82e 100644 +index 009c6be..83c2e26 100644 --- a/lib/cosNotification/src/Makefile +++ b/lib/cosNotification/src/Makefile @@ -371,8 +371,7 @@ release_spec: opt @@ -117,7 +133,7 @@ index 72b063f..0fdb82e 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosProperty/src/Makefile b/lib/cosProperty/src/Makefile -index cd559e1..bdf035e 100644 +index 1fdc258..90cf711 100644 --- a/lib/cosProperty/src/Makefile +++ b/lib/cosProperty/src/Makefile @@ -180,8 +180,7 @@ release_spec: opt @@ -131,7 +147,7 @@ index cd559e1..bdf035e 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTime/src/Makefile b/lib/cosTime/src/Makefile -index 7a14db6..4b55398 100644 +index 55d59ba..f22e2c8 100644 --- a/lib/cosTime/src/Makefile +++ b/lib/cosTime/src/Makefile @@ -199,8 +199,7 @@ release_spec: opt @@ -145,7 +161,7 @@ index 7a14db6..4b55398 100644 $(INSTALL_DATA) $(GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/cosTransactions/src/Makefile b/lib/cosTransactions/src/Makefile -index 90e1e51..05826e0 100644 +index 4cc1e48..084f0a7 100644 --- a/lib/cosTransactions/src/Makefile +++ b/lib/cosTransactions/src/Makefile @@ -174,7 +174,7 @@ release_spec: opt @@ -158,7 +174,7 @@ index 90e1e51..05826e0 100644 $(INSTALL_DATA) $(EXTERNAL_GEN_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/crypto/src/Makefile b/lib/crypto/src/Makefile -index 6e4008e..c2d00fc 100644 +index 456b8be..fcfa8de 100644 --- a/lib/crypto/src/Makefile +++ b/lib/crypto/src/Makefile @@ -82,8 +82,6 @@ docs: @@ -171,7 +187,7 @@ index 6e4008e..c2d00fc 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) \ $(APPUP_TARGET) "$(RELSYSDIR)/ebin" diff --git a/lib/debugger/src/Makefile b/lib/debugger/src/Makefile -index f115f49..e7dc360 100644 +index 9594a0b..bc33e67 100644 --- a/lib/debugger/src/Makefile +++ b/lib/debugger/src/Makefile @@ -117,7 +117,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -184,10 +200,10 @@ index f115f49..e7dc360 100644 $(INSTALL_DATA) $(TARGET_FILES) $(TARGET_TOOLBOX_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/dialyzer/src/Makefile b/lib/dialyzer/src/Makefile -index 770af21..4f8a6d8 100644 +index 256f20f..2920c0f 100644 --- a/lib/dialyzer/src/Makefile +++ b/lib/dialyzer/src/Makefile -@@ -152,7 +152,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -154,7 +154,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -197,7 +213,7 @@ index 770af21..4f8a6d8 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/diameter/src/Makefile b/lib/diameter/src/Makefile -index e0bbbdf..10771b2 100644 +index 7f61620..cade771 100644 --- a/lib/diameter/src/Makefile +++ b/lib/diameter/src/Makefile @@ -251,11 +251,8 @@ release_spec: opt @@ -228,22 +244,27 @@ index 4e5a418..c0bb0c3 100644 release_docs_spec: diff --git a/lib/eldap/src/Makefile b/lib/eldap/src/Makefile -index cd3c102..b55c513 100644 +index b79a537..d0b231e 100644 --- a/lib/eldap/src/Makefile +++ b/lib/eldap/src/Makefile -@@ -99,10 +99,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -98,13 +98,9 @@ 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_DATA) $(ASN1_HRL) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" - $(INSTALL_DIR) "$(RELSYSDIR)/src" - $(INSTALL_DATA) $(ERL_FILES) "$(RELSYSDIR)/src" - $(INSTALL_DIR) "$(RELSYSDIR)/asn1" - $(INSTALL_DATA) ../asn1/$(ASN1_FILES) "$(RELSYSDIR)/asn1" ++ $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" - $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" +- $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" ++ $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" + + release_docs_spec: diff --git a/lib/erl_docgen/src/Makefile b/lib/erl_docgen/src/Makefile -index 7d41506..3f3562f 100644 +index 82d051e..950fdbe 100644 --- a/lib/erl_docgen/src/Makefile +++ b/lib/erl_docgen/src/Makefile @@ -90,8 +90,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -256,7 +277,7 @@ index 7d41506..3f3562f 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/et/src/Makefile b/lib/et/src/Makefile -index 461a52d..1f2e885 100644 +index b6347d8..a695d2c 100644 --- a/lib/et/src/Makefile +++ b/lib/et/src/Makefile @@ -109,7 +109,6 @@ release_spec: opt @@ -280,7 +301,7 @@ index 86a6d88..5732fd8 100644 $(INSTALL_DIR) "$(RELSYSDIR)/include" $(INSTALL_DATA) $(INCLUDE_DELIVERABLES) "$(RELSYSDIR)/include" diff --git a/lib/gs/src/Makefile b/lib/gs/src/Makefile -index ff3080e..60337dd 100644 +index e19ce82..6b7c96e 100644 --- a/lib/gs/src/Makefile +++ b/lib/gs/src/Makefile @@ -109,8 +109,8 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -295,7 +316,7 @@ index ff3080e..60337dd 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/priv/bitmap" diff --git a/lib/hipe/cerl/Makefile b/lib/hipe/cerl/Makefile -index 0938010..134ed7b 100644 +index 9f50d6b..df92b84 100644 --- a/lib/hipe/cerl/Makefile +++ b/lib/hipe/cerl/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -308,7 +329,7 @@ index 0938010..134ed7b 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/flow/Makefile b/lib/hipe/flow/Makefile -index f0af6ac..16b512e 100644 +index d883eec..3119bc4 100644 --- a/lib/hipe/flow/Makefile +++ b/lib/hipe/flow/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -321,7 +342,7 @@ index f0af6ac..16b512e 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/icode/Makefile b/lib/hipe/icode/Makefile -index a82e28c..f364a53 100644 +index b220bc1..d407327 100644 --- a/lib/hipe/icode/Makefile +++ b/lib/hipe/icode/Makefile @@ -120,7 +120,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -334,10 +355,10 @@ index a82e28c..f364a53 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/llvm/Makefile b/lib/hipe/llvm/Makefile -index f6f6f6b..4369923 100644 +index 88016a7..d8e8fa0 100644 --- a/lib/hipe/llvm/Makefile +++ b/lib/hipe/llvm/Makefile -@@ -103,7 +103,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) $(RELSYSDIR)/llvm @@ -347,7 +368,7 @@ index f6f6f6b..4369923 100644 $(INSTALL_DATA) $(TARGET_FILES) $(RELSYSDIR)/ebin diff --git a/lib/hipe/main/Makefile b/lib/hipe/main/Makefile -index d44be2d..ed81f10 100644 +index 8ef31db..80d2881 100644 --- a/lib/hipe/main/Makefile +++ b/lib/hipe/main/Makefile @@ -118,7 +118,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -360,7 +381,7 @@ index d44be2d..ed81f10 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/misc/Makefile b/lib/hipe/misc/Makefile -index be5c9bc..d40b322 100644 +index 72cfff2..e55223a 100644 --- a/lib/hipe/misc/Makefile +++ b/lib/hipe/misc/Makefile @@ -102,7 +102,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -373,7 +394,7 @@ index be5c9bc..d40b322 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/rtl/Makefile b/lib/hipe/rtl/Makefile -index 1bf52fe..5049bec 100644 +index b4cdf8b..f9ebcae 100644 --- a/lib/hipe/rtl/Makefile +++ b/lib/hipe/rtl/Makefile @@ -105,7 +105,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -386,7 +407,7 @@ index 1bf52fe..5049bec 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/hipe/util/Makefile b/lib/hipe/util/Makefile -index 4a78ad7..1b1ce05 100644 +index 66e9421..1951742 100644 --- a/lib/hipe/util/Makefile +++ b/lib/hipe/util/Makefile @@ -50,7 +50,6 @@ HIPE_MODULES = @@ -407,7 +428,7 @@ index 4a78ad7..1b1ce05 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/ic/src/Makefile b/lib/ic/src/Makefile -index a6da81a..60870be 100644 +index 6ad2fbe..258517d 100644 --- a/lib/ic/src/Makefile +++ b/lib/ic/src/Makefile @@ -200,7 +200,7 @@ release_spec: opt @@ -420,7 +441,7 @@ index a6da81a..60870be 100644 $(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 f8daa2b..48e5d49 100644 +index 6b99694..530a19e 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 @@ -433,7 +454,7 @@ index f8daa2b..48e5d49 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_client/Makefile b/lib/inets/src/http_client/Makefile -index cb97b52..cb13dfb 100644 +index a1c1f36..f2eb86f 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 @@ -446,7 +467,7 @@ index cb97b52..cb13dfb 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/inets/src/http_lib/Makefile b/lib/inets/src/http_lib/Makefile -index 4a4eef9..c779c8e 100644 +index 8248e37..1f1b231 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 @@ -472,10 +493,10 @@ index 1c05d45..88f9f62 100644 $(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 7f51676..093f462 100644 +index eb0098d..fff21ff 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 +@@ -114,7 +114,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" $(INSTALL_DIR) "$(RELSYSDIR)/src/inets_app" @@ -485,7 +506,7 @@ index 7f51676..093f462 100644 $(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 d5d94e1..5583064 100644 +index 4eaa959..198fbf3 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 @@ -498,10 +519,10 @@ index d5d94e1..5583064 100644 $(INSTALL_DATA) $(TARGET_FILES) $(BEHAVIOUR_TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/kernel/src/Makefile b/lib/kernel/src/Makefile -index 57daceb..1cebd80 100644 +index 2b72f78..31eed45 100644 --- a/lib/kernel/src/Makefile +++ b/lib/kernel/src/Makefile -@@ -200,7 +200,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -202,7 +202,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -510,7 +531,7 @@ index 57daceb..1cebd80 100644 $(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 8f8e6ec..9e0bc82 100644 +index ab45548..5c7a7f0 100644 --- a/lib/megaco/src/app/Makefile +++ b/lib/megaco/src/app/Makefile @@ -114,7 +114,7 @@ release_spec: opt @@ -523,7 +544,7 @@ index 8f8e6ec..9e0bc82 100644 $(INSTALL_DATA) $(EXTERNAL_HRL_FILES) "$(RELSYSDIR)/include" diff --git a/lib/megaco/src/binary/Makefile b/lib/megaco/src/binary/Makefile -index 711fbb7..1db4593 100644 +index b964366..5b5a4cf 100644 --- a/lib/megaco/src/binary/Makefile +++ b/lib/megaco/src/binary/Makefile @@ -176,7 +176,7 @@ release_spec: opt @@ -536,7 +557,7 @@ index 711fbb7..1db4593 100644 release_docs_spec: diff --git a/lib/megaco/src/engine/Makefile b/lib/megaco/src/engine/Makefile -index 208942c..d5b7218 100644 +index 869b516..fa7d774 100644 --- a/lib/megaco/src/engine/Makefile +++ b/lib/megaco/src/engine/Makefile @@ -102,7 +102,7 @@ release_spec: opt @@ -549,7 +570,7 @@ index 208942c..d5b7218 100644 diff --git a/lib/megaco/src/flex/Makefile.in b/lib/megaco/src/flex/Makefile.in -index 39be02a..8c6ba31 100644 +index 09bf1ef..b320b2e 100644 --- a/lib/megaco/src/flex/Makefile.in +++ b/lib/megaco/src/flex/Makefile.in @@ -268,7 +268,6 @@ release_spec: opt @@ -561,7 +582,7 @@ index 39be02a..8c6ba31 100644 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 0c546a8..78f659a 100644 +index d07db3f..7f421d2 100644 --- a/lib/megaco/src/tcp/Makefile +++ b/lib/megaco/src/tcp/Makefile @@ -94,7 +94,7 @@ release_spec: opt @@ -574,7 +595,7 @@ index 0c546a8..78f659a 100644 release_docs_spec: diff --git a/lib/megaco/src/text/Makefile b/lib/megaco/src/text/Makefile -index f4fc56a..1cc73fd 100644 +index 8e7e82b..2a118d2 100644 --- a/lib/megaco/src/text/Makefile +++ b/lib/megaco/src/text/Makefile @@ -135,7 +135,7 @@ release_spec: opt @@ -587,7 +608,7 @@ index f4fc56a..1cc73fd 100644 release_docs_spec: diff --git a/lib/megaco/src/udp/Makefile b/lib/megaco/src/udp/Makefile -index 7288c20..aefd9f3 100644 +index 028a63e..9e11e9b 100644 --- a/lib/megaco/src/udp/Makefile +++ b/lib/megaco/src/udp/Makefile @@ -94,7 +94,7 @@ release_spec: opt @@ -600,10 +621,10 @@ index 7288c20..aefd9f3 100644 release_docs_spec: diff --git a/lib/mnesia/src/Makefile b/lib/mnesia/src/Makefile -index dae0df7..6294ae9 100644 +index 08a00e6..a21ffb3 100644 --- a/lib/mnesia/src/Makefile +++ b/lib/mnesia/src/Makefile -@@ -133,7 +133,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -613,10 +634,10 @@ index dae0df7..6294ae9 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/observer/src/Makefile b/lib/observer/src/Makefile -index 2d42510..7579014 100644 +index dd7831f..1d5c505 100644 --- a/lib/observer/src/Makefile +++ b/lib/observer/src/Makefile -@@ -152,7 +152,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -153,7 +153,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -625,7 +646,7 @@ index 2d42510..7579014 100644 $(INSTALL_DIR) "$(RELSYSDIR)/examples" $(INSTALL_DATA) $(EXAMPLE_FILES) "$(RELSYSDIR)/examples" diff --git a/lib/odbc/src/Makefile b/lib/odbc/src/Makefile -index 51c9ed3..50a4c10 100644 +index 7ca5949..a52ade2 100644 --- a/lib/odbc/src/Makefile +++ b/lib/odbc/src/Makefile @@ -110,7 +110,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -638,7 +659,7 @@ index 51c9ed3..50a4c10 100644 $(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 0eca8dd..18d9627 100644 +index 1086633..553c9cd 100644 --- a/lib/orber/COSS/CosNaming/Makefile +++ b/lib/orber/COSS/CosNaming/Makefile @@ -145,8 +145,8 @@ release_spec: opt @@ -653,7 +674,7 @@ index 0eca8dd..18d9627 100644 release_docs_spec: diff --git a/lib/orber/src/Makefile b/lib/orber/src/Makefile -index 30b74c4..9c6708f 100644 +index 7fec29a..a71b9f1 100644 --- a/lib/orber/src/Makefile +++ b/lib/orber/src/Makefile @@ -253,7 +253,7 @@ release_spec: opt @@ -666,7 +687,7 @@ index 30b74c4..9c6708f 100644 $(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 1003d24..1b12154 100644 +index 29b53a8..3ae2074 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 @@ -677,22 +698,8 @@ index 1003d24..1b12154 100644 $(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 a89e939..224d944 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 03892cd..c3ad326 100644 +index 4023f50..864a0a5 100644 --- a/lib/otp_mibs/src/Makefile +++ b/lib/otp_mibs/src/Makefile @@ -96,8 +96,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -705,7 +712,7 @@ index 03892cd..c3ad326 100644 $(INSTALL_DATA) $(TARGETS) "$(RELSYSDIR)/ebin" diff --git a/lib/parsetools/src/Makefile b/lib/parsetools/src/Makefile -index dbecdd2..1d45801 100644 +index dea29be..655aea9 100644 --- a/lib/parsetools/src/Makefile +++ b/lib/parsetools/src/Makefile @@ -91,8 +91,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -718,7 +725,7 @@ index dbecdd2..1d45801 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/percept/src/Makefile b/lib/percept/src/Makefile -index 9b963e0..deeb75c 100644 +index b2ec87d..3153e34 100644 --- a/lib/percept/src/Makefile +++ b/lib/percept/src/Makefile @@ -97,7 +97,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -730,7 +737,7 @@ index 9b963e0..deeb75c 100644 # $(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 7474297..a510658 100644 +index a920ea8..7672ef3 100644 --- a/lib/public_key/asn1/Makefile +++ b/lib/public_key/asn1/Makefile @@ -96,8 +96,8 @@ release_spec: opt @@ -745,7 +752,7 @@ index 7474297..a510658 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" diff --git a/lib/public_key/src/Makefile b/lib/public_key/src/Makefile -index 786f244..0463c67 100644 +index e61390b..6ed6c2c 100644 --- a/lib/public_key/src/Makefile +++ b/lib/public_key/src/Makefile @@ -109,8 +109,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -758,7 +765,7 @@ index 786f244..0463c67 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/reltool/src/Makefile b/lib/reltool/src/Makefile -index 1fea415..a756470 100644 +index 4bddee4..c714255 100644 --- a/lib/reltool/src/Makefile +++ b/lib/reltool/src/Makefile @@ -100,7 +100,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -771,10 +778,10 @@ index 1fea415..a756470 100644 $(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 99b90f9..25b3ebb 100644 +index 2c90295..d674a8f 100644 --- a/lib/runtime_tools/src/Makefile +++ b/lib/runtime_tools/src/Makefile -@@ -97,8 +97,6 @@ docs: +@@ -99,8 +99,6 @@ docs: include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt @@ -784,7 +791,7 @@ index 99b90f9..25b3ebb 100644 $(INSTALL_DATA) $(HRL_FILES) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/examples" diff --git a/lib/sasl/src/Makefile b/lib/sasl/src/Makefile -index 7ff6a03..a304900 100644 +index ac7ee51..c53f661 100644 --- a/lib/sasl/src/Makefile +++ b/lib/sasl/src/Makefile @@ -93,7 +93,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk @@ -796,7 +803,7 @@ index 7ff6a03..a304900 100644 $(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 89037b3..01de885 100644 +index 2943a4d..8203e62 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 @@ -809,7 +816,7 @@ index 89037b3..01de885 100644 $(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 7972d95..78a9f2b 100644 +index 6f2b8a4..bd062a6 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 @@ -822,7 +829,7 @@ index 7972d95..78a9f2b 100644 $(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 54f2e22..488faa4 100644 +index 4093ffa..18878aa 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 @@ -835,7 +842,7 @@ index 54f2e22..488faa4 100644 $(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 382f83b..db50c26 100644 +index 0cc8749..d203f28 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 @@ -848,7 +855,7 @@ index 382f83b..db50c26 100644 $(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 c71ecf9..d17e699 100644 +index adc2c48..89ce954 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 @@ -861,10 +868,10 @@ index c71ecf9..d17e699 100644 $(INSTALL_DATA) $(TARGET_FILES) "$(RELSYSDIR)/ebin" # $(INSTALL_DIR) "$(RELSYSDIR)/include" diff --git a/lib/ssh/src/Makefile b/lib/ssh/src/Makefile -index b44c8ee..8f8b58d 100644 +index 69d5a47..c79ffd1 100644 --- a/lib/ssh/src/Makefile +++ b/lib/ssh/src/Makefile -@@ -135,7 +135,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -136,7 +136,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -874,10 +881,10 @@ index b44c8ee..8f8b58d 100644 $(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 7a7a373..419fa9e 100644 +index b625db0..9172486 100644 --- a/lib/ssl/src/Makefile +++ b/lib/ssl/src/Makefile -@@ -142,7 +142,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -143,7 +143,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -887,10 +894,10 @@ index 7a7a373..419fa9e 100644 $(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 9f4a446..50ac11e 100644 +index 302834f..53804f8 100644 --- a/lib/stdlib/src/Makefile +++ b/lib/stdlib/src/Makefile -@@ -207,7 +207,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -208,7 +208,6 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -899,7 +906,7 @@ index 9f4a446..50ac11e 100644 $(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 2e91adf..0085fca 100644 +index 8325db4..d17fdaa 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 @@ -911,23 +918,11 @@ index 2e91adf..0085fca 100644 $(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 6a26ee2..7336477 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 9fcfb79..b30b173 100644 +index 032bd61..efb0309 100644 --- a/lib/tools/src/Makefile +++ b/lib/tools/src/Makefile -@@ -107,7 +107,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk +@@ -106,7 +106,7 @@ include $(ERL_TOP)/make/otp_release_targets.mk release_spec: opt $(INSTALL_DIR) "$(RELSYSDIR)/src" @@ -937,7 +932,7 @@ index 9fcfb79..b30b173 100644 $(INSTALL_DATA) $(TARGET_FILES) $(APP_TARGET) $(APPUP_TARGET) \ "$(RELSYSDIR)/ebin" diff --git a/lib/typer/src/Makefile b/lib/typer/src/Makefile -index 620ca21..9c9390e 100644 +index 6c5d8b0..82f516a 100644 --- a/lib/typer/src/Makefile +++ b/lib/typer/src/Makefile @@ -102,9 +102,6 @@ $(APPUP_TARGET): $(APPUP_SRC) ../vsn.mk @@ -950,21 +945,8 @@ index 620ca21..9c9390e 100644 $(INSTALL_DIR) "$(RELSYSDIR)/ebin" $(INSTALL_DATA) $(INSTALL_FILES) "$(RELSYSDIR)/ebin" -diff --git a/lib/webtool/src/Makefile b/lib/webtool/src/Makefile -index a5a8eaf..be80ba7 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 b345e34..153a270 100644 +index 21b45af..a7bf34f 100644 --- a/lib/wx/src/Makefile +++ b/lib/wx/src/Makefile @@ -122,9 +122,9 @@ $(EBIN)/%.beam: $(EGEN)/%.erl $(HEADER_FILES) @@ -980,7 +962,7 @@ index b345e34..153a270 100644 $(INSTALL_DATA) $(EXT_HRL) "$(RELSYSDIR)/include" $(INSTALL_DIR) "$(RELSYSDIR)/ebin" diff --git a/lib/xmerl/src/Makefile b/lib/xmerl/src/Makefile -index f8f0320..099513e 100644 +index 51d9190..1ab65bd 100644 --- a/lib/xmerl/src/Makefile +++ b/lib/xmerl/src/Makefile @@ -218,9 +218,7 @@ release_spec: opt diff --git a/otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch b/otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch new file mode 100644 index 0000000..664f559 --- /dev/null +++ b/otp-0007-Respect-proto_dist-switch-while-connection-to-EPMD.patch @@ -0,0 +1,47 @@ +From: Peter Lemenkov +Date: Thu, 14 Jul 2016 17:51:16 +0300 +Subject: [PATCH] Respect -proto_dist switch while connection to EPMD + +Signed-off-by: Peter Lemenkov + +diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl +index f8ef4a4..79a026a 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 f91d7ef..94bde55 100644 +--- a/lib/kernel/src/inet_tcp_dist.erl ++++ b/lib/kernel/src/inet_tcp_dist.erl +@@ -74,7 +74,7 @@ gen_listen(Driver, Name) -> + TcpAddress = get_tcp_address(Driver, Socket), + {_,Port} = TcpAddress#net_address.address, + ErlEpmd = net_kernel:epmd_module(), +- case ErlEpmd:register_node(Name, Port) of ++ case ErlEpmd: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 a920f54..08947f2 100644 +--- a/lib/ssl/src/ssl_tls_dist_proxy.erl ++++ b/lib/ssl/src/ssl_tls_dist_proxy.erl +@@ -117,7 +117,7 @@ handle_call({listen, Driver, Name}, _From, State) -> + {ok, WorldTcpAddress} = get_tcp_address(World), + {_,Port} = WorldTcpAddress#net_address.address, + ErlEpmd = net_kernel:epmd_module(), +- case ErlEpmd:register_node(Name, Port) of ++ case ErlEpmd:register_node(Name, Port, Driver) of + {ok, Creation} -> + {reply, {ok, {Socket, TcpAddress, Creation}}, + State#state{listen={Socket, World}}}; diff --git a/otp-0007-Split-off-webtool-dependency-from-tools.patch b/otp-0007-Split-off-webtool-dependency-from-tools.patch deleted file mode 100644 index 9a06884..0000000 --- a/otp-0007-Split-off-webtool-dependency-from-tools.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Peter Lemenkov -Date: Sat, 8 Nov 2014 22:54:57 +0300 -Subject: [PATCH] Split off webtool dependency from tools - -Signed-off-by: Peter Lemenkov - -diff --git a/lib/tools/src/cover_web.erl b/lib/tools/src/cover_web.erl -index ae8b3f2..539ca96 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. - - - diff --git a/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch b/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch deleted file mode 100644 index d148331..0000000 --- a/otp-0008-Add-patch-to-crash-dump-on-large-distribution.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: John Eckersberg -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 787241b..069d80a 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); diff --git a/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch b/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch deleted file mode 100644 index 1d19ace..0000000 --- a/otp-0009-Don-t-send-unasked-for-systemd-notifications.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Alexey Lebedeff -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 5513cb2..4740ce8 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 e1bac99..59d59ad 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"); diff --git a/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch b/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch deleted file mode 100644 index d832978..0000000 --- a/otp-0010-Fix-decoding-of-LLONG_MIN-in-erl_decode.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: =?UTF-8?q?Bj=C3=B6rn-Egil=20Dahlberg?= -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 a4216c9..6a1b573 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 diff --git a/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch b/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch deleted file mode 100644 index 8b8fd0d..0000000 --- a/otp-0011-Respect-proto_dist-switch-while-connection-to-EPMD.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Peter Lemenkov -Date: Thu, 14 Jul 2016 17:51:16 +0300 -Subject: [PATCH] Respect -proto_dist switch while connection to EPMD - -Signed-off-by: Peter Lemenkov - -diff --git a/lib/kernel/src/erl_epmd.erl b/lib/kernel/src/erl_epmd.erl -index c6202dd..ec2e330 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 64b28bb..ffbd5d5 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/sources b/sources index 1a7d38d..036b00a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd9934b664769500f3216f688eb57493 otp-OTP-18.3.4.2.tar.gz +4f3ce6ba4288bda714e58d30ea9c2e69 otp-OTP-19.0.2.tar.gz