From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx1.pokylinux.org (Postfix) with ESMTP id C2AF94C811FD for ; Fri, 13 May 2011 12:14:03 -0500 (CDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 13 May 2011 10:14:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.64,365,1301900400"; d="scan'208";a="642367235" Received: from unknown (HELO [10.7.199.58]) ([10.7.199.58]) by orsmga002.jf.intel.com with ESMTP; 13 May 2011 10:14:03 -0700 From: Joshua Lock To: poky@yoctoproject.org Date: Fri, 13 May 2011 10:14:02 -0700 In-Reply-To: <7b9f4d4a10900dc73e5faea2d59131465b667eea.1305295079.git.paul.eggleton@linux.intel.com> References: <7b9f4d4a10900dc73e5faea2d59131465b667eea.1305295079.git.paul.eggleton@linux.intel.com> X-Mailer: Evolution 3.0.1 (3.0.1-1.fc15) Message-ID: <1305306842.2023.20.camel@scimitar> Mime-Version: 1.0 Subject: Re: [PATCH 1/3] qt4: update from 4.7.2 to 4.7.3 X-BeenThere: poky@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Poky build system developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2011 17:14:04 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit On Fri, 2011-05-13 at 14:59 +0100, Paul Eggleton wrote: > From: Paul Eggleton > > The Comodo certificates patch has been merged upstream so it no longer > needs to be applied. Some PR values were reset and SRC_URI checksums > updated but other than this there are no recipe changes. > > Signed-off-by: Paul Eggleton Reviewed-by: Joshua Lock > --- > meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} | 5 ++--- > .../0001-Added-Openembedded-crossarch-option.patch | 0 > .../recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf | 0 > .../hack-out-pg2-4.7.0.patch | 0 > .../qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf | 0 > ...qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} | 2 +- > ...s-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} | 4 ++-- > meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb | 6 ------ > meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 6 ++++++ > ...qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} | 2 +- > 10 files changed, 12 insertions(+), 13 deletions(-) > rename meta/recipes-qt/qt4/{qt-4.7.2.inc => qt-4.7.3.inc} (89%) > rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/0001-Added-Openembedded-crossarch-option.patch (100%) > rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/g++.conf (100%) > rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/hack-out-pg2-4.7.0.patch (100%) > rename meta/recipes-qt/qt4/{qt-4.7.2 => qt-4.7.3}/linux.conf (100%) > rename meta/recipes-qt/qt4/{qt4-embedded_4.7.2.bb => qt4-embedded_4.7.3.bb} (87%) > rename meta/recipes-qt/qt4/{qt4-tools-native_4.7.2.bb => qt4-tools-native_4.7.3.bb} (61%) > delete mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb > create mode 100644 meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb > rename meta/recipes-qt/qt4/{qt4-x11-free_4.7.2.bb => qt4-x11-free_4.7.3.bb} (88%) > > diff --git a/meta/recipes-qt/qt4/qt-4.7.2.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc > similarity index 89% > rename from meta/recipes-qt/qt4/qt-4.7.2.inc > rename to meta/recipes-qt/qt4/qt-4.7.3.inc > index 0f75a46..7f26b9b 100644 > --- a/meta/recipes-qt/qt4/qt-4.7.2.inc > +++ b/meta/recipes-qt/qt4/qt-4.7.3.inc > @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \ > FILESPATH =. "${FILE_DIRNAME}/qt-${PV}:" > > SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \ > - file://blacklist-fraudulent-comodo-certificates-patch.diff \ > file://0004-no-qmake.patch \ > file://hack-out-pg2-4.7.0.patch \ > file://0006-freetype-host-includes.patch \ > @@ -15,8 +14,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}. > file://linux.conf \ > " > > -SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" > -SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" > +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" > +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" > > S = "${WORKDIR}/qt-everywhere-opensource-src-${PV}" > > diff --git a/meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch b/meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch > similarity index 100% > rename from meta/recipes-qt/qt4/qt-4.7.2/0001-Added-Openembedded-crossarch-option.patch > rename to meta/recipes-qt/qt4/qt-4.7.3/0001-Added-Openembedded-crossarch-option.patch > diff --git a/meta/recipes-qt/qt4/qt-4.7.2/g++.conf b/meta/recipes-qt/qt4/qt-4.7.3/g++.conf > similarity index 100% > rename from meta/recipes-qt/qt4/qt-4.7.2/g++.conf > rename to meta/recipes-qt/qt4/qt-4.7.3/g++.conf > diff --git a/meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch b/meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch > similarity index 100% > rename from meta/recipes-qt/qt4/qt-4.7.2/hack-out-pg2-4.7.0.patch > rename to meta/recipes-qt/qt4/qt-4.7.3/hack-out-pg2-4.7.0.patch > diff --git a/meta/recipes-qt/qt4/qt-4.7.2/linux.conf b/meta/recipes-qt/qt4/qt-4.7.3/linux.conf > similarity index 100% > rename from meta/recipes-qt/qt4/qt-4.7.2/linux.conf > rename to meta/recipes-qt/qt4/qt-4.7.3/linux.conf > diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb > similarity index 87% > rename from meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb > rename to meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb > index c3f6713..b88b1e9 100644 > --- a/meta/recipes-qt/qt4/qt4-embedded_4.7.2.bb > +++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.3.bb > @@ -1,7 +1,7 @@ > require qt-${PV}.inc > require qt4-embedded.inc > > -PR = "${INC_PR}.1" > +PR = "${INC_PR}.0" > > QT_CONFIG_FLAGS_append_armv6 = " -no-neon " > > diff --git a/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb b/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb > similarity index 61% > rename from meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb > rename to meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb > index d3c0eda..deb4231 100644 > --- a/meta/recipes-qt/qt4/qt4-tools-native_4.7.2.bb > +++ b/meta/recipes-qt/qt4/qt4-tools-native_4.7.3.bb > @@ -9,5 +9,5 @@ EXTRA_OECONF += " -no-fast -silent -no-rpath" > > TOBUILD := "src/tools/bootstrap ${TOBUILD}" > > -SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" > -SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" > +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" > +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" > diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb > deleted file mode 100644 > index a917ac4..0000000 > --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.2.bb > +++ /dev/null > @@ -1,6 +0,0 @@ > -require qt4-tools-nativesdk.inc > - > -PR = "${INC_PR}.0" > - > -SRC_URI[md5sum] = "66b992f5c21145df08c99d21847f4fdb" > -SRC_URI[sha256sum] = "d4783b524b90bcd270ccf6e7a30d5fb51696c47eb5de49ebc2d553cd3eb49336" > diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb > new file mode 100644 > index 0000000..d61f312 > --- /dev/null > +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb > @@ -0,0 +1,6 @@ > +require qt4-tools-nativesdk.inc > + > +PR = "${INC_PR}.0" > + > +SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe" > +SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e" > diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb > similarity index 88% > rename from meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb > rename to meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb > index 75c6314..359a756 100644 > --- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.2.bb > +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.3.bb > @@ -1,7 +1,7 @@ > require qt4-x11-free.inc > require qt-${PV}.inc > > -PR = "${INC_PR}.1" > +PR = "${INC_PR}.0" > > QT_CONFIG_FLAGS_append_armv6 = " -no-neon " > -- Joshua Lock Yocto Build System Monkey Intel Open Source Technology Centre