Skip to content

Commit

Permalink
Remove unneeded startup scripts
Browse files Browse the repository at this point in the history
Change-Id: I853839da80efec8dd3d0cac5c9e8e050488ea945
Reviewed-on: http://review.couchbase.org/9396
Reviewed-by: Dale Harvey <daleharvey@arandomurl.com>
Tested-by: Dale Harvey <daleharvey@arandomurl.com>
  • Loading branch information
daleharvey authored and Dale Harvey committed Sep 6, 2011
1 parent 65b4796 commit b68329b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 82 deletions.
6 changes: 4 additions & 2 deletions build.final
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ shopt -s extglob

rm -rf erts-5.8.5/doc erts-5.8.5/include erts-5.8.5/man erts-5.8.5/src misc releases usr

rm bin/dialyzer bin/erlc bin/escript bin/run_erl bin/to_erl bin/typer
rm erts-5.8.5/bin/dialyzer erts-5.8.5/bin/erlc erts-5.8.5/bin/escript erts-5.8.5/bin/run_erl erts-5.8.5/bin/to_erl erts-5.8.5/bin/typer
rm bin/dialyzer bin/erlc bin/escript bin/run_erl bin/to_erl bin/typer bin/ct_run bin/epmd bin/erl bin/run_test bin/start

rm erts-5.8.5/bin/dialyzer erts-5.8.5/bin/erlc erts-5.8.5/bin/escript erts-5.8.5/bin/run_erl erts-5.8.5/bin/to_erl erts-5.8.5/bin/typer erts-5.8.5/bin/erl erts-5.8.5/bin/erl.src erts-5.8.5/bin/ct_run erts-5.8.5/bin/start erts-5.8.5/bin/start.src erts-5.8.5/bin/start_erl.src

cd lib

Expand All @@ -50,6 +51,7 @@ cd inets-5.7/ebin/
rm !(httpd_util.beam|httpd_util|inets.app)
cd ../..
rm -rf inets-5.7/priv

#rm public_key-0.12/asn1/OTP-PUB-KEY.erl
#rm ssl-4.1.6/pkix/OTP-PKIX.erl

Expand Down
80 changes: 0 additions & 80 deletions patches/release.patch
Original file line number Diff line number Diff line change
Expand Up @@ -25,23 +25,6 @@ diff -ruN release.bak/couchdb/lib/couchdb/erlang/lib/couch/priv/couchspawnkillab

# 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
diff -ruN release.bak/erlang/bin/erl release/erlang/bin/erl
--- release.bak/erlang/bin/erl 2011-02-05 01:28:07.000000000 -0700
+++ release/erlang/bin/erl 2011-02-05 01:49:29.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/system/bin/sh
#
# %CopyrightBegin%
#
@@ -21,6 +21,7 @@
BINDIR=$ROOTDIR/erts-5.8.5/bin
EMU=beam
PROGNAME=`echo $0 | sed 's/.*\///'`
+export ERL_INETRC=$ROOTDIR/bin/erl_inetrc
export EMU
export ROOTDIR
export BINDIR
diff -ruN release.bak/erlang/bin/erl_inetrc release/erlang/bin/erl_inetrc
--- release.bak/erlang/bin/erl_inetrc 1969-12-31 17:00:00.000000000 -0700
+++ release/erlang/bin/erl_inetrc 2011-02-05 01:49:58.000000000 -0700
Expand All @@ -51,66 +34,3 @@ diff -ruN release.bak/erlang/bin/erl_inetrc release/erlang/bin/erl_inetrc
+%% TODO: Not this,
+{nameserver, {8,8,8,8}}.
\ No newline at end of file
diff -ru release.bak/erlang/bin/start release/erlang/bin/start
--- release.bak/erlang/bin/start 2011-02-05 01:57:26.000000000 -0700
+++ release/erlang/bin/start 2011-02-05 02:05:54.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/system/bin/sh
#
# %CopyrightBegin%
#
diff -ru release.bak/erlang/bin/start_erl release/erlang/bin/start_erl
--- release.bak/erlang/bin/start_erl 2011-02-05 01:57:26.000000000 -0700
+++ release/erlang/bin/start_erl 2011-02-05 02:05:48.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/system/bin/sh
#
#
# %CopyrightBegin%
diff -ru release.bak/erlang/erts-5.8.5/bin/erl release/erlang/erts-5.8.5/bin/erl
--- release.bak/erlang/erts-5.8.5/bin/erl 2011-02-05 01:57:26.000000000 -0700
+++ release/erlang/erts-5.8.5/bin/erl 2011-02-05 02:06:04.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/system/bin/sh
#
# %CopyrightBegin%
#
diff -ru release.bak/erlang/erts-5.8.5/bin/erl.src release/erlang/erts-5.8.5/bin/erl.src
--- release.bak/erlang/erts-5.8.5/bin/erl.src 2011-02-05 01:23:30.000000000 -0700
+++ release/erlang/erts-5.8.5/bin/erl.src 2011-02-05 02:06:01.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/system/bin/sh
#
# %CopyrightBegin%
#
diff -ru release.bak/erlang/erts-5.8.5/bin/start release/erlang/erts-5.8.5/bin/start
--- release.bak/erlang/erts-5.8.5/bin/start 2011-02-05 01:57:26.000000000 -0700
+++ release/erlang/erts-5.8.5/bin/start 2011-02-05 02:06:09.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/system/bin/sh
#
# %CopyrightBegin%
#
diff -ru release.bak/erlang/erts-5.8.5/bin/start_erl.src release/erlang/erts-5.8.5/bin/start_erl.src
--- release.bak/erlang/erts-5.8.5/bin/start_erl.src 2011-02-05 01:23:30.000000000 -0700
+++ release/erlang/erts-5.8.5/bin/start_erl.src 2011-02-05 02:06:06.000000000 -0700
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/system/bin/sh
#
#
# %CopyrightBegin%
diff -ru release.bak/erlang/erts-5.8.5/bin/start.src release/erlang/erts-5.8.5/bin/start.src
--- release.bak/erlang/erts-5.8.5/bin/start.src 2011-02-05 01:23:30.000000000 -0700
+++ release/erlang/erts-5.8.5/bin/start.src 2011-02-05 02:05:58.000000000 -0700
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/system/bin/sh
#
# %CopyrightBegin%
#

0 comments on commit b68329b

Please sign in to comment.