* [PATCH 01/16] rpm 5.4.0: respect to the arch when choose the alternatives
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 02/16] ncurses: Avoid occasional builling failure when having parallel processable task Scott Garman
` (16 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Robert Yang <liezhi.yang@windriver.com>
There is a bug if we:
1) bitbake diffutils with MACHINE=crownbay
2) bitbake diffutils with MACHINE=qemux86
3) bitbake core-image-sato with MACHINE=crownbay
Then the diffutils.i586 would be installed to the crownbay's image, this
is because diffutils.i586 is newer than diffutils.core2, and rpm doesn't
respect to the arch priorities:
We have put the archs in order in _solve_dbpath:
crownbay/solvedb:core2/solvedb:i586/solvedb:all/solvedb
Fix rpm to respect to the order, for example, if it finds a pkg in both
core2/ and i586/, and the core2/ comes first, it should not use the one
in i586/ even if it's build time is newer.
Note: Don't worry about the _free(*ptr), it can check whether ptr is
NULL or not.
This is for the denzil branch, and the master branch also needs it.
[YOCTO #2360]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
.../rpm/rpm/rpm-respect-arch.patch | 67 ++++++++++++++++++++
meta/recipes-devtools/rpm/rpm_5.4.0.bb | 3 +-
2 files changed, 69 insertions(+), 1 deletion(-)
create mode 100644 meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
diff --git a/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch b/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
new file mode 100644
index 0000000..9b63b37
--- /dev/null
+++ b/meta/recipes-devtools/rpm/rpm/rpm-respect-arch.patch
@@ -0,0 +1,67 @@
+rpmts.c: respect to the arch priorities
+
+Let rpm respect to the priorities when choose alternatives rpm, the arch
+which comes first is preferred.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ lib/rpmts.c | 14 ++++++++++++++
+ 1 files changed, 14 insertions(+), 0 deletions(-)
+
+diff --git a/lib/rpmts.c b/lib/rpmts.c
+index 3fbbc9e..40ec08e 100644
+--- a/lib/rpmts.c
++++ b/lib/rpmts.c
+@@ -353,6 +353,7 @@ int rpmtsSolve(rpmts ts, rpmds ds, /*@unused@*/ const void * data)
+ Header h = NULL;
+ size_t bhnamelen = 0;
+ time_t bhtime = 0;
++ const char *bharch = NULL;
+ rpmTag rpmtag;
+ const char * keyp;
+ size_t keylen = 0;
+@@ -409,6 +410,7 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
+ while ((h = rpmmiNext(mi)) != NULL) {
+ size_t hnamelen;
+ time_t htime;
++ const char *harch = NULL;
+
+ if (rpmtag == RPMTAG_PROVIDENAME && !rpmdsAnyMatchesDep(h, ds, 1))
+ continue;
+@@ -431,12 +433,23 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
+ if (htime <= bhtime)
+ continue;
+
++ /* XXX Respect to the arch priorities */
++ he->tag = RPMTAG_ARCH;
++ xx = headerGet(h, he, 0);
++ harch = ((xx && he->p.str) ? xstrdup(he->p.str) : NULL);
++ he->p.ptr = _free(he->p.ptr);
++ if (bharch && (strcmp(bharch, harch) != 0))
++ continue;
++
+ /* Save new "best" candidate. */
+ (void)headerFree(bh);
+ bh = NULL;
+ bh = headerLink(h);
+ bhtime = htime;
+ bhnamelen = hnamelen;
++ bharch = _free(bharch);
++ bharch = xstrdup(harch);
++ harch = _free(harch);
+ }
+ mi = rpmmiFree(mi);
+
+@@ -449,6 +462,7 @@ fprintf(stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, ds, data);
+ } while (1);
+
+ }
++ bharch = _free(bharch);
+
+ /* Is there a suggested resolution? */
+ if (bh == NULL)
+--
+1.7.1
+
diff --git a/meta/recipes-devtools/rpm/rpm_5.4.0.bb b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
index 5ee6b47..d79d199 100644
--- a/meta/recipes-devtools/rpm/rpm_5.4.0.bb
+++ b/meta/recipes-devtools/rpm/rpm_5.4.0.bb
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
extrarpmdeps = "python perl file"
extrarpmdeps_virtclass-native = "python-native file-native"
-PR = "r36"
+PR = "r37"
# rpm2cpio is a shell script, which is part of the rpm src.rpm. It is needed
# in order to extract the distribution SRPM into a format we can extract...
@@ -70,6 +70,7 @@ SRC_URI = "http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.0-0.20101229.src.rpm;ex
file://pythondeps.sh \
file://rpmdeps-oecore.patch \
file://rpm-resolvedep.patch \
+ file://rpm-respect-arch.patch \
"
# file://rpm-autoconf.patch \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 02/16] ncurses: Avoid occasional builling failure when having parallel processable task
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
2012-06-12 20:36 ` [PATCH 01/16] rpm 5.4.0: respect to the arch when choose the alternatives Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 03/16] bitbake.conf: Improve wget timeouts Scott Garman
` (15 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Xiaofeng Yan <xiaofeng.yan@windriver.com>
ncurses failure non-gplv3 build (race issue) like the following \
error information:
| tic: error while loading shared libraries: /srv/home/pokybuild \
/yocto-autobuilder/yocto-slave/nightly-non-gpl3/build/build/tmp/\
work/x86_64-linux/ncurses-native-5.9-r8.1/ncurses-5.9/narrowc/lib\
/libtinfo.so.5: file too short
| ? tic could not build /srv/home/pokybuild/yocto-autobuilder/\
yocto-slave/nightly-non-gpl3/build/build/tmp/work/x86_64-linux/\
ncurses-native-5.9-r8.1/image/srv/home/pokybuild/yocto-autobuilder\
/yocto-slave/nightly-non-gpl3/build/build/tmp/sysroots/x86_64-linux\
/usr/share/terminfo
| make[1]: *** [install.data] Error 1
This is a race issue which is caused by
install.libs and install.data:
1) install.data needs run tic
2) tic needs libtinfo.so
3) install.libs would regenerate libtinfo.so
4) but install.data doesn't depend on install.libs, and they can run
parallelly
So there would be errors in a very critical condition: tic is begining
to run at the same time when install.libs is generating libtinfo.so, and
this libtinfo.so is not integrity, then there would be the above error.
Let task install.libs run before install.data for fixing this bug.
[YOCTO #2298]
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
---
meta/recipes-core/ncurses/ncurses.inc | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc
index ae99e2c..b031119 100644
--- a/meta/recipes-core/ncurses/ncurses.inc
+++ b/meta/recipes-core/ncurses/ncurses.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://ncurses/base/version.c;beginline=1;endline=27;md5=cbc
SECTION = "libs"
DEPENDS = "ncurses-native"
DEPENDS_virtclass-native = ""
-INC_PR = "r8"
+INC_PR = "r9"
inherit autotools binconfig multilib_header
@@ -107,10 +107,15 @@ do_test() {
diff curses-narrowc.h curses-widec.h
}
+# Split original _install_opts to two parts.
+# One is the options to install contents, the other is the parameters \
+# when running command "make install"
_install_opts = "\
+ install.libs install.includes install.man \
+"
+_install_cfgs = "\
DESTDIR='${D}' \
PKG_CONFIG_LIBDIR='${libdir}/pkgconfig' \
- install.libs install.includes install.man \
"
python do_install () {
@@ -122,11 +127,19 @@ shell_do_install() {
# Order of installation is important; widec installs a 'curses.h'
# header with more definitions and must be installed last hence.
# Compatibility of these headers will be checked in 'do_test()'.
- oe_runmake -C narrowc ${_install_opts} \
- install.data install.progs
+ oe_runmake -C narrowc ${_install_cfgs} ${_install_opts} \
+ install.progs
+
+ # The install.data should run after install.libs, otherwise
+ # there would be a race issue in a very critical conditon, since
+ # tic will be run by install.data, and tic needs libtinfo.so
+ # which would be regenerated by install.libs.
+ oe_runmake -C narrowc ${_install_cfgs} \
+ install.data
+
! ${ENABLE_WIDEC} || \
- oe_runmake -C widec ${_install_opts}
+ oe_runmake -C widec ${_install_cfgs} ${_install_opts}
cd narrowc
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 03/16] bitbake.conf: Improve wget timeouts
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
2012-06-12 20:36 ` [PATCH 01/16] rpm 5.4.0: respect to the arch when choose the alternatives Scott Garman
2012-06-12 20:36 ` [PATCH 02/16] ncurses: Avoid occasional builling failure when having parallel processable task Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 04/16] sudo: fixed wrong `chmod` path Scott Garman
` (14 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
The wget default is a 900 second timeout and 20 retries. This is way too long
for most of our usecases so this patch changes it to a 30 second timeout and
reduces retries from 5 to 2. We have good mirror infrastructure, this will
let us fall back to it easier.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/conf/bitbake.conf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 56e3e4d..618780c 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -559,17 +559,17 @@ XORG_MIRROR = "http://xorg.freedesktop.org/releases"
FETCHCMD_svn = "/usr/bin/env svn"
FETCHCMD_cvs = "/usr/bin/env cvs"
-FETCHCMD_wget = "/usr/bin/env wget -t 5 -nv --no-check-certificate"
+FETCHCMD_wget = "/usr/bin/env wget -t 2 -T 30 -nv --no-check-certificate"
FETCHCMD_bzr = "/usr/bin/env bzr"
FETCHCMD_hg = "/usr/bin/env hg"
FETCHCOMMAND = "ERROR, this must be a BitBake bug"
-FETCHCOMMAND_wget = "/usr/bin/env wget -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
+FETCHCOMMAND_wget = "/usr/bin/env wget -t 2 -T 30 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
FETCHCOMMAND_cvs = "/usr/bin/env cvs '-d${CVSROOT}' co ${CVSCOOPTS} ${CVSMODULE}"
FETCHCOMMAND_svn = "/usr/bin/env svn co ${SVNCOOPTS} ${SVNROOT} ${SVNMODULE}"
-CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 5 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
+CHECKCOMMAND_wget = "/usr/bin/env wget --spider -t 2 -T 30 --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
RESUMECOMMAND = "ERROR, this must be a BitBake bug"
-RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 5 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
+RESUMECOMMAND_wget = "/usr/bin/env wget -c -t 2 -T 30 -nv --passive-ftp --no-check-certificate -P ${DL_DIR} '${URI}'"
UPDATECOMMAND = "ERROR, this must be a BitBake bug"
UPDATECOMMAND_cvs = "/usr/bin/env cvs -d${CVSROOT} update -d -P ${CVSCOOPTS}"
UPDATECOMMAND_svn = "/usr/bin/env svn update ${SVNCOOPTS}"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 04/16] sudo: fixed wrong `chmod` path
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (2 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 03/16] bitbake.conf: Improve wget timeouts Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 05/16] image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation Scott Garman
` (13 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Mihai Lindner <mihaix.lindner@linux.intel.com>
Placed $D between braces ${D} to be correctly expanded to the
workdir path, instead of a path relative to host rootfs.
Currently, bitbake sudo fails on host systems where sudo is not
installed.
Signed-off-by: Mihai Lindner <mihaix.lindner@linux.intel.com>
---
meta/recipes-extended/sudo/sudo_1.8.4p4.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/sudo/sudo_1.8.4p4.bb b/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
index 2315322..20c4a14 100644
--- a/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
+++ b/meta/recipes-extended/sudo/sudo_1.8.4p4.bb
@@ -1,6 +1,6 @@
require sudo.inc
-PR = "r0"
+PR = "r1"
SRC_URI = "http://ftp.sudo.ws/sudo/dist/sudo-${PV}.tar.gz \
file://libtool.patch \
@@ -24,6 +24,6 @@ do_install_append () {
fi
done
- chmod 4111 $D/usr/bin/sudo
- chmod 0440 $D/etc/sudoers
+ chmod 4111 ${D}/usr/bin/sudo
+ chmod 0440 ${D}/etc/sudoers
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 05/16] image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (3 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 04/16] sudo: fixed wrong `chmod` path Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 06/16] sanity.bbclass: copy the data store and finalise before running checks Scott Garman
` (12 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Some image classes such as bootimg save files into ${S} as part of rootfs
generation. For correctness we should therefore clean this at the start of
image generation to ensure reproducibility.
I found this issue when some files I thought should disappear from my rootfs
would not disappear.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/image.bbclass | 1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 907c59b..9557433 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -131,6 +131,7 @@ PSEUDO_PASSWD = "${IMAGE_ROOTFS}"
do_rootfs[nostamp] = "1"
do_rootfs[dirs] = "${TOPDIR}"
do_rootfs[lockfiles] += "${IMAGE_ROOTFS}.lock"
+do_rootfs[cleandirs] += "${S}"
do_build[nostamp] = "1"
# Must call real_do_rootfs() from inside here, rather than as a separate
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 06/16] sanity.bbclass: copy the data store and finalise before running checks
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (4 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 05/16] image.bbclass: Ensure ${S} is cleaned at the start of rootfs generation Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 07/16] classes/sanity: send sanity check failure as a separate event for Hob Scott Garman
` (11 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Joshua Lock <josh@linux.intel.com>
At the ConfigParsed event the datastore has yet to be finalised and thus
appends and overrides have not been set.
To ensure the sanity check is being run against the configuration values
the user has set call finalize() on a copy of the datastore and pass that
for all sanity checks.
Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
meta/classes/sanity.bbclass | 127 +++++++++++++++++++++++--------------------
1 file changed, 68 insertions(+), 59 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 687ddeb..0c2fa04 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -112,8 +112,8 @@ def check_connectivity(d):
return retval
-def check_supported_distro(e):
- tested_distros = e.data.getVar('SANITY_TESTED_DISTROS', True)
+def check_supported_distro(sanity_data):
+ tested_distros = sanity_data.getVar('SANITY_TESTED_DISTROS', True)
if not tested_distros:
return
@@ -160,26 +160,26 @@ def check_supported_distro(e):
bb.warn('Host distribution could not be determined; you may possibly experience unexpected failures. It is recommended that you use a tested distribution.')
# Checks we should only make if MACHINE is set correctly
-def check_sanity_validmachine(e):
+def check_sanity_validmachine(sanity_data):
from bb import data
messages = ""
# Check TUNE_ARCH is set
- if data.getVar('TUNE_ARCH', e.data, True) == 'INVALID':
+ if data.getVar('TUNE_ARCH', sanity_data, True) == 'INVALID':
messages = messages + 'TUNE_ARCH is unset. Please ensure your MACHINE configuration includes a valid tune configuration file which will set this correctly.\n'
# Check TARGET_ARCH is set correctly
- if data.getVar('TARGE_ARCH', e.data, False) == '${TUNE_ARCH}':
+ if data.getVar('TARGE_ARCH', sanity_data, False) == '${TUNE_ARCH}':
messages = messages + 'TARGET_ARCH is being overwritten, likely by your MACHINE configuration files.\nPlease use a valid tune configuration file which should set this correctly automatically\nand avoid setting this in the machine configuration. See the OE-Core mailing list for more information.\n'
# Check TARGET_OS is set
- if data.getVar('TARGET_OS', e.data, True) == 'INVALID':
+ if data.getVar('TARGET_OS', sanity_data, True) == 'INVALID':
messages = messages + 'Please set TARGET_OS directly, or choose a MACHINE or DISTRO that does so.\n'
# Check that we don't have duplicate entries in PACKAGE_ARCHS & that TUNE_PKGARCH is in PACKAGE_ARCHS
- pkgarchs = data.getVar('PACKAGE_ARCHS', e.data, True)
- tunepkg = data.getVar('TUNE_PKGARCH', e.data, True)
+ pkgarchs = data.getVar('PACKAGE_ARCHS', sanity_data, True)
+ tunepkg = data.getVar('TUNE_PKGARCH', sanity_data, True)
tunefound = False
seen = {}
dups = []
@@ -201,7 +201,7 @@ def check_sanity_validmachine(e):
return messages
-def check_sanity(e):
+def check_sanity(sanity_data):
from bb import note, error, data, __version__
try:
@@ -211,7 +211,7 @@ def check_sanity(e):
import commands
# Check the bitbake version meets minimum requirements
- minversion = data.getVar('BB_MIN_VERSION', e.data , True)
+ minversion = data.getVar('BB_MIN_VERSION', sanity_data , True)
if not minversion:
# Hack: BB_MIN_VERSION hasn't been parsed yet so return
# and wait for the next call
@@ -233,42 +233,42 @@ def check_sanity(e):
messages = messages + 'Bitbake version %s is required and version %s was found\n' % (minversion, __version__)
# Check that the MACHINE is valid, if it is set
- if data.getVar('MACHINE', e.data, True):
- if not check_conf_exists("conf/machine/${MACHINE}.conf", e.data):
+ if data.getVar('MACHINE', sanity_data, True):
+ if not check_conf_exists("conf/machine/${MACHINE}.conf", sanity_data):
messages = messages + 'Please set a valid MACHINE in your local.conf or environment\n'
else:
- messages = messages + check_sanity_validmachine(e)
+ messages = messages + check_sanity_validmachine(sanity_data)
else:
messages = messages + 'Please set a MACHINE in your local.conf or environment\n'
# Check we are using a valid lacal.conf
- current_conf = data.getVar('CONF_VERSION', e.data, True)
- conf_version = data.getVar('LOCALCONF_VERSION', e.data, True)
+ current_conf = data.getVar('CONF_VERSION', sanity_data, True)
+ conf_version = data.getVar('LOCALCONF_VERSION', sanity_data, True)
if current_conf != conf_version:
messages = messages + "Your version of local.conf was generated from an older version of local.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/local.conf conf/local.conf.sample\" is a good way to visualise the changes.\n"
# Check bblayers.conf is valid
- current_lconf = data.getVar('LCONF_VERSION', e.data, True)
- lconf_version = data.getVar('LAYER_CONF_VERSION', e.data, True)
+ current_lconf = data.getVar('LCONF_VERSION', sanity_data, True)
+ lconf_version = data.getVar('LAYER_CONF_VERSION', sanity_data, True)
if current_lconf != lconf_version:
messages = messages + "Your version of bblayers.conf was generated from an older version of bblayers.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/bblayers.conf conf/bblayers.conf.sample\" is a good way to visualise the changes.\n"
# If we have a site.conf, check it's valid
- if check_conf_exists("conf/site.conf", e.data):
- current_sconf = data.getVar('SCONF_VERSION', e.data, True)
- sconf_version = data.getVar('SITE_CONF_VERSION', e.data, True)
+ if check_conf_exists("conf/site.conf", sanity_data):
+ current_sconf = data.getVar('SCONF_VERSION', sanity_data, True)
+ sconf_version = data.getVar('SITE_CONF_VERSION', sanity_data, True)
if current_sconf != sconf_version:
messages = messages + "Your version of site.conf was generated from an older version of site.conf.sample and there have been updates made to this file. Please compare the two files and merge any changes before continuing.\nMatching the version numbers will remove this message.\n\"meld conf/site.conf conf/site.conf.sample\" is a good way to visualise the changes.\n"
- assume_provided = data.getVar('ASSUME_PROVIDED', e.data , True).split()
+ assume_provided = data.getVar('ASSUME_PROVIDED', sanity_data , True).split()
# Check user doesn't have ASSUME_PROVIDED = instead of += in local.conf
if "diffstat-native" not in assume_provided:
messages = messages + 'Please use ASSUME_PROVIDED +=, not ASSUME_PROVIDED = in your local.conf\n'
# Check that DL_DIR is set, exists and is writable. In theory, we should never even hit the check if DL_DIR isn't
# set, since so much relies on it being set.
- dldir = data.getVar('DL_DIR', e.data, True)
+ dldir = data.getVar('DL_DIR', sanity_data, True)
if not dldir:
messages = messages + "DL_DIR is not set. Your environment is misconfigured, check that DL_DIR is set, and if the directory exists, that it is writable. \n"
if os.path.exists(dldir) and not os.access(dldir, os.W_OK):
@@ -276,32 +276,32 @@ def check_sanity(e):
# Check that the DISTRO is valid, if set
# need to take into account DISTRO renaming DISTRO
- distro = data.getVar('DISTRO', e.data, True)
+ distro = data.getVar('DISTRO', sanity_data, True)
if distro:
- if not ( check_conf_exists("conf/distro/${DISTRO}.conf", e.data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", e.data) ):
- messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", e.data, True )
+ if not ( check_conf_exists("conf/distro/${DISTRO}.conf", sanity_data) or check_conf_exists("conf/distro/include/${DISTRO}.inc", sanity_data) ):
+ messages = messages + "DISTRO '%s' not found. Please set a valid DISTRO in your local.conf\n" % data.getVar("DISTRO", sanity_data, True )
missing = ""
- if not check_app_exists("${MAKE}", e.data):
+ if not check_app_exists("${MAKE}", sanity_data):
missing = missing + "GNU make,"
- if not check_app_exists('${BUILD_PREFIX}gcc', e.data):
- missing = missing + "C Compiler (%sgcc)," % data.getVar("BUILD_PREFIX", e.data, True)
+ if not check_app_exists('${BUILD_PREFIX}gcc', sanity_data):
+ missing = missing + "C Compiler (%sgcc)," % data.getVar("BUILD_PREFIX", sanity_data, True)
- if not check_app_exists('${BUILD_PREFIX}g++', e.data):
- missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", e.data, True)
+ if not check_app_exists('${BUILD_PREFIX}g++', sanity_data):
+ missing = missing + "C++ Compiler (%sg++)," % data.getVar("BUILD_PREFIX", sanity_data, True)
- required_utilities = e.data.getVar('SANITY_REQUIRED_UTILITIES', True)
+ required_utilities = sanity_data.getVar('SANITY_REQUIRED_UTILITIES', True)
if "qemu-native" in assume_provided:
- if not check_app_exists("qemu-arm", e.data):
+ if not check_app_exists("qemu-arm", sanity_data):
messages = messages + "qemu-native was in ASSUME_PROVIDED but the QEMU binaries (qemu-arm) can't be found in PATH"
- if "." in data.getVar('PATH', e.data, True).split(":"):
+ if "." in data.getVar('PATH', sanity_data, True).split(":"):
messages = messages + "PATH contains '.' which will break the build, please remove this"
- if data.getVar('TARGET_ARCH', e.data, True) == "arm":
+ if data.getVar('TARGET_ARCH', sanity_data, True) == "arm":
# This path is no longer user-readable in modern (very recent) Linux
try:
if os.path.exists("/proc/sys/vm/mmap_min_addr"):
@@ -315,7 +315,7 @@ def check_sanity(e):
pass
for util in required_utilities.split():
- if not check_app_exists( util, e.data ):
+ if not check_app_exists( util, sanity_data ):
missing = missing + "%s," % util
if missing != "":
@@ -326,10 +326,10 @@ def check_sanity(e):
if pseudo_msg != "":
messages = messages + pseudo_msg + '\n'
- check_supported_distro(e)
+ check_supported_distro(sanity_data)
# Check if DISPLAY is set if IMAGETEST is set
- if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
+ if not data.getVar( 'DISPLAY', sanity_data, True ) and data.getVar( 'IMAGETEST', sanity_data, True ) == 'qemu':
messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
omask = os.umask(022)
@@ -337,11 +337,11 @@ def check_sanity(e):
messages = messages + "Please use a umask which allows a+rx and u+rwx\n"
os.umask(omask)
- oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True )
+ oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', sanity_data, True )
if not oes_bb_conf:
messages = messages + 'You do not include OpenEmbeddeds version of conf/bitbake.conf. This means your environment is misconfigured, in particular check BBPATH.\n'
- nolibs = data.getVar('NO32LIBS', e.data, True)
+ nolibs = data.getVar('NO32LIBS', sanity_data, True)
if not nolibs:
lib32path = '/lib'
if os.path.exists('/lib64') and ( os.path.islink('/lib64') or os.path.islink('/lib') ):
@@ -350,8 +350,8 @@ def check_sanity(e):
if os.path.exists('%s/libc.so.6' % lib32path) and not os.path.exists('/usr/include/gnu/stubs-32.h'):
messages = messages + "You have a 32-bit libc, but no 32-bit headers. You must install the 32-bit libc headers.\n"
- tmpdir = data.getVar('TMPDIR', e.data, True)
- sstate_dir = data.getVar('SSTATE_DIR', e.data, True)
+ tmpdir = data.getVar('TMPDIR', sanity_data, True)
+ sstate_dir = data.getVar('SSTATE_DIR', sanity_data, True)
# Check saved sanity info
last_sanity_version = 0
@@ -368,16 +368,16 @@ def check_sanity(e):
if line.startswith('SSTATE_DIR'):
last_sstate_dir = line.split()[1]
- sanity_version = int(data.getVar('SANITY_VERSION', e.data, True) or 1)
+ sanity_version = int(data.getVar('SANITY_VERSION', sanity_data, True) or 1)
if last_sanity_version < sanity_version:
- messages = messages + check_sanity_version_change(e.data)
- messages = messages + check_sanity_tmpdir_change(tmpdir, e.data)
- messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data)
+ messages = messages + check_sanity_version_change(sanity_data)
+ messages = messages + check_sanity_tmpdir_change(tmpdir, sanity_data)
+ messages = messages + check_sanity_sstate_dir_change(sstate_dir, sanity_data)
else:
if last_tmpdir != tmpdir:
- messages = messages + check_sanity_tmpdir_change(tmpdir, e.data)
+ messages = messages + check_sanity_tmpdir_change(tmpdir, sanity_data)
if last_sstate_dir != sstate_dir:
- messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data)
+ messages = messages + check_sanity_sstate_dir_change(sstate_dir, sanity_data)
if os.path.exists("conf") and not messages:
f = file(sanityverfile, 'w')
@@ -402,8 +402,8 @@ def check_sanity(e):
#
# Check the 'ABI' of TMPDIR
#
- current_abi = data.getVar('OELAYOUT_ABI', e.data, True)
- abifile = data.getVar('SANITY_ABIFILE', e.data, True)
+ current_abi = data.getVar('OELAYOUT_ABI', sanity_data, True)
+ abifile = data.getVar('SANITY_ABIFILE', sanity_data, True)
if os.path.exists(abifile):
f = file(abifile, "r")
abi = f.read().strip()
@@ -412,16 +412,16 @@ def check_sanity(e):
f.write(current_abi)
elif abi == "2" and current_abi == "3":
bb.note("Converting staging from layout version 2 to layout version 3")
- os.system(e.data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots"))
- os.system(e.data.expand("ln -s sysroots ${TMPDIR}/staging"))
- os.system(e.data.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done"))
+ os.system(sanity_data.expand("mv ${TMPDIR}/staging ${TMPDIR}/sysroots"))
+ os.system(sanity_data.expand("ln -s sysroots ${TMPDIR}/staging"))
+ os.system(sanity_data.expand("cd ${TMPDIR}/stamps; for i in */*do_populate_staging; do new=`echo $i | sed -e 's/do_populate_staging/do_populate_sysroot/'`; mv $i $new; done"))
f = file(abifile, "w")
f.write(current_abi)
elif abi == "3" and current_abi == "4":
bb.note("Converting staging layout from version 3 to layout version 4")
- if os.path.exists(e.data.expand("${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}")):
- os.system(e.data.expand("mv ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS} ${STAGING_BINDIR_CROSS}"))
- os.system(e.data.expand("ln -s ${STAGING_BINDIR_CROSS} ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"))
+ if os.path.exists(sanity_data.expand("${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}")):
+ os.system(sanity_data.expand("mv ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS} ${STAGING_BINDIR_CROSS}"))
+ os.system(sanity_data.expand("ln -s ${STAGING_BINDIR_CROSS} ${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"))
f = file(abifile, "w")
f.write(current_abi)
@@ -429,7 +429,7 @@ def check_sanity(e):
messages = messages + "Staging layout has changed. The cross directory has been deprecated and cross packages are now built under the native sysroot.\nThis requires a rebuild.\n"
elif abi == "5" and current_abi == "6":
bb.note("Converting staging layout from version 5 to layout version 6")
- os.system(e.data.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}"))
+ os.system(sanity_data.expand("mv ${TMPDIR}/pstagelogs ${SSTATE_MANIFESTS}"))
f = file(abifile, "w")
f.write(current_abi)
elif abi == "7" and current_abi == "8":
@@ -442,7 +442,7 @@ def check_sanity(e):
f.write(current_abi)
f.close()
- oeroot = data.getVar('COREBASE', e.data)
+ oeroot = data.getVar('COREBASE', sanity_data)
if oeroot.find ('+') != -1:
messages = messages + "Error, you have an invalid character (+) in your COREBASE directory path. Please move the installation to a directory which doesn't include a +."
elif oeroot.find (' ') != -1:
@@ -451,12 +451,21 @@ def check_sanity(e):
if messages != "":
raise_sanity_error(messages)
+# Create a copy of the datastore and finalise it to ensure appends and
+# overrides are set - the datastore has yet to be finalised at ConfigParsed
+def copy_data(e):
+ sanity_data = bb.data.createCopy(e.data)
+ sanity_data.finalize()
+ return sanity_data
+
addhandler check_sanity_eventhandler
python check_sanity_eventhandler() {
if bb.event.getName(e) == "ConfigParsed" and e.data.getVar("BB_WORKERCONTEXT", True) != "1" and e.data.getVar("DISABLE_SANITY_CHECKS", True) != "1":
- check_sanity(e)
+ sanity_data = copy_data(e)
+ check_sanity(sanity_data)
elif bb.event.getName(e) == "SanityCheck":
- check_sanity(e)
+ sanity_data = copy_data(e)
+ check_sanity(sanity_data)
bb.event.fire(bb.event.SanityCheckPassed(), e.data)
return
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 07/16] classes/sanity: send sanity check failure as a separate event for Hob
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (5 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 06/16] sanity.bbclass: copy the data store and finalise before running checks Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 08/16] webkit-gtk: Use glib as unicode backend to avoid browser crash Scott Garman
` (10 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Paul Eggleton <paul.eggleton@linux.intel.com>
In order to show a friendlier error message within Hob that does not
bury the actual sanity error in our typical preamble about disabling
sanity checks, use a separate event to indicate that sanity checks
failed.
This change is intended to work together with the related change to
BitBake, however it has a check to ensure that it does not fail with
older versions that do not include that change.
Fixes [YOCTO #2336].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/classes/sanity.bbclass | 16 +++++++++++++---
1 file changed, 13 insertions(+), 3 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 0c2fa04..9755694 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -4,7 +4,16 @@
SANITY_REQUIRED_UTILITIES ?= "patch diffstat texi2html makeinfo svn bzip2 tar gzip gawk chrpath wget cpio"
-def raise_sanity_error(msg):
+def raise_sanity_error(msg, d):
+ if d.getVar("SANITY_USE_EVENTS", True) == "1":
+ # FIXME: handle when BitBake version is too old to support bb.event.SanityCheckFailed
+ # We can just fire the event directly once the minimum version is bumped beyond 1.15.1
+ try:
+ bb.event.fire(bb.event.SanityCheckFailed(msg), d)
+ return
+ except AttributeError:
+ pass
+
bb.fatal(""" OE-core's config sanity checker detected a potential misconfiguration.
Either fix the cause of this error or at your own risk disable the checker (see sanity.conf).
Following is the list of potential problems / advisories:
@@ -219,7 +228,7 @@ def check_sanity(sanity_data):
return
if 0 == os.getuid():
- raise_sanity_error("Do not use Bitbake as root.")
+ raise_sanity_error("Do not use Bitbake as root.", sanity_data)
messages = ""
@@ -449,7 +458,7 @@ def check_sanity(sanity_data):
messages = messages + "Error, you have a space in your COREBASE directory path. Please move the installation to a directory which doesn't include a space."
if messages != "":
- raise_sanity_error(messages)
+ raise_sanity_error(messages, sanity_data)
# Create a copy of the datastore and finalise it to ensure appends and
# overrides are set - the datastore has yet to be finalised at ConfigParsed
@@ -465,6 +474,7 @@ python check_sanity_eventhandler() {
check_sanity(sanity_data)
elif bb.event.getName(e) == "SanityCheck":
sanity_data = copy_data(e)
+ sanity_data.setVar("SANITY_USE_EVENTS", "1")
check_sanity(sanity_data)
bb.event.fire(bb.event.SanityCheckPassed(), e.data)
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 08/16] webkit-gtk: Use glib as unicode backend to avoid browser crash
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (6 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 07/16] classes/sanity: send sanity check failure as a separate event for Hob Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 09/16] gnupg: add libusb to DEPENDS Scott Garman
` (9 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Zhai Edwin <edwin.zhai@intel.com>
webkit-gtk depends on ICU for the unicode, but ICU is not safe when build and
target system owns different endian. ICU's community is not responsive to make
a patch for this, so glib is used as work around here.
[YOCTO #1570] got fixed
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-sato/webkit/webkit-gtk_svn.bb | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-sato/webkit/webkit-gtk_svn.bb b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
index 7db573d..9381486 100644
--- a/meta/recipes-sato/webkit/webkit-gtk_svn.bb
+++ b/meta/recipes-sato/webkit/webkit-gtk_svn.bb
@@ -10,12 +10,13 @@ LIC_FILES_CHKSUM = "file://Source/WebCore/rendering/RenderApplet.h;endline=22;md
DEPENDS = "zlib enchant gnome-keyring libsoup-2.4 curl icu libxml2 cairo libxslt libxt libidn gnutls gtk+ gstreamer gst-plugins-base flex-native gperf-native perl-native-runtime sqlite3"
DEPENDS += " ${@base_contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)}"
DEPENDS_darwin8 = "curl icu libxml2 cairo libxslt libidn gnutls gtk+ gstreamer flex-native gperf-native perl-native-runtime sqlite3"
+DEPENDS_append_qemuppc += "pango"
SRCREV_FORMAT = "source"
SRCREV = "101488"
PV = "1.7.2+svnr${SRCPV}"
-PR = "r4"
+PR = "r5"
SRC_URI = "\
svn://svn.webkit.org/repository/webkit/trunk/;module=Source;proto=http;name=source \
@@ -47,6 +48,13 @@ EXTRA_OECONF = "\
UNICODE_CFLAGS=-D_REENTRANT \
"
+#default unicode backend icu breaks in cross-compile when target and host owns different endian type
+EXTRA_OECONF_append_qemuppc += "--with-unicode-backend=glib"
+
+CPPFLAGS_append_qemuppc += "-I${STAGING_INCDIR}/pango-1.0 \
+ -I${STAGING_LIBDIR}/glib-2.0/include \
+ -I${STAGING_INCDIR}/glib-2.0"
+
EXTRA_AUTORECONF = " -I Source/autotools "
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 09/16] gnupg: add libusb to DEPENDS
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (7 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 08/16] webkit-gtk: Use glib as unicode backend to avoid browser crash Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 10/16] gnupg: disable CCID driver Scott Garman
` (8 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
gnupg apparently depends on libusb:
| error: Failed dependencies:
| libusb-0.1-4 >= 0.1.3 is needed by gnupg-2.0.18-r1.core2
So add libusb to gnupg DEPENDS.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Resolved merge conflicts when importing from oe-core master.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/recipes-support/gnupg/gnupg_2.0.18.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/gnupg/gnupg_2.0.18.bb b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
index 3085494..7dfd908 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.18.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv3 & LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
-PR = "r1"
+DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt libusb"
+PR = "r2"
inherit autotools gettext
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 10/16] gnupg: disable CCID driver
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (8 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 09/16] gnupg: add libusb to DEPENDS Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 11/16] runqemu-ifup: enable arp proxying Scott Garman
` (7 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Tom Zanussi <tom.zanussi@intel.com>
The CCID driver driver is apparently unnecessary, so disable it.
Also remove the associated libusb dependency, since that won't be
needed either.
According to Scott Garman <scott.a.garman@intel.com>:
I'd just note that the CCID smartcard reader is a specific piece of
hardware that is unlikely to be used in a majority of our use cases.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Resolved merge conflicts when importing from oe-core master.
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
meta/recipes-support/gnupg/gnupg_2.0.18.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/gnupg/gnupg_2.0.18.bb b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
index 7dfd908..54be88d 100644
--- a/meta/recipes-support/gnupg/gnupg_2.0.18.bb
+++ b/meta/recipes-support/gnupg/gnupg_2.0.18.bb
@@ -4,8 +4,8 @@ LICENSE = "GPLv3 & LGPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949 \
file://COPYING.LIB;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt libusb"
-PR = "r2"
+DEPENDS = "pth libassuan libksba zlib bzip2 readline libgcrypt"
+PR = "r3"
inherit autotools gettext
@@ -15,6 +15,7 @@ SRC_URI[md5sum] = "2f37e0722666a0fedbe4d9f9227ac4d7"
SRC_URI[sha256sum] = "48aedd762ca443fb952a9e859efe3c66706d7c2c9c77c32dbdbac4fe962dae5b"
EXTRA_OECONF = "--disable-ldap \
+ --disable-ccid-driver \
--with-zlib=${STAGING_LIBDIR}/.. \
--with-bzip2=${STAGING_LIBDIR}/.. \
--with-readline=${STAGING_LIBDIR}/.. \
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 11/16] runqemu-ifup: enable arp proxying
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (9 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 10/16] gnupg: disable CCID driver Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 12/16] beecrypt: disable java Scott Garman
` (6 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
This allows core-image-sato to access the WAN.
Thanks to Dexuan Cui for proposing this fix.
Fixes [YOCTO #2329]
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
scripts/runqemu-ifup | 1 +
1 file changed, 1 insertion(+)
diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup
index f80538f..1f1b4c8 100755
--- a/scripts/runqemu-ifup
+++ b/scripts/runqemu-ifup
@@ -103,6 +103,7 @@ $ROUTE add -host 192.168.7.$dest $TAP
$IPTABLES -A POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$n/32
$IPTABLES -A POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$dest/32
echo 1 > /proc/sys/net/ipv4/ip_forward
+echo 1 > /proc/sys/net/ipv4/conf/$TAP/proxy_arp
$IPTABLES -P FORWARD ACCEPT
echo $TAP
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 12/16] beecrypt: disable java
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (10 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 11/16] runqemu-ifup: enable arp proxying Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 13/16] groff: Fix build on Fedora 17 Scott Garman
` (5 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Jesse Zhang <sen.zhang@windriver.com>
If java is installed on host, beecrypt will attempt to use it.
Signed-off-by: Jesse Zhang <sen.zhang@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-support/beecrypt/beecrypt_4.2.1.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
index 2913b46..2b2b348 100644
--- a/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
+++ b/meta/recipes-support/beecrypt/beecrypt_4.2.1.bb
@@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9894370afd5dfe7d02b8d14319e729a1 \
DEPENDS = "icu"
-PR = "r1"
+PR = "r2"
inherit autotools multilib_header
acpaths=""
@@ -26,7 +26,7 @@ do_install_append() {
oe_multilib_header beecrypt/gnu.h
}
-EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp"
+EXTRA_OECONF="--without-python --enable-shared --enable-static --disable-openmp --with-java=no"
FILES_${PN} = "${sysconfdir} ${libdir}/*.so.* ${libdir}/${BPN}/*.so.*"
FILES_${PN}-dev += "${libdir}/${BPN}/*.so ${libdir}/${BPN}/*.la"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 13/16] groff: Fix build on Fedora 17
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (11 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 12/16] beecrypt: disable java Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 14/16] shared-mime-info: fix build race condition Scott Garman
` (4 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: "Song.Li" <Song.Li@windriver.com>
Generally distros keep perl at /usr/bin/perl
But Fedora 17 also has /bin/perl,
this causes groff_1.20.1 build to put perl
interpreter path as /bin/perl
But we set perl location for target as /usr/bin/perl
This mismatch of perl path causes failure of rootfs image creation
like this:
| error: Failed dependencies:
| bin/perl is needed by groff-1.20.1-r1.ppc603e
Signed-off-by: Song.Li <song.li@windriver.com>
Sync up with the do_install_append_virtclass-native chunk.
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-extended/groff/groff_1.20.1.bb | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/groff/groff_1.20.1.bb b/meta/recipes-extended/groff/groff_1.20.1.bb
index 6cb72bf..ef22548 100644
--- a/meta/recipes-extended/groff/groff_1.20.1.bb
+++ b/meta/recipes-extended/groff/groff_1.20.1.bb
@@ -4,7 +4,7 @@ formatting commands and produces formatted output."
SECTION = "base"
HOMEPAGE = "ftp://ftp.gnu.org/gnu/groff/"
LICENSE = "GPLv2"
-PR = "r1"
+PR = "r2"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
@@ -18,6 +18,10 @@ DEPENDS_virtclass-native = ""
inherit autotools
+PERLPATH = "${bindir}/perl"
+PERLPATH_virtclass-native = "/usr/bin/env perl"
+PERLPATH_virtclass-nativesdk = "/usr/bin/env perl"
+
EXTRA_OECONF = "--without-x"
PARALLEL_MAKE = ""
@@ -34,7 +38,25 @@ do_configure_prepend() {
fi
}
+do_install_append() {
+ # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
+ # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
+ for i in afmtodit mmroff; do
+ if [ -f ${D}${bindir}/$i ]; then
+ sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/$i
+ fi
+ done
+}
+
do_install_append_virtclass-native() {
+ # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location
+ # for target as /usr/bin/perl, so fix it to /usr/bin/perl.
+ for i in afmtodit mmroff; do
+ if [ -f ${D}${bindir}/$i ]; then
+ sed -i -e '1s,#!.*perl,#! ${PERLPATH},' ${D}${bindir}/$i
+ fi
+ done
+
create_cmdline_wrapper ${D}/${bindir}/groff \
-F${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/font \
-M${STAGING_DIR_NATIVE}${datadir_native}/groff/${PV}/tmac
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 14/16] shared-mime-info: fix build race condition
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (12 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 13/16] groff: Fix build on Fedora 17 Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 15/16] gitignore: add wildcard to match toplevel patch files Scott Garman
` (3 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Joe Slater <jslater@windriver.com>
The definition of install-data-hook in Makefile.am leads
to multiple, overlapping, executions of the install-binPROGRAMS
target. We modify the definition to avoid that.
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../shared-mime-info/install-data-hook.patch | 21 ++++++++++++++++++++
.../shared-mime-info/shared-mime-info_0.91.bb | 5 +++--
2 files changed, 24 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
new file mode 100644
index 0000000..4c075f2
--- /dev/null
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch
@@ -0,0 +1,21 @@
+fix shared-mime-info build race condition
+
+The definition of install-data-hook in Makefile.am leads
+to multiple, overlapping, executions of install-binPROGRAMS
+target. We modify the definition to avoid that.
+
+Signed-off-by: Joe Slater <jslater@windriver.com>
+
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -44,7 +44,9 @@ $(pkgconfig_DATA): config.status
+ @INTLTOOL_XML_RULE@
+ @INTLTOOL_DESKTOP_RULE@
+
+-install-data-hook: install-binPROGRAMS
++# do NOT make this dependent on anything!
++#
++install-data-hook:
+ if ENABLE_UPDATE_MIMEDB
+ $(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime"
+ endif
diff --git a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
index 7ae6e10..910cb7f 100644
--- a/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
+++ b/meta/recipes-support/shared-mime-info/shared-mime-info_0.91.bb
@@ -1,7 +1,8 @@
require shared-mime-info.inc
-PR = "r3"
+PR = "r4"
SRC_URI[md5sum] = "982a211560ba4c47dc791ccff34e8fbc"
SRC_URI[sha256sum] = "98cfebe1d809afb24934e634373821e2a1dfa86fc6462cab230589a1c80988bd"
-SRC_URI =+ "file://parallelmake.patch"
+SRC_URI =+ "file://parallelmake.patch \
+ file://install-data-hook.patch"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 15/16] gitignore: add wildcard to match toplevel patch files
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (13 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 14/16] shared-mime-info: fix build race condition Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-12 20:36 ` [PATCH 16/16] freetype: upgrade to 2.4.9 Scott Garman
` (2 subsequent siblings)
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To support the basic workflow of trivial patches:
git format-patch HEAD~.. ; git send-email --to foo@bar.com 0001-foo.patch
We don't want git status reporting on patches lying in the top
level dir in this case.
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.gitignore | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitignore b/.gitignore
index 04e36c5..f8db092 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
*.pyc
*.pyo
+/*.patch
build*/conf/local.conf
build*/conf/bblayers.conf
build*/downloads
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* [PATCH 16/16] freetype: upgrade to 2.4.9
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (14 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 15/16] gitignore: add wildcard to match toplevel patch files Scott Garman
@ 2012-06-12 20:36 ` Scott Garman
2012-06-13 15:59 ` RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
2012-06-14 10:20 ` Richard Purdie
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-12 20:36 UTC (permalink / raw)
To: openembedded-core
From: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
.../no-hardcode.patch | 0
.../{freetype_2.4.8.bb => freetype_2.4.9.bb} | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/freetype/{freetype-2.4.8 => freetype-2.4.9}/no-hardcode.patch (100%)
rename meta/recipes-graphics/freetype/{freetype_2.4.8.bb => freetype_2.4.9.bb} (91%)
diff --git a/meta/recipes-graphics/freetype/freetype-2.4.8/no-hardcode.patch b/meta/recipes-graphics/freetype/freetype-2.4.9/no-hardcode.patch
similarity index 100%
rename from meta/recipes-graphics/freetype/freetype-2.4.8/no-hardcode.patch
rename to meta/recipes-graphics/freetype/freetype-2.4.9/no-hardcode.patch
diff --git a/meta/recipes-graphics/freetype/freetype_2.4.8.bb b/meta/recipes-graphics/freetype/freetype_2.4.9.bb
similarity index 91%
rename from meta/recipes-graphics/freetype/freetype_2.4.8.bb
rename to meta/recipes-graphics/freetype/freetype_2.4.9.bb
index bce01cf..31bee80 100644
--- a/meta/recipes-graphics/freetype/freetype_2.4.8.bb
+++ b/meta/recipes-graphics/freetype/freetype_2.4.9.bb
@@ -18,8 +18,8 @@ PR = "r0"
SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \
file://no-hardcode.patch"
-SRC_URI[md5sum] = "dbf2caca1d3afd410a29217a9809d397"
-SRC_URI[sha256sum] = "a9eb7da3875fcb2f022a9c280c01b94ae45ac83d8102838c05dce1277948fb71"
+SRC_URI[md5sum] = "77a893dae81fd5b896632715ca041179"
+SRC_URI[sha256sum] = "c4204ac1d48e99d4375a2f32bf4f3f92780a9d9f015e64e57e852f6c004859b9"
S = "${WORKDIR}/freetype-${PV}"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 19+ messages in thread* Re: RFC: [PATCH 00/16] denzil pull request 2
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (15 preceding siblings ...)
2012-06-12 20:36 ` [PATCH 16/16] freetype: upgrade to 2.4.9 Scott Garman
@ 2012-06-13 15:59 ` Scott Garman
2012-06-14 10:20 ` Richard Purdie
17 siblings, 0 replies; 19+ messages in thread
From: Scott Garman @ 2012-06-13 15:59 UTC (permalink / raw)
To: openembedded-core
On 06/12/2012 01:36 PM, Scott Garman wrote:
> Hello,
>
> This is the second pull request for the oe-core denzil branch, based on
> a set of commits I've been testing from my sgarman/denzil-next branch.
>
> I'm submitting this as an RFC so the community can offer feedback as
> soon as possible. I'm planning on running this through the Yocto
> autobuilder tonight and will reply to this thread with test results.
> Assuming we get green builds, the goal is to get this pull request
> merged into oe-core's denzil branch fairly quickly, so please speak
> up if you have any comments or concerns with these commits.
Autobuilder test results are in:
nightly:
http://autobuilder.yoctoproject.org:8010/builders/nightly/builds/509
We appear to have a package_index failure:
http://autobuilder.yoctoproject.org:8010/builders/nightly/builds/509/steps/shell_45/logs/stdio
I'll file a bug for this after confirming some things with Beth.
nightly-non-gpl3:
http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/105
nightly-tiny:
http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/86
nightly-meta-intel:
http://autobuilder.yoctoproject.org:8010/builders/nightly-meta-intel/builds/101
I'll note these tests were done with the poky-based tree.
Scott
--
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 19+ messages in thread* Re: RFC: [PATCH 00/16] denzil pull request 2
2012-06-12 20:36 RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
` (16 preceding siblings ...)
2012-06-13 15:59 ` RFC: [PATCH 00/16] denzil pull request 2 Scott Garman
@ 2012-06-14 10:20 ` Richard Purdie
17 siblings, 0 replies; 19+ messages in thread
From: Richard Purdie @ 2012-06-14 10:20 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On Tue, 2012-06-12 at 13:36 -0700, Scott Garman wrote:
> Hello,
>
> This is the second pull request for the oe-core denzil branch, based on
> a set of commits I've been testing from my sgarman/denzil-next branch.
>
> I'm submitting this as an RFC so the community can offer feedback as
> soon as possible. I'm planning on running this through the Yocto
> autobuilder tonight and will reply to this thread with test results.
> Assuming we get green builds, the goal is to get this pull request
> merged into oe-core's denzil branch fairly quickly, so please speak
> up if you have any comments or concerns with these commits.
>
> Thanks,
>
> Scott
>
> The following changes since commit d7bf94647f17c0382caad8af0bdda837b14b22dc:
>
> fotowall: Add #include ui_wizard.h to ExportWizard.cpp (2012-05-16 16:20:31 -0700)
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib sgarman/denzil-next-testing
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgarman/denzil-next-pull2
>
> Jesse Zhang (1):
> beecrypt: disable java
>
> Joe Slater (1):
> shared-mime-info: fix build race condition
>
> Joshua Lock (1):
> sanity.bbclass: copy the data store and finalise before running
> checks
>
> Laurentiu Palcu (1):
> freetype: upgrade to 2.4.9
>
> Mihai Lindner (1):
> sudo: fixed wrong `chmod` path
>
> Paul Eggleton (1):
> classes/sanity: send sanity check failure as a separate event for Hob
>
> Paul Gortmaker (1):
> gitignore: add wildcard to match toplevel patch files
>
> Richard Purdie (2):
> bitbake.conf: Improve wget timeouts
> image.bbclass: Ensure ${S} is cleaned at the start of rootfs
> generation
>
> Robert Yang (1):
> rpm 5.4.0: respect to the arch when choose the alternatives
>
> Scott Garman (1):
> runqemu-ifup: enable arp proxying
>
> Song.Li (1):
> groff: Fix build on Fedora 17
>
> Tom Zanussi (2):
> gnupg: add libusb to DEPENDS
> gnupg: disable CCID driver
>
> Xiaofeng Yan (1):
> ncurses: Avoid occasional builling failure when having parallel
> processable task
>
> Zhai Edwin (1):
> webkit-gtk: Use glib as unicode backend to avoid browser crash
Merged into denzil, thanks.
Richard
^ permalink raw reply [flat|nested] 19+ messages in thread