diff options
author | P. J. McDermott <pjm@nac.net> | 2012-10-08 11:27:00 (EDT) |
---|---|---|
committer | P. J. McDermott <pjm@nac.net> | 2012-10-08 11:27:00 (EDT) |
commit | e8dadb4d7571633cb0b1b085c449ad606dec2ebd (patch) | |
tree | 126bfab1906fadfe8e75a9cf23286100486412b4 | |
parent | 3e48d93af2cadd4ea1c622d1a12e0d5367bb19e8 (diff) |
s/OB_/OPK_/ in env vars specified by SPF 2.0.
-rw-r--r-- | src/opkbuild.sh | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/opkbuild.sh b/src/opkbuild.sh index 2091b3f..21c6e1a 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -26,22 +26,22 @@ ob_use output ob_use package ob_use metadata -export OB_SOURCE= -export OB_SOURCE_VERSION= -export OB_SOURCE_VERSION_UPSTREAM= -export OB_BINARY_VERSION= -export OB_BUILD_ARCH= -export OB_BUILD_ARCH_CPU= -export OB_BUILD_ARCH_KERNEL= -export OB_BUILD_ARCH_LIBS= -export OB_BUILD_PLATFORM= -export OB_BUILD_ARCH_GNU= -export OB_HOST_ARCH= -export OB_HOST_ARCH_CPU= -export OB_HOST_ARCH_KERNEL= -export OB_HOST_ARCH_LIBS= -export OB_HOST_PLATFORM= -export OB_HOST_ARCH_GNU= +export OPK_SOURCE= +export OPK_SOURCE_VERSION= +export OPK_SOURCE_VERSION_UPSTREAM= +export OPK_BINARY_VERSION= +export OPK_BUILD_ARCH= +export OPK_BUILD_ARCH_CPU= +export OPK_BUILD_ARCH_KERNEL= +export OPK_BUILD_ARCH_LIBS= +export OPK_BUILD_PLATFORM= +export OPK_BUILD_ARCH_GNU= +export OPK_HOST_ARCH= +export OPK_HOST_ARCH_CPU= +export OPK_HOST_ARCH_KERNEL= +export OPK_HOST_ARCH_LIBS= +export OPK_HOST_PLATFORM= +export OPK_HOST_ARCH_GNU= opt_build= opt_target= @@ -210,26 +210,26 @@ setup_arch_plat() { ob_info "$(ob_get_msg 'setup_arch_plat')" - OB_BUILD_ARCH="$(ob_get_system_arch)" - OB_BUILD_PLATFORM="$(ob_get_system_plat)" + OPK_BUILD_ARCH="$(ob_get_system_arch)" + OPK_BUILD_PLATFORM="$(ob_get_system_plat)" if [ -n "${opt_host_arch}" ]; then - OB_HOST_ARCH="${opt_host_arch}" + OPK_HOST_ARCH="${opt_host_arch}" else - OB_HOST_ARCH="${OB_BUILD_ARCH}" + OPK_HOST_ARCH="${OPK_BUILD_ARCH}" fi if [ -n "${opt_host_plat}" ]; then - OB_HOST_PLATFORM="${opt_host_plat}" + OPK_HOST_PLATFORM="${opt_host_plat}" else - OB_HOST_PLATFORM="${OB_BUILD_PLATFORM}" + OPK_HOST_PLATFORM="${OPK_BUILD_PLATFORM}" fi - IFS=- read OB_BUILD_ARCH_CPU OB_BUILD_ARCH_KERNEL OB_BUILD_ARCH_LIBS <<EOF -${OB_BUILD_ARCH} + IFS=- read OPK_BUILD_ARCH_CPU OPK_BUILD_ARCH_KERNEL OPK_BUILD_ARCH_LIBS <<EOF +${OPK_BUILD_ARCH} EOF - IFS=- read OB_HOST_ARCH_CPU OB_HOST_ARCH_KERNEL OB_HOST_ARCH_LIBS <<EOF -${OB_HOST_ARCH} + IFS=- read OPK_HOST_ARCH_CPU OPK_HOST_ARCH_KERNEL OPK_HOST_ARCH_LIBS <<EOF +${OPK_HOST_ARCH} EOF } @@ -248,10 +248,10 @@ setup_package() ob_init_package '..' ob_parse_package_metadata -c '.opkbuild.cache' - OB_SOURCE="$(ob_get_source_parameter 'Source')" - OB_SOURCE_VERSION="$(ob_get_source_parameter 'Version')" - ob_parse_version -u 'OB_SOURCE_VERSION_UPSTREAM' "${OB_SOURCE_VERSION}" - OB_BINARY_VERSION="$(ob_get_source_parameter 'Version')" + OPK_SOURCE="$(ob_get_source_parameter 'Source')" + OPK_SOURCE_VERSION="$(ob_get_source_parameter 'Version')" + ob_parse_version -u 'OPK_SOURCE_VERSION_UPSTREAM' "${OPK_SOURCE_VERSION}" + OPK_BINARY_VERSION="$(ob_get_source_parameter 'Version')" } build_source() @@ -287,16 +287,16 @@ build_source() print_arch_stats() { ob_info "$(ob_get_msg 'build_arch_stat_header')" - ob_info "$(ob_get_msg 'arch_stat_arch')" "${OB_BUILD_ARCH}" - ob_info "$(ob_get_msg 'arch_stat_plat')" "${OB_BUILD_PLATFORM}" + ob_info "$(ob_get_msg 'arch_stat_arch')" "${OPK_BUILD_ARCH}" + ob_info "$(ob_get_msg 'arch_stat_plat')" "${OPK_BUILD_PLATFORM}" ob_info "$(ob_get_msg 'host_arch_stat_header')" - ob_info "$(ob_get_msg 'arch_stat_arch')" "${OB_HOST_ARCH}" - ob_info "$(ob_get_msg 'arch_stat_plat')" "${OB_HOST_PLATFORM}" + ob_info "$(ob_get_msg 'arch_stat_arch')" "${OPK_HOST_ARCH}" + ob_info "$(ob_get_msg 'arch_stat_plat')" "${OPK_HOST_PLATFORM}" } setup_build() { - pkgs="$(ob_get_binary_packages -a "${OB_HOST_ARCH}")" + pkgs="$(ob_get_binary_packages -a "${OPK_HOST_ARCH}")" eval "$(ob-buildenv | sed 's/^/export /')" |