From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH OSSTEST v2 16/19] Collect xen.efi into xendist and install in appropriate place Date: Thu, 18 Jun 2015 17:25:07 +0100 Message-ID: <1434644710-28881-16-git-send-email-ian.campbell@citrix.com> References: <1434644687.28264.53.camel@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1434644687.28264.53.camel@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: ian.jackson@eu.citrix.com Cc: Ian Campbell , xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org Previously these binaries would have been included in the regular ("tools") dist file, whereas they really belong in the xen one. Install into /boot/efi/EFI/osstest ready for use when chainloading. Note that /boot/efi is (or should be) a VFAT filesystem. So a bit of care is needed WRT symlinks etc. This is also what prevents us from just including /boot/efi/EFI/osstest/xen.efi in the dist tarball since untarring over a VFAT needs a little care WRT the case of directories etc. Signed-off-by: Ian Campbell --- ts-xen-build | 7 +++++++ ts-xen-install | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/ts-xen-build b/ts-xen-build index 353a82c..cebfaf3 100755 --- a/ts-xen-build +++ b/ts-xen-build @@ -172,6 +172,13 @@ sub divide () { mv \$mvfiles xeninstall/boot/. fi fi + if test -d install/usr/lib64/efi/; then + if test -f install/usr/lib64/efi/xen.efi; then + mkdir -p xeninstall/usr/lib64/efi + mvfiles=`find install/usr/lib64/efi -name 'xen[a-z]*' -prune -o -name 'xen*' -print` + mv \$mvfiles xeninstall/usr/lib64/efi/. + fi + fi END } diff --git a/ts-xen-install b/ts-xen-install index d55401c..83fa143 100755 --- a/ts-xen-install +++ b/ts-xen-install @@ -74,6 +74,13 @@ sub extract () { target_extract_jobdistpath($ho, $part, "path_${part}dist", $r{"${part}buildjob"}, \%distpath); } + if (target_file_exists($ho, "/usr/lib64/efi/xen.efi")) { + target_cmd_root($ho,<