From patchwork Tue May 17 15:57:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Liu X-Patchwork-Id: 9114121 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AE98DBF29F for ; Tue, 17 May 2016 16:00:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C4A732025A for ; Tue, 17 May 2016 16:00:39 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D957B2022D for ; Tue, 17 May 2016 16:00:37 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b2hNh-0005Iu-CM; Tue, 17 May 2016 15:58:01 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b2hNg-0005Il-89 for xen-devel@lists.xenproject.org; Tue, 17 May 2016 15:58:00 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 52/53-26599-78F3B375; Tue, 17 May 2016 15:57:59 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrGLMWRWlGSWpSXmKPExsXitHRDpG67vXW 4wZs+DovvWyYzOTB6HP5whSWAMYo1My8pvyKBNeNB5xm2glmcFa8e72VqYGzg6GLk5JAQ8Jf4 17OXBcRmE1CW+NnZywZiiwjoSTQdeM4IYjML5EnMX7qYGcQWFrCRuPX4G1ANBweLgKrEqg/hI GFeAWeJM793sUGMlJM4f/wnWLmQgIJEx/RjTBA1ghInZz5hgRgpIXHwxQtmkDESAtwSf7vtJz DyzEJSNQtJ1QJGplWM6sWpRWWpRbpGeklFmekZJbmJmTm6hgamermpxcWJ6ak5iUnFesn5uZs YgeHBAAQ7GL//cTrEKMnBpCTKe8HEOlyILyk/pTIjsTgjvqg0J7X4EKMMB4eSBG+4HVBOsCg1 PbUiLTMHGKgwaQkOHiUR3giQNG9xQWJucWY6ROoUo6KUOK89SEIAJJFRmgfXBouOS4yyUsK8j ECHCPEUpBblZpagyr9iFOdgVBLmjQGZwpOZVwI3/RXQYiagxRPMLEAWlyQipKQaGLOrq8IXHD yRn/tuceVETu6yaT/mFrcVbuj1bG1+Y72Jf4uATP6+ufLRd1/JlfFcmKBfJj5x5p430vEKpy9 N//mj22Oy/lO/JSmLmnetLmZ7/n2rwfzIeRUWDi6OCQwn5wn57Lv/nU0l+PVBrre1vdVRJ0Xm fyiYPs2DQXq31b1D5gUvbYRkK5VYijMSDbWYi4oTAYjvMyKJAgAA X-Env-Sender: prvs=938bff018=wei.liu2@citrix.com X-Msg-Ref: server-9.tower-206.messagelabs.com!1463500677!40177974!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58233 invoked from network); 17 May 2016 15:57:58 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-9.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 17 May 2016 15:57:58 -0000 X-IronPort-AV: E=Sophos;i="5.26,324,1459814400"; d="scan'208";a="354803054" From: Wei Liu To: Xen-devel Date: Tue, 17 May 2016 16:57:55 +0100 Message-ID: <1463500675-23974-1-git-send-email-wei.liu2@citrix.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 X-DLP: MIA1 Cc: Ian Jackson , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH for-4.6] Config.mk: update mini-os changeset X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Patches pulled in: lib/sys.c: enclose file_types in define guards build: change MINI-OS_ROOT to MINIOS_ROOT Signed-off-by: Wei Liu --- Cc: Jan Beulich Cc: Ian Jackson One of the patches is required to build stubdom on Ubuntu 16.04. Samuel has confirmed it's fine to backport both. http://lists.xen.org/archives/html/minios-devel/2016-05/msg00018.html --- Config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Config.mk b/Config.mk index e529513..513467b 100644 --- a/Config.mk +++ b/Config.mk @@ -255,9 +255,9 @@ MINIOS_UPSTREAM_URL ?= git://xenbits.xen.org/mini-os.git endif OVMF_UPSTREAM_REVISION ?= 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d QEMU_UPSTREAM_REVISION ?= qemu-xen-4.6.1 -MINIOS_UPSTREAM_REVISION ?= 6aadd46e0927763861b19eacce2f2aeac9f17835 -# Sat, 9 Apr 2016 23:46:32 +0100 (00:46 +0200) -# Fix time update +MINIOS_UPSTREAM_REVISION ?= e1cca557c64272d33da7bafc0ad25399267563d0 +# Fri May 13 15:21:10 2016 +0100 +# lib/sys.c: enclose file_types in define guards SEABIOS_UPSTREAM_REVISION ?= rel-1.8.2 # Tue Mar 17 10:52:16 2015 -0400