summaryrefslogtreecommitdiffstats
path: root/meta/classes/package_rpm.bbclass
Commit message (Collapse)AuthorAgeFilesLines
* package_rpm.bbclass: ensure base-passwd and shadow get installed firstScott Garman2012-03-231-1/+8
| | | | | | | | | | | | | | | When generating images, we need to make sure that base-passwd and shadow get installed before other packages, which might need to create custom user accounts. Thanks to Richard Purdie for the initial version of this fix. This fixes [YOCTO #2127] (From OE-Core rev: 3d2d3cb379608301b17ce57787d324c2f06bf4f9) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: fix bashims at rpm_common_comand() methodOtavio Salvador2012-03-191-2/+1
| | | | | | | | (From OE-Core rev: 43d48d60613418acbaf671c7e8c6cd7d1f6b176b) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Cc: Daiane Angolini <daiane.angolini@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)Richard Purdie2012-03-051-3/+3
| | | | | | | | sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)Richard Purdie2012-03-051-1/+1
| | | | | | | | | | | | Using "1" with getVar is bad coding style and "True" is preferred. This patch is a sed over the meta directory of the form: sed \ -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \ -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \ -i `grep -ril getVar *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta/classes: Convert to use appendVar and appendVarFlagsRichard Purdie2012-03-051-4/+2
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes: replace 'Poky' with 'OE-core'Koen Kooi2012-02-011-5/+5
| | | | | | | (From OE-Core rev: 1fdcd32520a05465b0d54c062f28bac9cdf74a20) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: Add support for filenames with spacesMark Hatle2012-01-171-4/+4
| | | | | | | | | | Files with spaces must be fully quoted in an RPM spec file. It was easier to quote all file paths, then to do it selectively. (From OE-Core rev: a0f5dd25a37fe3b8664c2133e80b6214559f93f6) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Incremental rpm image generationRobert Yang2012-01-111-10/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incremental rpm image generation, the rootfs would be totally removed and re-created in the second generation by default, but with INC_RPM_IMAGE_GEN = "1", the rpm based rootfs would be kept, and will do update(remove/add some pkgs) on it. NOTE: This is not suggested when you want to create a productive rootfs For example: 1) Add the follow config option to a conf file: INC_RPM_IMAGE_GEN = "1" 2) bitbake core-image-sato modify a package bitbake core-image-sato The rootfs would not be totally removed and re-created in the second generation, it would be simply updated based on the "package". Implatation: 1) Figure out the pkg which need to be removed or re-installed, then use 'rpm -e to remove the old one. Use the rpm's BUILDTIME to determine which pkg has been rebuilt. 2) Figure out the pkg which is newly added, and use 'rpm -U' to install it. This only for the rpm based rootfs, the deb and ipk based rootfs would be done later. [YOCTO #1651] (From OE-Core rev: 575ba3c9e153a1d8ac228a99a03ca2df5fbca151) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: Add RPMSPEC_PREAMBLEMark Hatle2011-12-241-0/+6
| | | | | | | | | | | Add a way to add arbitrary text to the top of a spec file. This can be useful for adding specific tags to the produced binaries for tracking purposes. (From OE-Core rev: c01a92408d267bcc5365bf8495035f6021a49ced) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Adjust RPM call to use dynamic location for magic filesMark Hatle2011-12-241-1/+1
| | | | | | | | | | The magic file could be installed somewhere else if the system native prefix settings are changed. Adjust the packaging files to compensate for this. (From OE-Core rev: 93c0e9915b5c9bf8b0877c76f89de721adfbfd66) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* getVar/setVar cleanupsRichard Purdie2011-11-271-3/+3
| | | | | | | | | Complete the bb.data.getVar/setVar replacements with accesses directly to the data store object. (From OE-Core rev: 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: Set _tmppath to avoid races over tmp filesRichard Purdie2011-11-181-0/+1
| | | | | | | | | | | | | Occasionally we keep seeing "unable to open temp file" messages during do_package_write_rpm tasks. This appears to happen when multiple processes are writing rpm files and is likely due to using the shared system temp directory. This patch changes the tmp path to the package work directory meaning conflicts should become a non-issue. (From OE-Core rev: b2ef543284c8c8d0d3badb2e1bcadad1106982d2) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rootfs_rpm.bbclass: Enable pre and post install scriptsMark Hatle2011-11-111-1/+32
| | | | | | | | | | | | | | | | | | | | | [YOCTO #1755] We change the want the RPM rootfs install works to install pre and post install scripts. The new method uses a script helper that is invoked by RPM outside of the normal chroot. The wrapper is dynamically generated prior to the install starting. It will check the return code of the script. If the script fails, it will store a copy to be executed on the first system boot. This is similar to the previous mechanism. In addition, a line of debug was added to the scripts as written by package_rpm to list which package and which script for later debugging, if necessary. (From OE-Core rev: 3e7120d6a9fd5e46214673d0a6e1085a7314ff42) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Convert to use direct access to the data store (instead of bb.data.*Var*())Richard Purdie2011-11-101-68/+68
| | | | | | | | | | | | | | | | | This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes: Remove various bashismsRichard Purdie2011-11-101-9/+9
| | | | | | (From OE-Core rev: a057adfbb72454e28294f00075a69e0e7c699bec) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/package_rpm: disable uninstall scripts for upgradesPaul Eggleton2011-11-101-2/+16
| | | | | | | | | | | | | | | | | | | | | Our current assumption (based on the behaviour of opkg) when writing recipes is that prerm and postrm do not get called during an upgrade. When using rpm however, these are mapped to the rpm "preun" and "postun" events which occur after postinst for upgrades, and when these contain removal type operations (such as update-alternatives --remove) this causes problems. This patch wraps each preun and postun script for rpm in a check that determines whether or not the script is being called during an upgrade, and skips the entire script if it is, which mimics the behaviour of opkg under the same conditions. Fixes [YOCTO #1760] (From OE-Core rev: 1d3f37dc9a43ba6d6beb7b4530c077f239032b99) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* multilib: Drop MULTILIB_IMAGE_INSTALLDongxiao Xu2011-11-081-28/+9
| | | | | | | | | | | | | | | There should just be a single IMAGE_INSTALL variable. If the package backends need this split into different multilib components they should be responsible for doing this, not the user. This commit removes the MULTILIB_IMAGE_INSTALL variable. [YOCTO #1564] (From OE-Core rev: 7736862a74c92fe1afe42e170822be13117575c2) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: Ensure multilib code is only called in the multilib caseRichard Purdie2011-10-041-15/+18
| | | | | | | | | This fixes some error messages in the do_rootfs logs of non-multilib builds. (From OE-Core rev: 439867efcc9a7df6062fdb8dae85004b1e9ed08c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* multilib: add MLPREFIX to deploy folderDongxiao Xu2011-09-281-2/+8
| | | | | | | | | | Add MLPREFIX to multilib deploy forlder to avoid the confliction between multilib and normal package deploy directory. (From OE-Core rev: 18b8d1f7769b63725c3b6883298a841806cd06ab) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: combine normal and multilib solution manifest togetherDongxiao Xu2011-09-281-2/+3
| | | | | | | | | | | | When RPM does the real install, if the first manifest file is empty, the installation will stop without handling the second manifest file. Merge the two manifest files together to fix this issue. (From OE-Core rev: e0ffab2321b22b40333a0e857d42c16ae599cc0c) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rootfs_rpm: two step installationDongxiao Xu2011-09-221-4/+50
| | | | | | | | Firstly we install a base image. Then install those multilib packages listed in MULTILIB_IMAGE_INSTALL. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Fix RPM dependenciesMark Hatle2011-09-211-1/+1
| | | | | | | | | | | When packaging for RPM, dependencies were not being properly added to the packages. Only the "providing" dependencies were added due to a typo. (From OE-Core rev: c5d4e17f29d7f032d566d3b222a0ee231da03f78) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* multilib: install MULTILIB_IMAGE_INSTALLDongxiao Xu2011-09-211-14/+28
| | | | | | | | | | | | | | | If user set MULTILIB_IMAGE_INSTALL, we need to install those multitlib packages into the final image. Also fix the logic in handling multilib prefix. For certain case like a normal image contains several multilib libraries, the image recipe isn't extended with MLPREFIX, therefore we need to enumerate the possible multilib prefixes and compare them with package prefixes. (From OE-Core rev: a94cc552dc764d3cc83ea638cb08b9a2a8829d2f) 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>
* package_rpm: Fix attemptonly and suggest packagesMark Hatle2011-08-121-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | [YOCTO #1325] [YOCTO #1366] Packages that were in the PACKAGE_ATTEMPTONLY and SUGGESTS were not being properly found, which was causing image creation failures. In PACKAGE_ATTEMPTONLY, when an item was not found, it caused an error. This should have been a note, followed by skipping the package. The SUGGESTS processing was simply broken. It was using a non-existant function, due to an apparently typo. In addition to the above, the MLPREFIX processing was not being done properly, preventing multilib packages from working in this with PACKAGE_ATTEMPTONLY. (SUGGESTS doesn't need this as the names are munged when creating the packages.) (From OE-Core rev: 4fb6723ab1ee14cf539f0ef2df63a3ee1b978de6) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: Update the platform config and --targetMark Hatle2011-08-121-3/+11
| | | | | | | | | | | | | | | | | When constructing the /etc/rpm/platform file, we need to ensure that the any, all, and noarch platforms will allow any "linux" variant to be installable, not just matching variants.. i.e. arm-oe-linux-gnueabi should be able to install noarch-oe-linux Also ensure that we pass the full canonical arch via the --target= parameter. This allows us to define the proper platform settings for all packages. (From OE-Core rev: c6bb9445de90cfb46db9c40842dbe1bfbb5b8ce8) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Magic file path should be given for rpmbuildjani.uusi-rantala@nokia.com2011-08-111-0/+2
| | | | | | | | | | | Magic file path should be given for rpmbuild in _rpmfc_magic_path define so that build system default file is not used by accident. Not doing this caused many packages to fail building in several systems. Fixes [YOCTO #1358] Signed-off-by: Jani Uusi-Rantala <jani.uusi-rantala@nokia.com>
* package_rpm: Ensure alternatives links are reflected in rpm package dependenciesRichard Purdie2011-08-031-0/+4
| | | | | | | | | | | | | | | Currently, if a file is provided as an alternative link within the package, rpm doesn't see the dependency. This works out badly for dependencies such as /bin/sh which scripts might require. Since rpm detects and adds these dependencies we do need to ensure the dependency information in the packages is correct. This patch does so for the rpm backend ensuring internal consistency whilst the approach for addressing this problem in the other package backends is considered. (From OE-Core rev: 102fc29b9c9eae8435b29edb41b5090ace2373c5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake.conf: Add SDK_PACKAGE_ARCHSMark Hatle2011-08-021-9/+1
| | | | | | | | | | | | | | | | Add SDK_PACKAGE_ARCHS to avoid the sed operations we were previously doing inside of the variouns populate_sdk functions and related items. Also add documentation to populate_sdk to explain when the various functions are expected to be doing. Finally fix a bug in populate_sdk_rpm where the wrong value was being set, noticed while working on this change. (From OE-Core rev: 587c1d5bac71fa6faa65ee3a271391cbf931e8f7) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rootfs_rpm: Cleanup and minor bug fixesMark Hatle2011-08-021-73/+55
| | | | | | | | | | | | | | | | | | | | | | | in packages_rpm.bbclass: Cleanup the way package_update_index_rpm works. Break this out into two functions, one for common functionality and one for controlling target vs sdk package processing. Similar change to package_generate_rpm_conf. Usage of IMAGE_ROOTFS should actually be "target_rootfs", this fixes a problem with the SDK case. in rootfs_rpm.bbclass: Minor re-order of the values, and avoid multiple uses of IMAGE_ROOTFS in order to make the merge with the SDK behavior easier. (From OE-Core rev: 46559f36d8a39655060b45d3d235de44a2c4c09b) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: fix one typoYu Ke2011-08-011-1/+1
| | | | | | | | | | | | fix the MLPREFIX referrence typo which cause multilib rpm do_rootfs failure CC: Mark Hatle <mark.hatle@windriver.com> (From OE-Core rev: 9653089620ad5aef7876b582708561c3a315a064) Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_{deb, rpm, ipk}.bbclass: fix 'lingusa' typoKoen Kooi2011-08-011-3/+3
| | | | | | | (From OE-Core rev: 5e22d7d1fea7dfb14380de5692e4b2940781b518) Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: Fix mistake reported by Mark HatleRichard Purdie2011-07-271-1/+1
| | | | | | (From OE-Core rev: 78a1a915d660d6039ac532239e25ead8507bc2df) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package/rootfs_rpm: Implement RPM multilib package handlingMark Hatle2011-07-271-85/+144
| | | | | | | | | | This is a first pass at adding multilib support to the RPM package and image handling code. (From OE-Core rev: 1939a4395997098862912e013a2b13ed2f385f9f) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/package_rpm.bbclass: Change the way the PV is transformedMark Hatle2011-06-231-5/+18
| | | | | | | | | | | There were some odd instances where the PKGV could not be loaded in the old way. Change to verify that PKGV exists before attempting to retrieve the value from the key. (From OE-Core rev: c2ce3573fb2816cd2023a56b364fae4c0f4455ae) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/package_rpm.bbclass: Enhance diagnostic messagesMark Hatle2011-06-231-1/+6
| | | | | | | | | | | | We clearly state now if we are: * Skipping an empty package * Creating a (full) package * Creating an empty package (From OE-Core rev: 3db9d865ef7d65e3712eb7f9a659bb31cb3cb75e) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: make RPM use on-disk permissionsScott Garman2011-06-061-0/+2
| | | | | | | | | | | | Instruct RPM to use the on-disk permissions, owners, groups, and directory permissions, instead of defaulting to root:root Code changes suggested by Mark Hatle. (From OE-Core rev: a6464f9484f56f596e3215184ad56ac6769ebb0c) Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/package_xxx.class: Use PKGE/PKGV/PKGR.Lianhao Lu2011-05-271-7/+7
| | | | | | | | | Use PKGE/PKGV/PKGR to build various package feed in tasks of pacakge_write_xxx. (From OE-Core rev: c2872315905fcdf6e4bf11fe96e5ca62af3475f8) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Move packagedata code into oe.packagedata (sync from OE)Chris Larson2011-05-201-1/+2
| | | | | | | (From OE-Core rev: e6858627ab087f2f25ebbd6c4422eeae35f3b0ac) Signed-off-by: Chris Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package-index.bb: add support for deb and rpm.Dexuan Cui2011-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [YOCTO #1024] Currently package-index.bb only supports ipk. This commit adds the support for rpm and deb, too. ------------------------------ How to generate and use repos: 1) run "bitbake package-index" after building some target, e.g., core-image-sato-sdk; 2) export ${DEPLOY_DIR_RPM}, ${DEPLOY_DIR_IPK} and ${DEPLOY_DIR_DEB} by a webserver on the host, assuming the host IP is 192.168.7.1, at http://192.168.7.1/rpm http://192.168.7.1/ipk http://192.168.7.1/deb 3) inside the target, according to the packaging system (rpm, ipk or deb) used when we generate the target image, we can use different ways to manage packages: 3.1) RPM run "zypper addrepo http://192.168.7.1/rpm main; zypper refresh" to retrieve info about the repo; next, we can use "zypper install/remove" to manage packages. 3.2) IPK add the repo info into opkg config file, i.e., in /etc/opkg/arch.conf, we can add something like "src i586 http://192.168.7.1/ipk/i586", and next, we run "opkg update" to make opkg update the list of available packages. And later, we can use "opkg install/remove" to manage packages. 3.3) DEB Currently in target, some important config files, like /var/lib/dpkg/status and /etc/apt/sources.list, for deb/apt are missing. So we can't install/remove package in target at present. (From OE-Core rev: 01e34bdb43e0cc27c1cfffd6730c384f40c404c1) Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: use target vendor informationAdrian Alonso2011-05-101-1/+2
| | | | | | | | | | | * Instead of hardcoding target vendor string "-poky" use TARGET_VENDOR information in case of using external toolchains (From OE-Core rev: 0638c470410b7ac3057d8f64ae0d389b5c3da838) Signed-off-by: Adrian Alonso <aalonso@secretlab.ca> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: Ensure we take the sstate shared lockfile in the place we write ↵Richard Purdie2011-03-291-6/+3
| | | | | | | | | | | | | | | | files The point we need to take the lock is when the rpm files are written into the deploy rpm directory. Since sstate makes the actual installation of the files, that is the point we need to take the lock. This also stops the deploy/rpm directory being accessed for a lock before it exists. [YOCTO #797] [YOCTO #925] (From OE-Core rev: 833a1e970f087dfcb32967cee3e24540f041cde0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: Fix rootfs generationMark Hatle2011-03-101-1/+7
| | | | | | | | | | | | | | | [YOCTO #797] During rootfs generation, if other RPM packages are being wrtten this could cause a failure during the solvedb generation. We add a shared lock around the RPM package building. This will allow multiple RPM packages to continue to be written at the same time, but prevent rootfs generation and RPM package generation at the same time. (From OE-Core rev: 1d5ca654a482f582c75faf546140dfd6064da73b) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* rootfs_rpm: Fix rootfs generation using RPM packagesMark Hatle2011-02-251-6/+9
| | | | | | | | | | | [BUG #756] Fix bug #756. The rootfs contains a control file /etc/rpm/platform that specifies the default system platform, as well as patterns for compatible architectures. This file was not being setup properly due to a misunderstanding of the format in a previous patch. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
* package_rpm: Fix solverdb generationMark Hatle2011-02-161-13/+19
| | | | | | | | | | | The RPM solverdb was potentially being generated multiple times. Fix this by ensuring we only process each directory once. Also correct an issue where the solution did not necessarily follow the preferred architecture ordering, reverse the default Poky ordering so that preferred is listed first. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
* rpm: Add the ability to use the platform file during installMark Hatle2011-02-161-5/+10
| | | | | | | | | | | Add a new rpm macro, rpmrc_platform_path to specify an alternative platform file. This is required to allow the dep resolver to identify compatible packages. Also workaround a minor problem with the --showrc command in RPM. A bug has been reported upstream on this. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
* rootfs_rpm/package_rpm.bbclass: Move func from rootfs_rpm to package_rpmLianhao Lu2011-02-011-10/+220
| | | | | | | | | | | | | | | | | | | | | package_deb.bbclass: 1. Modified package_update_index_rpm() and package_generate_rpm_conf() to generate sperate depsolver db and rpm configuration, for target packages and host packages respectively. 2. Added new function package_install_internal_rpm() to install a list deb packages to a specified root directory, with the specified package architecutre information. 3. Added new function resolve_package_rpm() to resolve package names to filepaths. rootfs_deb.bbclass: Used the above new functions to install the rootfs. [sgw: merged changes for createrepo] Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com>
* image/package_xx/rootfs_xx.bbclass: move rootfs_xx_log_check().Lianhao Lu2011-01-311-0/+20
| | | | | | | Move function rootfs_xx_log_check() from rootfs_xx.bbclass to relevant package_xx.bbclass. (Where xx is rpm/ipk/deb). Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
* package_rpm: Fix package-split summaryMark Hatle2011-01-301-1/+1
| | | | | | | The package-split summaries were being pulled in from the main package, not the split package metadata. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>