mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
CI: Build with --prefix=/usr rather than setting LD_LIBRARY_PATH
This also moves executables too.
I'm not sure why xilinx-smoke-dom0-x86_64.sh was overriding PATH too, as
/usr/local is clearly in PATH given the other tests, but drop that too.
No practical change.
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@vates.tech>
Acked-by: Stefano Stabellini <sstabellini@kernel.org>
(cherry picked from commit 7f8c2dd829)
This commit is contained in:
Andrew Cooper committed
1 parent
690655a511
commit
47d911f69e
7 files changed
+3
-11
No files matched your search
@@ -67,7 +67,7 @@ elif [[ "${HYPERVISOR_ONLY}" == "y" ]]; then
|
||||
collect_xen_artefacts
|
||||
else
|
||||
# Full build. Figure out our ./configure options
|
||||
cfgargs=()
|
||||
cfgargs=("--prefix=/usr")
|
||||
cfgargs+=("--enable-docs")
|
||||
|
||||
# booleans for which compiler is in use
|
||||
|
||||
@@ -49,7 +49,6 @@ echo "#!/bin/bash
|
||||
|
||||
set -x
|
||||
|
||||
export LD_LIBRARY_PATH=/usr/local/lib
|
||||
bash /etc/init.d/xencommons start
|
||||
|
||||
xl list
|
||||
|
||||
@@ -46,7 +46,6 @@ extra=\"console=hvc0 root=/dev/ram0 rdinit=/bin/sh\"
|
||||
" > root/domU.cfg
|
||||
echo "#!/bin/bash
|
||||
|
||||
export LD_LIBRARY_PATH=/usr/local/lib
|
||||
bash /etc/init.d/xencommons start
|
||||
|
||||
xl list
|
||||
|
||||
@@ -122,10 +122,9 @@ mkdir -p etc/local.d
|
||||
|
||||
echo "#!/bin/bash
|
||||
|
||||
export LD_LIBRARY_PATH=/usr/local/lib
|
||||
bash /etc/init.d/xencommons start
|
||||
|
||||
/usr/local/lib/xen/bin/init-dom0less
|
||||
/usr/lib/xen/bin/init-dom0less
|
||||
|
||||
brctl addbr xenbr0
|
||||
brctl addif xenbr0 eth0
|
||||
|
||||
@@ -201,7 +201,6 @@ cp -a ../automation/scripts/run-tools-tests tests/
|
||||
|
||||
echo "#!/bin/bash
|
||||
|
||||
export LD_LIBRARY_PATH=/usr/local/lib
|
||||
bash /etc/init.d/xencommons start
|
||||
|
||||
brctl addbr xenbr0
|
||||
|
||||
@@ -92,8 +92,6 @@ cd rootfs
|
||||
mkdir -p etc/local.d
|
||||
echo "#!/bin/sh
|
||||
set -x
|
||||
export LD_LIBRARY_PATH=/usr/local/lib
|
||||
PATH=/usr/local/bin:/usr/local/sbin:\$PATH
|
||||
${DOMU_CMD}
|
||||
" > etc/local.d/xen.start
|
||||
chmod +x etc/local.d/xen.start
|
||||
@@ -119,7 +117,6 @@ cd rootfs
|
||||
mkdir -p boot etc/local.d etc/xen etc/default
|
||||
echo "#!/bin/bash
|
||||
set -x
|
||||
export LD_LIBRARY_PATH=/usr/local/lib
|
||||
bash /etc/init.d/xencommons start
|
||||
${DOM0_CMD}
|
||||
" > etc/local.d/xen.start
|
||||
|
||||
@@ -64,10 +64,9 @@ cd rootfs
|
||||
mkdir -p etc/local.d
|
||||
echo "#!/bin/bash
|
||||
|
||||
export LD_LIBRARY_PATH=/usr/local/lib
|
||||
bash /etc/init.d/xencommons start
|
||||
|
||||
/usr/local/lib/xen/bin/init-dom0less
|
||||
/usr/lib/xen/bin/init-dom0less
|
||||
|
||||
${dom0_check}
|
||||
" > etc/local.d/xen.start
|
||||
|
||||