Author: richard
Date: Wed May 6 10:43:47 2009
New Revision: 5627
URL: http://svn.slimdevices.com/jive?rev=5627&view=rev
Log:
r5...@harrypotter (orig r5622): richard | 2009-05-06 16:44:25 +0100
Bug: N/A
Description:
Fix (workaround) for parallel parabuild builds.
r5...@harrypotter (orig r5626): richard | 2009-05-06 18:43:28 +0100
r5...@harrypotter (orig r5624): mwise | 2009-05-06 17:53:08 +0100
Richard found the bug that was causing bitbake to break on multithreaded
systems. Returning this to the DOUBLECPUCOUNT value for performance.
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.4/branches/pango/squeezeos/poky/parabuild/build.sh
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed May 6 10:43:47 2009
@@ -3,8 +3,8 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.1/trunk:2920
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5607
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:5618
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:5624
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:5626
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=5627&r1=5626&r2=5627&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
Wed May 6 10:43:47 2009
@@ -17,7 +17,8 @@
DISTRO_FEATURES = "alsa usbgadget usbhost wifi nfs zeroconf"
-INHERIT += "pkg_metainfo"
+# This causes build problems, disable it for now
+#INHERIT += "pkg_metainfo"
# Add support for ubi images
IMAGE_CMD_ubi = "echo -e ${IMAGE_UBI_CONFIG} > ${TMPDIR}/ubi.cfg && ubinize -o
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubi -m ${IMAGE_UBI_MIN_IO_SIZE} -p
${IMAGE_UBI_PEB_SIZE} -s ${IMAGE_UBI_SUB_PAGE_SIZE} ${EXTRA_IMAGECMD}
${TMPDIR}/ubi.cfg"
Modified: 7.4/branches/pango/squeezeos/poky/parabuild/build.sh
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeos/poky/parabuild/build.sh?rev=5627&r1=5626&r2=5627&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeos/poky/parabuild/build.sh (original)
+++ 7.4/branches/pango/squeezeos/poky/parabuild/build.sh Wed May 6 10:43:47
2009
@@ -57,7 +57,7 @@
echo "INHERIT += \"rm_work\"" >> conf/local.conf
# Make build use all available CPUs
-echo "BB_NUMBER_THREADS = 2
+echo "BB_NUMBER_THREADS = $DOUBLECPUCOUNT
DL_DIR = $HOME/.poky_dl_dir
PARALLEL_MAKE = \"-j $CPUCOUNT\" " >> conf/local.conf
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
