Commit 5dcdec1

committed

cleanup: simplify onload_install

Make install of `orm_json` unconditional as these days it will always be provided as part of userbuild. We no longer have `onload_helper` or `onload_fe` so remove references to these.

1 parent 512436b commit 5dcdec1Copy full SHA for 5dcdec1

File tree

1 file changed

-18

lines changed

scripts
- onload_install

1 file changed

-18

lines changed

`‎scripts/onload_install‎`

Lines changed: 3 additions & 18 deletions

Original file line number	Diff line number	Diff line change
`@@ -257,15 +257,9 @@ install_userland() {`
`257`	`257`	`"$i_usrbin/onload_mibdump"`
`258`	`258`	`install_x "$u64/tools/shrub_controller/shrub_controller" \`
`259`	`259`	`"$i_usrbin/shrub_controller"`
`260`		`- [ -f "$u64/tools/onload_helper/onload_helper" ] && \`
`261`		`- install_x "$u64/tools/onload_helper/onload_helper" "$i_usrbin/onload_helper"`
`262`		`- [ -f "$u64/tools/ip/onload_fe" ] && install_x "$u64/tools/ip/onload_fe" "$i_usrbin/onload_fe"`
`263`		`- failorm=true`
`264`		`- [ -f "$u64/tools/onload_remote_monitor/orm_json" ] && {`
`265`		`- install_x "$u64/tools/onload_remote_monitor/orm_json" "$i_usrbin/orm_json"`
`266`		`- install_x "$TOP/src/tools/onload_remote_monitor/orm_webserver" "$i_usrbin/orm_webserver"`
`267`		`- failorm=false`
`268`		`- }`
	`260`	`+ install_x "$u64/tools/onload_remote_monitor/orm_json" "$i_usrbin/orm_json"`
	`261`	`+ install_x "$TOP/src/tools/onload_remote_monitor/orm_webserver" \`
	`262`	`+ "$i_usrbin/orm_webserver"`
`269`	`263`	`install_solar_clusterd`
`270`	`264`	`fi`
`271`	`265`
`@@ -663,7 +657,6 @@ do=`
`663`	`657`	`docd=cd`
`664`	`658`	`verbose=`
`665`	`659`	`listfiles=false`
`666`		`-failorm=false`
`667`	`660`	`setuid=false`
`668`	`661`	`force=false`
`669`	`662`	`allow_unsupported_cpu=false`
`@@ -810,14 +803,6 @@ $headers && install_all_headers`
`810`	`803`
`811`	`804`	`logprog "Install complete."`
`812`	`805`
`813`		`-if $failorm; then`
`814`		`- err`
`815`		`- log "Note: Onload Remote Monitor (ORM) was not installed." \`
`816`		`- "If ORM is required, please check availability of libtool, autoconf and" \`
`817`		`- "automake, then rebuild. See build log for further details."`
`818`		`- err`
`819`		`-fi`
`820`		`-`
`821`	`806`	`if $sfccheck && { [ "$kernelfiles" = "true" ] \|\| [ "$all" = "true" ] ; } ; then`
`822`	`807`	`if /sbin/lsmod \| grep -qw sfc; then`
`823`	`808`	`err`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5dcdec1

File tree

1 file changed

1 file changed

`‎scripts/onload_install‎`

0 commit comments