홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Brian O'Connor
0eed29e0 1 parent 0bff4303

ONOS-2894 Renaming tools/package/debian to tools/package/init 

Change-Id: I66748d3033f4adb6d1052772776b6b3e5814bf91
(cherry picked from commit 27dbb18d)
Inline Side-by-side
Showing 3 changed files with 4 additions and 4 deletions
...@@ -30,7 +30,7 @@ function build_stage_dir() { ...@@ -30,7 +30,7 @@ function build_stage_dir() {
30 30
31 # Stage the ONOS admin scripts and patch in Karaf service wrapper extras 31 # Stage the ONOS admin scripts and patch in Karaf service wrapper extras
32 cp -r $ONOS_ROOT/tools/package/bin . 32 cp -r $ONOS_ROOT/tools/package/bin .
33 - cp -r $ONOS_ROOT/tools/package/debian $ONOS_STAGE/debian 33 + cp -r $ONOS_ROOT/tools/package/init $ONOS_STAGE/init
34 cp -r $ONOS_ROOT/tools/package/etc/* $ONOS_STAGE/$KARAF_DIST/etc 34 cp -r $ONOS_ROOT/tools/package/etc/* $ONOS_STAGE/$KARAF_DIST/etc
35 35
36 # Stage all builtin ONOS apps for factory install 36 # Stage all builtin ONOS apps for factory install
...@@ -111,7 +111,7 @@ function build_deb() { ...@@ -111,7 +111,7 @@ function build_deb() {
111 } > $ONOS_DEB_ROOT/DEBIAN/control 111 } > $ONOS_DEB_ROOT/DEBIAN/control
112 112
113 cp -r $ONOS_STAGE $ONOS_DEB_ROOT/opt/onos 113 cp -r $ONOS_STAGE $ONOS_DEB_ROOT/opt/onos
114 - cp $ONOS_ROOT/tools/package/debian/onos.conf $ONOS_DEB_ROOT/etc/init/ 114 + cp $ONOS_ROOT/tools/package/init/onos.conf $ONOS_DEB_ROOT/etc/init/
115 115
116 mkdir -p $ONOS_DEB_ROOT/opt/onos/var/ 116 mkdir -p $ONOS_DEB_ROOT/opt/onos/var/
117 117
...@@ -136,7 +136,7 @@ function build_rpm() { ...@@ -136,7 +136,7 @@ function build_rpm() {
136 mkdir -p $ONOS_RPM_ROOT/{BUILD,RPMS,SOURCES/ONOS-$ONOS_RPM_VERSION/{etc/init,opt},SPECS,SRPMS} 136 mkdir -p $ONOS_RPM_ROOT/{BUILD,RPMS,SOURCES/ONOS-$ONOS_RPM_VERSION/{etc/init,opt},SPECS,SRPMS}
137 137
138 cp -r $ONOS_STAGE $ONOS_RPM_ROOT/SOURCES/ONOS-$ONOS_RPM_VERSION/opt/onos 138 cp -r $ONOS_STAGE $ONOS_RPM_ROOT/SOURCES/ONOS-$ONOS_RPM_VERSION/opt/onos
139 - cp $ONOS_ROOT/tools/package/debian/onos.conf $ONOS_RPM_ROOT/SOURCES/ONOS-$ONOS_RPM_VERSION/etc/init/ 139 + cp $ONOS_ROOT/tools/package/init/onos.conf $ONOS_RPM_ROOT/SOURCES/ONOS-$ONOS_RPM_VERSION/etc/init/
140 140
141 cd $ONOS_RPM_ROOT/SOURCES 141 cd $ONOS_RPM_ROOT/SOURCES
142 COPYFILE_DISABLE=1 tar zcf ONOS-$ONOS_RPM_VERSION.tar.gz ONOS-$ONOS_RPM_VERSION 142 COPYFILE_DISABLE=1 tar zcf ONOS-$ONOS_RPM_VERSION.tar.gz ONOS-$ONOS_RPM_VERSION
......
...@@ -43,7 +43,7 @@ ssh $remote " ...@@ -43,7 +43,7 @@ ssh $remote "
43 mkdir -p -- $ONOS_INSTALL_DIR/$KARAF_DIST/data/raft 43 mkdir -p -- $ONOS_INSTALL_DIR/$KARAF_DIST/data/raft
44 44
45 # Install the upstart configuration file and setup options for debugging 45 # Install the upstart configuration file and setup options for debugging
46 - [ -z "$nostart" ] && sudo cp $ONOS_INSTALL_DIR/debian/onos.conf /etc/init/onos.conf 46 + [ -z "$nostart" ] && sudo cp $ONOS_INSTALL_DIR/init/onos.conf /etc/init/onos.conf
47 echo 'export ONOS_OPTS=debug' > $ONOS_INSTALL_DIR/options 47 echo 'export ONOS_OPTS=debug' > $ONOS_INSTALL_DIR/options
48 48
49 # Setup correct user to run onos-service 49 # Setup correct user to run onos-service
......