Merge branch 'dev' into major

* dev:
  tar_SUITE: Work around limited pathname length on Windows
  Merge the fourth bootstrap stage into the third bootstrap stage
  Remove unused lib/orber/include/Makefile
  Remove lib/orber/include/* from the primary bootstrap
  otp_build update_primary: Don't commit generated source files
  primary bootstrap: Remove source files

Conflicts:
	Makefile.in
	bootstrap/bin/start.script
	bootstrap/bin/start_clean.script
	bootstrap/lib/compiler/ebin/compiler.app
	bootstrap/lib/compiler/egen/beam_opcodes.erl
	bootstrap/lib/compiler/egen/core_parse.erl
	bootstrap/lib/kernel/ebin/kernel.app
	bootstrap/lib/kernel/ebin/kernel.appup
	bootstrap/lib/orber/include/Makefile
	bootstrap/lib/orber/include/corba.hrl
	bootstrap/lib/orber/include/orber_pi.hrl
	bootstrap/lib/stdlib/ebin/stdlib.app
	bootstrap/lib/stdlib/ebin/stdlib.appup
	bootstrap/lib/stdlib/egen/erl_parse.erl

2 files changed, 0 insertions, 121 deletions

diff --git a/bootstrap/lib/kernel/ebin/kernel.app b/bootstrap/lib/kernel/ebin/kernel.app
deleted file mode 100644
index 59e4aa8055..0000000000
--- a/bootstrap/lib/kernel/ebin/kernel.app
+++ /dev/null
@@ -1,120 +0,0 @@
-%%
-%% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
-%% The contents of this file are subject to the Erlang Public License,
-%% Version 1.1, (the "License"); you may not use this file except in
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved online at http://www.erlang.org/.
-%% 
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%% 
-%% %CopyrightEnd%
-%%
-%% This is an -*- erlang -*- file.
-%%
-{application, kernel,
- [
-  {description, "ERTS  CXC 138 10"},
-  {vsn, "2.15"},
-  {modules, [application,
-	     application_controller,
-	     application_master,
-	     application_starter,
-	     auth,
-	     code,
-	     packages,
-	     code_server,
-	     dist_util,
-	     erl_boot_server,
-	     erl_distribution,
-	     erl_reply,
-	     error_handler,
-	     error_logger,
-	     file,
-             file_server,
-             file_io_server,
-	     global,
-	     global_group,
-	     global_search,
-	     group,
-	     heart,
-	     hipe_unified_loader,
-	     inet6_tcp,
-	     inet6_tcp_dist,
-	     inet6_udp,
-	     inet6_sctp,
-	     inet_config,
-	     inet_hosts,
-	     inet_gethost_native,
-	     inet_tcp_dist,
-	     kernel,
-	     kernel_config,
-	     net,
-	     net_adm,
-	     net_kernel,
-	     os,
-	     ram_file,
-	     rpc,
-	     user,
-	     user_drv,
-	     user_sup,
-             disk_log,
-             disk_log_1,
-             disk_log_server,
-             disk_log_sup,
-             dist_ac,
-             erl_ddll,
-             erl_epmd,
-	     erts_debug,
-             gen_tcp,
-             gen_udp,
-	     gen_sctp,
-             inet,
-             inet_db,
-             inet_dns,
-             inet_parse,
-             inet_res,
-             inet_tcp,
-             inet_udp,
-	     inet_sctp,
-             pg2,
-	     seq_trace,
-	     standard_error,
-	     wrap_log_reader]},
-  {registered, [application_controller,
-		erl_reply,
-		auth,
-		boot_server,
-		code_server,
-		disk_log_server,
-		disk_log_sup,
-		erl_prim_loader,
-		error_logger,
-		file_server_2,
-		fixtable_server,
-		global_group,
-		global_name_server,
-		heart,
-		init,
-		kernel_config,
-		kernel_sup,
-		net_kernel,
-		net_sup,
-		rex,
-		user,
-	        os_server,
-                ddll_server,
-                erl_epmd,
-                inet_db,
-                pg2]},
-  {applications, []},
-  {env, [{error_logger, tty}]},
-  {mod, {kernel, []}}
- ]
-}.
diff --git a/bootstrap/lib/kernel/ebin/kernel.appup b/bootstrap/lib/kernel/ebin/kernel.appup
deleted file mode 100644
index 96f6e27774..0000000000
--- a/bootstrap/lib/kernel/ebin/kernel.appup
+++ /dev/null
@@ -1 +0,0 @@
-{"2.15",[],[]}.