From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 24404E00C66; Mon, 21 Dec 2015 21:50:06 -0800 (PST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [209.85.160.176 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mail-yk0-f176.google.com (mail-yk0-f176.google.com [209.85.160.176]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 9A48CE00457 for ; Mon, 21 Dec 2015 21:50:03 -0800 (PST) Received: by mail-yk0-f176.google.com with SMTP id 140so153713285ykp.0 for ; Mon, 21 Dec 2015 21:50:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cardoe-com.20150623.gappssmtp.com; s=20150623; h=subject:to:references:from:message-id:date:user-agent:mime-version :in-reply-to:content-type; bh=oVQDNdABn9lyJmdDIw40hWoJxshwSMOtbjkTScpAMyc=; b=j7LNslYr90TTK0FM6IrQUm0Fczh/rV/ZSGg8z+0O/mpugfg2sWuYSTqwIdOjSXlfNl kTMlKvExDCBiODiehx4ttSNKW0oNJpYOrUF2GLnmTH7WZDA3u4sp+dNDeJfmU2H8veT3 V0Mp8i6ks6xo1WMDZKj90TRqHXF9Pm2P8CwqX9vwDIePvbmnNpf4/Qm3q7O71enGLERV fTYH/Qql5/nKvI14hfrC9vm2yihnHUJunREF5UbvstHXU2ZyfGZgdW+iDf6U8N4Dx++2 LT6WHCOtr/3TOXRGD5EEUHyIdHn9J0kZnWjVoD3wIjlGXPRbAP4KsBcKTFvBPYIt26MK wtAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-type; bh=oVQDNdABn9lyJmdDIw40hWoJxshwSMOtbjkTScpAMyc=; b=RwB8o/ed+TLCL4YyWHF1GZXjIwdwDEe3Zv5/6kWdcnJI+s1+6NNowa9vSuZCvnv9hC sg3+yyCxIMp1kKTRtI/xT7Yt6jyiY0cX3cAUPeA55QGnyqitpHi+OMXcdW17v0Cw0aal asZicjRjK3S2HQczWUxcNDnYONDgm4435udxWaN4NGMcQzZ4RutFewv+SDMUXd8fqlf1 B0LMsTaZ/RCzXZNDvzyG4JeGbn7tBl7T2RUWUzewgWg+N+6nSMz3lJlNhs32KZJb4TXw FHmXkKL2/ovKn4L7tt7A75eavxQOi4h3AksGYyBDk8FYKWVC3m4yhoD0huRlKSKmCl4T U3zw== X-Gm-Message-State: ALoCoQmhfXNuWCm3YDJTqpwC9c1TWIVqN/8ItBUSJjQF6mudjulS+svNGyAF+nNSqeLCGf/wbaoEofHdHdF5EgTR/W7Fg9EgBg== X-Received: by 10.13.240.66 with SMTP id z63mr19622787ywe.171.1450763403196; Mon, 21 Dec 2015 21:50:03 -0800 (PST) Received: from doug-macbook.lan (c-68-46-196-185.hsd1.al.comcast.net. [68.46.196.185]) by smtp.googlemail.com with ESMTPSA id c67sm31838999ywe.31.2015.12.21.21.50.02 for (version=TLSv1/SSLv3 cipher=OTHER); Mon, 21 Dec 2015 21:50:02 -0800 (PST) To: meta-virtualization@yoctoproject.org References: <1450747435-5738-1-git-send-email-cjp256@gmail.com> <1450747435-5738-3-git-send-email-cjp256@gmail.com> From: Doug Goldstein Message-ID: <5678E434.10100@cardoe.com> Date: Mon, 21 Dec 2015 23:48:36 -0600 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.11; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 In-Reply-To: <1450747435-5738-3-git-send-email-cjp256@gmail.com> Subject: Re: [PATCH 3/4] xen: uprev to 4.6.0 X-BeenThere: meta-virtualization@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: "Discussion of layer enabling hypervisor, virtualization tool stack, and cloud support" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2015 05:50:06 -0000 X-Groupsio-MsgNum: 1604 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="o4EJdel6Bb7xC9uoWhmHTgIx3C9NOJQdf" --o4EJdel6Bb7xC9uoWhmHTgIx3C9NOJQdf Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: quoted-printable On 12/21/15 7:23 PM, Chris Patterson wrote: > - Fixup LICENSE checksum. > - Add patch to skip a check that breaks in cross-compile environments. > - Drop udev package that has been removed. >=20 > Signed-off-by: Chris Patterson > --- > recipes-extended/xen/files/skip-headers.chk.patch | 48 +++++++++++++= ++++++ > recipes-extended/xen/xen.inc | 13 +----- > recipes-extended/xen/xen_4.5.0.bb | 50 -------------= ------- > recipes-extended/xen/xen_4.6.0.bb | 51 +++++++++++++= ++++++++ > 4 files changed, 100 insertions(+), 62 deletions(-) > create mode 100644 recipes-extended/xen/files/skip-headers.chk.patch > delete mode 100644 recipes-extended/xen/xen_4.5.0.bb > create mode 100644 recipes-extended/xen/xen_4.6.0.bb >=20 > diff --git a/recipes-extended/xen/files/skip-headers.chk.patch b/recipe= s-extended/xen/files/skip-headers.chk.patch > new file mode 100644 > index 0000000..19ce7bf > --- /dev/null > +++ b/recipes-extended/xen/files/skip-headers.chk.patch > @@ -0,0 +1,48 @@ > +commit 162c1db56f3126f392269cb81808657e55c395e5 > +Author: Chris Patterson > +Date: Mon Dec 21 19:49:43 2015 -0500 > + > + Makefile: remove headers.chk which breaks in cross compilation env= ironments > + =20 > + Signed-off-by: Chris Patterson > + > +diff --git a/xen/include/Makefile b/xen/include/Makefile > +index 94ba3d8..dd51d5b 100644 > +--- a/xen/include/Makefile > ++++ b/xen/include/Makefile > +@@ -87,35 +87,5 @@ compat/xlat.h: $(addprefix compat/.xlat/,$(xlat-y))= Makefile > + cat $(filter %.h,$^) >$@.new > + mv -f $@.new $@ > +=20 > +-ifeq ($(XEN_TARGET_ARCH),$(XEN_COMPILE_ARCH)) > +- > +-all: headers.chk headers++.chk > +- > +-PUBLIC_HEADERS :=3D $(filter-out public/arch-% public/dom0_ops.h, $(w= ildcard public/*.h public/*/*.h) $(public-y)) > +- > +-PUBLIC_ANSI_HEADERS :=3D $(filter-out public/%ctl.h public/xsm/% publ= ic/%hvm/save.h, $(PUBLIC_HEADERS)) > +- > +-headers.chk: $(PUBLIC_ANSI_HEADERS) Makefile > +- for i in $(filter %.h,$^); do \ > +- $(CC) -x c -ansi -Wall -Werror -include stdint.h \ > +- -S -o /dev/null $$i || exit 1; \ > +- echo $$i; \ > +- done >$@.new > +- mv $@.new $@ > +- > +-headers++.chk: $(PUBLIC_HEADERS) Makefile > +- if $(CXX) -v >/dev/null 2>&1; then \ > +- for i in $(filter %.h,$^); do \ > +- echo '#include "'$$i'"' \ > +- | $(CXX) -x c++ -std=3Dgnu++98 -Wall -Werror -D__XEN_TOOLS__= \ > +- -include stdint.h -include public/xen.h -S -o /dev/null - = \ > +- || exit 1; \ > +- echo $$i; \ > +- done ; \ > +- fi >$@.new > +- mv $@.new $@ > +- > +-endif > +- > + clean:: > + rm -rf compat headers.chk headers++.chk > diff --git a/recipes-extended/xen/xen.inc b/recipes-extended/xen/xen.in= c > index 00f1823..c1be16d 100644 > --- a/recipes-extended/xen/xen.inc > +++ b/recipes-extended/xen/xen.inc > @@ -3,7 +3,7 @@ HOMEPAGE =3D "http://xen.org" > LICENSE =3D "GPLv2" > SECTION =3D "console/tools" > =20 > -LIC_FILES_CHKSUM =3D "file://COPYING;md5=3De0f0f3ac55608719a82394cc353= 928df" > +LIC_FILES_CHKSUM =3D "file://COPYING;md5=3Da6260c12cd5de27e80d89ae18e4= 8d20a" > =20 > COMPATIBLE_HOST =3D '(x86_64.*).*-linux|aarch64.*-linux' > =20 > @@ -69,7 +69,6 @@ RDEPENDS_${PN}-base =3D "\ > ${PN}-fsimage \ > ${PN}-scripts-block \ > ${PN}-scripts-network \ > - ${PN}-udev \ > ${PN}-xen-watchdog \ > ${PN}-xencommons \ > ${PN}-xendomains \ > @@ -99,7 +98,6 @@ RDEPENDS_${PN}-remus =3D "python" > RDEPENDS_${PN}-scripts-block =3D "\ > bash \ > ${PN}-scripts-common \ > - ${PN}-udev \ > ${PN}-volatiles \ > " > =20 > @@ -109,12 +107,9 @@ RDEPENDS_${PN}-scripts-network =3D "\ > bash \ > bridge-utils \ > ${PN}-scripts-common \ > - ${PN}-udev \ > ${PN}-volatiles \ > " > =20 > -RDEPENDS_${PN}-udev =3D "udev" > - > RDEPENDS_${PN}-xencommons =3D "\ > bash \ > ${PN}-console \ > @@ -182,7 +177,6 @@ PACKAGES =3D "\ > ${PN}-scripts-common \ > ${PN}-scripts-network \ > ${PN}-staticdev \ > - ${PN}-udev \ > ${PN}-volatiles \ > ${PN}-xcutils \ > ${PN}-xencommons \ > @@ -512,11 +506,6 @@ FILES_${PN}-scripts-common =3D " \ > ${sysconfdir}/xen/scripts/xen-script-common.sh \ > " > =20 > -FILES_${PN}-udev =3D "\ > - ${sysconfdir}/udev/rules.d/xen-backend.rules \ > - ${sysconfdir}/udev/rules.d/xend.rules \ > - " > - > FILES_${PN}-volatiles =3D "\ > ${sysconfdir}/default/volatiles/99_xen \ > ${sysconfdir}/tmpfiles.d/xen.conf \ The dependency updates here aren't actually correct. You've dropped the udev rules but failed to capture the devd bits. > diff --git a/recipes-extended/xen/xen_4.5.0.bb b/recipes-extended/xen/x= en_4.5.0.bb > deleted file mode 100644 > index 6c17b90..0000000 > --- a/recipes-extended/xen/xen_4.5.0.bb > +++ /dev/null > @@ -1,50 +0,0 @@ > -require xen.inc > - > -SRC_URI =3D " \ > - http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \= > - file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \ > - " > - > -SRC_URI[md5sum] =3D "9bac43d2419d05a647064d9253bb03fa" > -SRC_URI[sha256sum] =3D "5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b98752= 1d33f099541a006f3b" > - > -S =3D "${WORKDIR}/xen-${PV}" > - > -# Xen suffixes the libexecdir within its configure scripts, prevent th= e nested xen/xen/ > -libexecdir =3D "${libdir}" > - > -# These options override detected values from the build. > -EXTRA_OECONF_append +=3D " \ > - --with-initddir=3D${INIT_D_DIR} \ > - --with-sysconfig-leaf-dir=3Ddefault \ > - --with-system-qemu=3D/usr/bin/qemu-system-i386 \ > - --disable-qemu-traditional \ > - " > - > -EXTRA_OEMAKE +=3D "STDVGA_ROM=3D${STAGING_DIR_HOST}/usr/share/firmware= /vgabios-0.7a.bin" > -EXTRA_OEMAKE +=3D "CIRRUSVGA_ROM=3D${STAGING_DIR_HOST}/usr/share/firmw= are/vgabios-0.7a.cirrus.bin" > -EXTRA_OEMAKE +=3D "SEABIOS_ROM=3D${STAGING_DIR_HOST}/usr/share/firmwar= e/bios.bin" > -EXTRA_OEMAKE +=3D "ETHERBOOT_ROMS=3D${STAGING_DIR_HOST}/usr/share/firm= ware/rtl8139.rom" > -#EXTRA_OEMAKE +=3D "XENGFX_ROM=3D${STAGING_DIR_HOST}/usr/share/firmwar= e/vgabios.bin" > - > -do_configure_prepend() { > - # fixup AS/CC/CCP/etc variable within StdGNU.mk > - for i in AS LD CC CPP AR RANLIB NM STRIP OBJCOPY OBJDUMP; do > - sed -i "s/^\($i\s\s*\).*=3D/\1?=3D/" ${S}/config/StdGNU.mk > - done > - # fixup environment passing in some makefiles > - sed -i 's#\(\w*\)=3D\(\$.\w*.\)#\1=3D"\2"#' ${S}/tools/firmware/Ma= kefile > - > - # libsystemd-daemon -> libsystemd for newer systemd versions > - sed -i 's#libsystemd-daemon#libsystemd#' ${S}/tools/configure > -} > - > -do_install_append() { > - # fixup default path to qemu-system-i386 > - sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=3D\).*$#\1"/usr/bin/qe= mu-system-i386"#' ${D}/etc/init.d/xencommons > - > - if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.s= ervice ]; then > - sed -i 's#ExecStart=3D.*qemu-system-i386\(.*\)$#ExecStart=3D/u= sr/bin/qemu-system-i386\1#' \ > - ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.s= ervice > - fi > -} > diff --git a/recipes-extended/xen/xen_4.6.0.bb b/recipes-extended/xen/x= en_4.6.0.bb > new file mode 100644 > index 0000000..1c84a6f > --- /dev/null > +++ b/recipes-extended/xen/xen_4.6.0.bb > @@ -0,0 +1,51 @@ > +require xen.inc > + > +SRC_URI =3D " \ > + http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz \= > + file://xen-x86-Fix-up-rules-when-forcing-mno-sse.patch \ > + file://skip-headers.chk.patch \ > + " > + > +SRC_URI[md5sum] =3D "48e232f90927c08326a7b52bb06f49bc" > +SRC_URI[sha256sum] =3D "6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adb= d348a2186478e80909" > + > +S =3D "${WORKDIR}/xen-${PV}" > + > +# Xen suffixes the libexecdir within its configure scripts, prevent th= e nested xen/xen/ > +libexecdir =3D "${libdir}" > + > +# These options override detected values from the build. > +EXTRA_OECONF_append +=3D " \ > + --with-initddir=3D${INIT_D_DIR} \ > + --with-sysconfig-leaf-dir=3Ddefault \ > + --with-system-qemu=3D/usr/bin/qemu-system-i386 \ > + --disable-qemu-traditional \ > + " > + > +EXTRA_OEMAKE +=3D "STDVGA_ROM=3D${STAGING_DIR_HOST}/usr/share/firmware= /vgabios-0.7a.bin" > +EXTRA_OEMAKE +=3D "CIRRUSVGA_ROM=3D${STAGING_DIR_HOST}/usr/share/firmw= are/vgabios-0.7a.cirrus.bin" > +EXTRA_OEMAKE +=3D "SEABIOS_ROM=3D${STAGING_DIR_HOST}/usr/share/firmwar= e/bios.bin" > +EXTRA_OEMAKE +=3D "ETHERBOOT_ROMS=3D${STAGING_DIR_HOST}/usr/share/firm= ware/rtl8139.rom" > +#EXTRA_OEMAKE +=3D "XENGFX_ROM=3D${STAGING_DIR_HOST}/usr/share/firmwar= e/vgabios.bin" > + > +do_configure_prepend() { > + # fixup AS/CC/CCP/etc variable within StdGNU.mk > + for i in AS LD CC CPP AR RANLIB NM STRIP OBJCOPY OBJDUMP; do > + sed -i "s/^\($i\s\s*\).*=3D/\1?=3D/" ${S}/config/StdGNU.mk > + done > + # fixup environment passing in some makefiles > + sed -i 's#\(\w*\)=3D\(\$.\w*.\)#\1=3D"\2"#' ${S}/tools/firmware/Ma= kefile > + > + # libsystemd-daemon -> libsystemd for newer systemd versions > + sed -i 's#libsystemd-daemon#libsystemd#' ${S}/tools/configure > +} > + > +do_install_append() { > + # fixup default path to qemu-system-i386 > + sed -i 's#\(test -z "$QEMU_XEN" && QEMU_XEN=3D\).*$#\1"/usr/bin/qe= mu-system-i386"#' ${D}/etc/init.d/xencommons > + > + if [ -e ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.s= ervice ]; then > + sed -i 's#ExecStart=3D.*qemu-system-i386\(.*\)$#ExecStart=3D/u= sr/bin/qemu-system-i386\1#' \ > + ${D}${systemd_unitdir}/system/xen-qemu-dom0-disk-backend.s= ervice > + fi > +} >=20 --=20 Doug Goldstein --o4EJdel6Bb7xC9uoWhmHTgIx3C9NOJQdf Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.0 iQJ8BAEBCgBmBQJWeOQ0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRBNTM5MEQ2RTNFMTkyNzlCNzVDMzIwOTVB MkJDMDNEQzg3RUQxQkQ0AAoJEKK8A9yH7RvU7B0P/0rtK+bP+avR8M3VXfgKN92Z UwUDHaJMNMTXs6hKbAaRc3r88yem+9C0ZgeKkez2LfMlsJEwWK+EEZAEJ11+/hO6 FXtjnMePQIlXHcyc2fHUkv7XV79nBwaXyUMFsTf7HKuFfCBhs9usrVShkbJDTKi3 9yOymVDz3E5JTh6c6ighbIfISZa9OmtOskszBhl7dwOYWHn7dD7BPBwlrxD4r3BX khifpZZh1o+xMB3HrVukEE3tCXysRCmnokZqrRjawV3le9Ut7/BpXqE5uyjZOOMf 16YyKkcSR4GTUYbjOTWRNhso4i0SugfX0X2MQdQlb6wl3CPeQVXkvs8ot6kbDHDH LQVathJ8TLlc4IZFPzjqNtTBGwTfwP1GJ1WYecRYrzt/d+Rs8dUOIZByle3dZpLd 34EJzozOQCWWUDQOak59g6Ut2YA7EZir2iuqTk2cOLWCzKYMXdncxFdKgJFjp31Z mhlp22Nh1+VX+pItovERmJ3cUIeoSYiOgQy4s8OJrgo9v6hdZATmosm5dqErWQTs 65xwJM2EPAqKE0cQ3KIl2IzNdjcSNAuRo9OFPQnArLD5r+rYxXzPDrHMloVZ/z1a GV78tN9uafNcFsaecxaJ2wP5whQ+k6NZ4KScEiP+3eAs+hQdFYR0KaepFj985hV/ lXSZRTOMM1B8Tko+RfiQ =0IeE -----END PGP SIGNATURE----- --o4EJdel6Bb7xC9uoWhmHTgIx3C9NOJQdf--