|
|
@ -123,29 +123,22 @@ repo_package_list() { |
|
|
|
vers=$(package_version_from_path ${pkg}) |
|
|
|
vers=$(package_version_from_path ${pkg}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Version match check: arch: x86_64 name: spl-utils-linux-git vers: 0.7.0_rc1_r0_g4fd75d3_4.7.2_1-4 vers_match: 0.6.5.8.*4.7.2_1-4 |
|
|
|
if ! [[ ${name} =~ .*-git ]]; then |
|
|
|
debug "spl_pkgver: ${spl_pkgver}" |
|
|
|
# Version match check: arch: x86_64 name: spl-utils-linux-git vers: 0.7.0_rc1_r0_g4fd75d3_4.7.2_1-4 vers_match: 0.6.5.8.*4.7.2_1-4 |
|
|
|
debug "zfs_pkgver: ${zfs_pkgver}" |
|
|
|
debug "spl_pkgver: ${spl_pkgver}" |
|
|
|
|
|
|
|
debug "zfs_pkgver: ${zfs_pkgver}" |
|
|
|
if [[ ${pkg} =~ .*spl-.* ]]; then |
|
|
|
|
|
|
|
match="${spl_pkgver}-${spl_pkgrel}" |
|
|
|
if [[ ${pkg} =~ .*spl-.* ]]; then |
|
|
|
elif [[ ${pkg} =~ .*zfs-.* ]]; then |
|
|
|
match="${spl_pkgver}-${spl_pkgrel}" |
|
|
|
match="${zfs_pkgver}-${zfs_pkgrel}" |
|
|
|
elif [[ ${pkg} =~ .*zfs-.* ]]; then |
|
|
|
fi |
|
|
|
match="${zfs_pkgver}-${zfs_pkgrel}" |
|
|
|
debug "Version match check: arch: ${arch} name: ${name} vers: ${vers} vers_match: ${match}" |
|
|
|
fi |
|
|
|
|
|
|
|
debug "Version match check: arch: ${arch} name: ${name} vers: ${vers} vers_match: ${match}" |
|
|
|
if ! [[ ${vers} =~ ^${match} ]] ; then |
|
|
|
|
|
|
|
debug "Version mismatch!" |
|
|
|
if ! [[ ${vers} =~ ^${match} ]] ; then |
|
|
|
if [[ ${name} =~ .*-git ]]; then |
|
|
|
debug "Version mismatch!" |
|
|
|
error "Attempting to add Git packages that are out of date!" |
|
|
|
continue |
|
|
|
error "package version from filesystem: ${vers}" |
|
|
|
|
|
|
|
error "calculated version from git: ${match}" |
|
|
|
|
|
|
|
haz_error=1 |
|
|
|
|
|
|
|
if [[ ${dry_run} -ne 1 ]]; then |
|
|
|
|
|
|
|
exit 1 |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
fi |
|
|
|
fi |
|
|
|
continue |
|
|
|
|
|
|
|
fi |
|
|
|
fi |
|
|
|
|
|
|
|
|
|
|
|
debug "Using: pkgname: ${name} pkgver: ${vers} pkgpath: ${pkg} pkgdest: ${repo_target}/${arch}" |
|
|
|
debug "Using: pkgname: ${name} pkgver: ${vers} pkgpath: ${pkg} pkgdest: ${repo_target}/${arch}" |
|
|
@ -295,10 +288,6 @@ export spl_pkgver="" |
|
|
|
|
|
|
|
|
|
|
|
for func in ${update_funcs[@]}; do |
|
|
|
for func in ${update_funcs[@]}; do |
|
|
|
debug "Evaluating '${func}'" |
|
|
|
debug "Evaluating '${func}'" |
|
|
|
if [[ ${func} =~ .*_git_.* ]]; then |
|
|
|
|
|
|
|
# Update the local zfs/spl git repositories, this will change the calculated pkgver version of the PKGBUILD. |
|
|
|
|
|
|
|
commands+=("update") |
|
|
|
|
|
|
|
fi |
|
|
|
|
|
|
|
"${func}" |
|
|
|
"${func}" |
|
|
|
repo_package_list |
|
|
|
repo_package_list |
|
|
|
repo_package_backup |
|
|
|
repo_package_backup |
|
|
|