Commit Graph

78 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
Matthew McClintock 4115f94f22 Add new IMAGE_CLASSES variable for classes for image generation
Allows us to import classes only for images and not to the global
namespace

(From OE-Core rev: 49dcb301ab39327554d86d23cf6f8d435d7a7351)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-08 21:48:18 +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
Richard Purdie 6706c7bdd2 image.bbclass: No need to run most tasks except do_rootfs
Running fetch/unpack/patch/compile/install etc. is pointless
since the only image task that does anything is the rootfs task.

Hence mark the useless tasks as noexec so we don't bother running them.

(From OE-Core rev: b3d1c440feb7fd7b3e3374ca528195ab9bd3a7ce)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:42 +01:00
Otavio Salvador 2884c48743 image.bbclass: improve comments regarding exported functions
(From OE-Core rev: 2097874dab4d6b77d7ece026808283381c2cbe1a)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 23:11:11 +01:00
Lianhao Lu 99dd3c0b2c image/package.bbclass: Revise multilib support for DEBIAN_NAME.
[YOCTO #1486]
1. image.bbclass: In multilib_sanity_check, duplicated files except
those matching to MULTILIBRE_ALLOW_REP are allowed if they're equal.

2. pacakge.bbclass: Allow DEBIAN_NOAUTONAMES variable to be
automatically mapped in multilib case.

(From OE-Core rev: 66f9045e17c39f5c64a0699b72ea460a0701717a)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-16 18:07:26 +01:00
Chris Larson a6b35d9613 image.bbclass: use ${TARGET_PREFIX}depmod
Currently it uses ${TARGET_SYS}-. This is inconsistent, as the recipe
and kernel bbclass both use the prefix. While there aren't many cases
where the two differ, it is harmless to ensure that we are behaving
consistently.

(From OE-Core rev: 8aec52f4fd1ad3e4148e2ad32700a4378e69dcd3)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-30 22:12:56 +01:00
Paul Eggleton 472f050077 image.bbclass, kernel.bbclass: remove non-standard -n option from cp command
-n is not a POSIX option and does not work on some systems (e.g. Debian
Lenny); in any case it is not strictly necessary here, so remove it.

(From OE-Core rev: 13e14763f14b5b84051ecb158404dcef937cc4e0)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-23 18:32:39 -07:00
Paul Eggleton 333d571b36 image.bbclass, kernel.bbclass: create warning file about deleting deploydir 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>
2011-08-19 09:29:18 -07:00
Chris Larson a86252db8b image: add support for generally useful {dev,doc,dbg}-pkgs features
(From OE-Core rev: 7fd8fe53072d3bebb31da4e556878d3c25a10478)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-10 13:33:07 +01:00
Chris Larson 073caff599 image: implement IMAGE_FEATURES
IMAGE_FEATURES is analagous to DISTRO_FEATURES and MACHINE_FEATURES, for
root filesystem construction. Currently, the only supported features are
any defined package groups, as used by the oe.packagegroup python
module.

Example usage:

    PACKAGE_GROUP_myfeature = "vim iptables"
    IMAGE_FEATURES += "myfeature"

(From OE-Core rev: f9f4416a8cfbd37c7d3a8eb19ee82820e2e6b38c)

Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-10 13:33:07 +01:00
Lianhao Lu af1cd61210 image.bbclass: Added variables for multilib support.
1. Added MULTILIB_PACKAGE_INSTALL for multilib instances of packages to
be installed in the rootfs.

2. MULTILIBRE_ALLOW_REP contains the regular expression to match the
files allow to be replaced by the conflicting files.

3. MULTILIBRE_FORCE_SAME contains the regular expression to match the
files allow to be replaced only if the conflicting files are identical.

4. Added shell function multilib_sanity_check() to check whether the
overwring for multilib situation is allowed.

(From OE-Core rev: 137a4626a7e8107fc8a71724d5124f44236293b9)

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
Saul Wold ba8a726b7d classes/image*: Revamp creation of live images
This creates a live image as an IMAGE_FSTYPES, thus removing the
need to have additional -live.bb recipes.  To create a live image
one just needs to add live to the IMAGE_FSTYPES list

(From OE-Core rev: b3ff63796cd6629975ff0a726ba18cc168e0a2b2)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-27 12:02:46 +01:00
Richard Purdie f7b11f2fd5 image.bbclass: Add LINGUAS_INSTALL to dependency list
Currently if there are locales to install in the image the appropriate
packages might not automatically get built since there is no dependency
being exposed to bitbake.

This patch exposes the missing dependencies to bitbake through the RDEPENDS
field hence ensuring images build successfully when locales are added but
not depended upon anywhere else in the build.

[YOCTO #1215]

(From OE-Core rev: 2f731352aa21b43b35247eafd873de775eb0de34)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-08 16:39:07 +01:00
Anders Darander 586ccf2a3f image|kernel.bblass|module-init-tools: do not use depmod-2.6
Change to only depend on virtual/*/depmod.
Change all calls to only use depmod.
Do not install depmod as depmod-2.6
Bump PR in module-init-tools-cross.

(From OE-Core rev: 351e352c2e44a3d8103594ca7e1d8404979a220c)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:34:17 +01:00
Mark Hatle 477f685ce0 Add umask task control
Bitbake now allows the umask to be specified per task.  The
following tasks will have a umask of 022 set by default:

do_configure
do_compile
do_install
do_package
do_populate_sysroot
do_rootfs

do_configure and do_compile need a umask of 022 set because -many- recipes
directly copy generated files out of recipe's build directory.  Instead of
fixing each existing and future recipe, it was shown to be much easier to
just set the umask.

(From OE-Core rev: 0cfa7ebcf661aa0645c6d4d858b04946ebacb7e4)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-30 20:57:05 +01:00
Richard Purdie 5527983bcc task-core-nfs/image.bbclass: Fix some libc overrides
(From OE-Core rev: 4616095d75c0c13953e0bb339b0cafc3c3eb8314)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-17 15:14:46 +01:00
Phil Blundell 594d886f09 image.bbclass: use soft assignment for LDCONFIGDEPEND
This allows distros that don't want ldconfig to turn it off.

(From OE-Core rev: cd9662ff326de05332afabea3ec35bbbd861687c)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-17 15:14:45 +01:00
Richard Purdie 2c2e61743c Rename the remaining poky-* scripts to oe-* or runqemu-*
(From OE-Core rev: 877b3d84597fcfc3abf5aa332019d412f2717896)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:31 +01:00
Richard Purdie 751f42b943 image.bbclass: Disable ldconfig-native when using uclibc
(From OE-Core rev: 58286c2bc19f073d273895ad760689e2074489e4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-05 22:20:53 +01:00
Nitin A Kamble d0adbfd6d9 image.bbclass: make execution ldconfig verbose
The failure of ldconfig was not getting logged anywhere before.

(From OE-Core rev: 880b0a222fdc11ee088bcaf8c832edae23bc28a7)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 23:56:29 +01:00
Richard Purdie e7f52f8f4c image.bbclass: Remove uneeded do_populate_sysroot requirement for images
(From OE-Core rev: 68d19cc52869d7732fac0d185be811bc38334970)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-29 14:01:50 +01:00
Richard Purdie 89fee17fae image.bbclass: Add dependencies on native versions of update-alternatives and updated-rc.d explicitly
(From OE-Core rev: c7ab6c5697b5ab18848576ffd0b5cc8e5f89de01)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-29 14:01:50 +01:00
Richard Purdie b5e03a1a17 base/kernel/image.bbclass: Clean up do_deploy ordering to ensure it just happens before a build completes
(From OE-Core rev: a3b80688465ba5ba7e6d514f9a40ee224a9d3a28)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-29 14:01:49 +01:00
Richard Purdie ed41be01dc bitbake.conf/image.bbclass: Move image type information into image_types.bbclass
Image generation code in .conf files is hard to read as it needs to be
single line. By moving this to a separate class, multiline functions
can be used instead improving readability. It also declutters
bitbake.conf.

There is no real functional change with this patch but it highlights
the need for improvements in places such as the IMAGE_EXTRA_OPTION
ext* specific variable which makes no sense.

(From OE-Core rev: a5c403f0fc71f38c0669691da7f637303ea09a27)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-25 16:34:23 +00:00
Richard Purdie adac5a690f image.bbclass: Move ROOTFS_SIZE into runimagecmd() function
Image type specific size overrides for IMAGE_ROOTFS were being ignored.
Moving the size calculation to after the overide expansion point addresses
this problem.

[YOCTO #928]

(From OE-Core rev: 2f676dadebebc461c1e01e0b6da3cb2258829048)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-24 12:34:05 +00:00
Richard Purdie b94de9a24a image.bbclass: Improve readability of the image generation code
The quoting in get_imagecmds() is hard to read. We can simplify the constuction
a little to make this easier to parse and reduce complexity slightly.

(From OE-Core rev: da5d038f955bf47155a0f217dba2f96e263bcad8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-24 12:34:04 +00:00
Mark Hatle 110f1f9418 image.bbclass: Disable shell debug messages
By default image had a "set -x" to enable shell debug messages,
this adds a lot of overhead to the system due to logging.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2011-02-16 07:34:51 -08: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 e427f251a4 image.bbclass: Use the dedicated BB_WORKERCONTEXT, not bitbake internals to detect context
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-14 11:57:48 +00:00
Gary Thomas 2078af333d image.bbclass/initscripts: Make /etc/timestamp usage consistent.
Timestamp is kept in UTC
 Remove superfluous 'create_etc_timestamp()' function
 - seems to be a duplicate of 'rootfs_update_timestamp()'
 Remove External function reference

[sgw@linux.intel.com: merged 2 patches and cleanup commit message]

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-11-14 21:08:22 -08:00
Richard Purdie 0e0fadb400 rootfs_rpm: Add lock file in the rpm deploy directory to allow mutliple rootfs creation tasks to coexist without breaking each other
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-07 15:41:17 +01:00
Saul Wold 1f65837e78 image.bbclass: change IMAGE_EXTRA_SPACE to IMAGE_OVERHEAD_FACTOR
This change allows the IMAGE_OVERHEAD_FACTOR (default to 1.2) to
adjust dynamicly how much space to add for each image, thus there
is 20% overhead space by default.

Signed-off-by: Saul Wold <Saul.Wold@intel.com>
2010-09-08 16:36:53 -07:00
Joshua Lock 29d5edffb0 Use pseudo rather than fakeroot for fake root privileges
Make use of the ability to configure the fake root provider and use Wind
River's pseudo utility.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-07-16 15:40:32 +01:00
Jiajun Xu fd1d661b39 test: add automation framework and sanitytest
Automation test is disabled by default. User need set TESTCLASS
to qemu in conf/local.conf and run bitbake command "bitbake
poky-image-xxx" or "bitbake poky-image-xxx -c qemuimagetest" to
trigger it. Currently only the sanity test with two testcases are
added.

To run the test, user need prepare a testing environment:
1) "expect" should be installed on system
2) NOPASSWD should be set for user to run bitbake

Signed-off-by Jiajun Xu <jiajun.xu@intel.com>
2010-07-15 12:48:25 +01:00
Richard Purdie 4e0ee648b4 image.bbclass: Don't perform mapping renaming until we're running the task itself.
Need to extend bitbake to provide this information rather than refer to a bitbake
internal variable.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-07-02 14:34:14 +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 d5341fb796 Add poky-trim-schemas post install script to remove unneeded schema locale translations from images (credit to Ross Burton for the initial script)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2009-08-28 17:11:57 +01:00
Richard Purdie c92acf4b05 image.bbclass: Use IMAGE_ROOTFS_SIZE if the image will fit into it and only add extra space if the image is too small (ported from OE by hrw) 2009-01-23 16:24:46 +00:00
Richard Purdie 30238161a6 image.bbclass: Generate the image after running the kernel modules and ldconfig commands, not before 2009-01-07 16:31:48 +00:00
Richard Purdie 13ee3030f3 image.bbclass: Fix typo 2008-11-10 21:47:49 +00:00
Richard Purdie 793dc948e6 image.bbclass: Add function to write out an image manifest 2008-11-10 21:39:34 +00:00
Samuel Ortiz 31aee0a9f9 image.bbclass: Add routine for disabling x startup when needed 2008-11-10 17:21:10 +01: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 774485d133 image.bbclass: Add INHIBIT_DEFAULT_DEPS 2008-10-28 15:14:00 +00:00
Richard Purdie fc467314f8 image.bbclass: Make the kernel depmod dependent on the presence of a kernel - some images eg an initramfs don't have this
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5473 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-09 19:08:11 +00:00
Marcin Juszkiewicz 2eadfa913f image.bbclass: generate modules.dep
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5468 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-10-09 09:36:00 +00:00
Marcin Juszkiewicz 6ae402ea3f image.bbclass: make ext2/ext3 images autoresize
New variable IMAGE_EXTRA_SPACE contains amount of kilobytes which has
to be added to size of IMAGE_ROOTFS. Resulting size is then passed to
genext2fs util.

As a result we do not have to specify size for ROOTFS_SIZE anymore.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5269 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-09-25 14:09:22 +00:00
Richard Purdie 7438d56cae image.bbclass: Make sure DEPLOY_DIR_IMAGE exists before running image generation
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4633 311d38ba-8fff-0310-9ca6-ca027cbcb966
2008-06-12 20:18:24 +00:00