* [CONSOLIDATED PULL 01/36] lsbtest: Add recipe for LSB tests and automate test
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
@ 2012-02-28 5:24 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 02/36] distro_tracking_fields: add information for lsbtest Saul Wold
` (34 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:24 UTC (permalink / raw)
To: openembedded-core
From: Yi Zhao <yi.zhao@windriver.com>
The recipe is used for LSB tests. The script LSB_Test.sh does the following things:
- setup LSB testing environment
- download LSB rpm packages with list file packages_list from remote
- install the packages
- execute LSB testing with profile file session
- collect the results
Install packages_list and session files into ${D}/opt/lsb-test.
[YOCTO #1567]
---
meta/recipes-extended/lsb/lsbtest/LSB_Test.sh | 510 +++++++++++++++++++++++
meta/recipes-extended/lsb/lsbtest/packages_list | 50 +++
meta/recipes-extended/lsb/lsbtest/session | 194 +++++++++
meta/recipes-extended/lsb/lsbtest_1.0.bb | 37 ++
4 files changed, 791 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
create mode 100644 meta/recipes-extended/lsb/lsbtest/packages_list
create mode 100644 meta/recipes-extended/lsb/lsbtest/session
create mode 100644 meta/recipes-extended/lsb/lsbtest_1.0.bb
diff --git a/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
new file mode 100644
index 0000000..f14f485
--- /dev/null
+++ b/meta/recipes-extended/lsb/lsbtest/LSB_Test.sh
@@ -0,0 +1,510 @@
+#!/bin/bash
+
+# Copyright (C) 2012 Wind River Systems, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+WORK_DIR="/opt/lsb-test"
+
+if [ `id -u` -ne 0 ]
+then
+ cat << EOF
+ In order to install and run LSB testsuite, you need administrator privileges.
+ You are currently running this script as an unprivileged user.
+
+EOF
+ exit 1
+fi
+
+ARCH=`uname -m`
+if [ ${ARCH} != "i686" ] && [ ${ARCH} != "x86_64" ] && [ ${ARCH} != "ppc" ]
+then
+ echo "Error: Unsupported architecture"
+ exit 1
+fi
+
+which rpm
+if [ $? -ne 0 ]
+then
+ echo "No rpm command found"
+ exit 1
+fi
+
+RET=0
+
+cd ${WORK_DIR} || exit 1
+# Step 1: Download the LSB Packages
+echo ""
+echo "Download LSB packages..."
+echo ""
+
+if [ ! -e ./packages_list ]
+then
+ echo "Error: Could not find packages list" >&2
+ exit 1
+fi
+
+. ./packages_list
+
+PACKAGES_DIR="/var/opt/lsb/test/manager/packages/ftp.linuxfoundation.org/pub/lsb"
+
+BASE_PACKAGES_DIR="${PACKAGES_DIR}/base/${LSB_RELEASE}/binary"
+RUNTIME_BASE_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/released-all/binary/runtime"
+RUNTIME_PACKAGES_DIR="${PACKAGES_DIR}/test_suites/${LSB_RELEASE}/binary/runtime"
+APP_PACKAGES_DIR="${PACKAGES_DIR}/app-battery/${LSB_RELEASE}/${LSB_ARCH}"
+APP_TESTFILES_DIR="${PACKAGES_DIR}/app-battery/tests"
+SNAPSHOTS_TESTFILES_DIR="${PACKAGES_DIR}/snapshots/appbat/tests"
+
+if [ ! -d ${PACKAGES_DIR} ]
+then
+ mkdir -p ${PACKAGES_DIR}
+fi
+
+if [ ! -d ${BASE_PACKAGES_DIR} ]
+then
+ mkdir -p ${BASE_PACKAGES_DIR}
+fi
+
+if [ ! -d ${RUNTIME_BASE_PACKAGES_DIR} ]
+then
+ mkdir -p ${RUNTIME_BASE_PACKAGES_DIR}
+fi
+
+if [ ! -d ${RUNTIME_PACKAGES_DIR} ]
+then
+ mkdir -p ${RUNTIME_PACKAGES_DIR}
+fi
+
+if [ ! -d ${APP_PACKAGES_DIR} ]
+then
+ mkdir -p ${APP_PACKAGES_DIR}
+fi
+
+if [ ! -d ${APP_TESTFILES_DIR} ]
+then
+ mkdir -p ${APP_TESTFILES_DIR}
+fi
+
+# Official download server list. You can replace them with your own server.
+SERVER_IPADDR="140.211.169.23"
+SERVER_NAME="ftp.linuxfoundation.org"
+
+if ! `grep -F -q "${SERVER_NAME}" /etc/hosts`; then
+ echo "${SERVER_IPADDR} ${SERVER_NAME} ${SERVER_NAME}" >> /etc/hosts
+fi
+
+#ping -c 5 ${SERVER_NAME}
+#if [ $? -ne 0 ]
+#then
+# echo "The server: ${SERVER_NAME} is unreachable"
+# exit 1
+#fi
+
+SERVER1="\
+ http://${SERVER_NAME}/pub/lsb/base/${LSB_RELEASE}/binary"
+SERVER2="\
+ http://${SERVER_NAME}/pub/lsb/test_suites/released-all/binary/runtime"
+SERVER3="\
+ http://${SERVER_NAME}/pub/lsb/test_suites/${LSB_RELEASE}/binary/runtime"
+SERVER4="\
+ http://${SERVER_NAME}/pub/lsb/app-battery/${LSB_RELEASE}/${LSB_ARCH}"
+SERVER5="\
+ http://${SERVER_NAME}/pub/lsb/app-battery/tests"
+
+# We using "curl" as a download tool, "wget" is an alternative.
+CURL=`which curl`
+WGET=`which wget`
+if [ ! -z ${CURL} ]
+then
+ DOWNLOAD_CMD="${CURL} -R -L --retry 3 --retry-delay 4 --connect-timeout 180 --compressed -C - -o"
+elif [ ! -z ${WGET} ]
+then
+ DOWNLOAD_CMD="${WGET} -c -t 5 -O"
+else
+ echo "Can not find a download tool, please install curl or wget."
+ exit 1
+fi
+
+cd ${BASE_PACKAGES_DIR}
+for pkg in ${BASE_PACKAGES_LIST}; do
+ if [ ! -f ${pkg} ]
+ then
+ #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER1}/${pkg} > /dev/null 2>&1
+ ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER1}/${pkg}
+ if [ $? -eq 0 ]
+ then
+ mv -f ${pkg}".#part" ${pkg}
+ echo "Download ${pkg} successfully."
+ else
+ echo "Download ${pkg} failed."
+ RET=1
+ fi
+ fi
+done
+
+cd ${RUNTIME_BASE_PACKAGES_DIR}
+for pkg in ${RUNTIME_BASE_PACKAGES_LIST}; do
+ if [ ! -f ${pkg} ]
+ then
+ #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER2}/${pkg} > /dev/null 2>&1
+ ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER2}/${pkg}
+ if [ $? -eq 0 ]
+ then
+ mv -f ${pkg}".#part" ${pkg}
+ echo "Download ${pkg} successfully."
+ else
+ echo "Download ${pkg} failed."
+ RET=1
+ fi
+ fi
+done
+
+cd ${RUNTIME_PACKAGES_DIR}
+for pkg in ${RUNTIME_PACKAGES_LIST}; do
+ if [ ! -f ${pkg} ]
+ then
+ #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER3}/${pkg} > /dev/null 2>&1
+ ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER3}/${pkg}
+ if [ $? -eq 0 ]
+ then
+ mv -f ${pkg}".#part" ${pkg}
+ echo "Download ${pkg} successfully."
+ else
+ echo "Download ${pkg} failed."
+ RET=1
+ fi
+ fi
+done
+
+cd ${APP_PACKAGES_DIR}
+for pkg in ${APP_PACKAGES_LIST}; do
+ if [ ! -f ${pkg} ]
+ then
+ #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER4}/${pkg} > /dev/null 2>&1
+ ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER4}/${pkg}
+ if [ $? -eq 0 ]
+ then
+ mv -f ${pkg}".#part" ${pkg}
+ echo "Download ${pkg} successfully."
+ else
+ echo "Download ${pkg} failed."
+ RET=1
+ fi
+ fi
+done
+
+cd ${APP_TESTFILES_DIR}
+for pkg in ${APP_TESTFILES_LIST}; do
+ if [ ! -f ${pkg} ]
+ then
+ #${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER5}/${pkg} > /dev/null 2>&1
+ ${DOWNLOAD_CMD} ${pkg}".#part" ${SERVER5}/${pkg}
+ if [ $? -eq 0 ]
+ then
+ mv -f ${pkg}".#part" ${pkg}
+ echo "Download ${pkg} successfully."
+ else
+ echo "Download ${pkg} failed."
+ RET=1
+ fi
+ fi
+done
+
+if [ ${RET} -ne 0 ]
+then
+ echo "Download some packages failed. Please download them again."
+ exit 1
+fi
+
+# Step 2: Install the LSB Packages
+echo ""
+echo "Install LSB packages..."
+echo ""
+
+# Kill lighttpd
+ps aux | grep "lighttpd" | grep -v -q "grep"
+if [ $? -eq 0 ]
+then
+ killall lighttpd >/dev/null 2>&1
+fi
+
+# Start avahi-daemon
+ps aux | grep "avahi-daemon" | grep -v -q "grep"
+if [ $? -ne 0 ]
+then
+ /etc/init.d/avahi-daemon start >/dev/null 2>&1
+fi
+
+LSB_START_CMD="/opt/lsb/test/manager/bin/dist-checker-start.pl"
+LSB_STOP_CMD="/opt/lsb/test/manager/bin/dist-checker-stop.pl"
+
+PLATFORM_FILE="/etc/rpm/platform"
+
+RPM_INSTALL_CMD="rpm --quiet --nodeps --replacepkgs --nosignature -i"
+RPM_INSTALL_CMD_NOSCRIPTS="rpm --quiet --nodeps --replacepkgs --noscripts --nosignature -i"
+
+# If the lsb has been started, stop it first.
+if [ -x ${LSB_STOP_CMD} ]
+then
+ ${LSB_STOP_CMD}
+fi
+
+if [ ! -d /etc/rpm ]
+then
+ mkdir -p /etc/rpm
+fi
+
+if [ ! -f ${PLATFORM_FILE} ]
+then
+ touch ${PLATFORM_FILE}
+fi
+
+if ! `grep -F -q "noarch-suse" ${PLATFORM_FILE}`; then
+ if [ ${ARCH} == i686 ];then
+ echo "i486-suse" >> ${PLATFORM_FILE}
+ echo "i486-noarch" >> ${PLATFORM_FILE}
+ echo "i486-pc" >> ${PLATFORM_FILE}
+ echo "noarch-suse" >> ${PLATFORM_FILE}
+ else
+ echo "${ARCH}-suse" >> ${PLATFORM_FILE}
+ echo "${ARCH}-noarch" >> ${PLATFORM_FILE}
+ echo "${ARCH}-pc" >> ${PLATFORM_FILE}
+ echo "noarch-suse" >> ${PLATFORM_FILE}
+ fi
+fi
+
+if [ -d ${BASE_PACKAGES_DIR} ]
+then
+ cd ${BASE_PACKAGES_DIR}
+ for pkg in ${BASE_PACKAGES_LIST}
+ do
+ rpm --quiet -q ${pkg%\.*}
+ if [ $? -ne 0 ]; then
+ $RPM_INSTALL_CMD ${pkg}
+ fi
+ done
+fi
+
+if [ -d ${RUNTIME_BASE_PACKAGES_DIR} ]
+then
+ cd ${RUNTIME_BASE_PACKAGES_DIR}
+ for pkg in ${RUNTIME_BASE_PACKAGES_LIST}
+ do
+ rpm --quiet -q ${pkg%\.*}
+ if [ $? -ne 0 ]; then
+ $RPM_INSTALL_CMD ${pkg}
+ fi
+ done
+fi
+
+if [ -d ${RUNTIME_PACKAGES_DIR} ]
+then
+ cd ${RUNTIME_PACKAGES_DIR}
+ for pkg in ${RUNTIME_PACKAGES_LIST}
+ do
+ rpm --quiet -q ${pkg%\.*}
+ if [ $? -ne 0 ]; then
+ $RPM_INSTALL_CMD ${pkg}
+ fi
+ done
+fi
+
+if [ -d ${APP_PACKAGES_DIR} ]
+then
+ cd ${APP_PACKAGES_DIR}
+ for pkg in ${APP_PACKAGES_LIST}
+ do
+ echo "${pkg}" | grep -q "apache\|xpdf"
+ if [ $? -eq 0 ]
+ then
+ rpm --quiet -q ${pkg%\.*}
+ if [ $? -ne 0 ]; then
+ $RPM_INSTALL_CMD_NOSCRIPTS ${pkg}
+ fi
+ else
+ rpm --quiet -q ${pkg%\.*}
+ if [ $? -ne 0 ]; then
+ $RPM_INSTALL_CMD ${pkg}
+ fi
+ fi
+ done
+fi
+
+if [ ! -d ${SNAPSHOTS_TESTFILES_DIR} ]
+then
+ mkdir -p ${SNAPSHOTS_TESTFILES_DIR}
+fi
+
+if [ -d ${APP_TESTFILES_DIR} ]
+then
+ cd ${APP_TESTFILES_DIR}
+ for pkg in ${APP_TESTFILES_LIST}
+ do
+ cp -f ${pkg} ${SNAPSHOTS_TESTFILES_DIR}
+ done
+fi
+
+cd ${WORK_DIR}
+
+# Step 3: Set environment
+echo ""
+echo "Set environment..."
+echo ""
+
+check ()
+{
+ if [ $? -eq 0 ]
+ then
+ echo "PASS"
+ else
+ echo "FAIL"
+ exit 1
+ fi
+}
+
+echo ""
+echo "---------------------------------"
+echo "Create the Dirnames on target"
+
+if [ ! -d /etc/rpm/sysinfo ]
+then
+ mkdir -p /etc/rpm/sysinfo
+fi
+
+cat > /etc/rpm/sysinfo/Dirnames << EOF
+/etc/opt/lsb
+/home/tet/LSB.tools
+/opt/lsb-tet3-lite/lib/ksh
+/opt/lsb-tet3-lite/lib/perl
+/opt/lsb-tet3-lite/lib/posix_sh
+/opt/lsb-tet3-lite/lib/tet3
+/opt/lsb-tet3-lite/lib/xpg3sh
+/opt/lsb/appbat/lib/python2.4/site-packages/qm
+/opt/lsb/appbat/lib/python2.4/site-packages/qm/external
+/opt/lsb/appbat/lib/python2.4/site-packages/qm/external/DocumentTemplate
+/opt/lsb/appbat/lib/python2.4/site-packages/qm/test
+/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/classes
+/opt/lsb/appbat/lib/python2.4/site-packages/qm/test/web
+/opt/lsb/test/doc
+/opt/lsb/test/lib
+/opt/lsb/test/qm/diagnostics
+/opt/lsb/test/qm/doc
+/opt/lsb/test/qm/doc/test/html
+/opt/lsb/test/qm/doc/test/print
+/opt/lsb/test/qm/dtml
+/opt/lsb/test/qm/dtml/test
+/opt/lsb/test/qm/messages/test
+/opt/lsb/test/qm/tutorial/test/tdb
+/opt/lsb/test/qm/tutorial/test/tdb/QMTest
+/opt/lsb/test/qm/web
+/opt/lsb/test/qm/web/images
+/opt/lsb/test/qm/web/stylesheets
+/opt/lsb/test/qm/xml
+/opt/lsb/test/share
+/usr/share/doc/lsb-runtime-test
+/var/opt/lsb
+/opt/lsb/test/desktop
+/opt/lsb/test/desktop/fontconfig
+/opt/lsb/test/desktop/freetype
+/opt/lsb/test/desktop/gtkvts
+/opt/lsb/test/desktop/libpng
+/opt/lsb/test/desktop/qt3
+/opt/lsb/test/desktop/xft
+/opt/lsb/test/desktop/xml
+/opt/lsb/test/desktop/xrender
+
+
+EOF
+
+if [ -f /etc/rpm/sysinfo/Dirnames ]
+then
+ echo "Success to creat Dirnames file"
+else
+ echo "Fail to creat Dirnames file"
+fi
+
+echo ""
+echo "---------------------------------"
+echo "Update cache"
+ldconfig
+check;
+
+# Check loop device
+if [ ! -b /dev/loop0 ]
+then
+ insmod /lib/modules/`uname -r`/kernel/drivers/block/loop.ko
+ if [ $? != 0 ];then
+ echo "Insmod loop.ko failed."
+ fi
+fi
+
+# Resolve localhost
+LOCALHOST=`hostname`
+if ! `grep -F -q "$LOCALHOST" /etc/hosts`; then
+ echo "127.0.0.1 $LOCALHOST" >> /etc/hosts
+fi
+
+# Workaround to add part of locales for LSB test
+localedef -i de_DE -f ISO-8859-1 de_DE
+localedef -i de_DE -f ISO-8859-15 de_DE.ISO-8859-15
+localedef -i de_DE -f UTF-8 de_DE.UTF-8
+localedef -i de_DE@euro -f ISO-8859-15 de_DE@euro
+localedef -i en_HK -f ISO-8859-1 en_HK
+localedef -i en_PH -f ISO-8859-1 en_PH
+localedef -i en_US -f ISO-8859-15 en_US.ISO-8859-15
+localedef -i en_US -f ISO-8859-1 en_US.ISO-8859-1
+localedef -i en_US -f ISO-8859-1 en_US
+localedef -i en_US -f UTF-8 en_US.UTF-8
+localedef -i en_US -f ISO-8859-1 en_US.ISO8859-1
+localedef -i es_MX -f ISO-8859-1 es_MX
+localedef -i fr_FR -f ISO-8859-1 fr_FR
+localedef -i it_IT -f ISO-8859-1 it_IT
+localedef -i ja_JP -f EUC-JP ja_JP.eucjp
+localedef -i se_NO -f UTF-8 se_NO.UTF-8
+localedef -i ta_IN -f UTF-8 ta_IN
+
+echo ""
+echo "Installation done!"
+echo ""
+
+# Step 4: Start LSB test
+if [ -x ${LSB_START_CMD} ]
+then
+ ${LSB_START_CMD}
+fi
+
+echo "---------------------------------"
+echo "Run all the certification version of LSB Tests"
+echo "---------------------------------"
+
+LSB_DIST_CHECKER="/opt/lsb/test/manager/utils/dist-checker.pl"
+SESSION="${WORK_DIR}/session"
+if [ ! -e ${SESSION} ]
+then
+ echo "Error: Could not find session file."
+ echo "You must run LSB test from webbrower."
+ exit 1
+fi
+
+if [ -x ${LSB_DIST_CHECKER} ]
+then
+ ${LSB_DIST_CHECKER} -v2 -f ${SESSION}
+ check
+fi
+
+echo ""
+echo "LSB test complete. Please check the log file in /var/opt/lsb/test/manager/results/"
+echo ""
+
diff --git a/meta/recipes-extended/lsb/lsbtest/packages_list b/meta/recipes-extended/lsb/lsbtest/packages_list
new file mode 100644
index 0000000..9285ed9
--- /dev/null
+++ b/meta/recipes-extended/lsb/lsbtest/packages_list
@@ -0,0 +1,50 @@
+LSB_RELEASE="released-4.1.0"
+LSB_ARCH="lsbarch"
+
+BASE_PACKAGES_LIST="lsb-setup-4.1.0-1.noarch.rpm"
+
+RUNTIME_BASE_PACKAGES_LIST="lsb-dist-checker-4.1.0.1-2.targetarch.rpm \
+ lsb-tet3-lite-3.7-15.lsb4.targetarch.rpm \
+ lsb-tet3-lite-devel-3.7-15.lsb4.targetarch.rpm \
+ lsb-xvfb-1.2.0-19.targetarch.rpm \
+ "
+
+RUNTIME_PACKAGES_LIST="lsb-cmdchk-4.1.0-1.targetarch.rpm \
+ lsb-libchk-4.1.0-1.targetarch.rpm \
+ lsb-qm-2.2-8.lsb4.targetarch.rpm \
+ lsb-task-dist-testkit-4.1.0-1.noarch.rpm \
+ lsb-test-core-4.1.0-1.targetarch.rpm \
+ lsb-test-cpp-t2c-4.1.0-1.targetarch.rpm \
+ lsb-test-desktop-4.1.0-2.targetarch.rpm \
+ lsb-test-desktop-t2c-4.1.0-1.targetarch.rpm \
+ lsb-test-libstdcpp-4.1.0-13.lsb4.targetarch.rpm \
+ lsb-test-olver-core-4.1.0-1.targetarch.rpm \
+ lsb-test-perl-4.1.0-1.noarch.rpm \
+ lsb-test-printing-4.1.0-1.targetarch.rpm \
+ lsb-test-python-4.1.1-2.targetarch.rpm \
+ lsb-test-qt3-azov-4.1.0-1.targetarch.rpm \
+ lsb-test-qt4-azov-4.1.0-1.targetarch.rpm \
+ lsb-test-xts5-5.1.5-38.lsb4.targetarch.rpm \
+ lsb-test-alsa-t2c-4.1.0-1.targetarch.rpm \
+ lsb-test-core-t2c-4.1.0-1.targetarch.rpm \
+ lsb-test-xml2-azov-4.1.0-1.targetarch.rpm \
+ "
+
+APP_PACKAGES_LIST="lsb-python-2.4.6-5.lsb4.targetarch.rpm \
+ lsb-apache-2.2.14-3.lsb4.targetarch.rpm \
+ lsb-tcl-8.5.7-6.lsb4.targetarch.rpm \
+ lsb-expect-5.43.0-11.lsb4.targetarch.rpm \
+ lsb-groff-1.20.1-5.lsb4.targetarch.rpm \
+ lsb-raptor-1.4.19-3.lsb4.targetarch.rpm \
+ lsb-xpdf-1.01-10.lsb4.targetarch.rpm \
+ lsb-samba-3.4.3-5.lsb4.targetarch.rpm \
+ lsb-rsync-3.0.6-3.lsb4.targetarch.rpm \
+ "
+
+APP_TESTFILES_LIST="expect-tests.tar \
+ tcl-tests.tar \
+ raptor-tests.tar \
+ test1.pdf \
+ test2.pdf \
+ "
+
diff --git a/meta/recipes-extended/lsb/lsbtest/session b/meta/recipes-extended/lsb/lsbtest/session
new file mode 100644
index 0000000..85ca2ef
--- /dev/null
+++ b/meta/recipes-extended/lsb/lsbtest/session
@@ -0,0 +1,194 @@
+[GENERAL]
+VERBOSE_LEVEL: 1
+ARCHITECTURE: targetarch
+USE_INTERNET: 1
+STD_VERSION: LSB 4.1
+STD_PROFILE: no
+[cmdchk]
+RUN: 1
+VERSION: local|*
+
+[libchk]
+RUN: 1
+VERSION: local|*
+
+[alsa-t2c]
+RUN: 1
+VERSION: local|*
+
+[alsa-t2c|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/alsa-t2c
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/alsa-t2c/results
+
+[core]
+RUN: 1
+VERSION: local|*
+
+[core|local|*]
+AUTOREPLY_PROVIDES_BASH: n
+AUTOREPLY_TESTRUN_PATH: /home/tet/test_sets
+AUTOREPLY_PERSON: Automated
+AUTOREPLY_KERNEL_NAME: vmlinuz
+AUTOREPLY_INSTALL_LSBPAM_CONF: y
+AUTOREPLY_PROVIDES_C_SHELL: n
+AUTOREPLY_ORGANISATION: N/A
+AUTOREPLY_SET_PASS_MIN_DAYS: y
+AUTOREPLY_PROVIDES_SYSV_INIT:
+AUTOREPLY_ISNTALL_DEVS: y
+AUTOREPLY_SUPPORTS_FILE_CMD: y
+AUTOREPLY_TEST_SYSTEM: Distribution Checker
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/core/tet/test_sets
+AUTOREPLY_SUPPORTS_NLS: n
+AUTOREPLY_SUPPORTS_PROCESS_ACCOUNTING: n
+AUTOREPLY_PATH_TO_RC.D:
+AUTOREPLY_ALLOWS_MAKEDEV: n
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/core/tet/test_sets/results
+
+[core-t2c]
+RUN: 1
+VERSION: local|*
+
+[core-t2c|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/core-t2c
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/core-t2c/results
+
+[cpp-t2c]
+RUN: 1
+VERSION: local|*
+
+[cpp-t2c|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/cpp-t2c
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/cpp-t2c/results
+
+[desktop]
+RUN: 1
+VERSION: local|*
+
+[desktop|local|*]
+AUTOREPLY_DESKTOP_ENVIRONMENT: [default]
+AUTOREPLY_PERSON: Automated
+AUTOREPLY_X_CLIENT_HOSTNAME:
+AUTOREPLY_TEST_SYSTEM: Distribution Checker
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/desktop
+AUTOREPLY_X11_FONT_PATH: [default]
+AUTOREPLY_SHOW_SUMMARY_REPORT:
+AUTOREPLY_ORGANISATION: N/A
+AUTOREPLY_XVFB_DISPLAY: [default]
+
+[desktop-t2c]
+RUN: 1
+VERSION: local|*
+
+[desktop-t2c|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/desktop-t2c
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/desktop-t2c/results
+
+[libstdcpp]
+RUN: 1
+VERSION: local|*
+
+[libstdcpp|local|*]
+AUTOREPLY_TEST_SYSTEM: Distribution Checker
+AUTOREPLY_PERSON: Automated
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/libstdcpp_4.1.0
+AUTOREPLY_ORGANISATION: N/A
+AUTOREPLY_GNU_TRIPLET:
+
+[olver]
+RUN: 1
+VERSION: local|*
+
+[olver|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/olver-core
+AUTOREPLY_RESULTS_DIR: /var/opt/lsb/test/olver-core
+
+[perl]
+RUN: 1
+VERSION: local|*
+
+[perl|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/perl
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/perl/results
+
+[printing]
+RUN: 1
+VERSION: local|*
+
+[printing|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/printing
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/printing/results
+
+[python]
+RUN: 1
+VERSION: local|*
+
+[python|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/python
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/python/results
+
+[qt3-azov]
+RUN: 1
+VERSION: local|*
+
+[qt3-azov|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/qt3-azov
+AUTOREPLY_X11_FONT_PATH: [default]
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/qt3-azov/results
+
+[qt4-azov]
+RUN: 1
+VERSION: local|*
+
+[qt4-azov|local|*]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/qt4-azov
+AUTOREPLY_X11_FONT_PATH: [default]
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/qt4-azov/results
+
+[xml2-azov]
+RUN: 1
+VERSION: local|*
+
+[xts5]
+RUN: 1
+VERSION: local|*
+
+[xts5|local|*]
+AUTOREPLY_XT_FONTPATH_GOOD: [default]
+AUTOREPLY_TESTSUITE_DIR: /opt/lsb/test/xts5
+AUTOREPLY_XVFB_DISPLAY: [default]
+AUTOREPLY_RESULTS_DIR: /opt/lsb/test/xts5/xts5/results
+AUTOREPLY_XT_FONTPATH: [default]
+AUTOREPLY_X_CLIENT_HOSTNAME:
+
+[apache]
+RUN: 1
+VERSION: local|*
+
+[expect]
+RUN: 1
+VERSION: local|*
+
+[groff]
+RUN: 1
+VERSION: local|*
+
+[raptor]
+RUN: 1
+VERSION: local|*
+
+[rsync]
+RUN: 1
+VERSION: local|*
+
+[samba]
+RUN: 1
+VERSION: local|*
+
+[tcl]
+RUN: 1
+VERSION: local|*
+
+[xpdf]
+RUN: 1
+VERSION: local|*
+
diff --git a/meta/recipes-extended/lsb/lsbtest_1.0.bb b/meta/recipes-extended/lsb/lsbtest_1.0.bb
new file mode 100644
index 0000000..d932c83
--- /dev/null
+++ b/meta/recipes-extended/lsb/lsbtest_1.0.bb
@@ -0,0 +1,37 @@
+DESCRIPTION = "automate test for lsb"
+SECTION = "console/utils"
+LICENSE = "GPLv2"
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://LSB_Test.sh;beginline=3;endline=16;md5=7063bb54b04719df0716b513447f4fc0"
+
+SRC_URI = "file://LSB_Test.sh \
+ file://packages_list \
+ file://session \
+ "
+RDEPENDS_${PN} = "rpm"
+
+S=${WORKDIR}
+
+do_install() {
+ install -d ${D}/usr/bin
+ install -m 0755 ${S}/LSB_Test.sh ${D}/usr/bin
+ install -d ${D}/opt/lsb-test
+ install -m 0644 ${S}/packages_list ${D}/opt/lsb-test/packages_list
+ install -m 0644 ${S}/session ${D}/opt/lsb-test/session
+ if [ "${TARGET_ARCH}" == "i586" ];then
+ sed -i -e 's/lsbarch/ia32/g' -e 's/targetarch/i486/g' ${D}/opt/lsb-test/packages_list
+ sed -i -e 's/targetarch/x86/g' ${D}/opt/lsb-test/session
+ fi
+ if [ "${TARGET_ARCH}" == "x86_64" ];then
+ sed -i -e 's/lsbarch/amd64/g' -e 's/targetarch/x86_64/g' ${D}/opt/lsb-test/packages_list
+ sed -i -e 's/targetarch/x86-64/g' ${D}/opt/lsb-test/session
+ fi
+ if [ "${TARGET_ARCH}" == "powerpc" ];then
+ sed -i -e 's/lsbarch/ppc32/g' -e 's/targetarch/ppc/g' ${D}/opt/lsb-test/packages_list
+ sed -i -e 's/targetarch/PPC32/g' ${D}/opt/lsb-test/session
+ fi
+}
+
+FILES_${PN} += "/opt/lsb-test/* \
+ "
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 02/36] distro_tracking_fields: add information for lsbtest
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
2012-02-28 5:24 ` [CONSOLIDATED PULL 01/36] lsbtest: Add recipe for LSB tests and automate test Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 03/36] task-core-lsb: add lsbtest to RDEPENDS_task-core-misc list Saul Wold
` (33 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Yi Zhao <yi.zhao@windriver.com>
Add information for recipe lsbtest.
---
.../conf/distro/include/distro_tracking_fields.inc | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 686bdf7..91c36d9 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -5891,6 +5891,10 @@ RECIPE_MANUAL_CHECK_DATE_pn-lsbsetup = "Nov 28, 2011"
DISTRO_PN_ALIAS_pn-lsbsetup = "Windriver"
RECIPE_MAINTAINER_pn-lsbsetup = "Saul Wold <sgw@linux.intel.com>"
+RECIPE_LATEST_VERSION_pn-lsbtest = "1.0"
+RECIPE_LAST_UPDATE_pn-lsbtest = "Feb 17, 2012"
+RECIPE_MAINTAINER_pn-lsbtest = "Yi Zhao <yi.zhao@windriver.com>"
+
RECIPE_LATEST_VERSION_pn-libxml-simple-perl = "2.18"
RECIPE_LATEST_VERSION_pn-talloc = "2.0.5"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 03/36] task-core-lsb: add lsbtest to RDEPENDS_task-core-misc list
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
2012-02-28 5:24 ` [CONSOLIDATED PULL 01/36] lsbtest: Add recipe for LSB tests and automate test Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 02/36] distro_tracking_fields: add information for lsbtest Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 04/36] qt4: fix compile error in Qt 4.8.0 with gcc 4.6 Saul Wold
` (32 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Yi Zhao <yi.zhao@windriver.com>
---
meta/recipes-extended/tasks/task-core-lsb.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/tasks/task-core-lsb.bb
index c48ccf0..2767196 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/tasks/task-core-lsb.bb
@@ -3,7 +3,7 @@
#
DESCRIPTION = "Create Small Image Tasks"
-PR = "r6"
+PR = "r7"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
@@ -116,6 +116,7 @@ RDEPENDS_task-core-misc = "\
groff \
lsb \
lsbsetup \
+ lsbtest \
lsof \
man \
man-pages \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 04/36] qt4: fix compile error in Qt 4.8.0 with gcc 4.6
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (2 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 03/36] task-core-lsb: add lsbtest to RDEPENDS_task-core-misc list Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 05/36] qt4: build qmake for the target Saul Wold
` (31 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Ensure the Qt configure script can can detect the compiler correctly as
g++. This fixes the following compile error with gcc 4.6:
./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat]
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/qt4/qt-4.8.0.inc | 1 +
.../qt4/qt-4.8.0/configure_oe_compiler.patch | 31 ++++++++++++++++++++
meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb | 2 +-
3 files changed, 33 insertions(+), 1 deletions(-)
create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch
diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.0.inc
index 2addbb2..532f1ff 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.0.inc
@@ -14,6 +14,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://fix-translations.patch \
file://add_nostrip_for_debug_packages.diff \
file://qmake_cxx_eval.patch \
+ file://configure_oe_compiler.patch \
file://g++.conf \
file://linux.conf \
"
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch b/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch
new file mode 100644
index 0000000..d455d0a
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/configure_oe_compiler.patch
@@ -0,0 +1,31 @@
+Ensure we identify the compiler as g++ in configure
+
+Our PLATFORM in OE is ${TARGET_OS}-oe-g++, and previously the configure
+script was interpreting from this that the compiler was "oe-g++" and thus
+g++ specific checks were not being run since this string did not match;
+among other things this resulted in a compiler version check in the
+QtWebKit build code not working, and hence the following error at build
+time:
+
+./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat]
+
+The easiest thing since our PLATFORM is entirely artificial is to just
+force COMPILER to "g++" in the configure script if it is detected as
+"oe-g++".
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+
+--- qt-everywhere-opensource-src-4.8.0.orig/configure
++++ qt-everywhere-opensource-src-4.8.0/configure
+@@ -7444,6 +7444,9 @@ elif [ "$XPLATFORM" != "$PLATFORM" ]; th
+ else
+ COMPILER=`echo $PLATFORM | cut -f 2- -d-`
+ fi
++case $COMPILER in
++ *oe-g++) COMPILER="g++" ;;
++esac
+ if [ "$CFG_EXCEPTIONS" = "unspecified" -a "$PLATFORM_QWS" = "yes" ]; then
+ CFG_EXCEPTIONS=no
+ fi
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb b/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb
index 5c1c97e..efbc02a 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.8.0.bb
@@ -1,7 +1,7 @@
require qt-${PV}.inc
require qt4-embedded.inc
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
DEFAULT_PREFERENCE = "-1"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 05/36] qt4: build qmake for the target
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (3 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 04/36] qt4: fix compile error in Qt 4.8.0 with gcc 4.6 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 06/36] qt4-tools-nativesdk: fix build of 4.7.4 Saul Wold
` (30 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
qmake was not being built at all (since we had the host version from
qt4-native) and the default is to build for the host machine within
configure. With a minor hack we can build qmake for the target as well,
which is useful if you want to build Qt 4 software on an actual device.
This is now installed as part of the tools package (together with uic,
moc etc.)
Additionally, add an environment setup script (installed in
/usr/share/qt4/environment-setup or /usr/share/qtopia/environment-setup
for the embedded version) as part of the mkspecs package since the
mkspecs will not work without the paths set up by this script. The code
to create this script was adapted from the qmake2 recipe in meta-oe.
Also move do_compile() from qt-${PV}.inc up to qt4.inc as both versions
have the exact same content.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/qt4/files/target_qmake.patch | 27 ++++++++++
meta/recipes-qt/qt4/qt-4.7.4.inc | 11 +----
meta/recipes-qt/qt4/qt-4.8.0.inc | 12 +----
meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch | 51 ++++++++++++++++++++
meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 2 +-
meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 2 +-
meta/recipes-qt/qt4/qt4.inc | 47 ++++++++++++++++--
7 files changed, 126 insertions(+), 26 deletions(-)
create mode 100644 meta/recipes-qt/qt4/files/target_qmake.patch
create mode 100644 meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch
diff --git a/meta/recipes-qt/qt4/files/target_qmake.patch b/meta/recipes-qt/qt4/files/target_qmake.patch
new file mode 100644
index 0000000..9b53aff
--- /dev/null
+++ b/meta/recipes-qt/qt4/files/target_qmake.patch
@@ -0,0 +1,27 @@
+From e4b27237386b3dd864dd603de2ae54a707f5419f Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Mon, 27 Feb 2012 00:13:05 +0000
+Subject: [PATCH] Allow building a separate qmake for the target
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+
+Upstream-Status: Inappropriate [config]
+---
+ qmake/qmake.pro | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qmake/qmake.pro b/qmake/qmake.pro
+index b602afa..b59f7fb 100644
+--- a/qmake/qmake.pro
++++ b/qmake/qmake.pro
+@@ -7,6 +7,7 @@ CONFIG += console bootstrap
+ CONFIG -= qt shared app_bundle uic
+ DEFINES += QT_BUILD_QMAKE QT_BOOTSTRAPPED
+ DESTDIR = ../bin/
++TARGET = qmake2
+
+ OBJECTS_DIR = .
+ MOC_DIR = .
+--
+1.7.5.4
+
diff --git a/meta/recipes-qt/qt4/qt-4.7.4.inc b/meta/recipes-qt/qt4/qt-4.7.4.inc
index 9ddb055..216472c 100644
--- a/meta/recipes-qt/qt4/qt-4.7.4.inc
+++ b/meta/recipes-qt/qt4/qt-4.7.4.inc
@@ -15,6 +15,7 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://blacklist-diginotar-certs.diff \
file://fix-translations.patch \
file://add_nostrip_for_debug_packages.diff \
+ file://target_qmake.patch \
file://g++.conf \
file://linux.conf \
file://fix-qtbug-20925.patch \
@@ -43,13 +44,3 @@ do_configure_prepend() {
${S}/configure
}
-do_compile() {
- # Fixup missing wsegl header in some SGX SDKs
- if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
- cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
- fi
-
- unset CFLAGS CXXFLAGS
-
- oe_runmake ${EXTRA_ENV}
-}
diff --git a/meta/recipes-qt/qt4/qt-4.8.0.inc b/meta/recipes-qt/qt4/qt-4.8.0.inc
index 532f1ff..28586be 100644
--- a/meta/recipes-qt/qt4/qt-4.8.0.inc
+++ b/meta/recipes-qt/qt4/qt-4.8.0.inc
@@ -15,6 +15,8 @@ SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.
file://add_nostrip_for_debug_packages.diff \
file://qmake_cxx_eval.patch \
file://configure_oe_compiler.patch \
+ file://target_qmake.patch \
+ file://qmake_pri_fixes.patch \
file://g++.conf \
file://linux.conf \
"
@@ -50,13 +52,3 @@ do_configure_prepend() {
unset LD
}
-do_compile() {
- # Fixup missing wsegl header in some SGX SDKs
- if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
- cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
- fi
-
- unset CFLAGS CXXFLAGS
-
- oe_runmake ${EXTRA_ENV}
-}
diff --git a/meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch b/meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch
new file mode 100644
index 0000000..82bff04
--- /dev/null
+++ b/meta/recipes-qt/qt4/qt-4.8.0/qmake_pri_fixes.patch
@@ -0,0 +1,51 @@
+From c56ed5f64a5f47cf8d539aa4ca9bedbe1fea2264 Mon Sep 17 00:00:00 2001
+From: Paul Eggleton <paul.eggleton@linux.intel.com>
+Date: Fri, 10 Feb 2012 15:32:12 +0000
+Subject: [PATCH] qmake: fix source file references in qmake.pri
+
+Fix duplicate entries in SOURCES and HEADERS, and fix the source file
+list for the split of qlocale.cpp.
+
+Upstream-Status: Pending
+
+Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
+---
+ qmake/qmake.pri | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/qmake/qmake.pri b/qmake/qmake.pri
+index f2a3705..2d4e94c 100644
+--- a/qmake/qmake.pri
++++ b/qmake/qmake.pri
+@@ -22,8 +22,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \
+ generators/symbian/initprojectdeploy_symbian.cpp \
+ generators/integrity/gbuild.cpp \
+ windows/registry.cpp \
+- symbian/epocroot.cpp \
+- generators/integrity/gbuild.cpp
++ symbian/epocroot.cpp
+
+ HEADERS += project.h property.h generators/makefile.h \
+ generators/unix/unixmake.h meta.h option.h cachekeys.h \
+@@ -40,8 +39,7 @@ HEADERS += project.h property.h generators/makefile.h \
+ generators/symbian/initprojectdeploy_symbian.h \
+ generators/integrity/gbuild.h \
+ windows/registry_p.h \
+- symbian/epocroot_p.h \
+- generators/integrity/gbuild.h
++ symbian/epocroot_p.h
+
+ contains(QT_EDITION, OpenSource) {
+ DEFINES += QMAKE_OPENSOURCE_EDITION
+@@ -72,6 +70,8 @@ bootstrap { #Qt code
+ qlist.cpp \
+ qlinkedlist.cpp \
+ qlocale.cpp \
++ qlocale_tools.cpp \
++ qlocale_unix.cpp \
+ qmalloc.cpp \
+ qmap.cpp \
+ qmetatype.cpp \
+--
+1.7.5.4
+
diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
index 9b66d03..a1fcafb 100644
--- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb
@@ -1,7 +1,7 @@
require qt-${PV}.inc
require qt4-embedded.inc
-PR = "${INC_PR}.6"
+PR = "${INC_PR}.7"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
index 6dedf00..e7f848e 100644
--- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
+++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb
@@ -1,7 +1,7 @@
require qt4-x11-free.inc
require qt-${PV}.inc
-PR = "${INC_PR}.6"
+PR = "${INC_PR}.7"
QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index ea868ff..1e76dec 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -142,8 +142,8 @@ RRECOMMENDS_${QT_BASE_NAME}-qmlviewer += " \
RRECOMMENDS_${QT_BASE_NAME}-doc += " \
${QT_BASE_NAME}-demos-doc"
-FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
-FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
+FILES_${QT_BASE_NAME}-tools = "${bindir}/qttracereplay ${bindir}/qdoc* ${bindir}/qmake ${bindir}/moc ${bindir}/uic* ${bindir}/rcc"
+FILES_${QT_BASE_NAME}-tools-dbg = "${bindir}/.debug/qttracereplay ${bindir}/.debug/qdoc* ${bindir}/.debug/qmake ${bindir}/.debug/uic* ${bindir}/.debug/moc ${bindir}/.debug/rcc"
FILES_${QT_BASE_NAME}-assistant = "${bindir}/*assistant* ${bindir}/qcollectiongenerator ${bindir}/qhelpconverter ${bindir}/qhelpgenerator"
FILES_${QT_BASE_NAME}-assistant-dbg = "${bindir}/.debug/*assistant* ${bindir}/.debug/qcollectiongenerator ${bindir}/.debug/qhelpconverter ${bindir}/.debug/qhelpgenerator"
FILES_${QT_BASE_NAME}-common = "${bindir}/qtconfig"
@@ -172,7 +172,7 @@ FILES_${QT_BASE_NAME}-qmlviewer = "${bindir}/qmlviewer"
FILES_${QT_BASE_NAME}-qmlviewer-dbg = "${bindir}/.debug/qmlviewer"
FILES_${QT_BASE_NAME}-makeqpf = "${bindir}/makeqpf"
FILES_${QT_BASE_NAME}-makeqpf-dbg = "${bindir}/.debug/makeqpf"
-FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/*"
+FILES_${QT_BASE_NAME}-mkspecs = "${datadir}/${QT_DIR_NAME}/mkspecs/* ${datadir}/${QT_DIR_NAME}/environment-setup"
FILES_${QT_BASE_NAME}-xmlpatterns = "${bindir}/xmlpatterns*"
FILES_${QT_BASE_NAME}-xmlpatterns-dbg = "${bindir}/.debug/xmlpatterns*"
FILES_${QT_BASE_NAME}-qml-plugins = "${libdir}/${QT_DIR_NAME}/imports/* ${libdir}/${QT_DIR_NAME}/plugins/qmltooling/*"
@@ -236,6 +236,24 @@ do_configure() {
-I${STAGING_INCDIR}/freetype2
}
+do_compile() {
+ # Fixup missing wsegl header in some SGX SDKs
+ if ! [ -e ${STAGING_INCDIR}/wsegl.h ] ; then
+ cp src/3rdparty/powervr/wsegl.h src/plugins/gfxdrivers/powervr/QWSWSEGL/
+ fi
+
+ unset CFLAGS CXXFLAGS
+
+ oe_runmake ${EXTRA_ENV}
+
+ # Build target qmake
+ export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++"
+ cd ${S}/qmake
+ ${OE_QMAKE_QMAKE}
+ oe_runmake CC="${CC}" CXX="${CXX}"
+ cd ${S}
+}
+
python populate_packages_prepend() {
translation_dir = bb.data.expand('${datadir}/${QT_DIR_NAME}/translations/', d)
translation_name = bb.data.expand('${QT_BASE_NAME}-translation-%s', d)
@@ -295,8 +313,9 @@ python populate_packages_prepend() {
do_install() {
oe_runmake install INSTALL_ROOT=${D}
- # These are host binaries, we should only use them in staging
+ # Install a proper target version of qmake
rm ${D}/${bindir}/qmake
+ install -m 0755 bin/qmake2 ${D}${bindir}/qmake
# fix pkgconfig, libtool and prl files
sed -i -e 's#-L${S}/lib/\?##g' \
@@ -333,4 +352,24 @@ do_install() {
if [ -n "${QT_LIBINFIX}" ] ; then
[ -f ${D}${bindir}/qtdemo ] && mv ${D}${bindir}/qtdemo ${D}${bindir}/qtdemo${QT_LIBINFIX}
fi
+
+ script="${D}/${datadir}/${QT_DIR_NAME}/environment-setup"
+ touch $script
+ echo 'export QT_DIR_NAME=${QT_DIR_NAME}' >> $script
+ echo 'export QT_LIBINFIX=${QT_LIBINFIX}' >> $script
+ echo 'export OE_QMAKE_AR=ar' >> $script
+ echo 'export OE_QMAKE_CC=gcc' >> $script
+ echo 'export OE_QMAKE_CXX=g++' >> $script
+ echo 'export OE_QMAKE_LINK=g++' >> $script
+ echo 'export OE_QMAKE_LIBDIR_QT=${libdir}' >> $script
+ echo 'export OE_QMAKE_INCDIR_QT=${includedir}/${QT_DIR_NAME}' >> $script
+ echo 'export OE_QMAKE_MOC=${bindir}/moc' >> $script
+ echo 'export OE_QMAKE_UIC=${bindir}/uic' >> $script
+ echo 'export OE_QMAKE_UIC3=${bindir}/uic3' >> $script
+ echo 'export OE_QMAKE_RCC=${bindir}/rcc' >> $script
+ echo 'export OE_QMAKE_QDBUSCPP2XML=${bindir}/qdbuscpp2xml' >> $script
+ echo 'export OE_QMAKE_QDBUSXML2CPP=${bindir}/qdbusxml2cpp' >> $script
+ echo 'export OE_QMAKE_QT_CONFIG=${datadir}/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
+ echo 'export QMAKESPEC=${datadir}/${QT_DIR_NAME}/mkspecs/linux-g++' >> $script
+ chmod 0755 $script
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 06/36] qt4-tools-nativesdk: fix build of 4.7.4
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (4 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 05/36] qt4: build qmake for the target Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 07/36] qt4-tools-nativesdk: improve and tidy up qmake build Saul Wold
` (29 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
Commit 4ccae37db1aa77a1d15098c3720ea6e2d383fbdc introduced a sed command
line to modify a file that only exists in 4.8.0, thus do_configure of
4.7.4 was failing; so make this conditional upon the file existing.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 4b097cf..64cc1ae 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 = "r8"
+INC_PR = "r9"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
@@ -59,9 +59,12 @@ do_configure() {
cp ../g++.conf mkspecs/common
cp ../linux.conf mkspecs/common
- # don't use host g++ even during configure
- sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf
- sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
+
+ if [ -f mkspecs/common/g++-base.conf ] ; then
+ # don't use host g++ even during configure (4.8.0+)
+ sed -i -e "s#g++#${CXX}#" mkspecs/common/g++-base.conf
+ sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
+ fi
# first launch configure to get qmake compiled for the nativesdk
(echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 07/36] qt4-tools-nativesdk: improve and tidy up qmake build
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (5 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 06/36] qt4-tools-nativesdk: fix build of 4.7.4 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 08/36] gnupg: Add missing patch for curl_typeof_fix Saul Wold
` (28 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
* Use the same method to build qmake as in the qt4 target recipes
* We always have qmake from qt4-native so don't check if it exists -
just skip the check like we do in the qt4 target recipes. This
saves us a patch.
* Replace qt4-tools-native in DEPENDS with qt4-native
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
meta/recipes-qt/qt4/files/qmake-exists-check.patch | 19 -----------------
meta/recipes-qt/qt4/qt4-tools-nativesdk.inc | 22 +++++++++++--------
meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb | 2 +
3 files changed, 15 insertions(+), 28 deletions(-)
delete mode 100644 meta/recipes-qt/qt4/files/qmake-exists-check.patch
diff --git a/meta/recipes-qt/qt4/files/qmake-exists-check.patch b/meta/recipes-qt/qt4/files/qmake-exists-check.patch
deleted file mode 100644
index 27d21e0..0000000
--- a/meta/recipes-qt/qt4/files/qmake-exists-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-qt4-tools-nativesdk: avoid rebuilding qmake
-
-qt4-tools-nativesdk patch to avoids building qmake in configure if it already exists
-(as it will, since we symlink it in from the native sysroot in do_configure)
-
-Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-Upstream-Status: Inappropriate [configuration]
-
---- qt-everywhere-opensource-src-4.6.3.orig/configure 2011-01-10 12:01:56.260607001 +0000
-+++ qt-everywhere-opensource-src-4.6.3/configure 2011-01-10 12:02:20.584607015 +0000
-@@ -4286,7 +4286,7 @@
- }
-
- # build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if [ '!' -f "$outpath/bin/qmake" ]; then
- echo "Creating qmake. Please wait..."
-
- OLD_QCONFIG_H=
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
index 64cc1ae..efb61bf 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
@@ -1,21 +1,22 @@
DESCRIPTION = "SDK tools for Qt/[X11|Mac|Embedded] version 4.x"
-DEPENDS = "zlib-nativesdk dbus-nativesdk libx11-nativesdk qt4-tools-native"
+DEPENDS = "zlib-nativesdk dbus-nativesdk libx11-nativesdk qt4-native"
SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
LICENSE = "LGPLv2.1 | GPLv3"
-INC_PR = "r9"
+INC_PR = "r10"
FILESEXTRAPATHS =. "${FILE_DIRNAME}/qt-${PV}:"
inherit nativesdk qmake2
SRC_URI = "http://get.qt.nokia.com/qt/source/qt-everywhere-opensource-src-${PV}.tar.gz \
+ file://0004-no-qmake.patch \
file://configure-lflags.patch \
file://qt-config.patch \
- file://qmake-exists-check.patch \
file://configure-paths.patch \
file://qt-dbus-const.patch \
+ file://target_qmake.patch \
file://g++.conf \
file://linux.conf"
@@ -66,11 +67,7 @@ do_configure() {
sed -i -e "s#gcc#${CC}#" mkspecs/common/g++-base.conf
fi
- # first launch configure to get qmake compiled for the nativesdk
- (echo o; echo yes) | CC="${CC}" CXX="${CXX}" ./configure ${EXTRA_OECONF} || true
-
- # then backup the binary and start again with a qmake which can run on the build host
- mv bin/qmake bin/qmake_nativesdk
+ # Use qmake from qt4-native for building
if [ ! -e bin/qmake ]; then
ln -sf ${STAGING_BINDIR_NATIVE}/qmake2 bin/qmake
fi
@@ -99,11 +96,18 @@ do_compile() {
for i in ${TOBUILD}; do
cd ${S}/$i && oe_runmake CC="${CC}" CXX="${CXX}"
done
+
+ # Build nativesdk qmake
+ export QMAKESPEC="${S}/mkspecs/${TARGET_OS}-oe-g++"
+ cd ${S}/qmake
+ ${OE_QMAKE_QMAKE}
+ oe_runmake CC="${CC}" CXX="${CXX}"
+ cd ${S}
}
do_install() {
install -d ${D}${bindir}
- install -m 0755 bin/qmake_nativesdk ${D}${bindir}/qmake2
+ install -m 0755 bin/qmake2 ${D}${bindir}/qmake2
for i in moc uic uic3 rcc lrelease lupdate qdbuscpp2xml qdbusxml2cpp; do
install -m 0755 bin/${i} ${D}${bindir}/${i}4
done
diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
index e615d36..02917fe 100644
--- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
+++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.8.0.bb
@@ -2,6 +2,8 @@ require qt4-tools-nativesdk.inc
PR = "${INC_PR}.0"
+SRC_URI += "file://qmake_pri_fixes.patch"
+
DEFAULT_PREFERENCE = "-1"
SRC_URI[md5sum] = "e8a5fdbeba2927c948d9f477a6abe904"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 08/36] gnupg: Add missing patch for curl_typeof_fix
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (6 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 07/36] qt4-tools-nativesdk: improve and tidy up qmake build Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 09/36] qemu: Add glib-2.0 as depends Saul Wold
` (27 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Seems the wrong commit was grabbed and missed this patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../gnupg-1.4.7/curl_typeof_fix_backport.patch | 27 ++++++++++++++++++++
1 files changed, 27 insertions(+), 0 deletions(-)
create mode 100644 meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch
diff --git a/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch b/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch
new file mode 100644
index 0000000..e5fb24a
--- /dev/null
+++ b/meta/recipes-support/gnupg/gnupg-1.4.7/curl_typeof_fix_backport.patch
@@ -0,0 +1,27 @@
+
+This has been discussed in a couple of different bug reported
+upstream:
+
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=486250
+http://bugs.sourcemage.org/show_bug.cgi?id=14446
+
+Fix:
+http://lists.gnupg.org/pipermail/gnupg-devel/2008-April/024344.html
+
+Upstream-Status: Backport [Debian]
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: gnupg-1.4.7/keyserver/gpgkeys_curl.c
+===================================================================
+--- gnupg-1.4.7.orig/keyserver/gpgkeys_curl.c
++++ gnupg-1.4.7/keyserver/gpgkeys_curl.c
+@@ -286,7 +286,7 @@ main(int argc,char *argv[])
+ curl_easy_setopt(curl,CURLOPT_VERBOSE,1);
+ }
+
+- curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,opt->flags.check_cert);
++ curl_easy_setopt(curl,CURLOPT_SSL_VERIFYPEER,(long)opt->flags.check_cert);
+ curl_easy_setopt(curl,CURLOPT_CAINFO,opt->ca_cert_file);
+
+ if(proxy)
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 09/36] qemu: Add glib-2.0 as depends
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (7 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 08/36] gnupg: Add missing patch for curl_typeof_fix Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 10/36] util-linux: Update to 2.21 Saul Wold
` (26 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-devtools/qemu/qemu.inc | 2 +-
meta/recipes-devtools/qemu/qemu_0.15.1.bb | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 27ce14d..307a205 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -1,7 +1,7 @@
DESCRIPTION = "open source processor emulator"
HOMEPAGE = "http://qemu.org"
LICENSE = "GPLv2 & LGPLv2.1"
-DEPENDS = "zlib alsa-lib virtual/libx11"
+DEPENDS = "glib-2.0 zlib alsa-lib virtual/libx11"
# QEMU_TARGETS is overridable variable
QEMU_TARGETS ?= "arm i386 mips mipsel mips64 mips64el ppc sh4 x86_64"
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index b6a2294..3a4ef32 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
@@ -3,7 +3,7 @@ require qemu.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-PR = "r3"
+PR = "r4"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 10/36] util-linux: Update to 2.21
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (8 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 09/36] qemu: Add glib-2.0 as depends Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 11/36] file: Update to version 5.11 Saul Wold
` (25 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
This updates various checksums for the COPYING files, which moved in the process
no changes to Licenses
Tweak the scanf_cv_alloc_modifier and rebase the patch
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../util-linux-ng-replace-siginterrupt.patch | 25 -------------------
.../{util-linux-2.20.1 => util-linux-2.21}/MCONFIG | 0
.../defines.h | 0
.../make_include | 0
.../remove-lscpu.patch | 0
.../remove_sigsetmark.patch | 0
.../swapargs.h | 0
.../uclibc-__progname-conflict.patch | 0
.../uclibc-compile.patch | 0
.../util-linux-ng-2.16-mount_lock_path.patch | 0
.../util-linux-ng-replace-siginterrupt.patch | 26 ++++++++++++++++++++
meta/recipes-core/util-linux/util-linux.inc | 8 ++++--
.../{util-linux_2.20.1.bb => util-linux_2.21.bb} | 12 ++++----
13 files changed, 37 insertions(+), 34 deletions(-)
delete mode 100644 meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch
rename meta/recipes-core/util-linux/{util-linux-2.20.1 => util-linux-2.21}/MCONFIG (100%)
rename meta/recipes-core/util-linux/{util-linux-2.20.1 => util-linux-2.21}/defines.h (100%)
rename meta/recipes-core/util-linux/{util-linux-2.20.1 => util-linux-2.21}/make_include (100%)
rename meta/recipes-core/util-linux/{util-linux-2.20.1 => util-linux-2.21}/remove-lscpu.patch (100%)
rename meta/recipes-core/util-linux/{util-linux-2.20.1 => util-linux-2.21}/remove_sigsetmark.patch (100%)
rename meta/recipes-core/util-linux/{util-linux-2.20.1 => util-linux-2.21}/swapargs.h (100%)
rename meta/recipes-core/util-linux/{util-linux-2.20.1 => util-linux-2.21}/uclibc-__progname-conflict.patch (100%)
rename meta/recipes-core/util-linux/{util-linux-2.20.1 => util-linux-2.21}/uclibc-compile.patch (100%)
rename meta/recipes-core/util-linux/{util-linux-2.20.1 => util-linux-2.21}/util-linux-ng-2.16-mount_lock_path.patch (100%)
create mode 100644 meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch
rename meta/recipes-core/util-linux/{util-linux_2.20.1.bb => util-linux_2.21.bb} (84%)
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch
deleted file mode 100644
index c5c0aff..0000000
--- a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-replace-siginterrupt.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Pending
-
-Index: util-linux-ng-2.14/login-utils/login.c
-===================================================================
---- util-linux-ng-2.14.orig/login-utils/login.c 2008-05-28 16:01:02.000000000 -0700
-+++ util-linux-ng-2.14/login-utils/login.c 2009-03-04 18:31:42.000000000 -0800
-@@ -358,6 +358,7 @@
- char *childArgv[10];
- char *buff;
- int childArgc = 0;
-+ struct sigaction act;
- #ifdef HAVE_SECURITY_PAM_MISC_H
- int retcode;
- pam_handle_t *pamh = NULL;
-@@ -373,7 +374,9 @@
- pid = getpid();
-
- signal(SIGALRM, timedout);
-- siginterrupt(SIGALRM,1); /* we have to interrupt syscalls like ioclt() */
-+ (void) sigaction(SIGALRM, NULL, &act);
-+ act.sa_flags &= ~SA_RESTART;
-+ sigaction(SIGALRM, &act, NULL);
- alarm((unsigned int)timeout);
- signal(SIGQUIT, SIG_IGN);
- signal(SIGINT, SIG_IGN);
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG b/meta/recipes-core/util-linux/util-linux-2.21/MCONFIG
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.20.1/MCONFIG
rename to meta/recipes-core/util-linux/util-linux-2.21/MCONFIG
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/defines.h b/meta/recipes-core/util-linux/util-linux-2.21/defines.h
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.20.1/defines.h
rename to meta/recipes-core/util-linux/util-linux-2.21/defines.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/make_include b/meta/recipes-core/util-linux/util-linux-2.21/make_include
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.20.1/make_include
rename to meta/recipes-core/util-linux/util-linux-2.21/make_include
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch b/meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.20.1/remove-lscpu.patch
rename to meta/recipes-core/util-linux/util-linux-2.21/remove-lscpu.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch b/meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.20.1/remove_sigsetmark.patch
rename to meta/recipes-core/util-linux/util-linux-2.21/remove_sigsetmark.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h b/meta/recipes-core/util-linux/util-linux-2.21/swapargs.h
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.20.1/swapargs.h
rename to meta/recipes-core/util-linux/util-linux-2.21/swapargs.h
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-__progname-conflict.patch
rename to meta/recipes-core/util-linux/util-linux-2.21/uclibc-__progname-conflict.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch b/meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.20.1/uclibc-compile.patch
rename to meta/recipes-core/util-linux/util-linux-2.21/uclibc-compile.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-2.20.1/util-linux-ng-2.16-mount_lock_path.patch
rename to meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-2.16-mount_lock_path.patch
diff --git a/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch
new file mode 100644
index 0000000..ef56048
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux-2.21/util-linux-ng-replace-siginterrupt.patch
@@ -0,0 +1,26 @@
+Upstream-Status: Pending
+
+Index: util-linux-2.21/login-utils/login.c
+===================================================================
+--- util-linux-2.21.orig/login-utils/login.c
++++ util-linux-2.21/login-utils/login.c
+@@ -1216,6 +1216,8 @@ int main(int argc, char **argv)
+ char *buff;
+ int childArgc = 0;
+ int retcode;
++ struct sigaction act;
++
+
+ char *pwdbuf = NULL;
+ struct passwd *pwd = NULL, _pwd;
+@@ -1229,7 +1231,9 @@ int main(int argc, char **argv)
+ timeout = getlogindefs_num("LOGIN_TIMEOUT", LOGIN_TIMEOUT);
+
+ signal(SIGALRM, timedout);
+- siginterrupt(SIGALRM, 1); /* we have to interrupt syscalls like ioclt() */
++ (void) sigaction(SIGALRM, NULL, &act);
++ act.sa_flags &= ~SA_RESTART;
++ sigaction(SIGALRM, &act, NULL);
+ alarm((unsigned int)timeout);
+ signal(SIGQUIT, SIG_IGN);
+ signal(SIGINT, SIG_IGN);
diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc
index f60f33b..1a3d293 100644
--- a/meta/recipes-core/util-linux/util-linux.inc
+++ b/meta/recipes-core/util-linux/util-linux.inc
@@ -9,9 +9,11 @@ LICENSE = "GPLv2+ & LGPLv2.1+ & BSD"
LIC_FILES_CHKSUM = "file://README.licensing;md5=9c920d811858a74b67a36ba23cbaa95f \
file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
- file://licenses/COPYING.GPL;md5=8ca43cbc842c2336e835926c2166c28b \
- file://licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
- file://getopt/COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+ file://Documentation/licenses/COPYING.GPLv2;md5=8ca43cbc842c2336e835926c2166c28b \
+ file://Documentation/licenses/COPYING.LGPLv2.1;md5=bbb461211a33b134d42ed5ee802b37ff \
+ file://Documentation/licenses/COPYING.BSD-3;md5=58dcd8452651fc8b07d1f65ce07ca8af \
+ file://Documentation/licenses/COPYING.UCB;md5=263860f8968d8bafa5392cab74285262 \
+ file://getopt/COPYING;md5=c3a41733416fb80af7ba1b7e1f712551"
inherit autotools gettext pkgconfig
DEPENDS = "zlib ncurses"
diff --git a/meta/recipes-core/util-linux/util-linux_2.20.1.bb b/meta/recipes-core/util-linux/util-linux_2.21.bb
similarity index 84%
rename from meta/recipes-core/util-linux/util-linux_2.20.1.bb
rename to meta/recipes-core/util-linux/util-linux_2.21.bb
index ed445d7..aa6ac64 100644
--- a/meta/recipes-core/util-linux/util-linux_2.20.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.21.bb
@@ -1,5 +1,5 @@
-MAJOR_VERSION = "2.20"
-PR = "r2"
+MAJOR_VERSION = "2.21"
+PR = "r0"
require util-linux.inc
# note that `lscpu' is under GPLv3+
@@ -10,15 +10,15 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
file://uclibc-__progname-conflict.patch \
"
-SRC_URI[md5sum] = "079b37517fd4e002a2e6e992e8b4e361"
-SRC_URI[sha256sum] = "d16ebcda3e64ab88ed363d9c1242cdb7ccfd5e1f56c83d0c3b0638c23793bbe0"
+SRC_URI[md5sum] = "3c7a26963f3921c1e775a80330321870"
+SRC_URI[sha256sum] = "2813ae6fe0449b60402e122c2baf97f26aa53e6e2dd05591c6cbcdf67ffdb6c6"
# Only lscpu part is gplv3; rest of the code is not,
# so take out the lscpu parts while running non-gplv3 build.
python () {
d.setVar("REMOVELSCPU", "no")
if (d.getVar("INCOMPATIBLE_LICENSE", True) or "").find("GPLv3") != -1:
- # avoid GPLv3
+ # avoid GPLv3
d.setVar("REMOVELSCPU", "yes")
packages = (d.getVar("PACKAGES", False) or "").split()
if "util-linux-lscpu" in packages:
@@ -39,7 +39,7 @@ do_remove_lscpu() {
addtask remove_lscpu before do_configure after do_patch
-CACHED_CONFIGUREVARS += "scanf_cv_type_modifier=as"
+CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=as"
EXTRA_OECONF_virtclass-native += "--disable-fallocate --disable-use-tty-group"
do_install_append () {
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 11/36] file: Update to version 5.11
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (9 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 10/36] util-linux: Update to 2.21 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 12/36] psmisc: Update to version 22.16 Saul Wold
` (24 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../file/{file_5.10.bb => file_5.11.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-devtools/file/{file_5.10.bb => file_5.11.bb} (85%)
diff --git a/meta/recipes-devtools/file/file_5.10.bb b/meta/recipes-devtools/file/file_5.11.bb
similarity index 85%
rename from meta/recipes-devtools/file/file_5.10.bb
rename to meta/recipes-devtools/file/file_5.11.bb
index db247a7..540c2b2 100644
--- a/meta/recipes-devtools/file/file_5.10.bb
+++ b/meta/recipes-devtools/file/file_5.11.bb
@@ -10,15 +10,15 @@ LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03
DEPENDS = "zlib file-native"
DEPENDS_virtclass-native = "zlib-native"
-PR = "r1"
+PR = "r0"
SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
file://fix_version_check.patch \
file://dump \
file://filesystems"
-SRC_URI[md5sum] = "4cea34b087b060772511e066e2038196"
-SRC_URI[sha256sum] = "73ae51889006b1ddb95db729237d411eb8d353884dfb149f0b4427d314aff68a"
+SRC_URI[md5sum] = "16a407bd66d6c7a832f3a5c0d609c27b"
+SRC_URI[sha256sum] = "c70ae29a28c0585f541d5916fc3248c3e91baa481f63d7ccec53d1534cbcc9b7"
inherit autotools
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 12/36] psmisc: Update to version 22.16
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (10 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 11/36] file: Update to version 5.11 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 13/36] libdrm: Update to version 2.4.31 Saul Wold
` (23 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Remove libintl-link patch which has in the upstream code now
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../psmisc/files/libintl-link.patch | 32 --------------------
meta/recipes-extended/psmisc/psmisc.inc | 4 +-
.../psmisc/{psmisc_22.14.bb => psmisc_22.16.bb} | 4 +-
3 files changed, 4 insertions(+), 36 deletions(-)
delete mode 100644 meta/recipes-extended/psmisc/files/libintl-link.patch
rename meta/recipes-extended/psmisc/{psmisc_22.14.bb => psmisc_22.16.bb} (46%)
diff --git a/meta/recipes-extended/psmisc/files/libintl-link.patch b/meta/recipes-extended/psmisc/files/libintl-link.patch
deleted file mode 100644
index e42592c..0000000
--- a/meta/recipes-extended/psmisc/files/libintl-link.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Mei Lei <lei.mei@intel.com>
-
-uClibc needs to link against an external libintl but it doesn't do this by
-default. The configure script correctly figures out if this is needed, but
-doesn't actually link to the libraries it decides on. This makes it link to
-them if they are needed:
-
-Index: psmisc-22.14/src/Makefile.am
-===================================================================
---- psmisc-22.14.orig/src/Makefile.am 2011-06-20 04:59:44.000000000 -0700
-+++ psmisc-22.14/src/Makefile.am 2011-12-01 10:19:55.792680654 -0800
-@@ -26,15 +26,17 @@
-
- fuser_SOURCES = fuser.c comm.h signals.c signals.h i18n.h fuser.h lists.h
-
-+fuser_LDADD = @INTLLIBS@
-+
- killall_SOURCES = killall.c comm.h signals.c signals.h i18n.h
-
--killall_LDADD = @SELINUX_LIB@
-+killall_LDADD = @SELINUX_LIB@ @INTLLIBS@
-
- peekfd_SOURCES = peekfd.c
-
- pstree_SOURCES = pstree.c comm.h i18n.h
-
--pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@
-+pstree_LDADD = @TERMCAP_LIB@ @SELINUX_LIB@ @INTLLIBS@
-
- prtstat_SOURCES = prtstat.c prtstat.h
-
diff --git a/meta/recipes-extended/psmisc/psmisc.inc b/meta/recipes-extended/psmisc/psmisc.inc
index 9e281d5..4e9aad8 100644
--- a/meta/recipes-extended/psmisc/psmisc.inc
+++ b/meta/recipes-extended/psmisc/psmisc.inc
@@ -9,8 +9,8 @@ SECTION = "base"
DEPENDS = "ncurses virtual/libintl"
LICENSE = "GPLv2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz \
- file://libintl-link.patch"
+SRC_URI = "${SOURCEFORGE_MIRROR}/psmisc/psmisc-${PV}.tar.gz"
+
S = "${WORKDIR}/psmisc-${PV}"
inherit autotools gettext
diff --git a/meta/recipes-extended/psmisc/psmisc_22.14.bb b/meta/recipes-extended/psmisc/psmisc_22.16.bb
similarity index 46%
rename from meta/recipes-extended/psmisc/psmisc_22.14.bb
rename to meta/recipes-extended/psmisc/psmisc_22.16.bb
index 4f89672..ac3bd28 100644
--- a/meta/recipes-extended/psmisc/psmisc_22.14.bb
+++ b/meta/recipes-extended/psmisc/psmisc_22.16.bb
@@ -3,5 +3,5 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
PR = "r0"
-SRC_URI[md5sum] = "ba3f4e971895c92bba7770d81c981503"
-SRC_URI[sha256sum] = "22bbf4561837af475c0d8d14e3b9cab453998c787212c107fac7faf2f281e26e"
+SRC_URI[md5sum] = "d52caf26159c905574c2ce4bd792b9ee"
+SRC_URI[sha256sum] = "ae426d7238e5353fdf51b1d313897c2bbed0023e66e5b4af2be9cd03d87a9d01"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 13/36] libdrm: Update to version 2.4.31
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (11 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 12/36] psmisc: Update to version 22.16 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 14/36] mkfontdir: Update to version 1.0.7 Saul Wold
` (22 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../drm/{libdrm_2.4.30.bb => libdrm_2.4.31.bb} | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.30.bb => libdrm_2.4.31.bb} (59%)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.30.bb b/meta/recipes-graphics/drm/libdrm_2.4.31.bb
similarity index 59%
rename from meta/recipes-graphics/drm/libdrm_2.4.30.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.31.bb
index 5d99916..6aa0542 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.30.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.31.bb
@@ -2,11 +2,11 @@ require libdrm.inc
LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
-PR = "r1"
+PR = "r0"
SRC_URI += "file://installtests.patch \
file://GNU_SOURCE_definition.patch \
"
-SRC_URI[md5sum] = "9f57a68b2c0836b55ebcbc241f6ca175"
-SRC_URI[sha256sum] = "cacea9c157ec824ad278a06f4910659b2f3ae69686518ece8d6967843cddcd56"
+SRC_URI[md5sum] = "b8cf744ec113c6028fe0975b1133b649"
+SRC_URI[sha256sum] = "8fc7e0e5b2f9bf493447a4ef7adc49174a700824457774cb53c1b8f2da866af4"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 14/36] mkfontdir: Update to version 1.0.7
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (12 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 13/36] libdrm: Update to version 2.4.31 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 15/36] mkfontscale: Update to version 1.1.0 Saul Wold
` (21 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../{mkfontdir_1.0.6.bb => mkfontdir_1.0.7.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-app/{mkfontdir_1.0.6.bb => mkfontdir_1.0.7.bb} (81%)
diff --git a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.6.bb b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
similarity index 81%
rename from meta/recipes-graphics/xorg-app/mkfontdir_1.0.6.bb
rename to meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
index 3dcbca1..db6d2b4 100644
--- a/meta/recipes-graphics/xorg-app/mkfontdir_1.0.6.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontdir_1.0.7.bb
@@ -18,5 +18,5 @@ BBCLASSEXTEND = "native"
LIC_FILES_CHKSUM = "file://COPYING;md5=b4fcf2b90cadbfc15009b9e124dc3a3f"
-SRC_URI[md5sum] = "dc342dd8858416254bb5f71a9ddce589"
-SRC_URI[sha256sum] = "55d56c6310f8d2268cb8978e838d01d27c7d70e30282c373c5a935ab3fb8c859"
+SRC_URI[md5sum] = "18c429148c96c2079edda922a2b67632"
+SRC_URI[sha256sum] = "56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 15/36] mkfontscale: Update to version 1.1.0
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (13 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 14/36] mkfontdir: Update to version 1.0.7 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 16/36] boost: Update to version 1.49.0 Saul Wold
` (20 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../{mkfontscale_1.0.9.bb => mkfontscale_1.1.0.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-app/{mkfontscale_1.0.9.bb => mkfontscale_1.1.0.bb} (80%)
diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.0.9.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb
similarity index 80%
rename from meta/recipes-graphics/xorg-app/mkfontscale_1.0.9.bb
rename to meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb
index 4db3015..49706e5 100644
--- a/meta/recipes-graphics/xorg-app/mkfontscale_1.0.9.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.0.bb
@@ -14,5 +14,5 @@ BBCLASSEXTEND = "native"
LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f"
-SRC_URI[md5sum] = "3d1dc487f3e859f4e5c46540cb49abd3"
-SRC_URI[sha256sum] = "1e911c361c7617aebf2c9bffdc15b7b8956d64a49cef449f533ef1cc418e7e76"
+SRC_URI[md5sum] = "414fcb053418fb1418e3a39f4a37e0f7"
+SRC_URI[sha256sum] = "ce55f862679b8ec127d7f7315ac04a8d64a0d90a0309a70dc56c1ba3f9806994"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 16/36] boost: Update to version 1.49.0
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (14 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 15/36] mkfontscale: Update to version 1.1.0 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 17/36] sqlite3: Update to version 3.7.10 Saul Wold
` (19 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../boost/{boost_1.48.0.bb => boost_1.49.0.bb} | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-support/boost/{boost_1.48.0.bb => boost_1.49.0.bb} (53%)
diff --git a/meta/recipes-support/boost/boost_1.48.0.bb b/meta/recipes-support/boost/boost_1.49.0.bb
similarity index 53%
rename from meta/recipes-support/boost/boost_1.48.0.bb
rename to meta/recipes-support/boost/boost_1.49.0.bb
index 29e2153..71fdc48 100644
--- a/meta/recipes-support/boost/boost_1.48.0.bb
+++ b/meta/recipes-support/boost/boost_1.49.0.bb
@@ -6,5 +6,5 @@ PR = "${INC_PR}.0"
SRC_URI += "file://arm-intrinsics.patch"
-SRC_URI[md5sum] = "d1e9a7a7f532bb031a3c175d86688d95"
-SRC_URI[sha256sum] = "1bf254b2d69393ccd57a3cdd30a2f80318a005de8883a0792ed2f5e2598e5ada"
+SRC_URI[md5sum] = "0d202cb811f934282dea64856a175698"
+SRC_URI[sha256sum] = "dd748a7f5507a7e7af74f452e1c52a64e651ed1f7263fce438a06641d2180d3c"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 17/36] sqlite3: Update to version 3.7.10
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (15 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 16/36] boost: Update to version 1.49.0 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 18/36] xf86-video-intel: Update to version 2.18.0 Saul Wold
` (18 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-support/sqlite/sqlite3_3.7.10.bb | 11 +++++++++++
meta/recipes-support/sqlite/sqlite3_3.7.9.bb | 11 -----------
2 files changed, 11 insertions(+), 11 deletions(-)
create mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.10.bb
delete mode 100644 meta/recipes-support/sqlite/sqlite3_3.7.9.bb
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.10.bb b/meta/recipes-support/sqlite/sqlite3_3.7.10.bb
new file mode 100644
index 0000000..763878b
--- /dev/null
+++ b/meta/recipes-support/sqlite/sqlite3_3.7.10.bb
@@ -0,0 +1,11 @@
+require sqlite3.inc
+
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
+
+SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3071000.tar.gz"
+S = "${WORKDIR}/sqlite-autoconf-3071000"
+
+SRC_URI[md5sum] = "9ed2ca93577b58cfa0d01f64b9312ab9"
+SRC_URI[sha256sum] = "9c1775057af5cc8b6cc64808b9553d77beccf3757e16ecee3bc878404d9c43e3"
diff --git a/meta/recipes-support/sqlite/sqlite3_3.7.9.bb b/meta/recipes-support/sqlite/sqlite3_3.7.9.bb
deleted file mode 100644
index 8f7348d..0000000
--- a/meta/recipes-support/sqlite/sqlite3_3.7.9.bb
+++ /dev/null
@@ -1,11 +0,0 @@
-require sqlite3.inc
-
-PR = "r1"
-
-LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b3570bb0"
-
-SRC_URI = "http://www.sqlite.org/sqlite-autoconf-3070900.tar.gz"
-S = "${WORKDIR}/sqlite-autoconf-3070900"
-
-SRC_URI[md5sum] = "dce303524736fe89a76b8ed29d566352"
-SRC_URI[sha256sum] = "7be6cdb375505e5d9a4aee88b2ddb6ea0d9d29c9545114ff77b345e1fa812439"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 18/36] xf86-video-intel: Update to version 2.18.0
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (16 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 17/36] sqlite3: Update to version 3.7.10 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 19/36] tiff: Update to version 3.9.5 Saul Wold
` (17 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
...-intel_2.17.0.bb => xf86-video-intel_2.18.0.bb} | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-driver/{xf86-video-intel_2.17.0.bb => xf86-video-intel_2.18.0.bb} (84%)
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.17.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.18.0.bb
similarity index 84%
rename from meta/recipes-graphics/xorg-driver/xf86-video-intel_2.17.0.bb
rename to meta/recipes-graphics/xorg-driver/xf86-video-intel_2.18.0.bb
index ca90be2..637e11c 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.17.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.18.0.bb
@@ -14,8 +14,6 @@ PR = "${INC_PR}.0"
DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \
virtual/libgl xineramaproto xf86driproto libpciaccess"
-SRC_URI[md5sum] = "6d7b1f199dba5820f250888b136186ff"
-SRC_URI[sha256sum] = "8b8450f2a2cc52ef31a83414e2f290e748a956690e11b41759d5650aaedc4387"
EXTRA_OECONF += "--disable-xvmc"
@@ -23,3 +21,6 @@ EXTRA_OECONF += "--disable-xvmc"
EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}'
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+SRC_URI[md5sum] = "34f3987ffe86e30c57abc33b7f8030e9"
+SRC_URI[sha256sum] = "dce63e33ccfada39ef1e1e6768dfd8edd4c525670dfe56d1c42b2f9570039ffc"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 19/36] tiff: Update to version 3.9.5
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (17 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 18/36] xf86-video-intel: Update to version 2.18.0 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 20/36] bind: add DEPENDS for libcap Saul Wold
` (16 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Ensure that OpenGL and friends are disable with the
setting of ax_cv_check_gl_libgl = no.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../libtiff/{tiff_3.9.5.bb => tiff_4.0.1.bb} | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
rename meta/recipes-multimedia/libtiff/{tiff_3.9.5.bb => tiff_4.0.1.bb} (79%)
diff --git a/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb b/meta/recipes-multimedia/libtiff/tiff_4.0.1.bb
similarity index 79%
rename from meta/recipes-multimedia/libtiff/tiff_3.9.5.bb
rename to meta/recipes-multimedia/libtiff/tiff_4.0.1.bb
index bf0a387..6fb4163 100644
--- a/meta/recipes-multimedia/libtiff/tiff_3.9.5.bb
+++ b/meta/recipes-multimedia/libtiff/tiff_4.0.1.bb
@@ -3,16 +3,18 @@ LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=34da3db46fab7501992f9615d7e158cf"
HOMEPAGE = "http://www.remotesensing.org/libtiff/"
DEPENDS = "zlib jpeg lzo"
-PR = "r4"
+PR = "r0"
SRC_URI = "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${PV}.tar.gz \
file://libtool2.patch"
-SRC_URI[md5sum] = "8fc7ce3b4e1d0cc8a319336967815084"
-SRC_URI[sha256sum] = "ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33"
+SRC_URI[md5sum] = "fae149cc9da35c598d8be897826dfc63"
+SRC_URI[sha256sum] = "9a7a039e516c37478038740f1642818250bfb1414cf404cc8b569e5f9d4bf2f0"
inherit autotools
+CACHED_CONFIGUREVARS = "ax_cv_check_gl_libgl=no"
+
PACKAGES =+ "tiffxx tiffxx-dbg tiffxx-dev tiffxx-staticdev tiff-utils tiff-utils-dbg"
FILES_tiffxx = "${libdir}/libtiffxx.so.*"
FILES_tiffxx-dev = "${libdir}/libtiffxx.so ${libdir}/libtiffxx.la"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 20/36] bind: add DEPENDS for libcap
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (18 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 19/36] tiff: Update to version 3.9.5 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 21/36] distro_tracking: Account for updates and Manual Checking Saul Wold
` (15 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/bind/bind_9.8.1.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-connectivity/bind/bind_9.8.1.bb b/meta/recipes-connectivity/bind/bind_9.8.1.bb
index c2efa47..2efd09d 100644
--- a/meta/recipes-connectivity/bind/bind_9.8.1.bb
+++ b/meta/recipes-connectivity/bind/bind_9.8.1.bb
@@ -5,8 +5,8 @@ SECTION = "console/network"
LICENSE = "ISC & BSD"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=0fbe2a3ab3c68ac3fea3cad13093877c"
-DEPENDS = "openssl"
-PR = "r2"
+DEPENDS = "openssl libcap"
+PR = "r3"
SRC_URI = "ftp://ftp.isc.org/isc/bind9/${PV}/${BPN}-${PV}.tar.gz \
file://conf.patch \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 21/36] distro_tracking: Account for updates and Manual Checking
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (19 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 20/36] bind: add DEPENDS for libcap Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 22/36] classes: Add recipe class to overrides Saul Wold
` (14 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
Updates:
sqlite3
psmisc
boost
file
util-linux
tiff
mkfonddir
mkfontscale
libdrm
xf86-video-intel
Manual Checks:
libcheck
libcap
console-tools
zip
unzip
sysfsutils
less
usbutils
sysstat
cracklib
libexif
qemugl
glew
squashfs-tools
lsb
Fixup:
bzip2
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../conf/distro/include/distro_tracking_fields.inc | 106 ++++++++++----------
1 files changed, 52 insertions(+), 54 deletions(-)
diff --git a/meta/conf/distro/include/distro_tracking_fields.inc b/meta/conf/distro/include/distro_tracking_fields.inc
index 91c36d9..3328d96 100644
--- a/meta/conf/distro/include/distro_tracking_fields.inc
+++ b/meta/conf/distro/include/distro_tracking_fields.inc
@@ -528,10 +528,10 @@ RECIPE_INTEL_SECTION_pn-popt = "base libs"
RECIPE_LATEST_RELEASE_DATE_pn-popt = "May 01, 2010"
RECIPE_STATUS_pn-sqlite3 = "green" # need upgrade
-RECIPE_LATEST_VERSION_pn-sqlite3 = "3.7.9"
-RECIPE_LATEST_RELEASE_DATE_pn-sqlite3 = "Nov 01, 2011"
-RECIPE_LAST_UPDATE_pn-sqlite3 = "Dec 27, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-sqlite3= "Jan 09, 2012"
+RECIPE_LATEST_VERSION_pn-sqlite3 = "3.7.10"
+RECIPE_LATEST_RELEASE_DATE_pn-sqlite3 = "Jan 16, 2012"
+RECIPE_LAST_UPDATE_pn-sqlite3 = "Feb 27, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-sqlite3= "Feb 26, 2012"
RECIPE_MAINTAINER_pn-sqlite3 = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-sqlite3 = "not done"
RECIPE_INTEL_SECTION_pn-sqlite3 = "base libs"
@@ -559,7 +559,7 @@ RECIPE_STATUS_pn-libcap = "yellow" # hand crafted Makefiles
RECIPE_LATEST_VERSION_pn-libcap = "2.22"
RECIPE_LATEST_RELEASE_DATE_pn-libcap = "Jan 01, 2010"
RECIPE_LAST_UPDATE_pn-libcap = "Jul 25, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libcap = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libcap = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-libcap = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-libcap = "done"
RECIPE_INTEL_SECTION_pn-libcap = "base libs"
@@ -616,7 +616,7 @@ RECIPE_DEPENDENCY_CHECK_pn-libcheck = "done"
RECIPE_LATEST_VERSION_pn-libcheck = "0.9.8"
RECIPE_LATEST_RELEASE_DATE_pn-libcheck = "Sep 23, 2009"
RECIPE_LAST_UPDATE_pn-libcheck = "Aug 20, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-libcheck = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libcheck = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-libcheck = "Saul Wold <sgw@linux.intel.com>"
RECIPE_INTEL_SECTION_pn-libcheck = "base libs"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libcheck = "9 months"
@@ -1325,9 +1325,9 @@ RECIPE_MAINTAINER_pn-consolekit = "Zhai Edwin <edwin.zhai@intel.com>"
RECIPE_STATUS_pn-console-tools = "red"
RECIPE_LATEST_VERSION_pn-console-tools = "0.3.2"
RECIPE_LAST_UPDATE_pn-console-tools = "Jul 21, 2006"
+RECIPE_MANUAL_CHECK_DATE_pn-console-tools= "Feb 26, 2012"
RECIPE_MAINTAINER_pn-console-tools = "Saul Wold <sgw@linux.intel.com>"
DISTRO_PN_ALIAS_pn-console-tools = "Debian=console-tools Ubuntu=console-tools"
-RECIPE_MANUAL_CHECK_DATE_pn-console-tools= "Jan 09, 2012"
RECIPE_STATUS_pn-fuse = "red"
RECIPE_LATEST_VERSION_pn-fuse = "2.8.4"
@@ -1366,17 +1366,17 @@ RECIPE_LAST_UPDATE_pn-pm-utils = "Nov 18, 2010"
RECIPE_MAINTAINER_pn-pm-utils = "Dongxiao Xu <dongxiao.xu@intel.com>"
RECIPE_STATUS_pn-psmisc = "red"
-RECIPE_LATEST_VERSION_pn-psmisc = "22.14"
-RECIPE_LATEST_RELEASE_DATE_pn-psmisc = "Jun 20, 2011"
-RECIPE_LAST_UPDATE_pn-psmisc = "Dec 27, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-psmisc = "Jan 09, 2012"
+RECIPE_LATEST_VERSION_pn-psmisc = "22.16"
+RECIPE_LATEST_RELEASE_DATE_pn-psmisc = "Feb 25, 2012"
+RECIPE_LAST_UPDATE_pn-psmisc = "Feb 27, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-psmisc = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-psmisc = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-boost = "yellow"
-RECIPE_LATEST_VERSION_pn-boost = "1.48.0"
-RECIPE_LATEST_RELEASE_DATE_pn-boost = "Nov 15, 2011"
-RECIPE_LAST_UPDATE_pn-boost = "Dec 27, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-boost = "Jan 09, 2012"
+RECIPE_LATEST_VERSION_pn-boost = "1.49.0"
+RECIPE_LATEST_RELEASE_DATE_pn-boost = "Feb 24, 2012"
+RECIPE_LAST_UPDATE_pn-boost = "Feb 27, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-boost = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-boost = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-boost-jam-native = "green"
@@ -1425,7 +1425,7 @@ RECIPE_INTEL_SECTION_pn-bzip2 = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-bzip2 = "12 months"
RECIPE_LATEST_RELEASE_DATE_pn-bzip2 = "Mar 01, 2008"
RECIPE_COMMENTS_pn-bzip2 = "bzip2 license is 3-clause BSD plus an renaming clause"
-RECIPE_MANUAL_CHECK_DATE_pn-bzip = "May 24, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-bzip2 = "May 24, 2011"
RECIPE_STATUS_pn-portmap = "yellow"
RECIPE_LAST_UPDATE_pn-portmap = "Aug 27, 2007"
@@ -1523,7 +1523,7 @@ RECIPE_LAST_UPDATE_pn-sysfsutils = "Jun 18, 2010"
RECIPE_DEPENDENCY_CHECK_pn-sysfsutils = "not done"
RECIPE_INTEL_SECTION_pn-sysfsutils = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-sysfsutils = "n/a"
-RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-sysfsutils = "Feb 26, 2012"
RECIPE_COMMENTS_pn-sysfsutils = "No update on kernel.org"
RECIPE_MAINTAINER_pn-sysfsutils = "Saul Wold <sgw@linux.intel.com>"
@@ -1576,7 +1576,7 @@ RECIPE_STATUS_pn-less = "green"
RECIPE_LATEST_VERSION_pn-less = "444"
RECIPE_LATEST_RELEASE_DATE_pn-less = "Jun 9, 2011"
RECIPE_LAST_UPDATE_pn-less = "Dec 01, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-less = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-less = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-less = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-less = "done"
RECIPE_INTEL_SECTION_pn-less = "base utils"
@@ -1607,9 +1607,9 @@ RECIPE_LATEST_RELEASE_DATE_pn-findutils = "Jun 01, 2009"
RECIPE_COMMENTS_pn-findutils = ""
RECIPE_STATUS_pn-file = "green"
-RECIPE_LATEST_VERSION_pn-file = "5.15"
-RECIPE_LATEST_RELEASE_DATE_pn-file = "Sep 16, 2011"
-RECIPE_LAST_UPDATE_pn-file = "Feb 02, 2012"
+RECIPE_LATEST_VERSION_pn-file = "5.11"
+RECIPE_LATEST_RELEASE_DATE_pn-file = "Feb 21, 2012"
+RECIPE_LAST_UPDATE_pn-file = "Feb 27, 2012"
RECIPE_MAINTAINER_pn-file = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-file = "done"
RECIPE_PATCH_pn-file+dump = "some new magic data"
@@ -1617,7 +1617,7 @@ RECIPE_PATCH_pn-file+filesystems = "some other new magic data"
RECIPE_INTEL_SECTION_pn-file = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-file = "1-3 months"
RECIPE_COMMENTS_pn-file = "2-clause BSD"
-RECIPE_MANUAL_CHECK_DATE_pn-file = "Nov 08, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-file = "Feb 27, 2012"
RECIPE_STATUS_pn-rsync = "green"
RECIPE_LAST_UPDATE_pn-rsync = "Jul 6, 2010"
@@ -1723,7 +1723,7 @@ RECIPE_MAINTAINER_pn-unzip = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-unzip = "not done"
RECIPE_INTEL_SECTION_pn-unzip = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-unzip = "49 months"
-RECIPE_MANUAL_CHECK_DATE_pn-unzip = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-unzip = "Feb 26, 2012"
RECIPE_COMMENTS_pn-unzip = "5.52 has a race condition vulnerability for Unix version"
RECIPE_STATUS_pn-zip = "green"
@@ -1734,7 +1734,7 @@ RECIPE_MAINTAINER_pn-zip = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-zip = "not done"
RECIPE_INTEL_SECTION_pn-zip = "base utils"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-zip = "21 months"
-RECIPE_MANUAL_CHECK_DATE_pn-zip = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-zip = "Feb 26, 2012"
RECIPE_COMMENTS_pn-zip = ""
RECIPE_STATUS_pn-strace = "green"
@@ -1821,19 +1821,18 @@ RECIPE_INTEL_SECTION_pn-shared-mime-info = "base utils"
RECIPE_LATEST_RELEASE_DATE_pn-shared-mime-info = "Feb 01, 2010"
RECIPE_STATUS_pn-util-linux = "green"
-RECIPE_LATEST_VERSION_pn-util-linux = "2.20.1"
-RECIPE_LATEST_RELEASE_DATE_pn-util-linux = "Nov 07, 2011"
-RECIPE_LAST_UPDATE_pn-util-linux = "Dec 27, 2011"
+RECIPE_LATEST_VERSION_pn-util-linux = "2.21"
+RECIPE_LATEST_RELEASE_DATE_pn-util-linux = "Feb 24, 2012"
+RECIPE_LAST_UPDATE_pn-util-linux = "Feb 27, 2012"
RECIPE_MAINTAINER_pn-util-linux = "Saul Wold <sgw@linux.intel.com>"
RECIPE_INTEL_SECTION_pn-util-linux = "base utils"
-RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "Dec 01, 2011"
-RECIPE_NO_UPDATE_REASON_pn-uti-linux ="2.21 is still RC1"
+RECIPE_MANUAL_CHECK_DATE_pn-util-linux = "Feb 27, 2012"
RECIPE_STATUS_pn-usbutils = "green"
RECIPE_LATEST_VERSION_pn-usbutils = "0.91"
RECIPE_LATEST_RELEASE_DATE_pn-usbutils = "Oct 22, 2010"
RECIPE_LAST_UPDATE_pn-usbutils = "May 20, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-usbutils = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-usbutils = "Saul Wold <sgw@linux.intel.com>"
RECIPE_DEPENDENCY_CHECK_pn-usbutils = "done"
RECIPE_INTEL_SECTION_pn-usbutils = "base utils"
@@ -1878,7 +1877,7 @@ RECIPE_STATUS_pn-sysstat = "green"
RECIPE_LATEST_VERSION_pn-sysstat = "10.0.3"
RECIPE_LATEST_RELEASE_DATE_pn-sysstat = "Nov 27, 2011"
RECIPE_LAST_UPDATE_pn-sysstat = "Dec 27, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-sysstat = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-sysstat = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-sysklogd = "red" # need upgrade
@@ -1911,7 +1910,7 @@ RECIPE_STATUS_pn-cracklib="green"
RECIPE_LATEST_VERSION_pn-cracklib="2.8.18"
RECIPE_LATEST_RELEASE_DATE_pn-cracklib = "Aug 29, 2010"
RECIPE_LAST_UPDATE_pn-cracklib = "Nov 13, 2010"
-RECIPE_MANUAL_CHECK_DATE_pn-cracklib = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-cracklib = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-cracklib="Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-openobex = "red"
@@ -1986,18 +1985,18 @@ RECIPE_LAST_UPDATE_pn-ubootchart = "Nov 6, 2007"
RECIPE_MAINTAINER_pn-ubootchart = "Saul Wold <sgw@linux.intel.com>"
DISTRO_PN_ALIAS_pn-ubootchart = "OSPDT upstream=http://code.google.com/p/ubootchart"
-RECIPE_STATUS_pn-tiff = "red"
-RECIPE_LATEST_VERSION_pn-tiff = "3.9.5"
-RECIPE_LAST_UPDATE_pn-tiff = "Jul 12, 2011"
+RECIPE_STATUS_pn-tiff = "green"
+RECIPE_LATEST_VERSION_pn-tiff = "4.0.1"
+RECIPE_LATEST_RELEASE_DATE_pn-eggdbus = "Feb 18, 2012"
+RECIPE_LAST_UPDATE_pn-tiff = "Feb 27, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-tiff = "Feb 27, 2012"
RECIPE_MAINTAINER_pn-tiff = "Saul Wold <sgw@linux.intel.com>"
-RECIPE_MANUAL_CHECK_DATE_pn-tiff = "Jul 12, 2011"
-RECIPE_NO_UPDATE_REASON_pn-tiff = "Wait until 4.0.0 releases"
RECIPE_STATUS_pn-libexif = "green"
RECIPE_LATEST_VERSION_pn-libexif = "0.6.20"
RECIPE_LATEST_RELEASE_DATE_pn-libexif = "Dec 12, 2010"
RECIPE_LAST_UPDATE_pn-libexif = "Apr 15, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libexif = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-libexif = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-libexif = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-setserial = "red"
@@ -3424,19 +3423,18 @@ RECIPE_MAINTAINER_pn-x11vnc = "Zhai Edwin <edwin.zhai@intel.com>"
DISTRO_PN_ALIAS_pn-x11vnc = "Fedora=x11vnc Ubuntu=x11vnc"
RECIPE_STATUS_pn-mkfontdir="green" # no update needed
-RECIPE_LATEST_VERSION_pn-mkfontdir="1.0.5"
+RECIPE_LATEST_VERSION_pn-mkfontdir="1.0.7"
RECIPE_NO_OF_PATCHES_pn-mkfontdir="0"
-RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mkfontdir="Oct 11, 2009"
-RECIPE_LATEST_RELEASE_DATE_pn-mkfontdir="Nov 7, 2010"
+RECIPE_LATEST_RELEASE_DATE_pn-mkfontdir="Feb 10, 2012"
RECIPE_INTEL_SECTION_pn-mkfontdir="graphic apps"
-RECIPE_LAST_UPDATE_pn-mkfontdir = "Jan 18, 2011"
+RECIPE_LAST_UPDATE_pn-mkfontdir = "Feb 27, 2012"
RECIPE_MAINTAINER_pn-mkfontdir="Saul Wold <sgw@linux.intel.com>"
DISTRO_PN_ALIAS_pn-mkfontdir = "Mandriva=mkfontdir Ubuntu=xfonts-utils Fedora=xorg-x11-font-utils"
RECIPE_STATUS_pn-mkfontscale="green" # no update needed
-RECIPE_LATEST_VERSION_pn-mkfontscale="1.0.9"
-RECIPE_LATEST_RELEASE_DATE_pn-mkfontscale="Jun 29, 2011"
-RECIPE_LAST_UPDATE_pn-mkfontscale = "Nov 28, 2011"
+RECIPE_LATEST_VERSION_pn-mkfontscale="1.10.0"
+RECIPE_LATEST_RELEASE_DATE_pn-mkfontscale="Feb 10, 2012"
+RECIPE_LAST_UPDATE_pn-mkfontscale = "Feb 27, 2012"
RECIPE_NO_OF_PATCHES_pn-mkfontscale="0"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-mkfontscale="10 monthes"
RECIPE_INTEL_SECTION_pn-mkfontscale="graphic apps"
@@ -3559,7 +3557,7 @@ RECIPE_INTEL_SECTION_pn-qemugl="graphic app"
RECIPE_LAST_UPDATE_pn-qemugl = "Nov 28, 2010"
RECIPE_NO_UPDATE_REASON_pn-qemugl = "Do not upgrade to version: 33466cd8 because the upstream is broken in x86_64 build"
RECIPE_MAINTAINER_pn-qemugl="Saul Wold <sgw@linux.intel.com>"
-RECIPE_MANUAL_CHECK_DATE_pn-qemugl= "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-qemugl= "Feb 26, 2012"
RECIPE_STATUS_pn-fotowall="green" # no update needed
RECIPE_LATEST_VERSION_pn-fotowall="0.9"
@@ -3696,9 +3694,9 @@ RECIPE_LAST_UPDATE_pn-xf86-input-vmmouse = "Nov 12, 2010"
RECIPE_MAINTAINER_pn-xf86-input-vmmouse="Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-libdrm="green" # no update needed
-RECIPE_LATEST_VERSION_pn-libdrm = "2.4.30"
-RECIPE_LATEST_RELEASE_DATE_pn-libdrm = "Jan 06, 2012"
-RECIPE_LAST_UPDATE_pn-libdrm = "Feb 02, 2012"
+RECIPE_LATEST_VERSION_pn-libdrm = "2.4.31"
+RECIPE_LATEST_RELEASE_DATE_pn-libdrm = "Feb 06, 2012"
+RECIPE_LAST_UPDATE_pn-libdrm = "Feb 27, 2012"
RECIPE_NO_OF_PATCHES_pn-libdrm="1"
RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libdrm="1 month"
RECIPE_INTEL_SECTION_pn-libdrm="graphic core"
@@ -3842,8 +3840,8 @@ RECIPE_MAINTAINER_pn-xf86-input-synaptics = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-xf86-video-intel = "red"
DISTRO_PN_ALIAS_pn-xf86-video-intel = "Debian=xserver-xorg-video-intel Fedora=xorg-x11-drv-intel Mandriva=x11-driver-video-intel Meego=xorg-x11-drv-intel Ubuntu=xserver-xorg-video-intel"
-RECIPE_LATEST_VERSION_pn-xf86-video-intel = "2.17.0"
-RECIPE_LAST_UPDATE_pn-xf86-video-intel = "Nov 28, 2011"
+RECIPE_LATEST_VERSION_pn-xf86-video-intel = "2.18.0"
+RECIPE_LAST_UPDATE_pn-xf86-video-intel = "Feb 27, 2012"
RECIPE_MAINTAINER_pn-xf86-video-intel = "Saul Wold <sgw@linux.intel.com>"
RECIPE_STATUS_pn-xf86-video-omapfb = "red"
@@ -5850,13 +5848,13 @@ RECIPE_MAINTAINER_pn-adt-installer = "Jessica Zhang <jessica.zhang@intel.com>"
RECIPE_LATEST_VERSION_pn-glew = "1.7.0"
RECIPE_LATEST_RELEASE_DATE_pn-glew = "Aug 26, 2011"
RECIPE_LAST_UPDATE_pn-glew = "May 24, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-glew = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-glew = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-glew = "Saul Wold <sgw@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-squashfs-tools = "4.2"
RECIPE_LATEST_RELEASE_DATE_pn-squashfs-tools = "Feb 28, 2011"
RECIPE_LAST_UPDATE_pn-squashfs-tools = "Oct 21, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-squashfs-tools = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-squashfs-tools = "Feb 26, 2012"
RECIPE_MAINTAINER_pn-squashfs-tools = "Saul Wold <sgw@linux.intel.com>"
RECIPE_LATEST_VERSION_pn-mpeg2dec = "0.5.1"
@@ -5882,7 +5880,7 @@ RECIPE_LATEST_VERSION_pn-libxml-perl = "0.08"
RECIPE_LATEST_VERSION_pn-lsb = "1.4"
RECIPE_LAST_UPDATE_pn-lsb = "Nov 04, 2010"
RECIPE_LATEST_RELEASE_DATE_pn-lsb = "Jan 04, 2001"
-RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Jan 09, 2012"
+RECIPE_MANUAL_CHECK_DATE_pn-lsb = "Feb 26, 2012"
RECIPE_NO_UPDATE_REASON_pn-lsb = "1.4 is fixed version of LSB Test"
RECIPE_MAINTAINER_pn-lsb = "Saul Wold <sgw@linux.intel.com>"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 22/36] classes: Add recipe class to overrides
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (20 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 21/36] distro_tracking: Account for updates and Manual Checking Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 23/36] default-distrovars: Add empty weak definition for DISTRO variable Saul Wold
` (13 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
We have currently no override to detect a recipe
being build cross, crosssdk or for target
at times we can use virtclass-native and virtclass-nativesdk to
override stuff in recipes but we dont have way to modify a variables
based on recipe type always.
With this patch we attempt to have recipe class override always
so we can use it in recipes which use BBCLASSEXTEND as well as
others which inherit the classes directly.
I am not too fond of names that I have used so any suggestions are
welcome I would have liked to drop virtclass- from the existing
overrides but that would mean a lot of changes so I left them
alone.
With this change now we can say
EXTRA_OECONF_class-target = "...."
EXTRA_OECONF_virtclass-native = "..."
EXTRA_OECONF_virtclass-nativesdk = "..."
EXTRA_OECONF_virtclass-crosssdk= "..."
....
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/base.bbclass | 1 +
meta/classes/cross-canadian.bbclass | 2 +-
meta/classes/cross.bbclass | 1 +
meta/classes/crosssdk.bbclass | 1 +
meta/classes/native.bbclass | 3 +--
meta/classes/nativesdk.bbclass | 3 +--
meta/conf/bitbake.conf | 3 ++-
7 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e80e874..e977485 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -1,4 +1,5 @@
BB_DEFAULT_TASK ?= "build"
+CLASSOVERRIDE ?= "class-target"
inherit patch
inherit staging
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index e187b88..a1577ba 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -8,7 +8,7 @@
# SDK packages are built either explicitly by the user,
# or indirectly via dependency. No need to be in 'world'.
EXCLUDE_FROM_WORLD = "1"
-
+CLASSOVERRIDE = "virtclass-cross-canadian"
STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS}"
#
diff --git a/meta/classes/cross.bbclass b/meta/classes/cross.bbclass
index 8da3048..63eb91e 100644
--- a/meta/classes/cross.bbclass
+++ b/meta/classes/cross.bbclass
@@ -4,6 +4,7 @@ inherit relocatable
# no need for them to be a direct target of 'world'
EXCLUDE_FROM_WORLD = "1"
+CLASSOVERRIDE = "virtclass-cross"
PACKAGES = ""
PACKAGES_DYNAMIC = ""
PACKAGES_DYNAMIC_virtclass-native = ""
diff --git a/meta/classes/crosssdk.bbclass b/meta/classes/crosssdk.bbclass
index 83753b4..5abc950 100644
--- a/meta/classes/crosssdk.bbclass
+++ b/meta/classes/crosssdk.bbclass
@@ -1,5 +1,6 @@
inherit cross
+CLASSOVERRIDE = "virtclass-crosssdk"
PACKAGE_ARCH = "${SDK_ARCH}"
STAGING_DIR_TARGET = "${STAGING_DIR}/${SDK_ARCH}-nativesdk${SDK_VENDOR}-${SDK_OS}"
STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${TARGET_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass
index 00196ba..9fcb31f 100644
--- a/meta/classes/native.bbclass
+++ b/meta/classes/native.bbclass
@@ -94,6 +94,7 @@ PKG_CONFIG_SYSROOT_DIR = ""
# we dont want libc-uclibc or libc-glibc to kick in for native recipes
LIBCOVERRIDE = ""
+CLASSOVERRIDE = "virtclass-native"
PATH =. "${COREBASE}/scripts/native-intercept:"
@@ -141,8 +142,6 @@ python native_virtclass_handler () {
if not prov.endswith("-native"):
provides = provides.replace(prov, prov + "-native")
e.data.setVar("PROVIDES", provides)
-
- e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-native")
}
addhandler native_virtclass_handler
diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass
index ceec53e..084f5d9 100644
--- a/meta/classes/nativesdk.bbclass
+++ b/meta/classes/nativesdk.bbclass
@@ -8,6 +8,7 @@ STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${S
# we dont want libc-uclibc or libc-glibc to kick in for nativesdk recipes
LIBCOVERRIDE = ""
+CLASSOVERRIDE = "virtclass-nativesdk"
#
# Update PACKAGE_ARCH and PACKAGE_ARCHS
@@ -63,8 +64,6 @@ python nativesdk_virtclass_handler () {
pn = e.data.getVar("PN", True)
if not pn.endswith("-nativesdk"):
return
-
- e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + ":virtclass-nativesdk")
}
python () {
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 91aa756..9ed4b6c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -635,7 +635,8 @@ AUTO_LIBNAME_PKGS = "${PACKAGES}"
#
# This works for functions as well, they are really just environment variables.
# Default OVERRIDES to make compilation fail fast in case of build system misconfiguration.
-OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable"
+OVERRIDES = "${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:${CLASSOVERRIDE}:forcevariable"
+CLASSOVERRIDE ?= "class-target"
DISTROOVERRIDES ?= "${DISTRO}"
MACHINEOVERRIDES ?= "${MACHINE}"
MACHINEOVERRIDES[vardepsexclude] = "MACHINE"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 23/36] default-distrovars: Add empty weak definition for DISTRO variable
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (21 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 22/36] classes: Add recipe class to overrides Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 24/36] gcc: Stash the gcc-cross builddir to reuse in libgcc and gcc-runtime Saul Wold
` (12 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/conf/distro/include/default-distrovars.inc | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index 16b3108..dba204e 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -41,6 +41,13 @@ NO32LIBS ??= "1"
# Default to emitting logfiles if a build fails.
BBINCLUDELOGS ??= "yes"
+
+# dummy distro related variables
+# they should be overridden by real distros
+# these fallbacks only serve the purpose of
+# oe-core standalone testability
+
+DISTRO ??= ""
SDK_VERSION ??= "oe-core.0"
DISTRO_VERSION ??= "oe-core.0"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 24/36] gcc: Stash the gcc-cross builddir to reuse in libgcc and gcc-runtime
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (22 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 23/36] default-distrovars: Add empty weak definition for DISTRO variable Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 25/36] bluez4: Fix build on x86/amd64 with gcc 4.7 Saul Wold
` (11 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Currently we stash the libgcc install tree and then reuse that
to populate libgcc recipe later. This mechanism does not work
for gcc 4.7/trunk since now libstdc++ needs access to build tree
of libgcc. This patch stashes the gcc-cross build tree
and then reuses this in libgcc as well as in gcc-runtime
recipe builds.
Now we build libgcc in the libgcc recipe instead of just
using the prebuilt install tree
core-image-minimal build/run tested on all qemu machines
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/recipes-devtools/gcc/gcc-4.6.inc | 2 +-
meta/recipes-devtools/gcc/gcc-configure-common.inc | 3 --
.../recipes-devtools/gcc/gcc-configure-runtime.inc | 24 +++++++++-----
meta/recipes-devtools/gcc/gcc-cross-initial.inc | 2 +-
meta/recipes-devtools/gcc/gcc-package-cross.inc | 14 +-------
meta/recipes-devtools/gcc/libgcc_4.6.bb | 34 ++++++++++++++-----
6 files changed, 43 insertions(+), 36 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc b/meta/recipes-devtools/gcc/gcc-4.6.inc
index edc2a58..46a1ab4 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r22"
+PR = "r23"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 8ab799f..a012fc5 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -68,9 +68,6 @@ do_configure_prepend () {
echo "NATIVE_SYSTEM_HEADER_DIR = ${SYSTEMHEADERS}" > ${B}/gcc/t-oe
cat ${S}/gcc/defaults.h | grep -v "\#endif.*GCC_DEFAULTS_H" > ${B}/gcc/defaults.h.new
cat >>${B}/gcc/defaults.h.new <<_EOF
-#ifndef STANDARD_INCLUDE_DIR
-#define STANDARD_INCLUDE_DIR "${SYSTEMHEADERS}"
-#endif
#ifndef STANDARD_STARTFILE_PREFIX_1
#define STANDARD_STARTFILE_PREFIX_1 "${SYSTEMLIBS}"
#endif
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index 34bfaeb..353b083 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -3,6 +3,7 @@ require gcc-configure-common.inc
CXXFLAGS := "${@oe_filter_out('-fvisibility-inlines-hidden', '${CXXFLAGS}', d)}"
EXTRA_OECONF_PATHS = " \
+ --enable-sjlj-exceptions=no \
--with-local-prefix=${STAGING_DIR_TARGET}${prefix} \
--with-gxx-include-dir=${includedir}/c++/ \
--with-sysroot=${STAGING_DIR_TARGET} \
@@ -16,26 +17,32 @@ RUNTIMETARGET = "libssp libstdc++-v3"
do_configure () {
export CXX="${CXX} -nostdinc++ -nostdlib++"
- for d in ${RUNTIMETARGET}; do
+ mtarget=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##`
+ target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
+ cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$mtarget/* ${B}
+ for d in libgcc ${RUNTIMETARGET}; do
echo "Configuring $d"
- mkdir -p ${B}/$d/
- cd ${B}/$d/
+ rm -rf ${B}/$target/$d/
+ mkdir -p ${B}/$target/$d/
+ cd ${B}/$target/$d/
chmod a+x ${S}/$d/configure
${S}/$d/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
done
}
do_compile () {
- for d in ${RUNTIMETARGET}; do
- cd ${B}/$d/
- oe_runmake
+ target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
+ for d in libgcc ${RUNTIMETARGET}; do
+ cd ${B}/$target/$d/
+ oe_runmake MULTIBUILDTOP=${B}/$target/$d/
done
}
do_install () {
+ target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
for d in ${RUNTIMETARGET}; do
- cd ${B}/$d/
- oe_runmake 'DESTDIR=${D}' install
+ cd ${B}/$target/$d/
+ oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/$d/ install
done
chown -R root:root ${D}
}
@@ -45,4 +52,3 @@ DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++ libgcc"
PROVIDES = "virtual/${TARGET_PREFIX}compilerlibs"
BBCLASSEXTEND = "nativesdk"
-
diff --git a/meta/recipes-devtools/gcc/gcc-cross-initial.inc b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
index f0e7810..66c47e0 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-initial.inc
+++ b/meta/recipes-devtools/gcc/gcc-cross-initial.inc
@@ -25,5 +25,5 @@ EXTRA_OECONF = "--with-local-prefix=${STAGING_DIR_TARGET}${target_prefix} \
${@get_gcc_fpu_setting(bb, d)}"
do_compile () {
- oe_runmake
+ oe_runmake all-gcc all-target-libgcc
}
diff --git a/meta/recipes-devtools/gcc/gcc-package-cross.inc b/meta/recipes-devtools/gcc/gcc-package-cross.inc
index c872e00..7718e70 100644
--- a/meta/recipes-devtools/gcc/gcc-package-cross.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-cross.inc
@@ -36,19 +36,7 @@ do_install () {
case ${PN} in
*gcc-cross|*gcc-crosssdk)
dest=${D}/${includedir}/gcc-build-internal-${MULTIMACH_TARGET_SYS}
- oe_runmake "DESTDIR=$dest" libdir=${target_libdir} base_libdir=${target_base_libdir} prefix=${target_prefix} exec_prefix=${target_exec_prefix} install-target-libgcc
-
- # Ideally here we'd override the libgcc Makefile's idea of slibdir but
- # for now, we just move the files to the correct location
-
- install -d $dest${target_base_libdir}
- mv $dest${target_exec_prefix}/${TARGET_SYS}/lib*/* $dest${target_base_libdir}
- rm -rf $dest${target_exec_prefix}/${TARGET_SYS}
-
- # Also need to move gcc from /usr/lib/gcc/* to /usr/lib/ else the search paths won't find the crt*.o files
-
- mv $dest${target_libdir}/gcc/* $dest${target_libdir}/
- rmdir $dest${target_libdir}/gcc
+ cp -fpPR . $dest
;;
esac
}
diff --git a/meta/recipes-devtools/gcc/libgcc_4.6.bb b/meta/recipes-devtools/gcc/libgcc_4.6.bb
index 04e2877..9eb5cfb 100644
--- a/meta/recipes-devtools/gcc/libgcc_4.6.bb
+++ b/meta/recipes-devtools/gcc/libgcc_4.6.bb
@@ -1,6 +1,7 @@
require gcc-${PV}.inc
INHIBIT_DEFAULT_DEPS = "1"
+
DEPENDS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
PACKAGES = "\
@@ -20,15 +21,28 @@ FILES_libgcov-dev = " \
FILES_${PN}-dbg += "${base_libdir}/.debug/"
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
+EXTRA_OECONF += "--enable-sjlj-exceptions=no"
-do_install () {
+do_configure () {
target=`echo ${MULTIMACH_TARGET_SYS} | sed -e s#-nativesdk##`
-
- # Install libgcc from our gcc-cross saved data
install -d ${D}${base_libdir} ${D}${libdir}
- cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${D}
+ cp -fpPR ${STAGING_INCDIR_NATIVE}/gcc-build-internal-$target/* ${B}
+ mkdir -p ${B}/${PN}
+ cd ${B}/${PN}
+ chmod a+x ${S}/${PN}/configure
+ ${S}/${PN}/configure ${CONFIGUREOPTS} ${EXTRA_OECONF}
+}
+
+do_compile () {
+ target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
+ cd ${B}/${PN}
+ oe_runmake MULTIBUILDTOP=${B}/$target/${PN}/
+}
+
+do_install () {
+ target=`echo ${TARGET_SYS} | sed -e s#-nativesdk##`
+ cd ${B}/${PN}
+ oe_runmake 'DESTDIR=${D}' MULTIBUILDTOP=${B}/$target/${PN}/ install
# Move libgcc_s into /lib
mkdir -p ${D}${base_libdir}
@@ -38,8 +52,11 @@ do_install () {
mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true
fi
- chown -R root:root ${D}
- chmod +x ${D}${base_libdir}/libgcc_s.so.*
+ # install the runtime in /usr/lib/ not in /usr/lib/gcc on target
+ # so that cross-gcc can find it in the sysroot
+
+ mv ${D}${libdir}/gcc/* ${D}${libdir}
+ rm -rf ${D}${libdir}/gcc/
}
do_package_write_ipk[depends] += "virtual/${MLPREFIX}libc:do_package"
@@ -50,4 +67,3 @@ BBCLASSEXTEND = "nativesdk"
INSANE_SKIP_libgcc-dev = "staticdev"
INSANE_SKIP_libgcov-dev = "staticdev"
-
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 25/36] bluez4: Fix build on x86/amd64 with gcc 4.7
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (23 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 24/36] gcc: Stash the gcc-cross builddir to reuse in libgcc and gcc-runtime Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 26/36] linux-yocto: update 3.0 kernel to v3.0.22 Saul Wold
` (10 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
gcc figures an impossible asm contraint
in inline asm which it is correct about
"i" requires the operand to be a compile-time constant
but memory location of a multi-dimensional array isn't constant
at compile time.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../bluez/bluez4-4.98/sbc_mmx.patch | 24 ++++++++++++++++++++
meta/recipes-connectivity/bluez/bluez4_4.98.bb | 6 +++-
2 files changed, 28 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-connectivity/bluez/bluez4-4.98/sbc_mmx.patch
diff --git a/meta/recipes-connectivity/bluez/bluez4-4.98/sbc_mmx.patch b/meta/recipes-connectivity/bluez/bluez4-4.98/sbc_mmx.patch
new file mode 100644
index 0000000..98fab45
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.98/sbc_mmx.patch
@@ -0,0 +1,24 @@
+on x86 and x86_64 gcc 4.7 complains
+
+sbc/sbc_primitives_mmx.c: In function 'sbc_calc_scalefactors_mmx':
+sbc/sbc_primitives_mmx.c:294:4: warning: asm operand 2 probably doesn't match constraints [enabled by default]
+sbc/sbc_primitives_mmx.c:294:4: error: impossible constraint in 'asm'
+
+This patch is taken from https://bugs.launchpad.net/ubuntu/+source/bluez/+bug/911871
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: bluez-4.98/sbc/sbc_primitives_mmx.c
+===================================================================
+--- bluez-4.98.orig/sbc/sbc_primitives_mmx.c 2011-12-21 14:53:54.000000000 -0800
++++ bluez-4.98/sbc/sbc_primitives_mmx.c 2012-02-24 10:07:03.422073800 -0800
+@@ -318,7 +318,7 @@
+ "movl %k0, 4(%3)\n"
+ : "+r" (blk)
+ : "r" (&sb_sample_f[0][ch][sb]),
+- "i" ((char *) &sb_sample_f[1][0][0] -
++ "r" ((char *) &sb_sample_f[1][0][0] -
+ (char *) &sb_sample_f[0][0][0]),
+ "r" (&scale_factor[ch][sb]),
+ "r" (&consts),
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.98.bb b/meta/recipes-connectivity/bluez/bluez4_4.98.bb
index 62de1fe..2412b1b 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.98.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.98.bb
@@ -1,8 +1,10 @@
require bluez4.inc
-PR = "r0"
+PR = "r1"
-SRC_URI += "file://bluetooth.conf"
+SRC_URI += "file://bluetooth.conf \
+ file://sbc_mmx.patch \
+ "
SRC_URI[md5sum] = "362864b716950baa04797de735fc237b"
SRC_URI[sha256sum] = "9a5b655bada7c7a1921cb3bac83b8a32bbe49893e4c7a1377cdc1b0d35f7d233"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 26/36] linux-yocto: update 3.0 kernel to v3.0.22
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (24 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 25/36] bluez4: Fix build on x86/amd64 with gcc 4.7 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 27/36] linux-yocto: update 3.2 kernel to v3.2.7 Saul Wold
` (9 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
bumping the revision of the 3.0 kernel to the latest -stable release.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb | 8 ++++----
meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb | 6 +++---
meta/recipes-kernel/linux/linux-yocto_3.0.bb | 18 +++++++++---------
3 files changed, 16 insertions(+), 16 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 3d4a1d0..41a37fe 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.0.bb
@@ -11,12 +11,12 @@ KMACHINE_qemumips = "mti-malta32-be"
KBRANCH = "yocto/standard/preempt-rt/base"
KBRANCH_qemuppc = "yocto/standard/preempt-rt/qemu-ppc32"
-LINUX_VERSION ?= "3.0.18"
+LINUX_VERSION ?= "3.0.22"
LINUX_KERNEL_TYPE = "preempt-rt"
-SRCREV_machine ?= "2f9d925f5681eaae7f341cc1270c739e8b329c03"
-SRCREV_machine_qemuppc ?= "c66f7ef2315010756c8c97af6b13d52f9f18c03b"
-SRCREV_meta ?= "b78a519841bd8b477cad599af8d38df6760445c1"
+SRCREV_machine ?= "03705f7f066d83b4cd3a6088781d47e3b9e45b71"
+SRCREV_machine_qemuppc ?= "c8b184e8171f6f5a8017be4c5bf1e7a38c3f3002"
+SRCREV_meta ?= "808b49474268040ab27c8ee687b60807a11547b4"
PR = "r1"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb
index 061476c..f4eedb7 100644
--- a/meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-tiny_3.0.bb
@@ -5,10 +5,10 @@ require recipes-kernel/linux/linux-yocto.inc
KMACHINE = "yocto/standard/base"
KBRANCH = "${KMACHINE}"
-LINUX_VERSION ?= "3.0.12"
+LINUX_VERSION ?= "3.0.22"
-SRCREV_machine ?= "f389d310965a56091f688b28ea8be6d9cbb7fbbe"
-SRCREV_meta ?= "04a52a32cbdf0972033b97b83eaa83eb275dfdc9"
+SRCREV_machine ?= "c578f3a1f357142a6e02a1df4ae9aa16f45094d6"
+SRCREV_meta ?= "808b49474268040ab27c8ee687b60807a11547b4"
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 d52e93a..8e7842e 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -10,15 +10,15 @@ KMACHINE_qemuarm = "yocto/standard/arm-versatile-926ejs"
KBRANCH = "${KMACHINE}"
-LINUX_VERSION ?= "3.0.18"
-
-SRCREV_machine_qemuarm ?= "48e68bd72da497a14200801140b3b87dae6d60e9"
-SRCREV_machine_qemumips ?= "9d86aeb43e5bbb0851cc4f105b64caab13bc71f3"
-SRCREV_machine_qemuppc ?= "15fd748017f0849138ff4b47d73f6866fa26cfe8"
-SRCREV_machine_qemux86 ?= "8f74a4339b3dc029fafff0ba7d88d6dc950d4b31"
-SRCREV_machine_qemux86-64 ?= "610c5a62daeda033755b0b7bfcb3e2cad5c76f3f"
-SRCREV_machine ?= "5df0b4c2538399aed543133b3855f809adf08ab8"
-SRCREV_meta ?= "b78a519841bd8b477cad599af8d38df6760445c1"
+LINUX_VERSION ?= "3.0.22"
+
+SRCREV_machine_qemuarm ?= "6d4d3334bf648b97a0d44b7833060f4da40840d5"
+SRCREV_machine_qemumips ?= "1d8d58d120c92510be8a97b0ed493a25a3010d6c"
+SRCREV_machine_qemuppc ?= "804aff4612bb7a53ac4679412c2a78bc06e3c4ce"
+SRCREV_machine_qemux86 ?= "7b0476fde681e828417d8fa86c47b0ca539ade70"
+SRCREV_machine_qemux86-64 ?= "14fe1742198bd5a85fbcf6e53d336838ff87b2ef"
+SRCREV_machine ?= "c578f3a1f357142a6e02a1df4ae9aa16f45094d6"
+SRCREV_meta ?= "808b49474268040ab27c8ee687b60807a11547b4"
PR = "r3"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 27/36] linux-yocto: update 3.2 kernel to v3.2.7
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (25 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 26/36] linux-yocto: update 3.0 kernel to v3.0.22 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 28/36] linux-yocto: allow non-branched repositories to check out Saul Wold
` (8 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Updating the 3.2 kernel recipe to the latest -stable release.
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb | 9 +++++----
meta/recipes-kernel/linux/linux-yocto_3.2.bb | 19 ++++++++++---------
2 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
index 329527f..3370729 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.2.bb
@@ -11,12 +11,13 @@ KMACHINE_qemumips = "mti-malta32-be"
KBRANCH = "standard/preempt-rt/base"
KBRANCH_qemuppc = "standard/preempt-rt/qemu-ppc32"
-LINUX_VERSION ?= "3.2.2"
+LINUX_VERSION ?= "3.2.7"
LINUX_KERNEL_TYPE = "preempt-rt"
-SRCREV_machine ?= "415af017cf163c63d7b1e6e929e4a9c9baf5ba6d"
-SRCREV_machine_qemuppc ?= "38345c1e41b15c49308a9adbdde95167eeaa05fa"
-SRCREV_meta ?= "138bf5b502607fe40315c0d76822318d77d97e01"
+SRCREV_machine ?= "2043e8b786dfd06a41a66780141f731d2d788696"
+SRCREV_machine_qemuppc ?= "ec400326633f011c3b7d390beb765ad955145a29"
+SRCREV_meta ?= "5db8963f9aefc70b4483ca4ccce8f2ef6964e2c3"
+
PR = "r0"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index a80924d..9be1bd9 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
@@ -15,15 +15,16 @@ KBRANCH_qemuppc = "standard/default/qemu-ppc32"
KBRANCH_qemumips = "standard/default/mti-malta32-be"
KBRANCH_qemuarm = "standard/default/arm-versatile-926ejs"
-LINUX_VERSION ?= "3.2.2"
-
-SRCREV_machine_qemuarm ?= "8d79190c307c7d41580beb77f83526ae3defcacc"
-SRCREV_machine_qemumips ?= "c88f8c4f3be717be33a8ad89a14731eb94932336"
-SRCREV_machine_qemuppc ?= "b8228f337002ad88f1e152d0c0c46c6035cd0428"
-SRCREV_machine_qemux86 ?= "417fc778a86e81303bab5883b919ee422ec51c04"
-SRCREV_machine_qemux86-64 ?= "417fc778a86e81303bab5883b919ee422ec51c04"
-SRCREV_machine ?= "417fc778a86e81303bab5883b919ee422ec51c04"
-SRCREV_meta ?= "138bf5b502607fe40315c0d76822318d77d97e01"
+LINUX_VERSION ?= "3.2.7"
+
+
+SRCREV_machine_qemuarm ?= "c2028a144fe035719af7c5e9989fedc62ccf3c2c"
+SRCREV_machine_qemumips ?= "7dfffd937d4755cba0fcf3f2b9b69a1c62262084"
+SRCREV_machine_qemuppc ?= "8fc0489fffe4c626f9a8053ad86014e75073a3d0"
+SRCREV_machine_qemux86 ?= "0fae9c2722039df3e93398d314ee10e3f4330b86"
+SRCREV_machine_qemux86-64 ?= "0fae9c2722039df3e93398d314ee10e3f4330b86"
+SRCREV_machine ?= "0fae9c2722039df3e93398d314ee10e3f4330b86"
+SRCREV_meta ?= "5db8963f9aefc70b4483ca4ccce8f2ef6964e2c3"
PR = "r0"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 28/36] linux-yocto: allow non-branched repositories to check out
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (26 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 27/36] linux-yocto: update 3.2 kernel to v3.2.7 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 29/36] arch-powerpc{, 64}.inc: update/add PACKAGE_EXTRA_ARCHS for powerpc/powerpc64 Saul Wold
` (7 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Bruce Ashfield <bruce.ashfield@windriver.com>
Not all users of the checkout phase of linux-yocto have all
branches present. This is normal, and should be supported. By
checking for an empty KBRANCH we can avoid validating a branch
that isn't supposed to exist.
[YOCTO #2032]
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
meta/classes/kernel-yocto.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 50ff555..5f3cb63 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -165,7 +165,7 @@ do_kernel_checkout() {
echo "kernel repository"
exit 1
fi
- if [ -z "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
+ if [ -z "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ] && [ -n "${KBRANCH}" ] ; then
git branch -a | grep -q ${KBRANCH}
if [ $? -ne 0 ]; then
echo "ERROR. The branch '${KBRANCH}' is required and was not"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 29/36] arch-powerpc{, 64}.inc: update/add PACKAGE_EXTRA_ARCHS for powerpc/powerpc64
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (27 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 28/36] linux-yocto: allow non-branched repositories to check out Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 30/36] tune-ppce5500: consolidate ppce5500 and ppc64e5500 into one tune file Saul Wold
` (6 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Matthew McClintock <msm@freescale.com>
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
meta/conf/machine/include/powerpc/arch-powerpc.inc | 4 +---
.../machine/include/powerpc/arch-powerpc64.inc | 1 +
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc.inc b/meta/conf/machine/include/powerpc/arch-powerpc.inc
index 8347f86..c9b2829 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc.inc
@@ -30,6 +30,4 @@ BASE_LIB_tune-powerpc-nf = "lib"
PACKAGE_EXTRA_ARCHS_tune-powerpc-nf = "powerpc-nf"
TUNE_FEATURES_tune-powerpc ?= "m32 fpu-hard"
BASE_LIB_tune-powerpc = "lib"
-PACKAGE_EXTRA_ARCHS_tune-powerpc = "${PACKAGE_EXTRA_ARCHS_tune-powerpc-nf} powerpc"
-
-
+PACKAGE_EXTRA_ARCHS_tune-powerpc = "powerpc"
diff --git a/meta/conf/machine/include/powerpc/arch-powerpc64.inc b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
index 7ef8ddc..48cd08e 100644
--- a/meta/conf/machine/include/powerpc/arch-powerpc64.inc
+++ b/meta/conf/machine/include/powerpc/arch-powerpc64.inc
@@ -10,3 +10,4 @@ TUNE_ARCH .= "${@bb.utils.contains("TUNE_FEATURES", [ "m64" ], "powerpc64", "",
AVAILTUNES += "powerpc64"
TUNE_FEATURES_tune-powerpc64 ?= "m64 fpu-hard"
BASE_LIB_tune-powerpc64 = "lib64"
+PACKAGE_EXTRA_ARCHS_tune-powerpc64 = "powerpc64"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 30/36] tune-ppce5500: consolidate ppce5500 and ppc64e5500 into one tune file
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (28 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 29/36] arch-powerpc{, 64}.inc: update/add PACKAGE_EXTRA_ARCHS for powerpc/powerpc64 Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 31/36] multilib.bbclass: allow TARGET_VENDOR_virtclass-multilib to be overriden Saul Wold
` (5 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Matthew McClintock <msm@freescale.com>
We don't need two files for this. Also this fixes some mutlilib build
issues where we were not able to select the multilib arch to be
ppce5500 or ppc64e5500.
Changes recently made to meta-fsl-ppc layer depend on this change as
well
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
meta/conf/machine/include/tune-ppce5500-32b.inc | 15 ---------------
meta/conf/machine/include/tune-ppce5500-64b.inc | 15 ---------------
meta/conf/machine/include/tune-ppce5500.inc | 20 ++++++++++++++++++++
3 files changed, 20 insertions(+), 30 deletions(-)
delete mode 100644 meta/conf/machine/include/tune-ppce5500-32b.inc
delete mode 100644 meta/conf/machine/include/tune-ppce5500-64b.inc
create mode 100644 meta/conf/machine/include/tune-ppce5500.inc
diff --git a/meta/conf/machine/include/tune-ppce5500-32b.inc b/meta/conf/machine/include/tune-ppce5500-32b.inc
deleted file mode 100644
index 7a9e533..0000000
--- a/meta/conf/machine/include/tune-ppce5500-32b.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFAULTTUNE ?= "ppce5500"
-
-require conf/machine/include/powerpc/arch-powerpc64.inc
-
-TUNEVALID[ppce5500] = "Enable ppce5500 specific processor optimizations"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "-mcpu=e5500", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "ppce5500", "${PPCPKGARCH}", d)}"
-
-AVAILTUNES = "ppce5500"
-TUNE_FEATURES_tune-ppce5500 = "m32 ppce5500"
-PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "powerpc ppce5500"
-BASE_LIB_tune-ppce5500 = "lib"
-
-# glibc configure options to get e5500 specific library (for sqrt)
-GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppce5500", "--with-cpu=e5500", "", d)}"
diff --git a/meta/conf/machine/include/tune-ppce5500-64b.inc b/meta/conf/machine/include/tune-ppce5500-64b.inc
deleted file mode 100644
index 683d25f..0000000
--- a/meta/conf/machine/include/tune-ppce5500-64b.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFAULTTUNE ?= "ppc64e5500"
-
-require conf/machine/include/powerpc/arch-powerpc64.inc
-
-TUNEVALID[ppc64e5500] = "Enable ppc64e5500 specific processor optimizations"
-TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "-mcpu=e5500", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "ppc64e5500", "${PPCPKGARCH}", d)}"
-
-AVAILTUNES = "ppc64e5500"
-TUNE_FEATURES_tune-ppc64e5500 = "m64 ppc64e5500"
-PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "powerpc64 ppc64e5500"
-BASE_LIB_tune-ppc64e5500 = "lib64"
-
-# glibc configure options to get e5500 specific library (for sqrt)
-GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "ppc64e5500", "--with-cpu=e5500", "", d)}"
diff --git a/meta/conf/machine/include/tune-ppce5500.inc b/meta/conf/machine/include/tune-ppce5500.inc
new file mode 100644
index 0000000..fe8d79d
--- /dev/null
+++ b/meta/conf/machine/include/tune-ppce5500.inc
@@ -0,0 +1,20 @@
+DEFAULTTUNE ?= "ppce5500"
+
+require conf/machine/include/powerpc/arch-powerpc64.inc
+
+TUNEVALID[e5500] = "Enable Freescale e5500 specific processor optimizations"
+TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "-mcpu=e5500", "", d)}"
+
+AVAILTUNES += "ppce5500 ppc64e5500"
+TUNE_FEATURES_tune-ppce5500 = "m32 fpu-hard e5500"
+PACKAGE_EXTRA_ARCHS_tune-ppce5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc} ppce5500"
+BASE_LIB_tune-ppce5500 = "lib"
+TUNE_PKGARCH_tune-ppce5500 = "ppce5500"
+
+TUNE_FEATURES_tune-ppc64e5500 = "m64 fpu-hard e5500"
+PACKAGE_EXTRA_ARCHS_tune-ppc64e5500 = "${PACKAGE_EXTRA_ARCHS_tune-powerpc64} ppc64e5500"
+BASE_LIB_tune-ppc64e5500 = "lib64"
+TUNE_PKGARCH_tune-ppc64e5500 = "ppc64e5500"
+
+# glibc configure options to get e5500 specific library (for sqrt)
+GLIBC_EXTRA_OECONF += "${@bb.utils.contains("TUNE_FEATURES", "e5500", "--with-cpu=e5500", "", d)}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 31/36] multilib.bbclass: allow TARGET_VENDOR_virtclass-multilib to be overriden
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (29 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 30/36] tune-ppce5500: consolidate ppce5500 and ppc64e5500 into one tune file Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 32/36] bitbake.conf: add default value for TUNE_PKGARCH Saul Wold
` (4 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Matthew McClintock <msm@freescale.com>
If we set this bit, we can override the ugly "pokymllib32" to back to
"poky" (powerpc-pokymllib32-linux-gcc -> powerpc-poky-linux-gcc). I've
left this unset by default, but can be set by adding the following:
TARGET_VENDOR_virtclass-multilib-lib32 = "-poky"
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
meta/classes/multilib.bbclass | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index 87d0cd4..61b7765 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -26,7 +26,8 @@ python multilib_virtclass_handler () {
e.data.setVar("MLPREFIX", variant + "-")
e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))
e.data.setVar("SHLIBSDIR_virtclass-multilib-" + variant ,e.data.getVar("SHLIBSDIR", False) + "/" + variant)
- e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
+ if e.data.getVar("TARGET_VENDOR_virtclass-multilib-" + variant, False) is None:
+ e.data.setVar("TARGET_VENDOR_virtclass-multilib-" + variant, e.data.getVar("TARGET_VENDOR", False) + "ml" + variant)
e.data.setVar("OVERRIDES", e.data.getVar("OVERRIDES", False) + override)
}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 32/36] bitbake.conf: add default value for TUNE_PKGARCH
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (30 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 31/36] multilib.bbclass: allow TARGET_VENDOR_virtclass-multilib to be overriden Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 33/36] tune-ppc*.inc: update to use new " Saul Wold
` (3 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Matthew McClintock <msm@freescale.com>
Add a default value for TUNE_PKGARCH. This let's us use
the following:
TUNE_PKGARCH_tune-ppce500
Instead of scanning over variables and using bitbake internal
functions to create a valid value here.
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
meta/conf/bitbake.conf | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 9ed4b6c..8cbcaa6 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -95,6 +95,7 @@ TUNE_CCARGS ??= ""
TUNE_LDARGS ??= ""
TUNE_ASARGS ??= ""
TUNE_FEATURES ??= "${TUNE_FEATURES_tune-${DEFAULTTUNE}}"
+TUNE_PKGARCH ??= "${TUNE_PKGARCH_tune-${DEFAULTTUNE}}"
LIBCEXTENSION ??= ""
ABIEXTENSION ??= ""
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 33/36] tune-ppc*.inc: update to use new default value for TUNE_PKGARCH
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (31 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 32/36] bitbake.conf: add default value for TUNE_PKGARCH Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 34/36] qt4.inc: depend on tiff Saul Wold
` (2 subsequent siblings)
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Matthew McClintock <msm@freescale.com>
Signed-off-by: Matthew McClintock <msm@freescale.com>
---
meta/conf/machine/include/tune-ppc603e.inc | 2 +-
meta/conf/machine/include/tune-ppce300c2.inc | 2 +-
meta/conf/machine/include/tune-ppce500.inc | 2 +-
meta/conf/machine/include/tune-ppce500mc.inc | 2 +-
meta/conf/machine/include/tune-ppce500v2.inc | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/conf/machine/include/tune-ppc603e.inc b/meta/conf/machine/include/tune-ppc603e.inc
index 663f220..02cebe7 100644
--- a/meta/conf/machine/include/tune-ppc603e.inc
+++ b/meta/conf/machine/include/tune-ppc603e.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppc603e] = "Enable ppc603e specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppc603e", "-mcpu=603e", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains('TUNE_FEATURES', 'ppc603e', 'ppc603e', '${PPCPKGARCH}', d)}"
+TUNE_PKGARCH_tune-ppc603e = "ppc603e"
AVAILTUNES = "ppc603e"
TUNE_FEATURES_tune-ppc603e = "m32 fpu-hard ppc603e"
diff --git a/meta/conf/machine/include/tune-ppce300c2.inc b/meta/conf/machine/include/tune-ppce300c2.inc
index bdca1aa..27ef4a8 100644
--- a/meta/conf/machine/include/tune-ppce300c2.inc
+++ b/meta/conf/machine/include/tune-ppce300c2.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppce300c2] = "Enable ppce300c2 specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "-mcpu=e300c2", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce300c2", "ppce300c2", "${PPCPKGARCH}", d)}"
+TUNE_PKGARCH_tune-ppce300c2 = "ppce300c2"
AVAILTUNES += "ppce300c2"
TUNE_FEATURES_tune-ppce300c2 = "m32 fpu-soft ppce300c2"
diff --git a/meta/conf/machine/include/tune-ppce500.inc b/meta/conf/machine/include/tune-ppce500.inc
index 709e14f..1326720 100644
--- a/meta/conf/machine/include/tune-ppce500.inc
+++ b/meta/conf/machine/include/tune-ppce500.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppce500] = "Enable ppce500 specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "-mcpu=8540", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500", "ppce500", "${PPCPKGARCH}", d)}"
+TUNE_PKGARCH_tune-ppce500 = "ppce500"
TUNEVALID[spe] = "Enable SPE ABI extensions"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe", "", d)}"
diff --git a/meta/conf/machine/include/tune-ppce500mc.inc b/meta/conf/machine/include/tune-ppce500mc.inc
index 950c46d..51e6f53 100644
--- a/meta/conf/machine/include/tune-ppce500mc.inc
+++ b/meta/conf/machine/include/tune-ppce500mc.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppce500mc] = "Enable ppce500mc specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "-mcpu=e500mc", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500mc", "ppce500mc", "${PPCPKGARCH}", d)}"
+TUNE_PKGARCH_tune-ppce500mc = "ppce500mc"
AVAILTUNES = "ppce500mc"
TUNE_FEATURES_tune-ppce500mc = "m32 fpu-hard ppce500mc"
diff --git a/meta/conf/machine/include/tune-ppce500v2.inc b/meta/conf/machine/include/tune-ppce500v2.inc
index 0cbe5af..e7b51c6 100644
--- a/meta/conf/machine/include/tune-ppce500v2.inc
+++ b/meta/conf/machine/include/tune-ppce500v2.inc
@@ -4,7 +4,7 @@ require conf/machine/include/powerpc/arch-powerpc.inc
TUNEVALID[ppce500v2] = "Enable ppce500v2 specific processor optimizations"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "-mcpu=8548", "", d)}"
-TUNE_PKGARCH = "${@bb.utils.contains("TUNE_FEATURES", "ppce500v2", "ppce500v2", "${PPCPKGARCH}", d)}"
+TUNE_PKGARCH_tune-ppce500v2 = "ppce500v2"
TUNEVALID[spe] = "Enable SPE ABI extensions"
TUNE_CCARGS += "${@bb.utils.contains("TUNE_FEATURES", "spe", "-mabi=spe -mspe", "", d)}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 34/36] qt4.inc: depend on tiff
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (32 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 33/36] tune-ppc*.inc: update to use new " Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 35/36] mtd-utils: Don't use host 'ranlib' or 'ar' Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 36/36] gettext: Get gettext use its own libunistring Saul Wold
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Andreas Oberritter <obi@opendreambox.org>
* Fixes the following error with qt4-embedded-4.8.0 and possibly others:
| ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No such file or directory
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
meta/recipes-qt/qt4/qt4-embedded.inc | 2 +-
meta/recipes-qt/qt4/qt4-x11-free.inc | 2 +-
meta/recipes-qt/qt4/qt4.inc | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc
index e472af5..80948f3 100644
--- a/meta/recipes-qt/qt4/qt4-embedded.inc
+++ b/meta/recipes-qt/qt4/qt4-embedded.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is
SECTION = "libs"
HOMEPAGE = "http://qt.nokia.com"
DEPENDS += "directfb tslib"
-INC_PR = "r40"
+INC_PR = "r41"
QT_BASE_LIB ?= "libqt-embedded"
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc
index 40939de..75487f7 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 = "r37"
+INC_PR = "r38"
QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} "
QT_GLFLAGS_qemux86 = "-opengl"
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc
index 1e76dec..75abe6e 100644
--- a/meta/recipes-qt/qt4/qt4.inc
+++ b/meta/recipes-qt/qt4/qt4.inc
@@ -1,6 +1,6 @@
inherit qmake_base
-DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3"
+DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff"
require qt4_arch.inc
QT_ARCH := "${@qt_arch(d)}"
@@ -15,7 +15,7 @@ QT_GLFLAGS ?= ""
QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \
-shared -no-nas-sound -no-nis \
- -system-libjpeg -system-libpng -system-zlib \
+ -system-libjpeg -system-libpng -system-libtiff -system-zlib \
-no-pch -qdbus -stl -glib -phonon -webkit \
-xmlpatterns -no-rpath -qt3support -silent \
${QT_SQL_DRIVER_FLAGS} \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 35/36] mtd-utils: Don't use host 'ranlib' or 'ar'.
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (33 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 34/36] qt4.inc: depend on tiff Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
2012-02-28 5:25 ` [CONSOLIDATED PULL 36/36] gettext: Get gettext use its own libunistring Saul Wold
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: James Limbouris <james@digitalmatter.com.au>
If ranlib, ar, or cc are not supplied to make, it attempts to use ${CROSS}xxx.
Since ${CROSS} is not set, host ranlib may run, producing an unusable .a file on some platforms.
Signed-off-by: James Limbouris <james@digitalmatter.com.au>
---
meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb b/meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb
index 519472c..4228b51 100644
--- a/meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb
+++ b/meta/recipes-devtools/mtd/mtd-utils_1.4.9.bb
@@ -11,9 +11,9 @@ SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=995cfe51b0a3cf
S = "${WORKDIR}/git/"
-PR = "r0"
+PR = "r1"
-EXTRA_OEMAKE = "'CC=${CC}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
+EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'BUILDDIR=${S}'"
do_install () {
oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} INCLUDEDIR=${includedir}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread* [CONSOLIDATED PULL 36/36] gettext: Get gettext use its own libunistring
2012-02-28 5:24 [CONSOLIDATED PULL 00/36] General Updates, Kernel, QT, misc Saul Wold
` (34 preceding siblings ...)
2012-02-28 5:25 ` [CONSOLIDATED PULL 35/36] mtd-utils: Don't use host 'ranlib' or 'ar' Saul Wold
@ 2012-02-28 5:25 ` Saul Wold
35 siblings, 0 replies; 37+ messages in thread
From: Saul Wold @ 2012-02-28 5:25 UTC (permalink / raw)
To: openembedded-core
From: Wenzong Fan <wenzong.fan@windriver.com>
According to its documentation, gettext 0.18.1.1 needs either
libunistring or it will use its own internal version. Just add
a configure option '--with-included-libunistring' to force the
latter to avoid races.
[YOCTO#1934]
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
---
meta/recipes-core/gettext/gettext_0.18.1.1.bb | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/gettext/gettext_0.18.1.1.bb b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
index 615582e..3c65dca 100644
--- a/meta/recipes-core/gettext/gettext_0.18.1.1.bb
+++ b/meta/recipes-core/gettext/gettext_0.18.1.1.bb
@@ -5,7 +5,7 @@ SECTION = "libs"
LICENSE = "GPL-3+ & LGPL-2.1+"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
-PR = "r6"
+PR = "r7"
DEPENDS = "libxml2-native gettext-native virtual/libiconv ncurses expat"
DEPENDS_virtclass-native = "libxml2-native"
PROVIDES = "virtual/libintl virtual/gettext"
@@ -38,6 +38,7 @@ EXTRA_OECONF += "--without-lispdir \
--without-git \
--with-included-libxml \
--with-included-libcroco \
+ --with-included-libunistring \
"
acpaths = '-I ${S}/gettext-runtime/m4 \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 37+ messages in thread