Commit Graph

20 Commits

Author SHA1 Message Date
Richard Purdie
4b41d9072a busybox/packagegroups: Break out the busybox-syslog dependency
The busybox-syslog rrecomends is proving tricky as it gets pulled in early and
there are conflicts between its use of update-alternatives and busybox needing
to provide those things.

We already have recipes using BAD_RRECOMMENDS to remove this dependency, it probably
makes sense to spell it out explicitly and allow it to be overridden more easily.

This patch does this, dropping the now unneeded BAD_RRECOMMENDS. It preserves
the dependency as a recommendation for now, further cleanup may allow simplication
of that.

This unbreaks certain build failures on the autobuilder, more as a workaround but
is a change we probably want to make anyway.

(From OE-Core rev: 544ade2d78f1375d9e93d6bf5842d857ddaf3530)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-09-10 12:13:07 +01:00
California Sullivan
53078a00ce core-image-minimal-initramfs: use initramfs-framework for initialization
initramfs-framework is more modular and expandable. This change was
proposed in commit 28fc6ba761ed4a47efa7c43e7f7dff5e2fe72b5e
"core-image-minimal-initramfs: use initramfs-framework by default" but
reverted due to the selftests runqemu.RunqemuTests.test_boot_machine_iso
and runqemu.RunqemuTests.test_boot_deploy_hddimg failing. Since then,
the kinks have been worked out, and missing functionality that had been
missed (non-EFI installation module) has been added.

Since the PACKAGE_INSTALL variable was getting so long with all these
individual modules getting added, I also introduced a new
INITRAMFS_SCRIPTS variable to the core-image-minimal-initramfs recipe.
This variable makes the recipe look much cleaner, and also allows easier
replacement or additions to the scripts.

Fixes [YOCTO #10987].

(From OE-Core rev: 882ae0dcce2d96a7c286fc23b22b07972d3d8f93)

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-04-18 18:57:06 +01:00
Robert Yang
e18b7e77ed image-live.bbclass: add MLPREFIX to core-image-minimal-initramfs
The 32bit core-image-minimal-initramfs should be built when build lib32-iso, e.g.:
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
IMAGE_FSTYPES += "iso"

$ bitbake lib32-core-image-minimal
Exception: FileExistsError: [Errno 17] File exists: '/path/to/tmp/sysroots-components/core2-64/qemuwrapper-cross/usr/bin/crossscripts/qemuwrapper' -> '/path/to/tmp/work/qemux86_64-pokymllib32-linux/lib32-core-image-minimal/1.0-r0/lib32-recipe-sysroot/usr/bin/crossscripts/qemuwrapper'

This was because:
lib32-core-image-minimal -> core-image-minimal-initramfs
core-image-minimal-initramfs -> qemuwrapper-cross
lib32-core-image-minimal -> lib32-qemuwrapper-cross

So we got the error, build lib32-core-image-minimal-initramfs can fix the problem.

(From OE-Core rev: eee3ec805cf150f1c701427a2d182a537a67e8f5)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2018-01-02 17:24:37 +00:00
Richard Purdie
fab2219af4 Revert "core-image-minimal-initramfs: use initramfs-framework by default"
This reverts commit 28fc6ba761ed4a47efa7c43e7f7dff5e2fe72b5e since it causes
runqemu.RunqemuTests.test_boot_machine_iso and runqemu.RunqemuTests.test_boot_deploy_hddimg
to fail in oe-selftest.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-30 08:46:19 +01:00
Ng, Wei Tee
aec9e9b1dc core-image-minimal-initramfs: use initramfs-framework by default
Use the initramfs-framework for initialization by default due to
the modularity and expansibility.

[YOCTO #10987]

(From OE-Core rev: 28fc6ba761ed4a47efa7c43e7f7dff5e2fe72b5e)

Signed-off-by: Ng, Wei Tee <wei.tee.ng@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-07-27 22:36:53 +01:00
Martin Jansa
aac36591db core-image-{minimal, testmaster}-initramfs: set COMPATIBLE_HOST
* use the same COMPATIBLE_HOST restriction as initramfs-live-install(-testfs)
  to resolve ugly error when trying to build them e.g. for ARM:

  ERROR: Nothing RPROVIDES 'initramfs-live-install-testfs' (but /home/jenkins/oe/world/shr-core/openembedded-core/meta/recipes-extended/images/core-image-testmaster-initramfs.bb RDEPENDS on or otherwise requires it)
  ERROR: initramfs-live-install-testfs was skipped: incompatible with host arm-oe-linux-gnueabi (not in COMPATIBLE_HOST)
  NOTE: Runtime target 'initramfs-live-install-testfs' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['initramfs-live-install-testfs']
  ERROR: Required build target 'core-image-testmaster-initramfs' has no buildable providers.
  Missing or unbuildable dependency chain was: ['core-image-testmaster-initramfs', 'initramfs-live-install-testfs']

  ERROR: Nothing RPROVIDES 'initramfs-live-install' (but /home/jenkins/oe/world/shr-core/openembedded-core/meta/recipes-core/images/core-image-minimal-initramfs.bb RDEPENDS on or otherwise requires it)
  ERROR: initramfs-live-install was skipped: incompatible with host arm-oe-linux-gnueabi (not in COMPATIBLE_HOST)
  NOTE: Runtime target 'initramfs-live-install' is unbuildable, removing...
  Missing or unbuildable dependency chain was: ['initramfs-live-install']
  ERROR: Required build target 'core-image-minimal-initramfs' has no buildable providers.
  Missing or unbuildable dependency chain was: ['core-image-minimal-initramfs', 'initramfs-live-install']

(From OE-Core rev: 8016b51d81ca9ed1567effa9d2870b1d98684350)

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>
2016-05-22 16:11:14 +01:00
Stephano Cetola
4693593cc5 images: zero out the rootfs_extra_space in initramfs images
Setting IMAGE_ROOTFS_EXTRA_SPACE impacts the initramfs images, results
in an error about INITRAMFS_MAXSIZE.

(From OE-Core rev: 3ee82430f3f3eb62cbc949658808d109222e8b24)

Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-04-18 16:28:21 +01:00
Alejandro Joya
d9ffa59743 core-image-minimal-initramfs: replace base-utils
It replaces the use of busybox as hardcoded dependency to more dynamic
this wouldn't affect the way that the system is build only it let a more
flexible replacement in the core.

(From OE-Core rev: 3cef7dda39ac88046e282121585f5b4e067d47a7)

Signed-off-by: Alejandro Joya <alejandro.joya.cruz@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-06 15:27:33 +00:00
Saul Wold
8d13b43f16 core-image-minimal-initramfs: Use PACKAGE_INSTALL instead of IMAGE_INSTALL
PACKAGE_INSTALL is set from the IMAGE_INSTALL variable with some additional
items, since PACKAGE_INSTALL is intended to be more an internal variable, use
it instead of the IMAGE_INSTALL which is recommeded for installing additional
packages. This will allow the initramfs recipe to use a fixed set of packages
and not be affected by IMAGE_INSTALL.

[YOCTO #5791]

(From OE-Core rev: abf40223d1412ee8f9d2b5269fad7c6aca6c2570)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28 14:01:12 +00:00
Richard Purdie
00052fe695 core-image-minimal-initramfs: Remove odd quote characters
The quote characters present trigger python 3 characters type warnings,
we don't need them so replace them with normal quote characters.

(From OE-Core rev: 3c104443506cb89d72944e46096a94a80838a707)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-09 14:06:50 +01:00
Ross Burton
aeaee7155e core-image-minimal-initramfs: don't install busybox-syslog
This uses BAD_RECOMMENDATIONS which isn't supported by all package backends, but
it's a start.

(From OE-Core rev: 996b3e344838db40ef8ef17efd719b830c23fa40)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-03-26 22:43:02 +00:00
Darren Hart
64f7feb5c3 EFI: Make installer EFI aware
[YOCTO #1919]

Create a basic EFI installer script modeled after the existing installer
and add it to a new initramfs-live-install-efi recipe. Update the
init-live.sh script to distinguish between LABEL=install and
LABEL=install-efi and select the appropriate script. Add the efi
installer to core-image-minimal-initramfs.

Update grub-efi.bbclass to use "LABEL=install-efi" when it detects a
label of "install". This is clearly not ideal, but a proper fix would
involve decoupling the LABELS assignment from the image-live.bbclass
usage of SYSLINUX_LABELS. We should be able to address that in a
follow-on clean-up series.

V2: Include missing initramfs-live-install-efi_1.0.bb
V3: Rebase after Radu's console_params fix

(From OE-Core rev: 4bce3417917a3e88ba6529db394525fba82e0699)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 17:49:48 +01:00
Elizabeth Flanagan
c9173dab9a Hob: Modify Image Descriptions
Fixes [YOCTO #2227]

I've updated the image descriptions per the bug description.

(From OE-Core rev: 479b020edbc609c3ae1e3846e9e0d1643ac10059)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-06 01:12:46 +01:00
Shane Wang
127d1fd1c2 core-image-foo: add description to each image bb file
Add DESCRIPTION to each image bb file according to poky reference manual for Hob2 use later.

(From OE-Core rev: 05a7c022e613f35de8ce47bb667140a7ce47fcea)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-24 11:54:15 +00:00
Dmitry Eremin-Solenikov
b46e118431 bitbake.conf, core-image-minimal-initramfs: add INITRAMFS_FSTYPES
Initramfs images don't benefit from usual IMAGE_FSTYPES overrides. The
only sane values for them are "cpio.XXX". If IMAGE_FSTYPES is set to
include 'live', building core-image-minimal-initramfs can result in
build error, if the image is built before the kernel. To stop initramfs
images from responding on IMAGE_FSTYPES settings, but still allow
users/developers to override defaults (e.g. to generate "cpio.lzma"
initramfs), introduce INITRAMFS_FSTYPES variable, by default set to
"cpio.gz".

(From OE-Core rev: 17f7f3a43e863d9e2a16dd02face5137a4f4b225)

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-16 16:19:27 +00:00
Paul Eggleton
b4f471ce09 core-image-minimal-initramfs: force IMAGE_FSTYPES
If the user has set their own value for IMAGE_FSTYPES, they may have
disabled the cpio.gz image type, preventing the initramfs from being
produced in the format that image-live.bbclass expects; so force
IMAGE_FSTYPES to cpio.gz within the initramfs image recipe.

(From OE-Core rev: 571919f49cbe6f8f5b21de844b00761314e697fd)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>

Prepend cpio.gz instead

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-07 14:05:42 +00:00
Darren Hart
ce2b383d04 Prevent IMAGE_FEATURES from contaminating initrd
Set IMAGE_FEATURES="" in core-image-initramfs to prevent
the setting of things like EXTRA_IMAGE_FEATURES in local.conf
from contaminating the initrd with features meant for the rootfs.

Suggested-by: Richard Purdie <richardpurdie@linuxfoundation.org>
(From OE-Core rev: bb4dad44432b2e40ac3cf16baa45befbae3e70f5)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-16 13:30:27 +01:00
Saul Wold
470c0fee68 IMAGE_ROOTFS_SIZE Cleanup
This basic cleanup removes the _ext2/3 overrides from places they
no longer belong since they did not allow further overrides. In doing
this the core-image-minimal* recipes can now set a reasonably small
rootfs so that it's a realistic size for minimal.

The new default for minimal is 8M and will be adujsted upward by the
IMAGE_OVERHEAD_FACTOR (default of 1.3).

This also fixes the ROOTFS_SIZE usage in the IMAGE_CMD_<fstype> code

(From OE-Core rev: d3f6e1e6106ab539e73c19037915b2e4a5f2efa9)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-25 15:50:57 +01:00
Richard Purdie
fc2cee5cc6 Rename poky-lsb override to linuxstdbase
(From OE-Core rev: 73a227a738da17229baac142ccd889c7929402ba)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:32 +01:00
Richard Purdie
6e95cb246f Rename poky-image-* -> core-image-* and task-poky-* -> task-core-*
(From OE-Core rev: 560b04181d8f51d189b99f01a72f17210dadf7a3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:30 +01:00