- git_retrieve $sface_GITPATH sface "$img_mnt"/$resource_path/
- # retrieve version number from specfile
- sface_tag=$(rpm -q --specfile "$img_mnt"/$resource_path/sface/sface.spec --qf '%{version}-%{taglevel}')
- make -C "$img_mnt"/$resource_path/sface VERSIONTAG="${sface_tag}" SCMURL="${sface_GITPATH}" version
+ git_retrieve $sfa_GITPATH $temp/sfa
+ git_retrieve $sface_GITPATH $temp/sface
+
+ # retrieve version number, and run make version
+ sfa_spec=$temp/sfa/sfa.spec
+ sfa_tag=$(rpm -q --specfile $sfa_spec --qf '%{version}-%{taglevel}')
+ make -C $temp/sfa VERSIONTAG="${sfa_tag}" SCMURL="${sfa_GITPATH}" version
+ sface_spec=$temp/sface/sface.spec
+ sface_tag=$(rpm -q --specfile $sface_spec --qf '%{version}-%{taglevel}')
+ make -C $temp/sface VERSIONTAG="${sface_tag}" SCMURL="${sface_GITPATH}" version
+
+ # copy sfa/ and sface/ subdirs in image
+ rm -rf "$img_mnt"/$resource_path/{sfa,sface}
+ tar -C $temp/sfa -cf - sfa | tar -C "$img_mnt"/$resource_path/ -xf -
+ tar -C $temp/sface -cf - sface | tar -C "$img_mnt"/$resource_path/ -xf -