summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bitbake: bitbake-layers: fix get_file_layerRobert Yang2013-01-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The get_file_layer can't handle the nested layer correctly, e.g.: meta-intel/conf/layer.conf meta-intel/meta-cedartrail/conf/layer.conf They are two layers, the file: meta-intel/common/recipes-bsp/amt/lms_7.1.20.bb belongs to meta-intel's layer, but the get_file_layer() may return meta-cedartrail accordig to BBLAYERS' order, since it uses: for layerdir in self.bblayers: if regex.match(os.path.join(layerdir, 'test')): return self.get_layer_name(layerdir) which doesn't care the filename, re-match the filename would fix the problem. [YOCTO #3387] (Bitbake rev: 7a31b9eac4d894c302f0e052a132c31b17d13d1f) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: cache.py: remove the duplicated self.file_dependsRobert Yang2013-01-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | There are two "self.file_depends =" lines in cache.py::CoreRecipeInfo: class CoreRecipeInfo(RecipeInfoCommon): __slots__ = () cachefile = "bb_cache.dat" def __init__(self, filename, metadata): self.file_depends = metadata.getVar('__depends', False) [snip] self.file_depends = metadata.getVar('__depends', False) They are duplicated, remove the last one. [YOCTO #3795] (Bitbake rev: 409a4aa0e166c25a8cfcd91e54f1b61cced74e87) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: hob: hob do not use .hob dir for variables from local.conf and ↵Cristiana Voicu2013-01-252-28/+10
| | | | | | | | | | | | | bblayers.conf If .hob exists, hob takes the variable from there. Change to not override anymore the variables which comes from bblayers.conf and local.conf [YOCTO #2934] (Bitbake rev: 00533e83038e3d5e3cd5d1be73c45afece92ec0c) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: prserv: use only PRSERV_HOSTConstantin Musca2013-01-251-4/+11
| | | | | | | | | | | | | - remove PRSERV_PORT variable - use 'hostname:port' as PRSERV_HOST format - use 'localhost:0' for enabling the local PRServer [YOCTO #3744] (Bitbake rev: ad62eed9e1f0867a406e9fbfa44916a0f1ad1282) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: properly disable perl file dependency checking for rpmdepsPaul Eggleton2013-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | | We don't want the perl module dependencies being added to each package by rpmdeps because it causes too many problems when the modules aren't available at install time (since they get added in do_package which is too late for the build system to ensure they are available), and it appears that the perl dependency gathering isn't working reliably in any case judging by how they are detected on some build hosts and not others. This was being disabled previously but it seems like the macros moved to a different file at some point and nobody noticed; thus make sure we disable the macros in all RPM macro files. Should fix [YOCTO #3699]. (From OE-Core rev: e43a72af9055b76eb2ad7e2e42e6a5f3c8854efa) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sample.extended: Add DISTRO_FEATURES_INITMANRadu Moisan2013-01-241-0/+4
| | | | | | | (From meta-yocto rev: 5d34575d3f732580ecfe0ccb0f915b5c6c0ca0a0) Signed-off-by: Radu Moisan <radu.moisan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: Fix build on ppcKhem Raj2013-01-242-0/+35
| | | | | | | | | | | | | | | | | | | | ppc discovers an interesting issue in linking systemd where a library is missing in link cmdline and linker barfs ./.libs/libsystemd-core.a(libsystemd_core_la-manager.o): In function `manager_check_finished': /builddir/build/BUILD/systemd-196/src/core/manager.c:2092: undefined reference to `sd_notifyf' collect2: error: ld returned 1 exit status For more info see https://bugzilla.redhat.com/show_bug.cgi?id=888255 (From OE-Core rev: 2e2a91025ca9c113365c810ce08b48201fe792b8) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libcheck: fix HOMEPAGEPaul Eggleton2013-01-241-1/+1
| | | | | | | | | This was pointing to the zypper homepage, presumably a copy-paste error. (From OE-Core rev: 5f363483253af712f8ccb173c4cc9d77b7c1ae8c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/image-swab: remove zypper-related referencesPaul Eggleton2013-01-241-3/+0
| | | | | | | | | | Remove references to libzypp, zypper and sat-solver which have been removed. (From OE-Core rev: cc9144f99844a8485b2b96182bdf40429286ae66) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sat-solver: removePaul Eggleton2013-01-249-546/+0
| | | | | | | | | This was only needed by libzypp, which has itself been removed. (From OE-Core rev: 905f0d407a259f89e420ccdbee5a471cb0fea8f5) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libzypp: removePaul Eggleton2013-01-2414-1081/+0
| | | | | | | | | This was only needed by zypper, which has itself been removed. (From OE-Core rev: 5c8169bd1c114aab76001a38ee4dd68d00d825e0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* zypper: removePaul Eggleton2013-01-247-200/+0
| | | | | | | | | | | | | Functionality provided by Zypper is now covered more effectively by Smart (python-smartpm) which is now being used for package management on the target when enabled and RPM packaging is selected. Fixes [YOCTO #3349]. (From OE-Core rev: cc866433341532a0b5cf8cd5f67998960ea96499) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagedata: Add error message if multiple recipes try to write the same packageRichard Purdie2013-01-241-1/+6
| | | | | | | | | | | | If multiple recipes try and write the same package it resulted in a rather confusing traceback and unintuitive error. This patch prints a human readable error instead. [YOCTO #3645] (From OE-Core rev: 6f817779af77fdb0b861297f0f43c4c6607ce6f0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sanity.bbclass: Ensure tmpdir exists when running the checkRichard Purdie2013-01-241-0/+1
| | | | | | | | | | | This avoids tracebacks from bitbake if the directory doesn't already exist. [YOCTO #3640] (From OE-Core rev: 1a60e96b21d328fe936e594f3061459e8f2f1b5e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* core-image: Add hwcodecs IMAGE_FEATURERichard Purdie2013-01-243-2/+6
| | | | | | | | | | | Currently hardware codecs are being injected in rather ugly ways and end up either in no or all images. This adds a dedicated IMAGE_FEATURE for them based on the MACHINE_HWCODECS variable. We may need to refine this in due course but this patch at least illustrates the concept. (From OE-Core rev: 1cb370587fd72e3f0f69678748108cc4116767fb) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-core-x11-xserver: Add XSERVERCODECS variableRichard Purdie2013-01-241-0/+2
| | | | | | | | | | | | | At present its hard for the system to provide extra x11 hardware codecs. We could lump them in with the XSERVER variable but this is suboptimal as in some use cases the user might not want to include them in some images. With this patch we keep our options open about separating usage of the two in the future. (From OE-Core rev: 285c7577813cf75a3b554f8a5d6d7ba002127ef4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base: make feature backfilling happen earlierRichard Purdie2013-01-242-3/+2
| | | | | | | | | | | | | | | | | Backfilling DISTRO_FEATURES and MACHINE_FEATURES with _append statements happens too late to use those variables with conditional inherits, like this: inherit ${@base_contains('DISTRO_FEATURES','sysvinit','update-rc.d_real','',d)} Instead, do the backfilling at ConfigParse time so that it happens earlier in the parse, which results in that inherit behaving as expected when sysvinit was backfilled. (From OE-Core rev: 22429cdf79ed952072707a929643c7386fa7e056) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake.conf: unbreak all builds with custom DISTRO_FEATURESMarcin Juszkiewicz2013-01-241-1/+1
| | | | | | | | | | | | | | | | | Commit 9e7c64ca9afbf27edd0d35a1830ce55ee6d778ab broke all builds where custom DISTRO_FEATURES were used. Resulting images ended in non-bootable state due to lack of initscripts (unless someone had sysvinit or systemd in D_E already). https://bugs.launchpad.net/linaro-oe/+bug/1102910 https://bugs.launchpad.net/linaro-oe/+bug/1099405/comments/12 (From OE-Core rev: 211e473432230765a48d7af9c66c8737a08cdec7) Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* core-image-lsb-sdk/dev: Inherit the base image instead of duplicatingRichard Purdie2013-01-242-19/+7
| | | | | | (From OE-Core rev: de2ad361e7dfe553e2c49c73199da58ce44d89e4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* prserv: add LOCALCOUNT to AUTOINCs migration feature1.4_M3.rc1Constantin Musca2013-01-223-0/+80
| | | | | | | | | | | | | | | - use migrate_localcount.bbclass to generate AUTOINC entries which are exported to LOCALCOUNT_DUMPFILE - import the generated AUTOINC entries - one can migrate LOCALCOUNT to AUTOINC by executing: bitbake-prserv-tool migrate_localcount [YOCTO #3071] (From OE-Core rev: ffab86f13cafb10d8d6273b6af8cd9a3c84eae20) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemu.inc: Define preferred providers for libgl, libgles1 and libgles2Khem Raj2013-01-221-0/+3
| | | | | | | | | | | This is needed to to boot efl images on qemuarm,qemumips and qemuppc these options were already defined for qemux86 and qemux86-64 and therefore the images were booting fine for these two machines (From OE-Core rev: 60e73068cf542c2134106fe6cfc5971874bbc766) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: Fix build on uclibcKhem Raj2013-01-222-73/+83
| | | | | | | | | | Systemd has some uclibc specific patches which needed to be forwarded ported to 196 (From OE-Core rev: e39f01ba4f6d9d9f1d24fd01745530cde9e92131) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* uclibc-git: Upgrades to latest gitKhem Raj2013-01-228-280/+89
| | | | | | | | | Drop upstream accepted patches (From OE-Core rev: b4ee580d37d15e699dd6efc6551f4c7f8e902e2a) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rootfs_rpm.bbclass: fix the unexpected postinst errorChen Qi2013-01-221-1/+2
| | | | | | | | | | | | | | | | If the /etc/rpm-postinsts/ directory was empty, the following error would occur at system startup. ERROR: postinst /etc/rpm-postinsts/* failed This patch fixes this issue. [YOCTO #3767] (From OE-Core rev: 202263aeca837dc7b6615a3dc34569c199163733) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* blktrace: add back do_install methodSaul Wold2013-01-221-1/+7
| | | | | | | | | | | The recent change to blktrace removed the do_install method, since this recipe does not use autotools it needs to specifiy a do_install activity. (From OE-Core rev: f8832d969746fb879e63d1b28e6beef5ab82a39d) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* populate_sdk_base.bbclass: Allow installation of ix86 SDK on x86_64 hostWolfgang Denk2013-01-221-3/+6
| | | | | | | | | | | | | | | | | Commit c04f5435 "populate_sdk_base.bbclass: use SDK_ARCH instead of SDKMACHINE" prevents not only the installation of 64 bit SDK configurations on 32 bit hosts (which indeed cannot work), but also the legitimate installation of a 32 bit SDK on a 64 bit host. Fix this. While there, also make sure we use the same patterns ("i[3-6]86" resp. "x86[-_]64" to get unified strings for both INST_ARCH and SDK_ARCH. (From OE-Core rev: 7ddd97b9b09fe7a327916ea88908a63375556ae6) Signed-off-by: Wolfgang Denk <wd@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: crumbs: Add file lost from previous commitRichard Purdie2013-01-221-0/+161
| | | | | | (Bitbake rev: 90aabeb87d6c1f00d6333cc9930626d36b6d9709) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* createrepo-native: update dependencyKang Kai2013-01-221-2/+2
| | | | | | | | | | | | "RDEPENDS_${PN}_class-native" doesn't work for native recipe because no -native package will be created. Then the dependencies listed here are not built when bitbake createrepo-native. Update and use DEPENDS_class-native instead. (From OE-Core rev: 0b8dc781e4df0edffa10ac989f8745ac3f684de0) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bind: disable nslookup man pagewenzong.fan@windriver.com2013-01-221-1/+2
| | | | | | | | | | | | The nslookup is not shipped for now, we should disable its man page if the binary tool is not installed. [YOCTO#3754] (From OE-Core rev: 1a31918733a7f8479220c01fc99dd9099fdcaf9b) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: hob: combo box updated correctlyCristiana Voicu2013-01-221-2/+5
| | | | | | | | | | | The 'select a base image' option is no longer displayed once an image is selected [YOCTO #3671] (Bitbake rev: 27f2247b4c227c3b5adb1ca33d0cd7f7b492e170) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: persist_data: add get_by_pattern method to APIConstantin Musca2013-01-221-0/+5
| | | | | | | | | | - one can use get_by_pattern to get a list of values associated with keys that match the specified pattern (Bitbake rev: 6ee1f58698e2d782c54ce5aec271bcec26107eac) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: parse_py: add ~ to config_regexpConstantin Musca2013-01-221-1/+1
| | | | | | | | | - enable the '~' character in bitbake variables (Bitbake rev: 7c15ff1d50d7b601414f1d55c90e3c59981a0876) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: hob: Hob should display warnings generated during parsingCristiana Voicu2013-01-215-6/+80
| | | | | | | | | | | | | | -now Hob catches the warnings generated during parsing, and after the parsing is completed, if there are any warnings, it shows a bar that contains a message with how many warnings has encountered, and a button "View warnings" -when "View warnings" button is clicked, Hob shows a dialog with the warnings; if there more than 1 warning, you can use "Previous" and "Next" button to see them [YOCTO #3215] (Bitbake rev: d7b5311d35b3974398fecabfb5ecf1effa85c27e) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: hob: progress bar changed to busy cursor when you open log fileCristiana Voicu2013-01-215-161/+6
| | | | | | | | | | | | | | -the first implementation for this bug used a progress bar, that is shown during open file process; it revelead that the progress bar stops earlier -now I have implemented using gtk.show_uri() method, that shows itself a busy cursor when it opens a file; -deleted the code for the first implementation [YOCTO #2997] (Bitbake rev: 09d1c4c2db124104b9da460547b20a2c2ff07bb3) Signed-off-by: Cristiana Voicu <cristiana.voicu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* distro-tracking: remove e-d-s and libicalRoss Burton2013-01-215-9/+0
| | | | | | | (From meta-yocto rev: 16d4a6c44fdda6a230a26848347bbaa057a966af) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: remove unused SERIAL_CONSOLE variableRoss Burton2013-01-211-2/+0
| | | | | | | (From OE-Core rev: 751c11e998431613389f094264f096fac5a1c1ae) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd-serialgetty: skip package when not using systemdRoss Burton2013-01-211-0/+6
| | | | | | | | | | | As this package RDEPENDS on systemd it wants to build systemd, but if systemd isn't a DISTRO_FEATURE then that package is skipped so world builds fail. Solve this by skipping this package too. (From OE-Core rev: 192efd033c38205e114f62e9f62696a9a49b0970) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd-serialgetty: remove redundant statementsRoss Burton2013-01-211-3/+0
| | | | | | | (From OE-Core rev: e5820f56becb3bcee44a461f7fc5640159679a15) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* perl: Fix errors if configure is reattemptedRichard Purdie2013-01-211-1/+1
| | | | | | | | | | If configure of perl is reattempted it currently fails as it tries to edit files outside ${S}. Chaging from ${WORKDIR} to ${S} avoids this issue and allows rebuilds to work. (From OE-Core rev: 1b66c30eb6085aedce118ce086efbd2e562d0d6c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: update uclibc patch headersRoss Burton2013-01-217-8/+8
| | | | | | | | | | Discussion has revealed that upstream has formally rejected patches to support uclibc, so mark this in the headers. (From OE-Core rev: caf6aa1c996a949ca85f4beaf40d2a19433d18c8) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-sdk-gmae: remove GUPnP stack as it's no longer in oe-coreRoss Burton2013-01-211-4/+0
| | | | | | | | | GUPnP is now in meta-multimedia, so remove it from this SDK packagegroup. (From OE-Core rev: 356a5ee5a74f9cee112eac2c595c13ef707eca82) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gupnp: remove, migrated to meta-multimediaRoss Burton2013-01-214-80/+0
| | | | | | | | | | The GUPnP stack was stagnating in oe-core and untested. It's now moved to meta-multimedia where it's also been upgraded. (From OE-Core rev: 51e548a4e61709d9d87a424586529638873835b3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* site: add x86-32/64 alignment values for at-spi2-coreRoss Burton2013-01-212-0/+19
| | | | | | | | | | This package isn't yet in oe-core, but GTK+ 3.6 depends on it so will be here at some point. (From OE-Core rev: 8c46ec2edc0197b32d32e0f27d5b60271338b600) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: add missing patch headersRoss Burton2013-01-218-0/+22
| | | | | | | | | | The reverts were by Koen and are literal revert commits, the uclibc patches were mostly introduced by Khem. (From OE-Core rev: 8925501890cbe630258d9c6fe348f1e3c821fc71) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: use new GTKDOC_DOCDIR and clean upRoss Burton2013-01-211-6/+4
| | | | | | | | | | | Now that gtk-doc.bbclass supports overriding the documentation directory, systemd can just inherit gtk-doc and all of the manual operations can be removed. (From OE-Core rev: 8b7816804dcfdc380fbebe6dc8c81f431a7fc450) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gtk-doc: parameterise the documentation directoryRoss Burton2013-01-211-1/+4
| | | | | | | | | | Not every package puts the gtk-doc infrastructure into ${S}, so allow this to be overridden. (From OE-Core rev: 40353c9ef83f986a0d49cc6eb654b3ace6ef4dc4) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: fix typo in FILESRoss Burton2013-01-211-1/+1
| | | | | | | | | Accidently managed to corrupt FILES_udev. (From OE-Core rev: b1d8187f66d9646a53928fe288085f4605bc43ef) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* udev: skip in systemd distros, to fix world buildsRoss Burton2013-01-211-0/+6
| | | | | | | (From OE-Core rev: 1179e43d67c96367480e563a36684d550d83fcbe) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: skip in non-systemd distros to fix world buildsRoss Burton2013-01-211-0/+8
| | | | | | | (From OE-Core rev: a2553b5f8b80ca0cd578afa2d2857ebb2b70ee3c) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: BBHandler/ConfHandler: Merge fix for multiline commentsRichard Purdie2013-01-212-2/+2
| | | | | | | | | | This was meant to be squashed into the previous commit for multiline comment handling. It fixes the case the commented multiline is followed by an empty line which was resulting in a traceback instead of a sane error message. (Bitbake rev: 7e7d692e244fe8dca533f842ca143b9c821e317c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>