From 69c119a2b998be63816a1d483bdb656fd33f11d2 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 7 Apr 2009 16:20:08 -0700 Subject: canadian-sdk: Add SDK_REALPATH_MINGW variable, so that we can prepend a drive letter for sysroot. --- classes/canadian-sdk.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass index d73b62f485..6b4fdf878a 100644 --- a/classes/canadian-sdk.bbclass +++ b/classes/canadian-sdk.bbclass @@ -24,9 +24,12 @@ LDFLAGS = "${SDK_LDFLAGS}" # and otherwise just DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils " -SDK_PATH_sdk-mingw32 = "/OpenEmbedded/${SDK_NAME}" + +# On mingw systems we want to have the real sysroot default to c:/... and +# assume that the default install will be on the C drive. This can be changed +# by setting SDK_REALPATH_MINGW. SDK_REALPATH = "${SDK_PATH}" -SDK_REALPATH_sdk-mingw32 = "C:/OpenEmbedded/${SDK_NAME}" +SDK_REALPATH_MINGW ?= "C:" # Path prefixes prefix = "${SDK_PATH}" -- cgit v1.2.3 From 846330c96c871b0b4116581fa195a6ad1932a439 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Wed, 8 Apr 2009 09:23:01 +0000 Subject: insane.bbclass: make "LDFLAGS ignored" QA errors fatal --- classes/insane.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 3e519c3253..9fc5f0718d 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -184,7 +184,7 @@ def package_qa_make_fatal_error(error_class, name, path,d): TODO: Load a whitelist of known errors """ - return not error_class in [0, 5, 7, 9] + return not error_class in [0, 5, 7] def package_qa_write_error(error_class, name, path, d): """ -- cgit v1.2.3 From b579bdce5da97216a6020c2c1fe18839d5dd5603 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 14 Apr 2009 10:25:38 +0200 Subject: gtk-icon-cache bbclass: build caches for all icondirs in ${datadir}/icons --- classes/gtk-icon-cache.bbclass | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index b256365175..ea1fdff3dd 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -11,11 +11,19 @@ fi # Update the pixbuf loaders in case they haven't been registered yet gdk-pixbuf-query-loaders > /etc/gtk-2.0/gdk-pixbuf.loaders -gtk-update-icon-cache -q /usr/share/icons/hicolor +for icondir in /usr/share/icons/* ; do + if [ -d $icondir ] ; then + gtk-update-icon-cache -qt $icondir + fi +done } gtk_icon_cache_postrm() { -gtk-update-icon-cache -q /usr/share/icons/hicolor +for icondir in /usr/share/icons/* ; do + if [ -d $icondir ] ; then + gtk-update-icon-cache -qt $icondir + fi +done } python populate_packages_append () { @@ -24,7 +32,7 @@ python populate_packages_append () { workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - icon_dir = '%s/install/%s/%s/icons/hicolor' % (workdir, pkg, bb.data.getVar('datadir', d, 1)) + icon_dir = '%s/install/%s/%s/icons' % (workdir, pkg, bb.data.getVar('datadir', d, 1)) if not os.path.exists(icon_dir): continue -- cgit v1.2.3 From 42e6449391d52d0d92617c809f32757e451a1b9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Thu, 16 Apr 2009 10:34:23 +0000 Subject: siteinfo.bbclass: add entry for arm-darwin9 --- classes/siteinfo.bbclass | 1 + 1 file changed, 1 insertion(+) (limited to 'classes') diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 55ab371af3..82a1616d05 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -26,6 +26,7 @@ def get_siteinfo_list(d): "armeb-linux-uclibc": "endian-big bit-32 common-linux common-uclibc arm-common",\ "armeb-linux-uclibcgnueabi": "endian-big bit-32 common-linux common-uclibc arm-common armeb-linux-uclibc",\ "arm-darwin": "endian-little bit-32 common-darwin",\ + "arm-darwin9": "endian-little bit-32 common-darwin",\ "arm-linux": "endian-little bit-32 common-linux common-glibc arm-common",\ "arm-linux-gnueabi": "endian-little bit-32 common-linux common-glibc arm-common arm-linux",\ "arm-linux-uclibc": "endian-little bit-32 common-linux common-uclibc arm-common",\ -- cgit v1.2.3 From 8fa95dc3f6c3a06cb0ada1fc0e8269c4b1309f90 Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 16 Apr 2009 13:02:51 +0200 Subject: java.bbclass: Use force (-f) for ln (suggested by Marcin). --- classes/java.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/java.bbclass b/classes/java.bbclass index 38256d7798..cacd2ce525 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -72,7 +72,7 @@ oe_jarinstall() { oewarn "file was in the way. removing:" $dir/$1 rm $dir/$1 fi - ln -s $destname $dir/$1 + ln -sf $destname $dir/$1 shift done } -- cgit v1.2.3 From e0b9b374794838e0710d3ebbaaa5ceda49801981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Fri, 17 Apr 2009 16:18:53 +0200 Subject: insane.bbclass: add an entry for darwin9/arm --- classes/insane.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes') diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 9fc5f0718d..584a5f1c1e 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -31,6 +31,9 @@ PACKAGEFUNCS += " do_package_qa " # TARGET_OS TARGET_ARCH MACHINE, OSABI, ABIVERSION, Little Endian, 32bit? def package_qa_get_machine_dict(): return { + "darwin9" : { + "arm" : (40, 0, 0, True, True), + }, "linux" : { "arm" : (40, 97, 0, True, True), "armeb": (40, 97, 0, False, True), -- cgit v1.2.3 From a4f79016c537fc93e5a487d51a22fb4d01e9afe8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Fri, 17 Apr 2009 19:57:32 +0200 Subject: lib_package.bbclass: fix package population on darwin * make use of SOLIBS and SOLIBSDEV to populate FILE_* instead of hardcoded .so.* and .so --- classes/lib_package.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass index 9a48408527..03ba9d094f 100644 --- a/classes/lib_package.bbclass +++ b/classes/lib_package.bbclass @@ -1,9 +1,9 @@ PACKAGES += "${PN}-bin" -FILES_${PN} = "${libexecdir} ${libdir}/lib*.so.* \ +FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - /lib/*.so* ${datadir}/${PN} ${libdir}/${PN}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ + ${base_libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \ ${datadir}/aclocal ${bindir}/*-config" FILES_${PN}-bin = "${bindir}/* ${sbindir}/* /bin/* /sbin/*" -- cgit v1.2.3 From 669c8f650372b9208a036174fc137f23d791d428 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 17 Apr 2009 12:58:58 -0700 Subject: canadian-sdk: We DO want DEPENDS_prepend to always bring in host virtual gcc/binutils Without this gdb-canadian-sdk would try and build without a host compiler as it wasn't fixing up this missing dep itself. The comment in the bbclass was wrong (checked -g on all recipes using this bbclass). --- classes/canadian-sdk.bbclass | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'classes') diff --git a/classes/canadian-sdk.bbclass b/classes/canadian-sdk.bbclass index 6b4fdf878a..a6c5552310 100644 --- a/classes/canadian-sdk.bbclass +++ b/classes/canadian-sdk.bbclass @@ -19,11 +19,7 @@ CFLAGS = "${SDK_CFLAGS}" CXXFLAGS = "${SDK_CFLAGS}" LDFLAGS = "${SDK_LDFLAGS}" -# TODO: add logic to add the following unless PN ~= gcc* -#DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc " -# and otherwise just -DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils " - +DEPENDS_prepend = "virtual/${HOST_PREFIX}binutils virtual/${HOST_PREFIX}gcc " # On mingw systems we want to have the real sysroot default to c:/... and # assume that the default install will be on the C drive. This can be changed -- cgit v1.2.3 From 735fc3d09982be07c4ba62af618edfa6c1d974ae Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sat, 18 Apr 2009 14:52:56 +0200 Subject: testlab bbclass: disable package graphs when ONLINE_PACKAGE_MANAGEMENT != full --- classes/testlab.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/testlab.bbclass b/classes/testlab.bbclass index bb47ee877f..fc923c5112 100644 --- a/classes/testlab.bbclass +++ b/classes/testlab.bbclass @@ -22,7 +22,7 @@ # Needs 'dot', 'opkg-cl' do_testlab() { -if [ -e ${IMAGE_ROOTFS}/etc/opkg ] ; then +if [ -e ${IMAGE_ROOTFS}/etc/opkg ] && [ "${ONLINE_PACKAGE_MANAGEMENT}" = "full" ] ; then TESTLAB_DIR="${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-testlab" mkdir -p ${TESTLAB_DIR}/ -- cgit v1.2.3 From f06fc1880b1cd1925116916b7949c2032a15a4d0 Mon Sep 17 00:00:00 2001 From: Stanislav Brabec Date: Sat, 18 Apr 2009 12:59:58 +0000 Subject: autotools.bbclass, distutils-common-base.bbclass, bitbake.conf: Fully support datadir/pkgconfig... * http://lists.linuxtogo.org/pipermail/openembedded-devel/2009-April/009963.html --- classes/autotools.bbclass | 4 ++++ classes/distutils-common-base.bbclass | 1 + 2 files changed, 5 insertions(+) (limited to 'classes') diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 20f371a987..e43b289c56 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -231,6 +231,10 @@ autotools_stage_all() { echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ fi + if [ -e ${STAGE_TEMP}/${datadir}/pkgconfig/ ] ; then + echo "cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/" + cp -f ${STAGE_TEMP}/${datadir}/pkgconfig/*.pc ${STAGING_DATADIR}/pkgconfig/ + fi fi rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${infodir} || true diff --git a/classes/distutils-common-base.bbclass b/classes/distutils-common-base.bbclass index 068eac4de8..9ca392b84a 100644 --- a/classes/distutils-common-base.bbclass +++ b/classes/distutils-common-base.bbclass @@ -17,6 +17,7 @@ PACKAGES = "${PN}-dev ${PN}-dbg ${PN}-doc ${PN}" FILES_${PN} = "${bindir}/* ${libdir}/* ${libdir}/${PYTHON_DIR}/*" FILES_${PN}-dev += "\ + ${datadir}/pkgconfig \ ${libdir}/pkgconfig \ ${libdir}/${PYTHON_DIR}/site-packages/*.la \ " -- cgit v1.2.3 From ba434bd1dc9dc8ed61953a1579ea9e993e81cbb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Mon, 20 Apr 2009 11:42:08 +0200 Subject: bitbake.conf, lib_package.bbclass: fix packaging of ${base_libdir}/*.so We need to include ${base_libdir}/*${SOLIBSDEV} in FILES_${PN]} because the shared libraries in ${base_libdir} do not follow the usual *.so.* naming convention, for instance libproc-3.2.7.so. --- classes/lib_package.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass index 03ba9d094f..f866d10951 100644 --- a/classes/lib_package.bbclass +++ b/classes/lib_package.bbclass @@ -1,8 +1,12 @@ PACKAGES += "${PN}-bin" +# NB: ${base_libdir}/*${SOLIBSDEV} is included here because the shared libraries +# in ${base_libdir} do not follow the usual *.so.* naming convention, for instance +# libproc-3.2.7.so FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - ${base_libdir}/*${SOLIBS} ${datadir}/${PN} ${libdir}/${PN}" + ${base_libdir}/*${SOLIBS} ${base_libdir}/*{SOLIBSDEV} \ + ${datadir}/${PN} ${libdir}/${PN}" FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \ ${datadir}/aclocal ${bindir}/*-config" -- cgit v1.2.3 From 5dc5513ff17822f5ef092852476a901bab47b4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jeremy=20Lain=C3=A9?= Date: Mon, 20 Apr 2009 12:09:24 +0200 Subject: bitbake.conf, lib_package.bbclass: fix missing '$' in previous commit --- classes/lib_package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/lib_package.bbclass b/classes/lib_package.bbclass index f866d10951..788b7bb0c4 100644 --- a/classes/lib_package.bbclass +++ b/classes/lib_package.bbclass @@ -5,7 +5,7 @@ PACKAGES += "${PN}-bin" # libproc-3.2.7.so FILES_${PN} = "${libexecdir} ${libdir}/lib*${SOLIBS} \ ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - ${base_libdir}/*${SOLIBS} ${base_libdir}/*{SOLIBSDEV} \ + ${base_libdir}/*${SOLIBS} ${base_libdir}/*${SOLIBSDEV} \ ${datadir}/${PN} ${libdir}/${PN}" FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig /lib/*.a /lib/*.o \ -- cgit v1.2.3 From 4b48c66ff661c3b88f85dee62517a31ae66db242 Mon Sep 17 00:00:00 2001 From: Petri Lehtinen Date: Tue, 14 Apr 2009 21:59:55 +0000 Subject: base.bbclass: Combine all checksum.ini files found in BBPATH This makes it possible for overlays to have checksum.ini. Signed-off-by: Petri Lehtinen Acked-by: Khem Raj Acked-by: Denys Dmytriyenko Acked-by: Chris Larson Acked-by: Otavio Salvador --- classes/base.bbclass | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 9ec705bc1e..e5fd814b25 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -40,12 +40,11 @@ def base_path_relative(src, dest): return sep.join(relpath) # for MD5/SHA handling -def base_chk_load_parser(config_path): +def base_chk_load_parser(config_paths): import ConfigParser, os, bb parser = ConfigParser.ConfigParser() - if not len(parser.read(config_path)) == 1: - bb.note("Can not open the '%s' ini file" % config_path) - raise Exception("Can not open the '%s'" % config_path) + if len(parser.read(config_paths)) < 1: + raise ValueError("no ini files could be found") return parser @@ -620,13 +619,18 @@ python base_do_fetch() { # Verify the SHA and MD5 sums we have in OE and check what do # in - check_sum = bb.which(bb.data.getVar('BBPATH', d, True), "conf/checksums.ini") - if not check_sum: - bb.note("No conf/checksums.ini found, not checking checksums") - return + checksum_paths = bb.data.getVar('BBPATH', d, True).split(":") + + # reverse the list to give precedence to directories that + # appear first in BBPATH + checksum_paths.reverse() + checksum_files = ["%s/conf/checksums.ini" % path for path in checksum_paths] try: - parser = base_chk_load_parser(check_sum) + parser = base_chk_load_parser(checksum_files) + except ValueError: + bb.note("No conf/checksums.ini found, not checking checksums") + return except: bb.note("Creating the CheckSum parser failed") return -- cgit v1.2.3 From 736c06e8d8efa79d3d2bc512f13a51f0f63412e2 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Sun, 29 Mar 2009 21:59:57 +0000 Subject: image.bbclass: reorder do_rootfs Places do_rootfs function before do_install in image creation process. This change allows multiimage builds, when one image depends on another (before that second image creation raced with do_rootfs for the first one) and uses it for some purpose. Multiimage builds are useful in situations like creating an installer image with initramfs (built in OE) and an image of the target FS (also built in OE) or for building virtualized system images to be placed on target FS. Signed-off-by: Koen Kooi --- classes/image.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/image.bbclass b/classes/image.bbclass index fd0df4df08..3a0bc32c7b 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -106,6 +106,7 @@ do_rootfs[nostamp] = "1" do_rootfs[dirs] = "${TOPDIR}" do_rootfs[lockfiles] = "${IMAGE_ROOTFS}.lock" do_build[nostamp] = "1" +do_install[nostamp] = "1" # Must call real_do_rootfs() from inside here, rather than as a separate # task, so that we have a single fakeroot context for the whole process. @@ -234,5 +235,5 @@ rootfs_update_timestamp () { # export the zap_root_password, create_etc_timestamp and remote_init_link EXPORT_FUNCTIONS zap_root_password create_etc_timestamp remove_init_link do_rootfs make_zimage_symlink_relative set_image_autologin rootfs_update_timestamp -addtask rootfs before do_build after do_install +addtask rootfs after do_compile before do_install addtask deploy_to after do_rootfs -- cgit v1.2.3 From 462a9789b27b105282b99185a26e58f7c523647b Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Wed, 1 Apr 2009 00:15:28 +0000 Subject: package.bbclass: fix globbing for mask-like files When a package contains two files like "name*" and "name*smth" OE can't properly package those, looping infinetely trying to build file list. The reason is that first file name globs to two files and OE adds them both into the list, then globs the first one again and gets two same files, etc. Fix that. Signed-off-by: Koen Kooi --- classes/package.bbclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index 7a61c5a0fb..8a77369682 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -384,8 +384,12 @@ python populate_packages () { globbed = glob.glob(file) if globbed: if [ file ] != globbed: - files += globbed - continue + if not file in globbed: + files += globbed + continue + else: + globbed.remove(file) + files += globbed if (not os.path.islink(file)) and (not os.path.exists(file)): continue if file in seen: -- cgit v1.2.3 From 5773ed1828d801d9ad9187bc0b217b3da8842758 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Thu, 16 Apr 2009 01:47:01 +0000 Subject: image.bbclass: IMAGE_VARS->IMAGE_BOOT, make overridable IMAGE_VARS usage forces images to have init, dev management, login management and other stuff. In cases where you don't need any of those (like initramfs images or other special-purpose images) you need to override 4 variables in order to get clean image that only installs things from IMAGE_INSTALL. So, this changes IMAGE_VARS to more meaningful IMAGE_BOOT and makes it possible to build images without boot components with single IMAGE_BOOT="". Acked-by: Otavio Salvador Signed-off-by: Koen Kooi --- classes/image.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes') diff --git a/classes/image.bbclass b/classes/image.bbclass index 3a0bc32c7b..cbbbbd13d6 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -17,16 +17,16 @@ IMAGE_INITSCRIPTS ?= "initscripts" # IMAGE_LOGIN_MANAGER ?= "tinylogin" -IMAGE_VARS = "${IMAGE_INITSCRIPTS} \ +IMAGE_BOOT ?= "${IMAGE_INITSCRIPTS} \ ${IMAGE_DEV_MANAGER} \ ${IMAGE_INIT_MANAGER} \ ${IMAGE_LOGIN_MANAGER} " -RDEPENDS += "${IMAGE_INSTALL} ${IMAGE_VARS}" +RDEPENDS += "${IMAGE_INSTALL} ${IMAGE_BOOT}" # "export IMAGE_BASENAME" not supported at this time IMAGE_BASENAME[export] = "1" -export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${IMAGE_VARS}" +export PACKAGE_INSTALL ?= "${IMAGE_INSTALL} ${IMAGE_BOOT}" # We need to recursively follow RDEPENDS and RRECOMMENDS for images do_rootfs[recrdeptask] += "do_deploy do_populate_staging" -- cgit v1.2.3 From 5a1d7e7a88c6ef8ac0ca4c7034e637f831a05faf Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Fri, 17 Apr 2009 00:22:21 +0000 Subject: icecc.bbclass: fix kernel distributed compilation Signed-off-by: Koen Kooi --- classes/icecc.bbclass | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'classes') diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index dce29fbbeb..0eb2d9feee 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -137,7 +137,8 @@ def create_native_env(bb,d): def get_cross_kernel_cc(bb,d): kernel_cc = bb.data.expand('${KERNEL_CC}', d) - kernel_cc = kernel_cc.replace('ccache', '') + kernel_cc = kernel_cc.replace('ccache', '').strip() + kernel_cc = kernel_cc.split(' ')[0] kernel_cc = kernel_cc.strip() return kernel_cc @@ -182,10 +183,10 @@ def create_cross_kernel_env(bb,d): cr_env_script = bb.data.getVar('ICECC_ENV_EXEC', d) or bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" result=os.popen("%s %s %s %s %s %s" %(cr_env_script, "--silent", - os.path.join(ice_dir,'bin',kernel_cc), - os.path.join(ice_dir,target_sys,'bin','g++'), - os.path.join(ice_dir,target_sys,'bin','as'), - os.path.join(ice_dir,"ice",cross_name) ) ) + os.path.join(ice_dir, 'bin', kernel_cc), + os.path.join(ice_dir, 'bin', "%s-g++" % target_sys), + os.path.join(ice_dir, 'bin', "%s-as" % target_sys), + os.path.join(ice_dir, "ice", cross_name) ) ) return tar_file -- cgit v1.2.3 From 2343808f7386cbd4c7b43f1b24e65e173f5ddf15 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Thu, 23 Apr 2009 15:23:03 +0400 Subject: bitbake.conf: use rootfs/${PN} for IMAGE_ROOTFS Allows parallel build for different images. Acked-by: Otavio Salvador --- classes/image.bbclass | 1 - 1 file changed, 1 deletion(-) (limited to 'classes') diff --git a/classes/image.bbclass b/classes/image.bbclass index cbbbbd13d6..89d27120c1 100644 --- a/classes/image.bbclass +++ b/classes/image.bbclass @@ -104,7 +104,6 @@ LINGUAS_INSTALL = "${@" ".join(map(lambda s: "locale-base-%s" % s, bb.data.getVa do_rootfs[nostamp] = "1" do_rootfs[dirs] = "${TOPDIR}" -do_rootfs[lockfiles] = "${IMAGE_ROOTFS}.lock" do_build[nostamp] = "1" do_install[nostamp] = "1" -- cgit v1.2.3