* [RC2 PULL 01/13] Uprev to latest version of prelink_git, fixing TLS issues
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:14 ` [RC2 PULL 02/13] package_deb.bbclass, populate_sdk_deb.bbclass: fix meta-toolchain-gmae build Saul Wold
` (12 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Mark Hatle <mark.hatle@windriver.com>
[YOCTO #1473]
From the upstream cross prelink respository:
Fix printf typecast problem
Without this fix the printed TLS(...) information is incorrect, which
causes the core prelinker code to incorrectly prelink. This bug triggers
primarily on x86 (32-bit) hosts, targeting x86 (32-bit) targets and arm
targets.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
---
meta/recipes-devtools/prelink/prelink_git.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb b/meta/recipes-devtools/prelink/prelink_git.bb
index 1565ca6..af6de8e 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be resolved at \
runtime and thus programs come up faster."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
-SRCREV = "964f6eba613bf1c791a2a0b858cd044f05e2f151"
+SRCREV = "3e3f9b0876aa5ac83a783a95b8bab52cb38ed785"
PV = "1.0+git${SRCPV}"
-PR = "r6"
+PR = "r7"
#
# The cron script attempts to re-prelink the system daily -- on
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 02/13] package_deb.bbclass, populate_sdk_deb.bbclass: fix meta-toolchain-gmae build
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
2011-09-15 3:14 ` [RC2 PULL 01/13] Uprev to latest version of prelink_git, fixing TLS issues Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:14 ` [RC2 PULL 03/13] qt4: add blacklist-diginotar-certs patch Saul Wold
` (11 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Dexuan Cui <dexuan.cui@intel.com>
[YOCTO #1070]
Currently with deb packaging, we have 2 issues when running
"bitbake meta-toolchain-gmae".
1) when MACHINE="qemux86", SDKMACHINE="i686", INSTALL_BASEARCH_DEB is "i686",
too. This causes the following ERROR:
| E: Couldn't find package task-sdk-host-nativesdk
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed
This is becasue: due to the DPKG_ARCH mapping, we create such a deb package
tmp/deploy/deb/i686-nativesdk/task-sdk-host-nativesdk_1.0-r10_i386.deb; dpkg
can't recoginze the package. We need to map INSTALL_BASEARCH_DEB in the same
way.
2) when MACHINE="qemux86", SDKMACHINE="x86_64", INSTALL_BASEARCH_DEB is
"x86_64", too.
We get such an ERROR:
| E: Couldn't find package task-cross-canadian-i586
NOTE: package meta-toolchain-gmae-1.0-r6: task do_populate_sdk: Failed
This is because: dpkg can't recognize the generated package
tmp/deploy/deb/x86_64-nativesdk/task-cross-canadian-i586_1.0-r0_i386.deb
Here the "i386" suffix is incorrect and should be "x86_64" -- the i386
comes from the line
DPKG_ARCH_i586 ?= "i386" in package_deb.bbclass.
However, for canadian package, actually here the overriding of DPKG (from
"x86-64" to "i386") should not happen -- it accidently happens just because
TARGET_ARCH exists in OVERRIDES. We can move the overriding logic to the
anonymous python function to work this around.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
meta/classes/package_deb.bbclass | 10 ++++------
meta/classes/populate_sdk_deb.bbclass | 6 +++++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 87e20da..5a32047 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -6,13 +6,7 @@ inherit package
IMAGE_PKGTYPE ?= "deb"
-# Map TARGET_ARCH to Debian's ideas about architectures
DPKG_ARCH ?= "${TARGET_ARCH}"
-DPKG_ARCH_x86 ?= "i386"
-DPKG_ARCH_i486 ?= "i386"
-DPKG_ARCH_i586 ?= "i386"
-DPKG_ARCH_i686 ?= "i386"
-DPKG_ARCH_pentium ?= "i386"
PKGWRITEDIRDEB = "${WORKDIR}/deploy-debs"
@@ -418,6 +412,10 @@ python () {
bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d)
bb.data.setVarFlag('do_package_write_deb', 'fakeroot', "1", d)
bb.data.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1", d)
+
+ # Map TARGET_ARCH to Debian's ideas about architectures
+ if bb.data.getVar('DPKG_ARCH', d, True) in ["x86", "i486", "i586", "i686", "pentium"]:
+ bb.data.setVar('DPKG_ARCH', 'i386', d)
}
python do_package_write_deb () {
diff --git a/meta/classes/populate_sdk_deb.bbclass b/meta/classes/populate_sdk_deb.bbclass
index 40516b8..2cff69e 100644
--- a/meta/classes/populate_sdk_deb.bbclass
+++ b/meta/classes/populate_sdk_deb.bbclass
@@ -2,6 +2,10 @@ do_populate_sdk[depends] += "dpkg-native:do_populate_sysroot apt-native:do_popul
do_populate_sdk[recrdeptask] += "do_package_write_deb"
+DEB_SDK_ARCH = "${@[bb.data.getVar('SDK_ARCH', d, 1), "i386"]\
+ [bb.data.getVar('SDK_ARCH', d, 1) in \
+ ["x86", "i486", "i586", "i686", "pentium"]]}"
+
populate_sdk_post_deb () {
local target_rootfs=$1
@@ -37,7 +41,7 @@ fakeroot populate_sdk_deb () {
## install nativesdk ##
echo "Installing NATIVESDK packages"
export INSTALL_ROOTFS_DEB="${SDK_OUTPUT}"
- export INSTALL_BASEARCH_DEB="${SDK_ARCH}"
+ export INSTALL_BASEARCH_DEB="${DEB_SDK_ARCH}"
export INSTALL_ARCHS_DEB="${SDK_PACKAGE_ARCHS}"
export INSTALL_PACKAGES_NORMAL_DEB="${TOOLCHAIN_HOST_TASK}"
export INSTALL_PACKAGES_ATTEMPTONLY_DEB=""
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 03/13] qt4: add blacklist-diginotar-certs patch
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
2011-09-15 3:14 ` [RC2 PULL 01/13] Uprev to latest version of prelink_git, fixing TLS issues Saul Wold
2011-09-15 3:14 ` [RC2 PULL 02/13] package_deb.bbclass, populate_sdk_deb.bbclass: fix meta-toolchain-gmae build Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:14 ` [RC2 PULL 04/13] distro_tracking_field: add distro checking field Saul Wold
` (10 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Eric Bénard <eric@eukrea.com>
- this patch comes from Nokia and blacklist all DigiNotar intermediates
and root certificates, more details are available here :
http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
.../qt4/files/blacklist-diginotar-certs.diff | 95 ++++++++++++++++++++
meta/recipes-qt/qt4/qt-4.7.3.inc | 1 +
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-native.inc | 2 +-
meta/recipes-qt/qt4/qt4-native_4.7.3.bb | 2 +
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 2 +-
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb | 2 +
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
8 files changed, 104 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
diff --git a/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff b/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
new file mode 100644
index 0000000..4d88ae2
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/blacklist-diginotar-certs.diff
@@ -0,0 +1,95 @@
+http://labs.qt.nokia.com/2011/09/02/what-the-diginotar-security-breach-means-for-qt-users/
+http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
+
+Original Author:Nokia
+Upstream-Status: Integrated in upcoming versions
+
+diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
+index 328c5c2..1ae98f4 100644
+--- a/src/network/ssl/qsslcertificate.cpp
++++ b/src/network/ssl/qsslcertificate.cpp
+@@ -803,22 +803,47 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
+ // These certificates are known to be fraudulent and were created during the comodo
+ // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
+ static const char *certificate_blacklist[] = {
+- "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
+- "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
+- "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
+- "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
+- "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
+- "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
+- "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
+- "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
+- "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
++ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo
++ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo
++ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo
++ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo
++ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo
++ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo
++ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo
++ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo
++ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo
++
++ "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // leaf certificate issued by DigiNotar
++ "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", // DigiNotar root
++ "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar Root
++ "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root
++ "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA G2", // other DigiNotar Root CA
++ "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA G2"
++ "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar Root
++
++ "1184640176", "DigiNotar Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust
++ "120000525", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
++ "120000505", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
++ "120000515", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
++ "20015536", "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar intermediate cross-signed by the Dutch government
++ "20001983", "DigiNotar PKIoverheid CA Organisatie - G2", // DigiNotar intermediate cross-signed by the Dutch government
++ "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root
++ "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA 2025", // DigiNotar intermediate
++// "(has not been seen in the wild so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate
++// "(has not been seen in the wild so far)", "Koninklijke Notariele Beroepsorganisatie CA", // compromised during DigiNotar breach
++// "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach
++ "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
++ "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
+ 0
+ };
+
+ bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
+ {
+ for (int a = 0; certificate_blacklist[a] != 0; a++) {
+- if (certificate.serialNumber() == certificate_blacklist[a])
++ QString blacklistedCommonName = QString::fromUtf8(certificate_blacklist[(a+1)]);
++ if (certificate.serialNumber() == certificate_blacklist[a++] &&
++ (certificate.subjectInfo(QSslCertificate::CommonName) == blacklistedCommonName ||
++ certificate.issuerInfo(QSslCertificate::CommonName) == blacklistedCommonName))
+ return true;
+ }
+ return false;
+diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
+index 141d80a..b8e6c4c 100644
+--- a/src/network/ssl/qsslsocket_openssl.cpp
++++ b/src/network/ssl/qsslsocket_openssl.cpp
+@@ -1193,12 +1193,16 @@ bool QSslSocketBackendPrivate::startHandshake()
+ X509 *x509 = q_SSL_get_peer_certificate(ssl);
+ configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
+ q_X509_free(x509);
+- if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
+- q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
+- q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
+- emit q->error(QAbstractSocket::SslHandshakeFailedError);
+- plainSocket->disconnectFromHost();
+- return false;
++
++ // check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer)
++ foreach (const QSslCertificate &cert, configuration.peerCertificateChain) {
++ if (QSslCertificatePrivate::isBlacklisted(cert)) {
++ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
++ q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
++ emit q->error(QAbstractSocket::SslHandshakeFailedError);
++ plainSocket->disconnectFromHost();
++ return false;
++ }
+ }
+
+ // Start translating errors.
diff --git a/meta/recipes-qt/qt4/qt-4.7.3.inc b/meta/recipes-qt/qt4/qt-4.7.3.inc
index c58679f..a5b8b05 100644
--- a/meta/recipes-qt/qt4/qt-4.7.3.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.3.inc
@@ -12,6 +12,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://0008-qt-lib-infix.patch \
file://0009-support-2bpp.patch \
file://0001-Added-Openembedded-crossarch-option.patch \
+ file://blacklist-diginotar-certs.diff \
file://g++.conf \
file://linux.conf \
"
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index d464a1d..9914c61 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -3,7 +3,7 @@ SECTION = "libs"
LICENSE = "LGPLv2.1 | GPLv3"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r29"
+INC_PR = "r30"
QT_BASE_NAME ?= "qt4-embedded"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-native.inc b/meta/recipes-qt/qt4/qt4-native.inc
index 7ed6a63..59c0059 100644
--- a/meta/recipes-qt/qt4/qt4-native.inc
+++ b/meta/recipes-qt/qt4/qt4-native.inc
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=fbc093901857fcd118f065f900982c24 \
file://LICENSE.GPL3;md5=babc5b6b77441da277f5c06b2e547720 \
file://LGPL_EXCEPTION.txt;md5=411080a56ff917a5a1aa08c98acae354"
-INC_PR = "r11"
+INC_PR = "r12"
inherit native
diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
index 5c84d4d..e90a7ba 100644
--- a/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
+++ b/meta/recipes-qt/qt4/qt4-native_4.7.3.bb
@@ -2,6 +2,8 @@ require qt4-native.inc
PR = "${INC_PR}.1"
+SRC_URI += "file://blacklist-diginotar-certs.diff"
+
# Find the g++.conf/linux.conf in the right directory.
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 068528e..6c396a5 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -4,7 +4,7 @@ SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r5"
+INC_PR = "r6"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
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
index d61f312..e2a4539 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.3.bb
@@ -2,5 +2,7 @@ require qt4-tools-nativesdk.inc
PR = "${INC_PR}.0"
+SRC_URI += "file://blacklist-diginotar-certs.diff"
+
SRC_URI[md5sum] = "49b96eefb1224cc529af6fe5608654fe"
SRC_URI[sha256sum] = "d02b6fd69d089c01f4a787aa18175d074ccaecf8980a5956e328c2991905937e"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 234cb89..0a714be 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free.inc
+++ b/meta/recipes-qt/qt4/qt4-x11-free.inc
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com"
SECTION = "x11/libs"
DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor"
-INC_PR = "r26"
+INC_PR = "r27"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 04/13] distro_tracking_field: add distro checking field
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (2 preceding siblings ...)
2011-09-15 3:14 ` [RC2 PULL 03/13] qt4: add blacklist-diginotar-certs patch Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:14 ` [RC2 PULL 05/13] task-core: split into task-core-console and task-core-x11 Saul Wold
` (9 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Yu Ke <ke.yu@intel.com>
add the missing distro checking field for some recipes
Signed-off-by: Yu Ke <ke.yu@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 6f1a462..a7fc011 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -1811,6 +1811,7 @@ RECIPE_STATUS_pn-mktemp="red"
RECIPE_LAST_UPDATE_pn-mktemp = "Jul 29, 2010"
RECIPE_MAINTAINER_pn-mktemp="Yu Ke <ke.yu@intel.com>"
RECIPE_LATEST_VERSION_pn-mktemp="1.7"
+DISTRO_PN_ALIAS_pn-mktemp = "Mandriva=mktemp Fedora=mktemp"
RECIPE_STATUS_pn-iputils="red"
RECIPE_LAST_UPDATE_pn-iputils = "Jul 29, 2010"
@@ -2917,6 +2918,7 @@ RECIPE_STATUS_pn-distcc="green"
RECIPE_LATEST_VERSION_pn-distcc="2.18.3"
RECIPE_LAST_UPDATE_pn-distcc = "Oct 28, 2006"
RECIPE_MAINTAINER_pn-distcc = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+DISTRO_PN_ALIAS_pn-distcc = "Debian=distcc Fedora=distcc"
RECIPE_STATUS_pn-flex="green"
RECIPE_LATEST_VERSION_pn-flex="2.5.35"
@@ -3404,6 +3406,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-imake = "2010/04/16"
RECIPE_INTEL_SECTION_pn-imake = "graphic app"
RECIPE_LAST_UPDATE_pn-imake = "Nov 21, 2010"
RECIPE_MAINTAINER_pn-imake = "Yu Ke <ke.yu@intel.com>"
+DISTRO_PN_ALIAS_pn-imake = "Mandriva=xutils Ubuntu=xutils"
RECIPE_STATUS_pn-qt4-tools-native = "green" # no update needed
RECIPE_LATEST_VERSION_pn-qt4-tools-native = "4.7.3"
@@ -3543,6 +3546,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-libxfontcache="2009/10/08"
RECIPE_INTEL_SECTION_pn-libxfontcache="graphic core"
RECIPE_LAST_UPDATE_pn-libxfontcache = "Jun 23, 2010"
RECIPE_MAINTAINER_pn-libxfontcache="Yu Ke <ke.yu@intel.com>"
+DISTRO_PN_ALIAS_pn-libxfontcache = "Mandriva=libxfontcache Debian=libxfontcache"
RECIPE_STATUS_pn-xf86-input-evdev="green" # no update needed
DISTRO_PN_ALIAS_pn-xf86-input-evdev = "Ubuntu=xserver-xorg-input-evdev Mandriva=x11-driver-input-evdev Debian=xserver-xorg-input-evdev Fedora=xorg-x11-drv-evdev Meego=xorg-x11-drv-evdev"
@@ -3618,6 +3622,9 @@ RECIPE_LATEST_RELEASE_DATE_pn-mesa-dri="2010/06/17"
RECIPE_INTEL_SECTION_pn-mesa-dri="graphic core"
RECIPE_LAST_UPDATE_pn-mesa-dri = "Jan 18, 2011"
RECIPE_MAINTAINER_pn-mesa-dri="Yu Ke <ke.yu@intel.com>"
+DISTRO_PN_ALIAS_pn-mesa-dri = "Fedora=mesa Ubuntu=libgl1-mesa-dri"
+
+DISTRO_PN_ALIAS_pn-mesa-xlib = "Fedora=mesa Ubuntu=libgl1-mesa-swx11"
RECIPE_STATUS_pn-mesa-dri-glsl-native="green" # no update needed
RECIPE_LATEST_VERSION_pn-mesa-dri-glsl-native="7.8.2"
@@ -5792,3 +5799,9 @@ RECIPE_LAST_UPDATE_pn-pseudo = "Jun 06, 2011"
RECIPE_MAINTAINER_pn-pseudo = "Mark Hatle <mark.hatle@windriver.com>"
RECIPE_COMMENTS_pn-pseudo = "Yocto Project maintained"
RECIPE_MANUAL_CHECK_DATE_pn-pseudo = "Jun 06, 2011"
+
+DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
+DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu =rt-tests"
+DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
+DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
+DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 05/13] task-core: split into task-core-console and task-core-x11
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (3 preceding siblings ...)
2011-09-15 3:14 ` [RC2 PULL 04/13] distro_tracking_field: add distro checking field Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:14 ` [RC2 PULL 06/13] linux-yocto: move common tasks to a common location Saul Wold
` (8 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
[YOCTO #1481]
Since tasks are referred to almost exclusively via RDEPENDS, and bitbake
will build an entire task recipe when only one of its task packages are
actually needed, building a console-only image that uses
task-core-apps-console (or less directly, has apps-console in its
IMAGE_FEATURES) will cause a build of a whole list of X11 applications
that aren't needed. Splitting the task-core recipe into X11 and console
portions prevents this issue.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 10 +++++--
meta/conf/multilib.conf | 3 +-
meta/recipes-core/tasks/task-core-console.bb | 28 ++++++++++++++++++++
.../tasks/{task-core.bb => task-core-x11.bb} | 17 ++----------
4 files changed, 40 insertions(+), 18 deletions(-)
create mode 100644 meta/recipes-core/tasks/task-core-console.bb
rename meta/recipes-sato/tasks/{task-core.bb => task-core-x11.bb} (79%)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index a7fc011..9dfa6a9 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2460,9 +2460,13 @@ RECIPE_LATEST_VERSION_pn-core-image-sato-sdk = "1.0"
RECIPE_MAINTAINER_pn-core-image-sato-sdk = "Dongxiao Xu <dongxiao.xu@intel.com>"
DISTRO_PN_ALIAS_pn-core-image-sdk = "OE-Core"
-RECIPE_STATUS_pn-task-core = "green"
-RECIPE_LATEST_VERSION_pn-task-core = "1.0"
-RECIPE_MAINTAINER_pn-task-core = "Dongxiao Xu <dongxiao.xu@intel.com>"
+RECIPE_STATUS_pn-task-core-console = "green"
+RECIPE_LATEST_VERSION_pn-task-core-console = "1.0"
+RECIPE_MAINTAINER_pn-task-core-console = "Dongxiao Xu <dongxiao.xu@intel.com>"
+
+RECIPE_STATUS_pn-task-core-x11 = "green"
+RECIPE_LATEST_VERSION_pn-task-core-x11 = "1.0"
+RECIPE_MAINTAINER_pn-task-core-x11 = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-task-core-basic = "green"
RECIPE_LATEST_VERSION_pn-task-core-basic = "1.0"
diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 16db375..3133bf1 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -368,12 +368,13 @@ BBCLASSEXTEND_append_pn-task-base = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-apps-x11-pimlico = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-basic = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-boot = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-task-core-console = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-lsb = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-task-core = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-nfs = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-ssh-dropbear = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-ssh-openssh = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-tools = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-task-core-x11 = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-task-core-x11-sato = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-tasks = " ${MULTILIBS}"
BBCLASSEXTEND_append_pn-tcf-agent = " ${MULTILIBS}"
diff --git a/meta/recipes-core/tasks/task-core-console.bb b/meta/recipes-core/tasks/task-core-console.bb
new file mode 100644
index 0000000..cb22732
--- /dev/null
+++ b/meta/recipes-core/tasks/task-core-console.bb
@@ -0,0 +1,28 @@
+#
+# Copyright (C) 2011 Intel Corporation
+#
+
+DESCRIPTION = "Tasks for core console applications"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+PR = "r35"
+
+PACKAGES = "\
+ task-core-apps-console \
+ task-core-apps-console-dbg \
+ task-core-apps-console-dev \
+ "
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+ALLOW_EMPTY = "1"
+
+SPLASH ?= "psplash"
+
+RDEPENDS_task-core-apps-console = "\
+ avahi-daemon \
+ dbus \
+ portmap \
+ ${SPLASH}"
+
diff --git a/meta/recipes-sato/tasks/task-core.bb b/meta/recipes-sato/tasks/task-core-x11.bb
similarity index 79%
rename from meta/recipes-sato/tasks/task-core.bb
rename to meta/recipes-sato/tasks/task-core-x11.bb
index a595ad7..26d550a 100644
--- a/meta/recipes-sato/tasks/task-core.bb
+++ b/meta/recipes-sato/tasks/task-core-x11.bb
@@ -1,17 +1,14 @@
#
-# Copyright (C) 2007-2008 OpenedHand Ltd.
+# Copyright (C) 2011 Intel Corporation
#
-DESCRIPTION = "Tasks for OpenedHand Poky"
+DESCRIPTION = "Tasks for core X11 applications"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r34"
+PR = "r35"
PACKAGES = "\
- task-core-apps-console \
- task-core-apps-console-dbg \
- task-core-apps-console-dev \
task-core-apps-x11-core \
task-core-apps-x11-core-dbg \
task-core-apps-x11-core-dev \
@@ -29,18 +26,10 @@ XSERVER ?= "xserver-kdrive-fbdev"
ALLOW_EMPTY = "1"
-SPLASH ?= "psplash"
-
# pcmanfm doesn't work on mips/powerpc
FILEMANAGER ?= "pcmanfm"
FILEMANAGER_mips ?= ""
-RDEPENDS_task-core-apps-console = "\
- avahi-daemon \
- dbus \
- portmap \
- ${SPLASH}"
-
RDEPENDS_task-core-x11-base = "\
dbus \
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 06/13] linux-yocto: move common tasks to a common location
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (4 preceding siblings ...)
2011-09-15 3:14 ` [RC2 PULL 05/13] task-core: split into task-core-console and task-core-x11 Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:14 ` [RC2 PULL 07/13] linux-yocto: split e100 and e1000 support Saul Wold
` (7 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
During the initial development of the linux-yocto recipes there were
several additional tasks that needed to be run in any inheriting
recipe. At that time, they didn't seem to fire if they were in the
include file versus the recipes themselves. As it turns out, these
tasks do work fine if placed in the linux-yocto.inc file, and the
rest of the recipes can be simplified as a result.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb | 8 +-------
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 8 +-------
meta/recipes-kernel/linux/linux-yocto.inc | 5 +++++
meta/recipes-kernel/linux/linux-yocto_2.6.37.bb | 13 +------------
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 8 +-------
5 files changed, 9 insertions(+), 33 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
index 0ca53ae..d92a902 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_2.6.34.bb
@@ -17,9 +17,8 @@ SRCREV_machine_qemux86-64 = "3c84c45ad3c3592f9c7ff4076de9bee417cd322e"
SRCREV_machine = "439602eb6acd53d9beb8493710310214fc7bd749"
SRCREV_meta = "e1f85a470934a0cf6abde5d95533e74501822c6b"
-PR = "r2"
+PR = "r3"
PV = "${LINUX_VERSION}+git${SRCPV}"
-SRCREV_FORMAT = "meta_machine"
COMPATIBLE_MACHINE = "(qemux86|qemux86-64)"
@@ -34,11 +33,6 @@ python __anonymous () {
SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.34.git;protocol=git;nocheckout=1;branch=${KBRANCH},wrs_meta;name=machine,meta"
# Functionality flags
-KERNEL_REVISION_CHECKING ?= "t"
KERNEL_FEATURES=features/netfilter
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-
require recipes-kernel/linux/linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index b296ef4..ebf6054 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -18,9 +18,8 @@ SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
-PR = "r0"
+PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
-SRCREV_FORMAT = "meta_machine"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
@@ -35,9 +34,4 @@ KERNEL_FEATURES_append=" features/taskstats"
KERNEL_FEATURES_append_qemux86=" cfg/sound"
KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-addtask kernel_configcheck after do_configure before do_compile
-
require recipes-kernel/linux/linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto.inc b/meta/recipes-kernel/linux/linux-yocto.inc
index 11b77ce..09433fa 100644
--- a/meta/recipes-kernel/linux/linux-yocto.inc
+++ b/meta/recipes-kernel/linux/linux-yocto.inc
@@ -34,3 +34,8 @@ do_install_append(){
rm -rf ${STAGING_KERNEL_DIR}/${KMETA}
fi
}
+
+# extra tasks
+addtask kernel_link_vmlinux after do_compile before do_install
+addtask validate_branches before do_patch after do_kernel_checkout
+addtask kernel_configcheck after do_configure before do_compile
diff --git a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
index 4199137..34e563c 100644
--- a/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_2.6.37.bb
@@ -9,10 +9,8 @@ KMACHINE_qemumips = "yocto/standard/mti-malta32-be"
KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs"
KBRANCH = ${KMACHINE}
-KMETA = meta
LINUX_VERSION ?= "2.6.37"
-LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
SRCREV_machine_qemuarm = "b3e53a090eaa23aa82e64fa0a563a93a2b4dbb5d"
SRCREV_machine_qemumips = "91f2eb4a3b447476b36aac8e6e198d08c98e0680"
@@ -22,26 +20,17 @@ SRCREV_machine_qemux86-64 = "af2bfbe5f757361b5b027a24d67a93bfdfaaf33c"
SRCREV_machine = "4ae8f8605c81c39b959948e23f7123294a5dfb3f"
SRCREV_meta = "aeea99683c7283f1f3320bf2ee7085ee252d4e7e"
-PR = "r20"
+PR = "r21"
PV = "${LINUX_VERSION}+git${SRCPV}"
-SRCREV_FORMAT = "meta_machine"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
# Functionality flags
-KERNEL_REVISION_CHECKING ?= "t"
KERNEL_FEATURES="features/netfilter"
KERNEL_FEATURES_append=" features/taskstats"
KERNEL_FEATURES_append_qemux86=" cfg/sound"
KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
-YOCTO_KERNEL_META_DATA=t
-
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-addtask kernel_configcheck after do_configure before do_compile
-
require linux-tools.inc
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index f504b74..b296558 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -20,9 +20,8 @@ SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
-PR = "r1"
+PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
-SRCREV_FORMAT = "meta_machine"
SRC_URI = "git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
@@ -34,9 +33,4 @@ KERNEL_FEATURES_append=" features/taskstats"
KERNEL_FEATURES_append_qemux86=" cfg/sound"
KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
-# extra tasks
-addtask kernel_link_vmlinux after do_compile before do_install
-addtask validate_branches before do_patch after do_kernel_checkout
-addtask kernel_configcheck after do_configure before do_compile
-
require linux-tools.inc
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 07/13] linux-yocto: split e100 and e1000 support
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (5 preceding siblings ...)
2011-09-15 3:14 ` [RC2 PULL 06/13] linux-yocto: move common tasks to a common location Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:14 ` [RC2 PULL 08/13] linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c Saul Wold
` (6 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Merging the following meta changes:
12574e5 meta: create seperate feature for 10/100 LAN support
c8b37bf meta: Remove 10/100 LAN support.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 2 +-
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index ebf6054..36717d6 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -16,7 +16,7 @@ LINUX_KERNEL_TYPE = "preempt-rt"
SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
-SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
+SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index b296558..4b1bdb2 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -18,7 +18,7 @@ SRCREV_machine_qemuppc ?= "eccd57eaa4c2b580b9adbbc39e19ecbff56779ae"
SRCREV_machine_qemux86 ?= "72671808fdbe69a9fe03fd8f094e7c59da04a28c"
SRCREV_machine_qemux86-64 ?= "2b2d0954a6fd12b4bb7f02f019bc62633c8060a1"
SRCREV_machine ?= "6b2c7d65b844e686eae7d5cccb9b638887afe28e"
-SRCREV_meta ?= "3c9ebeed2598b74798a0c9247ef7c385e0cd96a7"
+SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c"
PR = "r2"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 08/13] linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (6 preceding siblings ...)
2011-09-15 3:14 ` [RC2 PULL 07/13] linux-yocto: split e100 and e1000 support Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:14 ` [RC2 PULL 09/13] initramfs-live-install: add support for grub2 Saul Wold
` (5 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Merging the following commit for the -rt machines:
[
preempt-rt/base: correct 3.0.3->3.0.4 mismerge for, stop_machine.c
Commit 0b805cce57f61a244eb3b8fce460b14f1be442b3 dropped a change making
stop_cpus_mutex non-static, resulting in a build failure for 3.0.4-rt
kernels.
Restore the move to non-static from commit
6857336c7fddaf460a13adc0c395698fcf9423ff.
Reported-by: Kishore Bodke <kishore.k.bodke@intel.com>
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
]
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
index 36717d6..b3bb4ac 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -14,8 +14,8 @@ KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
LINUX_VERSION ?= "3.0.4"
LINUX_KERNEL_TYPE = "preempt-rt"
-SRCREV_machine ?= "0b805cce57f61a244eb3b8fce460b14f1be442b3"
-SRCREV_machine_qemuppc ?= "48207085609f2b73a54e3c1ef4139894eef627af"
+SRCREV_machine ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
+SRCREV_machine_qemuppc ?= "0936e13cc65d816f1759e2322c5e3fc82a5037f3"
SRCREV_meta ?= "12574e5a77597f6938315ef82d18fc5e229fb79c"
PR = "r1"
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 09/13] initramfs-live-install: add support for grub2
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (7 preceding siblings ...)
2011-09-15 3:14 ` [RC2 PULL 08/13] linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:14 ` [RC2 PULL 10/13] grub2: new recipe Saul Wold
` (4 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
grub2 needs a different set of install steps from grub 0.97. This
adds them to init-install.sh and adds an install-time check that
determines which version is being used and which steps to use
depending on the version of grub selected.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../initrdscripts/files/init-install.sh | 31 ++++++++++++++++----
.../initrdscripts/initramfs-live-install_1.0.bb | 8 ++---
2 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 5e6b81c..fb6cea8 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -1,6 +1,6 @@
#!/bin/sh -e
#
-# Copyright (C) 2008 Intel
+# Copyright (C) 2008-2011 Intel
#
# install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
#
@@ -126,6 +126,7 @@ mkswap $swap
mkdir /ssd
mkdir /rootmnt
+mkdir /bootmnt
mount $rootfs /ssd
mount -o rw,loop,noatime,nodiratime /media/$1/$2 /rootmnt
@@ -142,6 +143,16 @@ if [ -d /ssd/etc/ ] ; then
fi
fi
+if [ -f /ssd/etc/grub.d/40_custom ] ; then
+ echo "Preparing custom grub2 menu..."
+ sed -i "s@__ROOTFS__@$rootfs@g" /ssd/etc/grub.d/40_custom
+ sed -i "s/__VIDEO_MODE__/$3/g" /ssd/etc/grub.d/40_custom
+ sed -i "s/__VGA_MODE__/$4/g" /ssd/etc/grub.d/40_custom
+ mount $bootfs /bootmnt
+ cp /ssd/etc/grub.d/40_custom /bootmnt/40_custom
+ umount /bootmnt
+fi
+
umount /ssd
umount /rootmnt
@@ -151,11 +162,19 @@ grub-install --root-directory=/ssd /dev/${device}
echo "(hd0) /dev/${device}" > /ssd/boot/grub/device.map
-echo "default 0" > /ssd/boot/grub/menu.lst
-echo "timeout 30" >> /ssd/boot/grub/menu.lst
-echo "title Live Boot/Install-Image" >> /ssd/boot/grub/menu.lst
-echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst
-echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
+if [ -f /ssd/40_custom ] ; then
+ mv /ssd/40_custom /ssd/boot/grub/grub.cfg
+ sed -i "/#/d" /ssd/boot/grub/grub.cfg
+ sed -i "/exec tail/d" /ssd/boot/grub/grub.cfg
+ chmod 0444 /ssd/boot/grub/grub.cfg
+else
+ echo "Preparing custom grub menu..."
+ echo "default 0" > /ssd/boot/grub/menu.lst
+ echo "timeout 30" >> /ssd/boot/grub/menu.lst
+ echo "title Live Boot/Install-Image" >> /ssd/boot/grub/menu.lst
+ echo "root (hd0,0)" >> /ssd/boot/grub/menu.lst
+ echo "kernel /boot/vmlinuz root=$rootfs rw $3 $4 quiet" >> /ssd/boot/grub/menu.lst
+fi
cp /media/$1/vmlinuz /ssd/boot/
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index 0eeabf1..619b16c 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -1,9 +1,9 @@
-DESCRIPTION = "A live image init script"
+DESCRIPTION = "A live image init script for grub"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-install.sh"
-PR = "r4"
+PR = "r5"
RDEPENDS="grub parted e2fsprogs-mke2fs"
@@ -19,6 +19,4 @@ INHIBIT_DEFAULT_DEPS = "1"
FILES_${PN} = " /install.sh "
-# Alternatives to grub need adding for other arch support
-# consistent with grub 0.97
-COMPATIBLE_HOST = "i.86.*-linux"
+COMPATIBLE_HOST = "(i.86|x86_64).*-linux"
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 10/13] grub2: new recipe
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (8 preceding siblings ...)
2011-09-15 3:14 ` [RC2 PULL 09/13] initramfs-live-install: add support for grub2 Saul Wold
@ 2011-09-15 3:14 ` Saul Wold
2011-09-15 3:15 ` [RC2 PULL 11/13] task-core-sdk: change task-core -> task-core-console Saul Wold
` (3 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:14 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
This adds the grub-1.98 from meta-intel while upgrading it to 1.99.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta/recipes-bsp/grub/grub-1.99/40_custom | 9 ++++
.../grub/grub-1.99/grub-install.in.patch | 20 +++++++++
meta/recipes-bsp/grub/grub_1.99.bb | 44 ++++++++++++++++++++
3 files changed, 73 insertions(+), 0 deletions(-)
create mode 100755 meta/recipes-bsp/grub/grub-1.99/40_custom
create mode 100644 meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
create mode 100644 meta/recipes-bsp/grub/grub_1.99.bb
diff --git a/meta/recipes-bsp/grub/grub-1.99/40_custom b/meta/recipes-bsp/grub/grub-1.99/40_custom
new file mode 100755
index 0000000..0d80854
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/40_custom
@@ -0,0 +1,9 @@
+#!/bin/sh
+exec tail -n +3 $0
+# This file provides an easy way to add custom menu entries. Simply type the
+# menu entries you want to add after this comment. Be careful not to change
+# the 'exec tail' line above.
+menuentry "Linux" {
+ set root=(hd0,1)
+ linux /boot/vmlinuz root=__ROOTFS__ rw __VIDEO_MODE__ __VGA_MODE__ quiet
+}
diff --git a/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
new file mode 100644
index 0000000..326951d
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub-1.99/grub-install.in.patch
@@ -0,0 +1,20 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Our use of grub-install doesn't require the -x option, so we should be
+be able make use of grep versions that don't support it.
+
+Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
+
+Index: grub-1.99/util/grub-install.in
+===================================================================
+--- grub-1.99.orig/util/grub-install.in 2011-09-09 22:37:20.093906679 -0500
++++ grub-1.99/util/grub-install.in 2011-09-09 22:37:30.854737882 -0500
+@@ -510,7 +510,7 @@
+
+ if [ "x${devabstraction_module}" = "x" ] ; then
+ if [ x"${install_device}" != x ]; then
+- if echo "${install_device}" | grep -qx "(.*)" ; then
++ if echo "${install_device}" | grep -q "(.*)" ; then
+ install_drive="${install_device}"
+ else
+ install_drive="`"$grub_probe" --device-map="${device_map}" --target=drive --device "${install_device}"`" || exit 1
diff --git a/meta/recipes-bsp/grub/grub_1.99.bb b/meta/recipes-bsp/grub/grub_1.99.bb
new file mode 100644
index 0000000..d9df573
--- /dev/null
+++ b/meta/recipes-bsp/grub/grub_1.99.bb
@@ -0,0 +1,44 @@
+SUMMARY = "GRUB2 is the next-generation GRand Unified Bootloader"
+
+DESCRIPTION = "GRUB2 is the next generaion of a GPLed bootloader \
+intended to unify bootloading across x86 operating systems. In \
+addition to loading the Linux kernel, it implements the Multiboot \
+standard, which allows for flexible loading of multiple boot images."
+
+HOMEPAGE = "http://www.gnu.org/software/grub/"
+SECTION = "bootloaders"
+PRIORITY = "optional"
+
+LICENSE = "GPLv3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
+
+RDEPENDS = "diffutils freetype"
+PR = "r0"
+
+SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
+ file://grub-install.in.patch;apply=yes \
+ file://40_custom"
+
+inherit autotools
+inherit gettext
+
+EXTRA_OECONF = "--with-platform=pc --disable-grub-mkfont --target=${TARGET_ARCH} --program-prefix="""
+
+do_configure() {
+ oe_runconf
+}
+
+python __anonymous () {
+ import re
+ host = bb.data.getVar('HOST_SYS', d, 1)
+ if not re.match('x86.64.*-linux', host) and not re.match('i.86.*-linux', host):
+ raise bb.parse.SkipPackage("incompatible with host %s" % host)
+}
+
+do_install_append () {
+ install -m 0755 ${WORKDIR}/40_custom ${D}${sysconfdir}/grub.d/40_custom
+}
+
+FILES_${PN}-doc = "${datadir}"
+FILES_${PN} = "/usr /etc"
+
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 11/13] task-core-sdk: change task-core -> task-core-console
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (9 preceding siblings ...)
2011-09-15 3:14 ` [RC2 PULL 10/13] grub2: new recipe Saul Wold
@ 2011-09-15 3:15 ` Saul Wold
2011-09-15 3:15 ` [RC2 PULL 12/13] distro_tracking: update package alias Saul Wold
` (2 subsequent siblings)
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:15 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-core/tasks/task-core-sdk.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/tasks/task-core-sdk.bb b/meta/recipes-core/tasks/task-core-sdk.bb
index 52fdd75..5743631 100644
--- a/meta/recipes-core/tasks/task-core-sdk.bb
+++ b/meta/recipes-core/tasks/task-core-sdk.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-DEPENDS = "task-core"
+DEPENDS = "task-core-console"
PR = "r7"
ALLOW_EMPTY = "1"
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 12/13] distro_tracking: update package alias
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (10 preceding siblings ...)
2011-09-15 3:15 ` [RC2 PULL 11/13] task-core-sdk: change task-core -> task-core-console Saul Wold
@ 2011-09-15 3:15 ` Saul Wold
2011-09-15 3:15 ` [RC2 PULL 13/13] distro-tracking: Update alias Saul Wold
2011-09-15 10:28 ` [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Richard Purdie
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:15 UTC (permalink / raw)
To: openembedded-core
From: Dongxiao Xu <dongxiao.xu@intel.com>
Update package alias which exist in other two distributions.
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 9dfa6a9..b8dc982 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -319,6 +319,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-db = "n/a"
RECIPE_COMMENTS_pn-db = ""
RECIPE_LAST_UPDATE_pn-db = "Jul 21, 2006"
RECIPE_MAINTAINER_pn-db = "Dongxiao Xu <dongxiao.xu@intel.com>"
+DISTRO_PN_ALIAS_pn-db = "Debian=db5.1 Ubuntu=db5.1"
RECIPE_STATUS_pn-libtirpc = "green"
RECIPE_DEPENDENCY_CHECK_pn-libtirpc = "not done"
@@ -2184,11 +2185,13 @@ RECIPE_LATEST_RELEASE_DATE_pn-ofono="2011/03/15"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-ofono="15 days"
RECIPE_LAST_UPDATE_pn-ofono = "Apr 15, 2011"
RECIPE_MAINTAINER_pn-ofono = "Dongxiao Xu <dongxiao.xu@intel.com>"
+DISTRO_PN_ALIAS_pn-ofono = "Debian=ofono Ubuntu=ofono"
RECIPE_STATUS_pn-libtelepathy = "red"
RECIPE_LATEST_VERSION_pn-libtelepathy = "0.3.3"
RECIPE_LAST_UPDATE_pn-libtelepathy = "Jul 21, 2008"
RECIPE_MAINTAINER_pn-libtelepathy = "Dongxiao Xu <dongxiao.xu@intel.com>"
+DISTRO_PN_ALIAS_pn-libtelepathy = "Debian=libtelepathy2 Ubuntu=libtelepathy2"
RECIPE_STATUS_pn-telepathy-farsight = "red"
RECIPE_LATEST_VERSION_pn-telepathy-farsight = "0.0.14"
@@ -3010,6 +3013,7 @@ RECIPE_STATUS_pn-python-pycurl="green"
RECIPE_LATEST_VERSION_pn-python-pycurl="7.19.0"
RECIPE_LAST_UPDATE_pn-python-pycurl = "Mar 25, 2010"
RECIPE_MAINTAINER_pn-python-pycurl = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+DISTRO_PN_ALIAS_pn-python-pycurl = "Debian=python-pycurl Ubuntu=python-pycurl"
RECIPE_STATUS_pn-python-pygobject="green"
DISTRO_PN_ALIAS_pn-python-pygobject = "Meego=pygobject2 Fedora=pygobject2 Ubuntu=pygobject Debian=pygobject"
@@ -5809,3 +5813,13 @@ DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu =rt-tests"
DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
+DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc"
+DISTRO_PN_ALIAS_pn-dtc-native = "Fedora=dtc Ubuntu=dtc"
+DISTRO_PN_ALIAS_pn-gail = "Fedora=gail Ubuntu=libgail-3-0"
+DISTRO_PN_ALIAS_pn-linux-yocto = "Debian=linux-base Ubuntu=linux"
+DISTRO_PN_ALIAS_pn-linux-yocto-rt = "Debian=linux-base Ubuntu=linux"
+DISTRO_PN_ALIAS_pn-libsdl = "Fedora=SDL Opensuse=SDL"
+DISTRO_PN_ALIAS_pn-lame = "Debian=lame Ubuntu=lame"
+DISTRO_PN_ALIAS_pn-libiconv = "Fedora=mingw-libiconv Opensuse=cross-mingw-libiconv"
+DISTRO_PN_ALIAS_pn-qt4-native = "Fedora=qt4 Debian=qt4-dev-tools"
+DISTRO_PN_ALIAS_pn-update-alternatives-dpkg = "Opensuse=update-alternatives Mandriva=update-alternatives"
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* [RC2 PULL 13/13] distro-tracking: Update alias
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (11 preceding siblings ...)
2011-09-15 3:15 ` [RC2 PULL 12/13] distro_tracking: update package alias Saul Wold
@ 2011-09-15 3:15 ` Saul Wold
2011-09-15 10:28 ` [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Richard Purdie
13 siblings, 0 replies; 15+ messages in thread
From: Saul Wold @ 2011-09-15 3:15 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 28 +++++++++++++++-----
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index b8dc982..13106c0 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -2648,11 +2648,11 @@ RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libmusicbrainz="2 years"
RECIPE_LAST_UPDATE_pn-libmusicbrainz = "Nov 16, 2010"
RECIPE_MAINTAINER_pn-libmusicbrainz = "Dongxiao Xu <dongxiao.xu@intel.com>"
-RECIPE_STATUS_pn-clutter-gst-1.4 = "red"
-DISTRO_PN_ALIAS_pn-clutter-gst-1.4 = "OpenSuSE=clutter-gst Debian=clutter-gst"
-RECIPE_LATEST_VERSION_pn-clutter-gst-1.4 = "0.11.0+git0+d48c6fc67b48304f90e51b520631c1ecc10410af"
-RECIPE_LAST_UPDATE_pn-clutter-gst-1.4 = "Feb 4, 2010"
-RECIPE_MAINTAINER_pn-clutter-gst-1.4 = "Dongxiao Xu <dongxiao.xu@intel.com>"
+RECIPE_STATUS_pn-clutter-gst-1.6 = "red"
+DISTRO_PN_ALIAS_pn-clutter-gst-1.6 = "Fedora=clutter-gst Debian=libclutter-gst"
+RECIPE_LATEST_VERSION_pn-clutter-gst-1.6 = "1.3.8"
+RECIPE_LAST_UPDATE_pn-clutter-gst-1.6 = "Mar 28, 2011"
+RECIPE_MAINTAINER_pn-clutter-gst-1.6 = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-farsight2 = "red"
RECIPE_LATEST_VERSION_pn-farsight2 = "0.0.20"
@@ -2715,7 +2715,7 @@ RECIPE_LATEST_RELEASE_DATE_pn-gst-fluendo-mp3 = "2010/10/21"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-gst-fluendo-mp3 = "3 months"
RECIPE_LAST_UPDATE_pn-gst-fluendo-mp3 = "Dec 7, 2010"
RECIPE_MAINTAINER_pn-gst-fluendo-mp3 = "Dongxiao Xu <dongxiao.xu@intel.com>"
-DISTRO_PN_ALIAS_pn-gst-fluendo-mp3 = "Debian=gstreamer0.10-fluendo-mp3 Ubuntu=gstreamer0.10-fluendo-mp3"
+DISTRO_PN_ALIAS_pn-gst-fluendo-mp3 = "Debian=gstreamer0.10-fluendo-mp3 Ubuntu=gstreamer0.10-fluendo-mp3"
RECIPE_STATUS_pn-gst-fluendo-mpegdemux = "green"
RECIPE_LATEST_VERSION_pn-gst-fluendo-mpegdemux = "0.10.67"
@@ -2957,10 +2957,17 @@ RECIPE_MANUAL_CHECK_DATE_pn-libtool = "Jul 06, 2011"
RECIPE_MAINTAINER_pn-libtool = "Nitin A Kamble <nitin.a.kamble@intel.com>"
RECIPE_STATUS_pn-linux-libc-headers="green"
+DISTRO_PN_ALIAS_pn-linux-libc-headers = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers"
RECIPE_LATEST_VERSION_pn-linux-libc-headers="2.6.36"
RECIPE_LAST_UPDATE_pn-linux-libc-headers = "Nov 8, 2010"
RECIPE_MAINTAINER_pn-linux-libc-headers = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+RECIPE_STATUS_pn-linux-libc-headers-yocto = "green"
+DISTRO_PN_ALIAS_pn-linux-libc-headers-yocto = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers"
+RECIPE_LATEST_VERSION_pn-linux-libc-headers-yocto = "2.6.36"
+RECIPE_LAST_UPDATE_pn-linux-libc-headers-yocto = "Nov 8, 2010"
+RECIPE_MAINTAINER_pn-linux-libc-headers-yocto = "Nitin A Kamble <nitin.a.kamble@intel.com>"
+
RECIPE_STATUS_pn-lsof="green"
RECIPE_LATEST_VERSION_pn-lsof="4.84"
RECIPE_LAST_UPDATE_pn-lsof = "Nov 8, 2010"
@@ -4957,6 +4964,7 @@ RECIPE_LAST_UPDATE_pn-screenshot = "Jun 25, 2010"
RECIPE_MAINTAINER_pn-screenshot = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-tasks = "green"
+DISTRO_PN_ALIAS_pn-tasks = "Debian=tasks Fedora=tasks"
RECIPE_DEPENDENCY_CHECK_pn-tasks = "not done"
RECIPE_LATEST_VERSION_pn-tasks = "0.18"
RECIPE_NO_OF_PATCHES_pn-tasks = "1"
@@ -4968,6 +4976,7 @@ RECIPE_LAST_UPDATE_pn-tasks = "Nov 19, 2010"
RECIPE_MAINTAINER_pn-tasks = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-contacts = "green"
+DISTRO_PN_ALIAS_pn-contacts = "Debian=contacts Fedora=contacts"
RECIPE_DEPENDENCY_CHECK_pn-contacts = "not done"
RECIPE_LATEST_VERSION_pn-contacts = "0.12+git0+19853893fdb595de6aa59db0d9dc2f9451ed2933"
RECIPE_NO_OF_PATCHES_pn-contacts = "1"
@@ -4979,6 +4988,7 @@ RECIPE_LAST_UPDATE_pn-contacts = "Jun 25, 2010"
RECIPE_MAINTAINER_pn-contacts = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-dates = "green"
+DISTRO_PN_ALIAS_pn-dates = "Debian=dates Fedora=dates"
RECIPE_DEPENDENCY_CHECK_pn-dates = "not done"
RECIPE_LATEST_VERSION_pn-dates = "0.4.11+git0+514185dc1f6588085fda41eb59898b93d0487dd4"
RECIPE_NO_OF_PATCHES_pn-dates = "1"
@@ -5036,6 +5046,7 @@ RECIPE_NO_UPDATE_REASON_pn-gtk+ = "Do not upgrade to version: 2.99.2 because pre
RECIPE_MAINTAINER_pn-gtk+ = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-gdk-pixbuf = "green"
+DISTRO_PN_ALIAS_pn-gdk-pixbuf = "Debian=libgdk-pixbuf2.0 Fedora=gdk-pixbuf"
RECIPE_LATEST_VERSION_pn-gdk-pixbuf = "2.22.1"
RECIPE_LAST_UPDATE_pn-gdk-pixbuf = "Nov 25, 2010"
RECIPE_MAINTAINER_pn-gdk-pixbuf = "Zhai Edwin <edwin.zhai@intel.com>"
@@ -5207,6 +5218,7 @@ RECIPE_LAST_UPDATE_pn-matchbox-config-gtk = "Jul 6, 2010"
RECIPE_MAINTAINER_pn-matchbox-config-gtk = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-matchbox-keyboard = "green"
+DISTRO_PN_ALIAS_pn-matchbox-keyboard = "Debian=matchbox-keyboard Fedora=matchbox-keyboard"
RECIPE_DEPENDENCY_CHECK_pn-matchbox-keyboard = "not done"
RECIPE_LATEST_VERSION_pn-matchbox-keyboard = "0.0+svnr2075"
RECIPE_NO_OF_PATCHES_pn-matchbox-keyboard = "0"
@@ -5385,6 +5397,7 @@ RECIPE_LAST_UPDATE_pn-gtk-doc = "Jun 10, 2009"
RECIPE_MAINTAINER_pn-gtk-doc = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-gtkhtml2 = "red"
+DISTRO_PN_ALIAS_pn-gtkhtml2 = "Debian=libgtkhtml2-0 Fedora=gtkhtml2"
RECIPE_LATEST_VERSION_pn-gtkhtml2 = "2.11.1"
RECIPE_LAST_UPDATE_pn-gtkhtml2 = "Aug 9, 2007"
RECIPE_MAINTAINER_pn-gtkhtml2 = "Zhai Edwin <edwin.zhai@intel.com>"
@@ -5751,6 +5764,7 @@ RECIPE_MANUAL_CHECK_DATE_pn-slang = "Jun 28, 2011"
RECIPE_MAINTAINER_pn-slang = "Kai Kang <kai.kang@windriver.com>"
RECIPE_STATUS_pn-libnewt = "green"
+DISTRO_PN_ALIAS_pn-libnewt = "Debian=libnewt0.52 Fedora=newt"
RECIPE_LATEST_VERSION_pn-libnewt = "0.52.13"
RECIPE_MAINTAINER_pn-libnewt = "Kai Kang <kai.kang@windriver.com>"
RECIPE_LAST_UPDATE_pn-libnewt = "Jul 27, 2011"
@@ -5809,7 +5823,7 @@ RECIPE_COMMENTS_pn-pseudo = "Yocto Project maintained"
RECIPE_MANUAL_CHECK_DATE_pn-pseudo = "Jun 06, 2011"
DISTRO_PN_ALIAS_pn-btrfs-tools = "Debian=btrfs-tools Fedora=btrfs-progs"
-DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu =rt-tests"
+DISTRO_PN_ALIAS_pn-rt-tests = "Debian=rt-tests Ubuntu=rt-tests"
DISTRO_PN_ALIAS_pn-xserver-xf86-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-xserver-xf86-dri-lite = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
DISTRO_PN_ALIAS_pn-xserver-kdrive = "Fedora=xorg-x11-server Ubuntu=xserver-xorg"
--
1.7.6
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [RC2 PULL 00/13] Prelinker, Kernel and distro tracking
2011-09-15 3:14 [RC2 PULL 00/13] Prelinker, Kernel and distro tracking Saul Wold
` (12 preceding siblings ...)
2011-09-15 3:15 ` [RC2 PULL 13/13] distro-tracking: Update alias Saul Wold
@ 2011-09-15 10:28 ` Richard Purdie
13 siblings, 0 replies; 15+ messages in thread
From: Richard Purdie @ 2011-09-15 10:28 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Wed, 2011-09-14 at 20:14 -0700, Saul Wold wrote:
> Richard,
>
> Please pull this first before pulling any other changes, so that
> we can tag / branch this for RC2.
>
> These changes are all reviewed. There is a kernel update, deb packaging
> fix, prelinker and distro tracking updates.
>
> I also included Paul's core-console change, Tom's Grub2 move and
> the blacklisting of diginotar certs.
>
> This is what was built on the Autobuilder for RC2 with no failures in
> the build.
>
> Thanks
> Sau!
>
>
> The following changes since commit 8df322abfd3fa8c460fd73c83c1ef0b5e419dc11:
>
> core-image-minimal: Add missing POKY_EXTRA_IMAGE variable (2011-09-14 01:27:08 +0100)
>
> are available in the git repository at:
> git://git.yoctoproject.org/poky-contrib sgw/stage
> http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/stage
>
> Bruce Ashfield (3):
> linux-yocto: move common tasks to a common location
> linux-yocto: split e100 and e1000 support
> linux-yocto-rt: correct 3.0.3->3.0.4 mismerge for, stop_machine.c
>
> Dexuan Cui (1):
> package_deb.bbclass, populate_sdk_deb.bbclass: fix
> meta-toolchain-gmae build
>
> Dongxiao Xu (1):
> distro_tracking: update package alias
>
> Eric Bénard (1):
> qt4: add blacklist-diginotar-certs patch
>
> Mark Hatle (1):
> Uprev to latest version of prelink_git, fixing TLS issues
>
> Paul Eggleton (1):
> task-core: split into task-core-console and task-core-x11
>
> Saul Wold (1):
> task-core-sdk: change task-core -> task-core-console
>
> Tom Zanussi (2):
> initramfs-live-install: add support for grub2
> grub2: new recipe
>
> Yu Ke (1):
> distro_tracking_field: add distro checking field
>
> Zhai Edwin (1):
> distro-tracking: Update alias
Merged to master, thanks.
Richard
^ permalink raw reply [flat|nested] 15+ messages in thread