summaryrefslogtreecommitdiffstats
path: root/meta
Commit message (Collapse)AuthorAgeFilesLines
* xcb/libpthreads: Add BBCLASSEXTEND to resolve missing providers in world buildsRichard Purdie2011-08-192-1/+3
| | | | | | (From OE-Core rev: 9134800548a03bfe3a7e351a15f2129bcb3cc680) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bluez4: drop usbpath from DEPENDSJoshua Lock2011-08-191-1/+1
| | | | | | | | | | | We don't (currently) have usbpath in oe-core, so drop it from the DEPENDS to make BlueZ buildable again. (From OE-Core rev: 919714837116097483fa3f475d2e1ad3b18961d1) Signed-off-by: Joshua Lock <josh@linux.intel.com> CC: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libgcc: Remove fetch/unpack/patch noexec stampsRichard Purdie2011-08-192-6/+0
| | | | | | | | | | | | | libgcc now uses shared work directories so we cannot mark these tasks as noexec. If we do, the tasks may not run and hence gcc may not get patched for example which results in failures. This patch simple removes the flags since they're unneeded. (From OE-Core rev: e2c03b2a80efeeea2298bdba385671d0ae208e95) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* newt: update distro tracking fieldsKang Kai2011-08-191-4/+4
| | | | | | | | | Update newt distro tracking fields (From OE-Core rev: c539155c51e43680711130df9050d3e92282591e) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* alsa-tools: update license and add distro tracking fieldsKang Kai2011-08-192-7/+11
| | | | | | | | | | Update license and other informations, then bump up PR. Update distro tracking fields. (From OE-Core rev: b989bb90919eb28cb92e842e989aa5b1fd7f068c) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* slang: add homepage and update distro tracking fieldsKang Kai2011-08-192-3/+5
| | | | | | | | | | Add slang homepage and bump up PR. Update distro tracking fields. (From OE-Core rev: 86c9732728e2e29051d6e6059e19c015c06358cb) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mailx: update license and distro tracking filedsKang Kai2011-08-192-4/+9
| | | | | | | | | update mailx license and bump up PR, and update distro tracking fields. (From OE-Core rev: 290d51e9c8884886995b8adbafe4aa5eb5f879bf) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* eglibc: check dependencies among eglibc optionsKang Kai2011-08-192-2/+75
| | | | | | | | | | | | | | | Fixes [Yocto #1212] 'libc-inet' and 'ipv4' are the same thing, so remove 'libc-inet' from the default DISTRO_FEATURES_LIBC in file default-distrovars.inc. Check the dependencies among eglibc configurable options, make sure that eglibc could be compile successfully only with part of the options. (From OE-Core rev: 4b8d13b72c2c338ec5606f19aa5d7554558c51e5) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* acl: Use BPN instead of PN for style like lib${PN}Dongxiao Xu2011-08-191-1/+1
| | | | | | | | | | | When supporting multilib, ${PN} will be extended with MLPREFIX. However if a package name contains ${PN} with styles like lib${PN}, such extension will cause error. Use BPN in this case. (From OE-Core rev: 58c66c0ef6f9233a308362f0aad36a753206770c) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* attr: Use BPN instead of PN for style like lib${PN}Dongxiao Xu2011-08-191-1/+1
| | | | | | | | | | | When supporting multilib, ${PN} will be extended with MLPREFIX. However if a package name contains ${PN} with styles like lib${PN}, such extension will cause error. Use BPN in this case. (From OE-Core rev: 4bb32686a727e0458f091a34800345938fb56606) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ea-acl: Use BPN instead of PN for style like lib${PN}Dongxiao Xu2011-08-191-3/+3
| | | | | | | | | | | When supporting multilib, ${PN} will be extended with MLPREFIX. However if a package name contains ${PN} with styles like lib${PN}, such extension will cause error. Use BPN in this case. (From OE-Core rev: 2768b3b26d392d988d392c80e52e1f5e9da23c5c) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* curl: Use BPN instead of PN for style like lib${PN}Dongxiao Xu2011-08-191-4/+4
| | | | | | | | | | | When supporting multilib, ${PN} will be extended with MLPREFIX. However if a package name contains ${PN} with styles like lib${PN}, such extension will cause error. Use BPN in this case. (From OE-Core rev: 618de3f788a22127def8244c0d6ebd3608ed5577) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* initrdscripts: fix init-live.shJingdong Lu2011-08-192-2/+2
| | | | | | | | | | | | | Fix bug: [YOCTO #686] Because the variable "ROOT_IMAGE" in init-live.sh is not correct, it fails to run when using liveCD. Modify value of "ROOT_IMAGE" to "isolinux/rootfs.img". If we want to use liveCD, we also need to add some kernel options related to CDROM support when compling kernel. (From OE-Core rev: f9b6f41c9249cc90f7621d446eafae5e5508dd6e) Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bluez4: update recipe from meta-oeMartin Jansa2011-08-191-11/+6
| | | | | | | | | | | | | * fix DEPENDS * fix typo in --enable-pandd option * remove unsupported options * update packaging * remove distro override which doesn't belong to oe-core (From OE-Core rev: dd678881dfd8626299ee3b68284d2f41f07c1c56) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* task-core-boot: allow distribution to override default dev_manager provider ↵Martin Jansa2011-08-191-1/+4
| | | | | | | | | with VIRTUAL-RUNTIME_dev_manager (From OE-Core rev: 6a38215b5214de2da82232f05ed1d29d3c422b3c) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gdb: Add lttng-ust to DEPENDS only for eglibcKhem Raj2011-08-191-2/+9
| | | | | | | (From OE-Core rev: 689c906a9c47b08f9597787c4158e203135787bb) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* task-core-tools: Use LTTNGUST variable instead of hardcoding lttng-ustKhem Raj2011-08-191-3/+3
| | | | | | | | | This helps build on uclibc where lttng-ust is not included (From OE-Core rev: 6baf17f1604853a1770c14cdc6ee0493beab6829) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* at: make at usable for common userKang Kai2011-08-191-21/+5
| | | | | | | | | | | | Fixes [Yocto #1297] The pkg_postinst was added to fix Yocto #675. But it seems not needed any more. Remove it then unprivilege user could use at. (From OE-Core rev: dec5dfa334ce1b2524f80fab3d3f37e476f54a9f) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libxslt: fix packaging of static librariesPhil Blundell2011-08-191-7/+8
| | | | | | | | | This prevents warnings about .a files being installed but not shipped. (From OE-Core rev: 187302dcc1536469a01c6ebd433eda4a4c2c411a) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemu: modify search paths for libglAnders Darander2011-08-191-1/+1
| | | | | | | | | | On e.g. Debian libql is found under /usr/lib/x86_64-linux-gnu/libGL.so. Use a wildcard to match different locations, as uname -i only return unknown on Debian. (From OE-Core rev: 32f74152dfe583f005c8654910b15cd7d0e3d421) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sysvinit: Change ${PN} to ${BPN} in file namesDongxiao Xu2011-08-191-26/+26
| | | | | | | | | | Some files in sysvinit are named with ${PN}. In multilib case, ${PN} will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead. (From OE-Core rev: c7bcf6e7c851269178af99ed9096207ab14fe76c) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* busybox: Change ${PN} to ${BPN} in file namesDongxiao Xu2011-08-192-16/+16
| | | | | | | | | | Some files in busybox are named with ${PN}. In multilib case, ${PN} will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead. (From OE-Core rev: d6c24d3944ed662591372fbd7bf855395655d634) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* perl-native: Update find_perl to find the perl wrapperWenzong Fan2011-08-192-2/+25
| | | | | | | | | | | | | | | | [YOCTO #1157] [YOCTO #829] This is a common issue to the packages which using 'MakeMaker.pm' to generate their Makefiles. The function 'find_perl()' in 'MM_Unix.pm' will be used to figure out the path/link of 'PERL/FULLPERL', but it always find the 'perl.real' instead of perl wrapper. Just update it to find the perl wrapper correctly. (From OE-Core rev: f1d4fb02d9952138acab6d647ce8975363dfdbab) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* glib-2.0: explicitly disable dtrace and systemtap for native varaintJoshua Lock2011-08-191-1/+1
| | | | | | | | | | This prevents systemtap and dtrace being picked up from the host as reported on the Yocto mailing list by Andre Haupt <andre@bitwigglers.org> (From OE-Core rev: 0d883b5df25635fbad45191d297cbdf78a6c1fe0) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: allow a reduction in build timeAnders Darander2011-08-191-6/+7
| | | | | | | | | | | | | | | When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools -nomake examples -nomake demos -nomake docs', build failure can occur, due to not building all tools. * Make rm not error out when removing one of the, possibly, non-existing tools. * Only try to rename qtdemo, if qtdemo exists. * Check if the phrasebook path exists, and only then call do_split_packages() (From OE-Core rev: 51ef8335df895603e75345a18aaefe2359b2387f) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sanity.bbclass: add optional untested host distro warningPaul Eggleton2011-08-191-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | SANITY_TESTED_DISTROS, if specified, is expected to be a newline-delimited list of distro identifier strings, e.g. SANITY_TESTED_DISTROS = " \ Ubuntu 11.04 \ Fedora release 14 (Laughlin) \ " (spaces, tabs etc. are trimmed) If SANITY_TESTED_DISTROS is defined, we will attempt to detect the host distribution. If the distribution is not in SANITY_TESTED_DISTROS or we could not detect the distribution then we show a warning during sanity checking. Provides the mechanism for fixing [YOCTO #1096]. (From OE-Core rev: 75e3875341ddc8940e9ee2ccbbb2ec18194a68e6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* image.bbclass, kernel.bbclass: create warning file about deleting deploydir ↵Paul Eggleton2011-08-193-0/+12
| | | | | | | | | | | | | | | | | | files New users sometimes delete files in tmp/deploy/images assuming they will be re-created just by re-running the build, and then are confused when this doesn't work. To discourage people from doing this, create a file called README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt in tmp/deploy/images containing an explanation of what needs to be done to re-create files there. Fixes [YOCTO #1315] and [YOCTO #1346]. (From OE-Core rev: 4316c5e9eec67d71f4699102a63a5f968bd8d1d9) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel: restore crtsavres.o to enable building external modules on powerpcDarren Hart2011-08-171-0/+7
| | | | | | | | | | | | | | | | | | | | Fixes [YOCTO #1276] As of Linux kernel version 3.0.1, and much earlier, the make clean target removes arch/powerpc/lib/crtsavres.o. As this object is present in KBUILD_LDFLAGS_MODULE, it is required to build external modules, and should therefor not be removed by make clean. While I do not advocate fixing buggy kernels in the generic kernel classes, we should probably account for this one in kernel.bbclass as it affects such a long list of kernel versions. (From OE-Core rev: 2e83e6755441cb14bd907d306974338c15173189) Signed-off-by: Darren Hart <dvhart@linux.intel.com> CC: Bruce Ashfield <bruce.ashfield@windriver.com> CC: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* shadow: switch to a fetchable SRC_URIJoshua Lock2011-08-172-2/+2
| | | | | | | | | | Swith the SRC_URI to the one referenced on the sources section of the utilities download page (http://pkg-shadow.alioth.debian.org/download.php). (From OE-Core rev: c8cdfcd2fe06593d8523b94c33920a607429004a) Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* buildstats.bbclass: Fixing task endtimeBeth Flanagan2011-08-171-3/+3
| | | | | | | | | Task endtime got left out of recent changes. Adding it back in. (From OE-Core rev: f1e4b049438218347922f13de810782be0205c3d) Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ofono: conditionally enable bluetoothAnders Darander2011-08-173-1/+6
| | | | | | | | | Use DISTRO_FEATURE to conditionally depend on bluez4, as well as enabling bluetooth. (From OE-Core rev: 4024bf2874e9da4fd0dd9a2b90a48e8a259781cc) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* connman: use DISTRO_FEATURES to enable wifi and bluetoothAnders Darander2011-08-171-2/+2
| | | | | | | | | As wifi and bluetooth is set in DISTRO_FEATURES, connman should respect this during configuring. (From OE-Core rev: 869a1efee685d59c762b965b98ac9c247be68c29) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qmake_base: add uclibceabiAnders Darander2011-08-171-1/+1
| | | | | | | | | | | Partial sync of qmake_base from meta-oe. * Add a matching rule for *linux-uclibceabi-oe-g++, to make qmake_base.bbclase more similar to the version in meta-oe. (From OE-Core rev: 2a1fa5b3f1424e9264d29027c589b55cf2feb109) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* distro_tracking_fields.inc: update the info for the following recipesDexuan Cui2011-08-171-28/+28
| | | | | | | | | | | | | | | cronie mdadm freetype xproto glproto dri2proto util-macros (From OE-Core rev: 4abc11e6b61d9b26d1b4ebc6c249467a47c5de07) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* dri2proto: upgrade from 2.4 to 2.6Dexuan Cui2011-08-172-57/+3
| | | | | | | | | The patch has been integrated into 1.4.14 so let's remove it. (From OE-Core rev: 8e0e309966576d705c75eb0e82cbf46e57fc0e46) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* glproto: upgrade from 1.4.13 to 1.4.14Dexuan Cui2011-08-172-57/+3
| | | | | | | | | The patch has been integrated into 1.4.14 so let's remove it. (From OE-Core rev: 6f66bab6bf9fa202bfbbaed5d86c0d585e23571e) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* xproto: upgrade from 7.0.21 to 7.0.22Dexuan Cui2011-08-171-2/+2
| | | | | | | (From OE-Core rev: 8f80adf492226af775487e9224d4892a5f9c72a3) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* freetype: upgrade from 2.4.4 to 2.4.6Dexuan Cui2011-08-172-4/+4
| | | | | | | | | | | freetype-2.4.6/docs/LICENSE.TXT changed a little to describe more clearly the compatibility about FreeTypeLicense and GPLv2+, but the actual license remains unchanged: it's still LICENSE = "FreeTypeLicense | GPLv2+". (From OE-Core rev: 06e0d50a936c01d4f02e7208b7e3784947436462) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* util-macros: upgrade from 1.14.0 to the latest version 0.15.0Dexuan Cui2011-08-171-2/+2
| | | | | | | (From OE-Core rev: c8289590ac4b60d1bec5397585c9ceb3d2982ae1) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mdadm: upgrade mdadm from 3.2.1 to 3.2.2Dexuan Cui2011-08-172-179/+4
| | | | | | | | | Remove the patch since 3.2.2 has integrated it. (From OE-Core rev: a39c0c022090ba078ba6132ff69f9587fea592be) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cronie: upgrade from 1.4.7 to 1.4.8Dexuan Cui2011-08-171-3/+3
| | | | | | | (From OE-Core rev: 42ee402fc4ecee9349c1e7ce31c55275f34b121e) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* tcf-agent: add openssl into DEPENDSDexuan Cui2011-08-171-2/+2
| | | | | | | | | | | | | | | | [YOCTO #1330] If tcf-agent's do_compile happens before openssl does populate_root, we'll get such a compilation failure: framework/channel_tcp.c:34:27: fatal error: openssl/ssl.h: No such file or directory Thanks Kumar Gala for reporting this! (From OE-Core rev: 9314d5844a16812bb66e8c9c471ee9fd70a574c2) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Cc: Kumar Gala <galak@kernel.crashing.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bluez-hcidump: upgrade from 2.0 to 2.1Dexuan Cui2011-08-171-2/+2
| | | | | | | | | | | | | | [YOCTO #1371] Recently bluez4 was updated from 4.82 to 4.96 and bluez-hcidump can't build: src/hcidump.c:54:24: error: redefinition of 'ntoh64'. In 2.1 the duplicated definition of ntoh64 was removed. (From OE-Core rev: 15a369b4e65fc8068ba7fec70ec24b7c23e7950b) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package(_ipk).bbclass: opkg using ALL_MULTILIB_PACKAGE_ARCHSLianhao Lu2011-08-173-38/+29
| | | | | | | | | | | | | | [YOCTO #1345] The new variable ALL_MULTILIB_PACKAGE_ARCHS contains all the values of PACKAGE_ARCHS for each multilib variants. The opkg backend now uses this new value insteald of the PACKAGE_ARCHS to update the opkg indexes and to generate the opkg configuration files. This allows the normal packages and multilib packages may be installed into the same rootfs. (From OE-Core rev: b774bf44ef004276da12a83ebd69715c00b596ac) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto: meta SRCREV bumpBruce Ashfield2011-08-171-1/+1
| | | | | | | | | | Bumping the linux-yocto meta SRCREV to pickup new target configurations and features. (From OE-Core rev: 110ca8dcaee263bc3c8380bcb91f6ada20655c14) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qemu: change default kernel to 3.0.xBruce Ashfield2011-08-171-1/+0
| | | | | | | | | | | | The explicit setting of version preference to 2.6.37 is no longer required. All of the qemu targets have been built and boot tested on 3.0.1 for core-image-minimal and core-image-sato and are safe for wider build/boot testing. (From OE-Core rev: 14831b6ba26a6e43a1771a8516d0af145006c504) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto: bump version string to 3.0.1Bruce Ashfield2011-08-171-2/+2
| | | | | | | | | | | There was some confusion around the 3.0 version string in the linux-yocto recipe when the merged version was 3.0.1. Bumping the version string should clarify what version will be fetched. (From OE-Core rev: 29017755329ff1ad740fe094a4a89057e9c2a48d) Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gtk-icon-cache: Adding MLPREFIX when dynamically set RDEPENDSDongxiao Xu2011-08-171-1/+1
| | | | | | | | | | | | When dynamically setting RDEPENDS, we need to add MLPREFIX to adapt multilib case. [YOCTO #1368] (From OE-Core rev: 2ed808b764f023c074fa3aabef18b4f874cd82c7) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: Fix package rename issue in multilib caseDongxiao Xu2011-08-171-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | do_package task will write information into pkgdata and do_package_write_rpm will read them out. Take lib32-dates as an example, one of its RDEPENDS is li32-gtk+, and PKG_lib32-gtk+ = "libgtk-2.0", these info is stored at: tmp/pkgdata/x86_64-pokymllib32-linux/runtime/lib32-dates. Function "mapping_rename_hook" in do_package_write_rpm is to handle those renamed packages. However before it executes, translate_vers has stripped the multilib prefix out, making it failed to find PKG_gtk+ value in pkgdata. This commit moves the strip_multilib out of translate_vers and call it after "mapping_rename_hook". [YOCTO #1368] CC: Mark Hatle <mark.hatle@windriver.com> (From OE-Core rev: 216a1cfe7973e99e3e79585040e91f7a6e298884) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: enhance strip_multilib functionDongxiao Xu2011-08-171-4/+4
| | | | | | | | | | | | | | | | The previous logic could only strip MLPREFIX from the first element in an array, take an example, strip_multilib the [lib32-a lib32-b lib32-c] will result in [a lib32-b lib32-c]. We need to strip prefix one by one. This commit change the logic to strip all elements' multilib prefix. [YOCTO #1368] CC: Mark Hatle <mark.hatle@windriver.com> (From OE-Core rev: ca729de4b261e4feba74fdf0b2578890bc80ea90) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>