diff --git a/bin/buildpkg.in b/bin/buildpkg.in index cbe296e..69d241d 100644 --- a/bin/buildpkg.in +++ b/bin/buildpkg.in @@ -41,8 +41,8 @@ display_settings(){ msg2 "buildsets: %s" "$(list_sets ${sets_dir_pkg})" msg2 "buildset_pkg: %s" "${buildset_pkg}" msg2 "is_buildset: %s" "${is_buildset}" - msg2 "pkgarch_dir: %s" "${pkgarch_dir}" - msg2 "pkgarches: %s" "$(list_pkgarches ${pkgarch_dir})" + msg2 "make_conf_dir: %s" "${make_conf_dir}" + msg2 "make_profiles: %s" "$(list_make_profiles ${make_conf_dir})" msg "OPTIONS:" msg2 "arch: %s" "${target_arch}" diff --git a/lib/util-pkg.sh b/lib/util-pkg.sh index be80328..1470bde 100644 --- a/lib/util-pkg.sh +++ b/lib/util-pkg.sh @@ -11,7 +11,7 @@ load_compiler_settings(){ local tarch="$1" conf - conf=${pkgarch_dir}/$tarch.conf + conf=${make_conf_dir}/$tarch.conf [[ -f $conf ]] || return 1 diff --git a/lib/util.sh b/lib/util.sh index 5e396a9..00bbe16 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -92,8 +92,8 @@ list_sets(){ echo $prof } -# $1: pkgarch_dir -list_pkgarches(){ +# $1: make_conf_dir +list_make_profiles(){ local arch temp for item in $(ls $1/*.conf); do temp=${item##*/} @@ -251,7 +251,7 @@ init_buildpkg(){ sets_dir_pkg="${SYSCONFDIR}/pkg.d" - pkgarch_dir="${SYSCONFDIR}/make.conf.d" + make_conf_dir="${SYSCONFDIR}/make.conf.d" [[ -d ${USERCONFDIR}/pkg.d ]] && sets_dir_pkg=${USERCONFDIR}/pkg.d @@ -558,7 +558,7 @@ is_valid_init(){ is_valid_arch_pkg(){ eval "case $1 in - $(list_pkgarches "${pkgarch_dir}")) return 0 ;; + $(list_make_profiles "${make_conf_dir}")) return 0 ;; *) return 1 ;; esac" }