summaryrefslogtreecommitdiffstats
path: root/meta
Commit message (Collapse)AuthorAgeFilesLines
* devtool: better support for local source filesMarkus Lehtonen2015-10-011-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * extract: Copy all local source files (i.e. non-compressed/non-arcived SRC_URI files that have file:// URI prefix) - excluding patches - to the srctree repository. The files will be placed in a subdirectory called 'oe-local-files'. The oe-local-files directory is not committed to the Git repository, but, marked to be ignored by a .gitignore file. The developer can manually add and commit the files to Git if the changes to them need to be tracked. Before this patch, local source files (were copied (and committed) to the srctree repository only in some special cases (basically when S=WORKDIR) when doing devtool-extract. For most of the packages local files were not copied at all. * update-recipe: This patch causes the local files to be 'synced' from the srctree (i.e. from the 'oe-local-files' subdirectory) to the layer. Being 'synced' means that in addition to copying modified files over the original sources, devtool will also handle removing and adding local source files and updating the recipe accordingly. We don't want to create patches against the local source files but rather update them directly. Thus, 'oe-local-file' directory is ignored in patch generation when doing update-recipe, even if committed to Git. This functionality is only enabled if the 'oe-local-files' directory is present in srctree. [YOCTO #7602] (From OE-Core rev: a3bb5bd25b72bd1bcc156dabd0ffa2d9184bb160) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-selftest: devtool: add method for checking repo statusMarkus Lehtonen2015-10-011-52/+34
| | | | | | | | | New method for checking the status of the working tree of a repository. (From OE-Core rev: 4e5eea06a77eca7311209b0b650e79e816713ab9) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-selftest: devtool: add method for checking srctree repoMarkus Lehtonen2015-10-011-31/+18
| | | | | | | | | Removes some code duplication. (From OE-Core rev: 5bd2ca137a496e34bb62cfafd406db8ae78635d6) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-selftest: devtool: add setup() methodMarkus Lehtonen2015-10-011-79/+45
| | | | | | | | | | In order to remove some code duplication. The method currently only does checking of workspace dir. (From OE-Core rev: 5d7cd3dc9e497bb3c2aba4cf2af3e3ee84dd7a2f) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe.patch.GitApplyTree: add paths argument to extractPatchesMarkus Lehtonen2015-10-011-1/+4
| | | | | | | | | Makes it possible to define which paths are included in the patches. (From OE-Core rev: 640e57b423e5a8f0e4572eac985f87139780f247) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipeutils: implement get_recipe_local_files()Markus Lehtonen2015-10-011-0/+16
| | | | | | | (From OE-Core rev: c94cf6e6e8a0645c822a708a432901dcb5ce5bf4) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* multilib: Add TARGET_VENDOR to saved variables listRichard Purdie2015-09-281-1/+1
| | | | | | (From OE-Core rev: 4a1dec5c61f73e7cfa430271ed395094bb262f6b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oeqa/sdk/gcc: Fix makefile testRichard Purdie2015-09-282-3/+8
| | | | | | | | | The makefile test was hardcoding a test for gcc. In the SDK context, we need to use $(CC) to use the cross compiler. (From OE-Core rev: d28ddc23bbf232901ae07f7a01f821ecc4b79e32) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gdk-pixbuf: Only apply native cleaning in normal task, not setsceneRichard Purdie2015-09-281-1/+1
| | | | | | | | | | | The previous fix works well for normal tasks since the ordering is always correct and gdk-pixbuf-native comes first. Setscene ordering is reversed so we can't rely on this there. Remove the fix in that case since it breaks more than it solves. (From OE-Core rev: 4e89fe719b3e237d84b7ceba2a8c83a768baa714) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oeqa/testimage: Remove absolute path to oeqa from jsonLucian Musat2015-09-281-1/+10
| | | | | | | | | | | | In the json file the whole datastore is serialized which contains absolute path to the oeqa folder. This breaks the functionality when trying to run the tests from other machines. (From OE-Core rev: 94057ccc70aa3fe29d774f571a65f56fd1285d4c) Signed-off-by: Lucian Musat <george.l.musat@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* iproute2: fix the configure processChen Qi2015-09-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the iproute2's configure script is actually run in the do_compile stage. There's a Makefile rule 'all: Config' which makes the configure process run to generate the Config file. However, this makes it hard to fix the dependency problems. We need to generate the Config file in the do_configure stage. Add do_configure_append to separate the configure process from the compile process. Besides, explicitly disable ATM support for iproute2, otherwise we'll sometimes meet errors like below when building. ld: cannot find -latm collect2: error: ld returned 1 exit status Makefile:154: recipe for target 'q_atm.so' failed make[1]: *** [q_atm.so] Error 1 (From OE-Core rev: a6967f6e441eca758058ced9982b715984ee9b5b) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gcc-multilib-config: Expand ccargs variableYuanjie Huang2015-09-281-1/+1
| | | | | | | | | | | | | | | | | | The ccargs obtained from get_tune_parameters may not be fully expanded, so that the gcc_multilib_setup function can be confused, and generates invalid MULTILIB_OPTIONS in GCC Makefile fragment, which will break the multilib feature of target gcc. To address problems above, this patch modifies gcc_multilib_setup function to expand ccargs before use. Upstream-Status: Inappropriate [configuration] (From OE-Core rev: 02eddf9a0b89b0cbe0c83d95cedb3431899197d0) Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Empty image:rootfs.py:handle empty PACKAGE_INSTALLAlex Franco2015-09-281-1/+5
| | | | | | | | | | | | | | rootfs.py: added a test in DpkgOpkgRootfs which skips the get package post installs step (get_pkgs_postinsts), when PACKAGE_INSTALL is empty. [YOCTO #7664] (From OE-Core rev: 2d5fb43ec647e8445fc8e8a5caba771c0361a539) Signed-off-by: Alex Franco <alejandro.franco@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gstreamer1.0-plugins-bad: change glimagesink rank to marginalAlexander Kanavin2015-09-282-1/+35
| | | | | | | | | | [YOCTO #7787] (From OE-Core rev: ab1bb8db62df4246c2ed3a3135d6d71003ee9386) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto/4.1: rt update to 4.1.x-rt8Bruce Ashfield2015-09-283-4/+4
| | | | | | | | | | | | | | | | | | The -rt build suffered the same breakage in master as the standard kernel builds: due to a bad git history merge, existing patches were dropped from branches. This meant that we were missing the -rt changes, which re-introduced some failures with linux-yocto-rt. With these SRCREV updates, we have the latest 4.1.x-rt and all architectures build. (From OE-Core rev: 96db930d8add6623168ec5e638769d5c0f348265) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto/4.1: common-pc-drivers: add CONFIG_PATA_SCHBruce Ashfield2015-09-283-3/+3
| | | | | | | | | | | | | | | | | | | | | Updating the meta SRCREVs to integrate the following config change: Author: Saul Wold <sgw@linux.intel.com> Date: Tue Sep 22 07:23:06 2015 -0700 common-pc-drivers: add CONFIG_PATA_SCH The NUC uses this hardware and should still operate correctly with a genericx86 Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> (From OE-Core rev: c597c230b4f66bd04d47a448a00cf54fca71c0f2) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ltp: replace 'inline' with 'static inline' for gcc 5.xKai Kang2015-09-282-0/+70
| | | | | | | | | | | | | | | | | | | | | gcc 5.x defaults to -std=gnu11 instead of -std=gnu89 which causes semantics for inline functions changes. The standalone 'inline' causes error with gcc 5 such as: git/testcases/kernel/syscalls/kill/kill10.c:355: undefined reference to `k_sigaction' Replace inline with static inline to be compatible with both gcc 4 and 5. Found and test with configure: SELECTED_OPTIMIZATION="-O0 -fno-omit-frame-pointer -g -pipe" (From OE-Core rev: 90e28e33c408d1607ebe0afb0db97e39255395d1) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* waffle: Fix build with muslKhem Raj2015-09-282-1/+57
| | | | | | | | | | Backport needed patches for compilation fixes on musl (From OE-Core rev: d19772d1f3c9d0a06c10dfb246bb156b575a14c5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cups: fix pam configuration file's permissionChen Qi2015-09-281-0/+5
| | | | | | | | | | | The files under /etc/pam.d should be 0644. The /etc/pam.d/cups file has 0444 after 'make install'. This patch fixes this problem. (From OE-Core rev: ba510849a8bc238997b6d1669300e24c46bcf328) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Use CC instead of bare LD to be the LinkerKhem Raj2015-09-283-0/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was on mailing list, another patch to make sure -r is not passed directly but via -Wl switch is added. This was exposed when using clang and gold linker, clang does not have -r switch to do relocatable objects and problem happens specific to OE becuase we use LD = CC now what happens is that busybox assumes that linker will be called directly, and hence sprinkles linkers options in its kbuild system which aggregate into LDFLAGS, some of these options are happily ignored by gcc as well but it passes -r options rightly to linker so it all works, however when using clang, this falls apart since -r is not known option for clang so it drops this option and all obects which should be partially linked becomes ET_EXEC and when they are added to final link then gold starts to get confused /mnt/home/kraj/work/angstrom/build/tmp-angstrom-glibc/sysroots/x86_64-linux/usr/bin/arm-angstrom-linux-gnueabi/arm-angstrom-linux-gnueabi-ld: error: applets/built-in.o: unsupported ELF file type 2 clang-3.7: error: linker command failed with exit code 1 (use -v to see invocation) (From OE-Core rev: 117282486b68e4da468c21795ea87bfc85625885) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Use UTMPX instead of legacy UTMPKhem Raj2015-09-282-0/+389
| | | | | | | | | | | | This makes busybox honor UTMPX feature if available in a libc [YOCTO #8243] (From OE-Core rev: c5de9b2ddb38790866bda5a88b9b7119aac0aa3f) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* distrodata: handle recipes with empty or absent SRC_URI in checkpkg()Alexander Kanavin2015-09-281-4/+8
| | | | | | | | (From OE-Core rev: ea7cd81d6d1d4d00553cd475623af0d24f5ea84f) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipeutils.py: don't hardcode the upstream version as 1.0 when SRC_URI is ↵Alexander Kanavin2015-09-281-4/+5
| | | | | | | | | | | | | empty or absent Instead, simply return the version of the recipe, so that the upstream version checker will declare that they match. (From OE-Core rev: 10c948a67546dd4ed2ac00b5210ef4b3eeca9401) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oeqa/parselogs: Updated log parser whitelist.Lucian Musat2015-09-281-6/+4
| | | | | | | | | | | Added some fixes for meta-intel boards and moved some errors from specific images to common. (From OE-Core rev: ccbb12f9ec7c0a5714a8b1a24efb46755408c256) Signed-off-by: Lucian Musat <george.l.musat@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* connman: Don't use a blanket "allow" D-Bus policyJussi Kukkonen2015-09-282-9/+25
| | | | | | | | | | | | | | | There are already "allow" rules for root and conditionally xuser to send messages to connman: there should be no reason for a default allow policy. Also, conditionally add a policy to allow xuser to send to the connman vpn service (similar to main service). (From OE-Core rev: 7c75981944e92b5534b054058407d19de2a8a78c) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* connman: Depend on xuser-account unconditionallyJussi Kukkonen2015-09-281-1/+1
| | | | | | | | | | | | | | | | | | This means dragging in xuser-account even when it's not used but that's a lesser evil than the recipe depending on machine specific settings. This also prevents a warning on connman service startup when ROOTLESS_X is not set: Unknown username "xuser" in message bus [YOCTO #8005] (From OE-Core rev: b791b8f1d175a73fcb9e48b3fcd56ebbc6bf6de1) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* byacc: add missing patch headerRoss Burton2015-09-281-0/+12
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sstate: run recipe-provided hooks outside of ${B}Ross Burton2015-09-281-16/+14
| | | | | | | | | | | | | To avoid races between the sstate tasks/hooks using ${B} as the cwd, and other tasks such as cmake_do_configure which deletes and re-creates ${B}, ensure that all sstate hooks are run in the right directory, and run the prefunc/postfunc in WORKDIR. (From OE-Core rev: 1d3bde02641f4b40030cf7e305ee3d7c2faabe29) (From OE-Core rev: a026dbfa0ce4ee769ae2c714f27f4c4eaa4a0c73) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oeqa/decorators: Add timestamp to decorator logs.Lucian Musat2015-09-281-2/+15
| | | | | | | | | | | | To avoid logs being overwriten when running the automated tests multiple times, log files include timestamps in their names and a link is created to point to the latest one. (From OE-Core rev: 0aa6af4aec6f9773ec2aea929deb3a1ed049cbb9) Signed-off-by: Lucian Musat <george.l.musat@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image types: add hdddirectPatrick Ohly2015-09-283-4/+6
| | | | | | | | | | | | | | | | | | When image-vm.bbclass was introduced, it indirectly also introduced a ".hdddirect" image type based on boot-directdisk.bbclass. However, one could only get that image when also enabling at least one of the virtual machine images. The .hdddirect images are useful by themselves. By registering image-vm.bbclass as implementation of it, it becomes possible to select them with: IMAGE_FSTYPES = "hdddirect" (From OE-Core rev: e3ff509091cbbfdef851f8a3c9e31c7b76d37e89) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-core-standalone-sdk-target: ensure libatomic is in SDKRoss Burton2015-09-281-0/+2
| | | | | | | | | | | | Some architectures (such as MIPS) need libatomic from gcc-runtime to perform atomic operations, so this package should be included in all SDKs. [ YOCTO #8274 ] (From OE-Core rev: 55e8067d3fb6a1fc97b4486e28e3e3bae2b5cd00) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* glibc/mmc-utils: Rename 'BRANCH' variable to 'SRCBRANCH' for clearnessOtavio Salvador2015-09-283-6/+6
| | | | | | | | | | | | | | The 'BRANCH' variable name has no explicit relation with the SRC_URI. Using 'SRCBRANCH' makes it more obvious and easier to identify. This patch makes the use consistent across the metadata. (From OE-Core rev: ed86bf9c327ceda3976e799ca453028382f277a7) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sanity.bbclass: show warning when chmod failsAlex Franco2015-09-281-3/+6
| | | | | | | | | | | | | | | * for some reason this part of: http://patchwork.openembedded.org/patch/102561/ wasn't ever merged. [YOCTO #7669] (From OE-Core rev: 95daa7c26d119ae11f1835ce0e895bbd4a3e9605) Signed-off-by: Alex Franco <alejandro.franco@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: apply persistent storage udev rules also for /dev/hd*Patrick Ohly2015-09-282-0/+33
| | | | | | | | | | | | | | This fixes booting with initramfs and root=UUID on machines with IDE disks, like "runqemu hdddirect", and kernels which still use the deprecated CONFIG_IDE. v2: Rebased against current master-next. (From OE-Core rev: 3d27dfb7e78b8e17b76fcc1d8f8e2b29ca26b0df) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rpm: search for gpg if gpg2 is not foundMarkus Lehtonen2015-09-282-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | Some (host) systems only have a binary named 'gpg' (e.g. Fedora) while some only have 'gpg2' (Ubuntu) and others have both of them (openSUSE). Currently the behavior of rpm-native with regards to GnuPG depends on the host platform: rpm(-native) is configured to use GnuPG binary of the host system if 'gpg2' is found in $PATH. Otherwise, rpm(-native) will default to using '%{_bindir}/gpg2' which will be pointing to a sysroot binary which usually does not exist. This patch changes rpm to look for both 'gpg' and 'gpg2' when searching for the GnuPG binary in PATH. This makes possible to create signed RPM packages on different host platforms, using the GnuPG binary of the host, without the need to explicitly define the gpg binary in bitbake configuration (via GPG_BIN variable). [YOCTO #8134] (From OE-Core rev: eb76b668e815fbecd18271808b871fc3b0f15e65) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* openssl: Add mapping for nios2Marek Vasut2015-09-281-1/+1
| | | | | | | | | | Map nios2 architecture to linux-generic32 target. (From OE-Core rev: f601a0df106fb1da188a4b1f1155d85fad4627bb) Signed-off-by: Marek Vasut <marex@denx.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemurunner: Handle qemu start failure correctlyRichard Purdie2015-09-281-2/+2
| | | | | | | | | | If qemu didn't start correctly, we may not have registered the child signal. This results in a nasty traceback which confuses the underlying issue. Cleanup this code and make the handler cleanup conditional. (From OE-Core rev: 0ead936925c61aaaa7a819f6c5b999ba3a4daeda) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gcc-runtime: Add multilib C++ header mappingRichard Purdie2015-09-281-0/+3
| | | | | | | | | | | The SDK was unable to find the C++ header pieces correctly since its using a generic compiler, not one specifically targeting the multilib vendor prefix. This adds in the right mapping to ensure multilib SDKs work as expected. This fixes multilib SDK automated tests. (From OE-Core rev: 823ce9555ee78aa460d0560b8fd9b309cfd36997) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oeqa/oetest: Fix SDK command executionRichard Purdie2015-09-281-1/+1
| | | | | | | | | | | | The SDK environment wasn't being sourced when running these test commands, meaning in some cases the cross compiler was being tested, not the SDK tools. This is clearly not the intent so fix this by ensuring the SDK environment is present. This fixes test failures in multilib SDKs. (From OE-Core rev: 39c56f7c280cfe6bf40ea9145f3f7060b565bc62) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mulitlib: Ensure SDKTARGETSYSROOT is set correctlyRichard Purdie2015-09-281-0/+1
| | | | | | | | | | | | | | When building something like lib32-core-image-minimal -c populate_sdk, we expect one sysroot with both multilibs installed. We therefore need a single SDKTARGETSYSROOT value which doesn't change when multilibs are enabled. This makes the image generation code match what the meta-environment files set the SDK up to use. (From OE-Core rev: a6ade4d24e8153920311db9a9033a7f5c430d1e4) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gtk-icon-cache/pixbufcache: don't set GDK_PIXBUF_MODULEDIRRoss Burton2015-09-282-2/+2
| | | | | | | | | | In normal use gdk-pixbuf knows where to find its own loaders and explicitly stating this will cause work in the future if the ABI version changes. (From OE-Core rev: 87eea290a799be0e852d8b3c357879680abedb77) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* librsvg: tell configure where gdk-pixbuf-query-loaders isRoss Burton2015-09-281-0/+2
| | | | | | | | | | Now that gdk-pixbuf-query-loaders isn't in the path, tell configure where to find it. (From OE-Core rev: 5fe4112ccd75858cdab8ba18eb6b1d9d5829f186) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gdk-pixbuf: move gdk-pixbuf-query-loaders to $libdir for multilib safetyRoss Burton2015-09-283-9/+20
| | | | | | | | | | | | | | | If for example gdk-pixbuf and lib32-gdk-pixbuf are in an image then only one ${bindir}/gdk-pixbuf-query-loaders will be installed, so only one variant will actually be usable. Solve this by moving gdk-pixbuf-query-loaders into ${libdir} as it's intimately tied to the library and rarely directly invoked by the user, and update the callers to use the right path. (From OE-Core rev: 69df75f268e2b3d5874f05e2b5a6125f6d990a03) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gdk-pixbuf: move gdk-pixbuf-pixdata to gdk-pixbuf-devRoss Burton2015-09-281-2/+2
| | | | | | | | | | This is a development tool, similar to gdk-pixbuf-csource, so move it to the -dev package. (From OE-Core rev: ac445614f0fec7537b3870581339f7d04db39fa9) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* multilib: Drop populate_sdk variable manipulationRichard Purdie2015-09-281-4/+0
| | | | | | | | | | | | | | | I believe this code dates from previous times when we didn't extend the TOOLCHAIN_TARGET* variables to cover all multilibs. We now do this so this code acutally breaks things by removing the non-multilib variants. By changing this, a multilib SDK now contains both sets of base libraries which matches the tools we ship with it. If the user wishes to customise, this also becomes easier. (From OE-Core rev: 568b81b5102213643e382d31a4e5e56f90ee6ff9) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_manager.py: make rpm install mutilib pkgs corectlyRobert Yang2015-09-281-2/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When configure multilib, "bitbake <image_bb> -c populate_sdk" should install all arch toolchains (for example, 32 and 64bit), but rpm not handle the multilib requires correctly, for example: lib32-packagegroup-core-standalone-sdk-target requires lib32-libc6, rpm may pull in libc6 rather than lib32-libc6, there are the similar issue when: IMAGE_INSTALL_append += "lib32-packagegroup-foo foo" Use bitbake to expand the RDEPENDS will fix the problem since bitbake knows mlprefix and handle it well, but rpm doesn't. This patch only affects when: IMAGE_INSTALL = "lib32-foo foo" Doesn't affect: IMAGE_INSTALL = "lib32-foo1 lib32-foo2" Or: IMAGE_INSTALL = "foo1 foo2" [YOCTO #8089] (From OE-Core rev: fc469e51475b5272b4047d4713eb99529193ac8a) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gdk-pixbuf: Avoid rebuild failuresRichard Purdie2015-09-241-0/+9
| | | | | | | | | | | | | | | | | | | | If gdkpixbuf-native rebuilds and there are stale (broken) modules lying around, it can fail to run the postinst. E.g. svg links to harfbuzz and if harfbuzz is removed from the sysroot but the svg loader isn't, we get a symbol linking issue. The reproducer is along the lines of build gdk-pixbuf-native along with harfbuzz-native and librsvg-native, then make a small change to the gdk-pixbuf recipe that would cause it to rebuild, clean harfbuzz-native and then build gdk-pixbuf. To fix this, when we install gdk-pixbuf, we wipe out any previous loaders. The idea is that gdk would always come first and anything else installing itself will come later and rerun the postinst if needed. We can therefore just remove any other loaders. (From OE-Core rev: d5cf21179d9f8d3c053316b0864d72fc609f5423) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: fix tmpfiles location when multilib in useReinette Chatre2015-09-241-2/+2
| | | | | | | | | | | | | | Systemd's configuration files for creation, deletion and cleaning of volatile and temporary files are installed in /usr/lib even when multilib is in use (when /usr/lib64 is available). In this check the systemd.conf file will not be found if libdir is /usr/lib64 so we fix the path to match this file's installation path to look for it in ${exec_prefix}/lib (From OE-Core rev: c1ef36c2b3e3876cc166a9a5e153fc6f23b42b92) Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* p11-kit: configure without trust-pathsKai Kang2015-09-241-0/+2
| | | | | | | | | | | | | | Configure option --with-trust-paths is only used for test scripts trust/test-extract which is not packaged by default. If the option is not provided, it checks 4 files on build machine. If the files don't exist, configure fails. Add configure option '--without-trust-paths' to fix this issue. (From OE-Core rev: 875f566f670f695d4538786df3a3e8c3cebaa30a) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* toolchain-shar-extract.sh: remove checkbashismRobert Yang2015-09-241-2/+2
| | | | | | | | | | | | | | | | | | Fixed when sh is bash: $ sh ./tmp/deploy/sdk/poky-glibc-x86_64-core-image-minimal-core2-64-toolchain-1.8+snapshot.sh Poky (Yocto Project Reference Distro) SDK installer version 1.8+snapshot =========================================================== ./tmp/deploy/sdk/poky-glibc-x86_64-core-image-minimal-core2-64-toolchain-1.8+snapshot.sh: 77: read: Illegal option -e You are about to install the SDK to "/opt/poky/1.8+snapshot". Proceed[Y/n]? ../SDK2 Installation aborted! There is ony one bashism "read -e" in toolchain-shar-extract.sh, but '-e' is useless here, so remove it and use /bin/sh. (From OE-Core rev: e951e20c4ef6a3f003f84e8f1bea568d1b7ef541) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>