From 4020f12ff37dfdaf9cb8c2c372a85b68daa7ac71 Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Fri, 26 Apr 2019 00:25:54 -0400 Subject: src/cmd/build.sh: Make some functions "static" --- diff --git a/src/cmd/build.sh b/src/cmd/build.sh index a7b6701..87020ad 100644 --- a/src/cmd/build.sh +++ b/src/cmd/build.sh @@ -22,7 +22,7 @@ cmd_build_root= cmd_build_pkg_dir= cmd_build_build_deps= -cmd_build_make_deps_pkg() +_cmd_build_make_deps_pkg() { local pkg_dir= @@ -45,7 +45,7 @@ cmd_build_make_deps_pkg() rm -Rf -- "${pkg_dir}" } -cmd_build_fini() +_cmd_build_fini() { local session_dir= local f= @@ -134,22 +134,22 @@ cmd_build_main() fi package_set_substvars "${arch}" "${plat}" - if ! session_begin "${root}" "${cmd_build_pkg_dir}" cmd_build_fini false - then - cmd_build_fini + if ! session_begin "${root}" "${cmd_build_pkg_dir}" _cmd_build_fini \ + false; then + _cmd_build_fini [ "x${dev}" != 'x' ] && block_umount "${root}" return 2 fi cmd_build_build_deps="$(package_get_build_deps "${arch}" "${plat}")" if [ "x${cmd_build_build_deps}" != 'x' ]; then - cmd_build_make_deps_pkg + _cmd_build_make_deps_pkg session_exec opkg install ../builddeps.opk fi session_exec opkbuild "${@}" - cmd_build_fini + _cmd_build_fini session_end -- cgit v0.9.1