MIRRORS/meta-virtualization
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-virtualization.git synced 2025-07-19 20:59:41 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen: Fix up architecture specific steps

Browse Source 
* Remove version specific sed pattern
* Add 'xen' as an output product instead of just 'xen.gz' as some
  architectures do not generate the 'xen.gz'

Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
This commit is contained in:
Nathan Rossi 2015-01-06 10:21:01 +10:00 committed by Bruce Ashfield
parent 5363c1ea1d
commit 38e0bb2618
1 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
recipes-extended/xen/xen.inc
View File

@ -274,6 +274,8 @@ FILES_${PN}-libfsimage-dev = "${libdir}/libfsimage.so"
FILES_${PN}-fsimage = "${libdir}/fs/*/*fsimage.so" FILES_${PN}-fsimage = "${libdir}/fs/*/*fsimage.so"
FILES_${PN}-hypervisor = "\ FILES_${PN}-hypervisor = "\
/boot/xen-* \
/boot/xen \
/boot/xen-*.gz \ /boot/xen-*.gz \
/boot/xen.gz \ /boot/xen.gz \
/boot/xen-syms-* \ /boot/xen-syms-* \
@ -656,20 +658,18 @@ EXTRA_OECONF += " \
do_configure() { do_configure() {
# no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu # no stubs-32.h in our 64-bit sysroot - hack it into tools/include/gnu
test -d ${S}/tools/include/gnu || mkdir ${S}/tools/include/gnu
if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then if ! test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-32.h ; then
cat ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-64.h | grep -v stub_bdflush | grep -v stub_getmsg | grep -v stub_putmsg > ${S}/tools/include/gnu/stubs-32.h if test -f ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-64.h ; then
echo \#define __stub___kernel_cosl >> ${S}/tools/include/gnu/stubs-32.h test -d ${S}/tools/include/gnu || mkdir ${S}/tools/include/gnu
echo \#define __stub___kernel_sinl >> ${S}/tools/include/gnu/stubs-32.h cat ${STAGING_DIR_TARGET}/usr/include/gnu/stubs-64.h | grep -v stub_bdflush | grep -v stub_getmsg | grep -v stub_putmsg > ${S}/tools/include/gnu/stubs-32.h
echo \#define __stub___kernel_tanl >> ${S}/tools/include/gnu/stubs-32.h echo \#define __stub___kernel_cosl >> ${S}/tools/include/gnu/stubs-32.h
echo \#define __stub___kernel_sinl >> ${S}/tools/include/gnu/stubs-32.h
echo \#define __stub___kernel_tanl >> ${S}/tools/include/gnu/stubs-32.h
fi
fi fi
# do configure # do configure
oe_runconf oe_runconf
# seabios needs a patch to specify correct compiler - pull and patch Makefile
make -C ${S}/tools/firmware seabios-dir
sed -i 's/export HOSTCC.*$(CC)/export HOSTCC ?= $(CC)/g' ${S}/tools/firmware/seabios-dir/Makefile
} }
do_compile() { do_compile() {
@ -720,5 +720,10 @@ sysroot_stage_all_append() {
sysroot_stage_dir ${D}/boot ${SYSROOT_DESTDIR}/kernel sysroot_stage_dir ${D}/boot ${SYSROOT_DESTDIR}/kernel
install -d ${DEPLOY_DIR_IMAGE} install -d ${DEPLOY_DIR_IMAGE}
install -m 0644 ${D}/boot/xen.gz ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz if [ -f ${D}/boot/xen ]; then
install -m 0644 ${D}/boot/xen ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}
fi
if [ -f ${D}/boot/xen.gz ]; then
install -m 0644 ${D}/boot/xen.gz ${DEPLOY_DIR_IMAGE}/xen-${MACHINE}.gz
fi
} }