Commit Graph

58 Commits

Author SHA1 Message Date
Richard Purdie c8dee9b92d Convert to use direct access to the data store (instead of bb.data.*Var*())
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>
2011-11-10 11:51:19 +00:00
Dongxiao Xu 1ef442561d multilib: Drop MULTILIB_IMAGE_INSTALL
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>
2011-11-08 14:32:55 +00:00
Koen Kooi de0d9ae939 rootfs_ipk bbclass: special-case base-passwd preinst to run first
Preinst are run alphabetically which breaks when e.g. avahi-daemon needs /etc/passwd present.

(From OE-Core rev: d6793165feb26c51b5f19ad1e6d1a4099878e879)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-04 15:43:29 +00:00
Lianhao Lu 27f8868509 debian/_ipk.bbclass: Added multilib support for package_name_hook()
[YOCTO #1486]
1. Added multilib support for package_name_hook() so MLPREFIX is kept in
the final package name.

2. clean the output of log_check_ipk.

(From OE-Core rev: e59c4e34daa688c033dd4ac07a69099610ac5705)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-16 18:07:25 +01:00
Lianhao Lu 28543c5780 package(rootfs)_ipk.bbclass: support multilib in opkg backend.
Support install multiple multilib in opkg backend.

The installation is done in 3 phases.

Phase 1: install normal packages to IMAGE_ROOTFS.

Phase 2: install multilib packages under MULTILIB_TEMP_ROOTFS. Packages
belongs to the same multilib arch would be installed to a unique
directory.

Phase 3: check file confliction between IMAGE_ROOTFS and
MULTILIB_TEMP_ROOTFS, install multilib packages to IMAGE_ROOTFS only if
the sanity check passed.

(From OE-Core rev: 9d81c2166be7ed388e5616e01ca2b4059e524c8e)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-27 16:25:35 +01:00
Chris Elston 1e433eef8f Add support for BAD_RECOMMENDATIONS to rootfs_ipk
As discussed on IRC on 30/06/11, this patch adds support for
BAD_RECOMMENDATIONS to rootfs_ipk, which is a list of packages NOT to
install if suggested or recommended by a recipe.  Taken from
http://thread.gmane.org/gmane.comp.handhelds.openembedded/30417.

Note that current support for this in oe.dev may also be broken,
depending on the version of opkg in use.

(From OE-Core rev: 2b6900ad73919a0ecb8c5f1de31744ce7afe65f5)

Signed-off-by: Chris Elston <celston@katalix.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-12 15:08:20 +01:00
Phil Blundell e24428521a rootfs_ipk: delete opkg metadata if package management not required and all packages are configured
If all the postinsts were successfully run in offline mode, and
package-management hasn't been requested as an IMAGE_FEATURE, the opkg
metadata is now redundant and can safely be deleted.

Also, the update-rc.d and base-passwd packages can be removed since
they will serve no further purpose in this situation.

If some packages are still unconfigured at this point then we need to
keep their metadata around so that either opkg or the awk script can
configure the packages at boot time.  In theory it would be possible to
strip out the data for packages that have already been configured, but
right now we just hold on to the whole status file in that situation.

(From OE-Core rev: 87780fc09b066525e47d0f50ee5497db54d304cd)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-02 14:55:55 +01:00
Phil Blundell 5d1fcb16b2 rootfs_ipk: issue a diagnostic if rootfs is declared read-only and not all maintainer scripts could be applied offline
(From OE-Core rev: 5e9becaa6ba8a0302e3bb91bff0d580127433918)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-25 15:50:57 +01:00
Lianhao Lu b94f9ccd05 rootfs_ipk/package_ipk.bbclass: Move func from rootfs_ipk to package_ipk
package_ipk.bbclass:
Added new function package_install_internal_ipk() to install a list of
ipk packages to a specified root directory, with the specified package
architecutre information.

rootfs_ipk.bbclass:
Used the above new functions to install rootfs.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
2011-02-01 23:59:37 +00:00
Lianhao Lu 5b7e96d852 image/package_xx/rootfs_xx.bbclass: move rootfs_xx_log_check().
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>
2011-01-31 16:58:15 +00:00
Richard Purdie 8c3a7ebac8 rootfs_ipk: The most recent opkg errors upon file overwrite. Until we fix package conflicts, disable this for now
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-24 01:12:56 +00:00
Kevin Tian 8ea7fa6d4c opkg: finalize the change to var directory
commit 1d0757f16b changes opkg run state from
/usr/lib/opkg to /var/lib/opkg, which however is incomplete and still many
important information is kept under old directory including postinst methods.
This makes latest boot into a mess.

So finalize this movement to /var here. Fix [BUGID #229]

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
2010-08-26 08:54:55 +01:00
Yu Ke 8658f478b7 rootfs_ipk.bbclass: add keyword "Collected errors" for log error check
Once ipk meet errors, the log will show "Collected errors:\n xxxx ".
so keyword "Collected errors" is more general to catch errors.

Signed-off-by: Yu Ke <ke.yu@intel.com>
2010-07-30 14:50:30 +01:00
Joshua Lock 0d18597ae7 rootfs_ipk: error when dependencies cannot be satisfied
Per bpo#109 dependency failure during rootfs generation did not cause an error
despite that it would cause errors later on in the process. This patch updates
the key phrases searched for in the log checking function.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-07-22 17:04:39 +01:00
Joshua Lock eb3c93f401 rootfs_ipk.bbclass: ensure the package manager can create lock files
The opkg package manager uses /usr/lib/opkg to store lock files in, modify the
remove_package_data_files() function to create an empty directory once the data
files are removed so that the lock can be created.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-06-10 14:49:50 +01:00
Richard Purdie b772c8cde5 bitbake.conf/base.bbclass: Rename the staging directory to sysroots and the populate_staging task to populate_sysroot
This change makes the purpose of the staging directory more obvious and
the taskname more true to what it now actually does.

The layout version number is increased due to the change in layout
but code to convert existing directories and insert a symlink for
backwards compatibility is included.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:42 +00:00
Richard Purdie c54117458a classes: Remove and sanitise import statements
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-11-13 12:15:28 +00:00
Richard Purdie 710d5b5f0f root_ipk.bbclass: Give EXTRAOPKGCONFIG a default value
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-07-15 13:43:33 +01:00
Richard Purdie efd00048e3 rootfs_ipk.bbclass: Don't generate the arch.conf file, provide this as a packaged file in future
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-07-15 12:57:10 +01:00
Richard Purdie 793dc948e6 image.bbclass: Add function to write out an image manifest 2008-11-10 21:39:34 +00:00
Richard Purdie 436c5f4716 classes: Add mechanism to install packages into images only if they've been built 2008-11-06 16:23:32 +00:00
Richard Purdie 51268c1f15 rootfs_ipk.bbclass: Don't error if the file doesn't exist
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5467 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-08 22:20:14 +00:00
Richard Purdie fb439d9bc0 package_ipk/rootfs_ipk.bbclass: Update image from feed handling
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5465 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-08 16:49:57 +00:00
Richard Purdie 8626cf563c rootfs_ipk.bbclass: Fix shell commands
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5378 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-02 09:42:27 +00:00
Richard Purdie beee0c51f2 rootfs_ipk.bbclass: Improve image from feed generation
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5374 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-01 15:52:19 +00:00
Richard Purdie 39b0cfa2bd Rename FEED_URIS -> IPK_FEED_URIS
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5373 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-01 15:42:55 +00:00
Richard Purdie 18104e1216 rootfs_ipk.bbclass: Add the hard bit of image generation from feeds, controlled by a BUILD_IMAGES_FROM_FEEDS variable
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5372 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-01 15:38:55 +00:00
Richard Purdie d12df5427a Switch from ipkg-utils to opkg-utils
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4863 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-07-17 21:34:57 +00:00
Marcin Juszkiewicz 76c8b40e44 opkg prints 'loading conf' informations so we get two lines each time
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4604 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-06 14:14:59 +00:00
Marcin Juszkiewicz 8009f0e3fe rootfs_ipk.bbclass: do grep in install_all_locales just once
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4603 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-06 14:14:28 +00:00
Marcin Juszkiewicz 99e0700b4b rootfs_ipk.bbclass: reformatted install_all_locales function
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4602 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-06 14:14:10 +00:00
Marcin Juszkiewicz eedc6b9b2f rootfs_ipk: added ROOTFS_POSTINSTALL_COMMAND
It is for functions which wants to install/remove packages after rootfs is
populated but before flags are mangled.

This can be used by 'install_all_locales' function for example.


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4601 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-06 14:13:40 +00:00
Richard Purdie d4e39f916c rootfs_ipk.bbclass: Fix for use with lock capable opkg
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4591 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-05 21:18:11 +00:00
Marcin Juszkiewicz 8678ec5d12 rootfs_ipk.bbclass: remove opkg lists later as some rootfs postprocessing may require them
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4589 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-05 20:52:08 +00:00
Marcin Juszkiewicz 626a4ac599 rootfs_ipk.bbclass: added install_all_locales function
This code checks which packages got installed in rootfs and install
locale packages for all languages (taken from IMAGE_LOCALES).


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4588 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-05 20:51:43 +00:00
Marcin Juszkiewicz 14b747cb79 rootfs_ipk.bbclass: do not install glibc-localedata-i18n separately - language support will fetch it automatically
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4587 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-05 20:51:21 +00:00
Richard Purdie bfe8092d3b poky-image.bbclass: Correctly handle inserting package-managers into images by making it an image feature
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4517 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-05-20 14:58:34 +00:00
Marcin Juszkiewicz d128d6fc75 rootfs_ipk.bbclass: new update-alternatives script use OPKG_OFFLINE_ROOT (from OE)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4108 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-20 17:17:08 +00:00
Marcin Juszkiewicz 280f86eb2c rootfs_ipk/image.bbclass: removing of opkg lists data to rootfs_ipk class where it should belong
Signed-off-by: Marcin Juszkiewicz <hrw@openedhand.com>


git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4028 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-17 13:18:54 +00:00
Marcin Juszkiewicz 346dec3686 rootfs_ipk.bbclass: switched to opkg
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4026 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-03-17 13:18:21 +00:00
Richard Purdie 63b739f0fe classes: Sync various tweaks from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2643 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-09-01 23:49:12 +00:00
Richard Purdie c6938aad87 Factor ipkg index and conf file creation into package_ipk.bbclass
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2637 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-09-01 22:17:06 +00:00
Richard Purdie f2ddfbb308 classes: Sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2630 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-09-01 15:25:40 +00:00
Richard Purdie 48fd37f5f9 packaging: Split deb and ipk creation into separate tasks so changing the packaging type means the new type of packages are automatically generated.
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2526 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-08-21 09:37:30 +00:00
Marcin Juszkiewicz a47e493bac rootfs classes: added remove_packaging_data_files() function to be used in minimal images
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2007 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-06-26 11:35:20 +00:00
Richard Purdie 409335beae classes: Rework core dependencies to work properly at the task level
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1427 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-04-03 11:31:02 +00:00
Richard Purdie b30afa242b rootfs_ipk.bbclass: Fix typo, whitespace
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1124 311d38ba-8fff-0310-9ca6-ca027cbcb966
2007-01-08 21:06:47 +00:00
Richard Purdie 4cf2d71a16 rootfs_(deb|ipk).bbclass: Fix bashism so works on dash
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1002 311d38ba-8fff-0310-9ca6-ca027cbcb966
2006-12-05 11:10:28 +00:00
Richard Purdie 0ac664d01a rootfs_xxx.bbclass: Add missing checkins from the log_check updates
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@938 311d38ba-8fff-0310-9ca6-ca027cbcb966
2006-11-22 15:28:28 +00:00
Richard Purdie e09dab0614 classes: Sync with OE - mainly quoting fixes or other minor updates
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@885 311d38ba-8fff-0310-9ca6-ca027cbcb966
2006-11-20 15:19:39 +00:00