diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-11-14 20:19:30 (EST) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-11-14 20:19:30 (EST) |
| commit | 22320956b78f2ac725c21a8ce858f873d96d6929 (patch) | |
| tree | fa0b45b536f0c74002c054a52e02a9777699b7bb | |
| parent | c05a2435ce3e5075c2c100757fe7ea1cd8895558 (diff) | |
Remove code for upstream build system arches.
| -rw-r--r-- | lib/metadata/proteanos.sh | 9 | ||||
| -rw-r--r-- | locale/en_US/opkbuild.sh | 2 | ||||
| -rw-r--r-- | src/opkbuild.sh | 15 |
3 files changed, 3 insertions, 23 deletions
diff --git a/lib/metadata/proteanos.sh b/lib/metadata/proteanos.sh index 6b5c2a5..c5774a5 100644 --- a/lib/metadata/proteanos.sh +++ b/lib/metadata/proteanos.sh @@ -157,15 +157,6 @@ _ob_get_system_path_proteanos() return ${?} fi ;; - 'archtab') - # arch - if [ ${#} -eq 1 ]; then - printf '@@DATADIR@@/opkbuild/archtab/%s' "${1}" - else - _ob_return 125 - return ${?} - fi - ;; 'buildflags') # arch if [ ${#} -eq 1 ]; then diff --git a/locale/en_US/opkbuild.sh b/locale/en_US/opkbuild.sh index 6263ce0..1d4d332 100644 --- a/locale/en_US/opkbuild.sh +++ b/locale/en_US/opkbuild.sh @@ -62,7 +62,7 @@ msg_opkbuild_cant_make_src_pkg_dir='Can'\''t make data directory for source pack msg_opkbuild_cant_install_src_pkg_file='Can'\''t install source package file' msg_opkbuild_cant_rm_src_pkg_data='Can'\''t clean up data directory for source package' msg_opkbuild_build_arch_stat_header='Build system:' -msg_opkbuild_arch_stat_arch=' Architecture: %s (%s)' +msg_opkbuild_arch_stat_arch=' Architecture: %s' msg_opkbuild_arch_stat_plat=' Platform: %s' msg_opkbuild_host_arch_stat_header='Host system:' diff --git a/src/opkbuild.sh b/src/opkbuild.sh index e168a9a..057ac9a 100644 --- a/src/opkbuild.sh +++ b/src/opkbuild.sh @@ -36,13 +36,11 @@ export OPK_BUILD_ARCH_CPU= export OPK_BUILD_ARCH_KERNEL= export OPK_BUILD_ARCH_LIBS= export OPK_BUILD_PLAT= -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_PLAT= -export OPK_HOST_ARCH_GNU= opt_build= opt_target= @@ -229,15 +227,6 @@ setup_arch_plat() <<-EOF ${OPK_HOST_ARCH} EOF - - { - read OPK_BUILD_ARCH_GNU - read OPK_BUILD_ARCH_KBUILD - } <"$(ob_get_system_path 'archtab' "${OPK_BUILD_ARCH}")" - { - read OPK_HOST_ARCH_GNU - read OPK_HOST_ARCH_KBUILD - } <"$(ob_get_system_path 'archtab' "${OPK_HOST_ARCH}")" } make_work_area() @@ -295,11 +284,11 @@ print_arch_stats() { ob_info "$(ob_get_msg 'build_arch_stat_header')" ob_info "$(ob_get_msg 'arch_stat_arch')" \ - "${OPK_BUILD_ARCH}" "${OPK_BUILD_ARCH_GNU}" + "${OPK_BUILD_ARCH}" ob_info "$(ob_get_msg 'arch_stat_plat')" "${OPK_BUILD_PLAT}" ob_info "$(ob_get_msg 'host_arch_stat_header')" ob_info "$(ob_get_msg 'arch_stat_arch')" \ - "${OPK_HOST_ARCH}" "${OPK_HOST_ARCH_GNU}" + "${OPK_HOST_ARCH}" ob_info "$(ob_get_msg 'arch_stat_plat')" "${OPK_HOST_PLAT}" } |