From 5c9a10871dc79ed4c77f7f031ae8b54e6a7ec875 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 8 Jun 2022 15:40:24 +0200 Subject: [PATCH] autoport: added epoch support for added BuildRequirements in rebuild mode --- autoport | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/autoport b/autoport index 0408f20..20cbdee 100755 --- a/autoport +++ b/autoport @@ -162,6 +162,7 @@ function get_pkg_buildinfo() { pkg_buildtime=${pkg_header[7]}; pkg_altrep=${pkg_header[8]}; pkg_repository=${pkg_header[9]}; + pkg_epoch=${pkg_header[10]}; return 0 fi unset pkg_name pkg_arch pkg_version pkg_release \ @@ -395,6 +396,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do get_pkg_buildinfo $DATADIR/$PORT_REPOSITORY $TARGET_ARCH $j port_pkg_list=${pkg_needrebuild[*]} port_pkg_builds=" ${pkg_builds[*]} " + port_pkg_epoch=$pkg_epoch port_pkg_version=$pkg_version port_pkg_release=$pkg_release currrebuild= @@ -413,7 +415,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do if [ "$port_pkgbuilds/ $currprovider-devel }" != "$port_pkgbuilds" ]; then currprovider=${currprovider}-devel fi - currjobscriptargs="$currjobscriptargs --buildreq ${currprovider} >= $port_pkg_version-$port_pkg_release " + currjobscriptargs="$currjobscriptargs --buildreq ${currprovider} >= ${port_pkg_epoch}:${port_pkg_version}-${port_pkg_release} " done [ "$currjobscriptargs" ] && JOB_SCRIPTARGS[$JOBNUM-1]="$currjobscriptargs" echo "Package dependant from $j to rebuild: ${JOB[*]}"