| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
| |
Change to inherit features_check, since distro_features_check has been
deprecated in OE.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
|
|
|
| |
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
|
|
|
|
| |
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
|
|
|
|
|
|
|
| |
No functional changes, rename OTA_IMAGE_ROOTFS to TAR_IMAGE_ROOTFS
since the later is a more common name.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
The command "ostree refs --create" creates a new ref that points to a pre-existing commit hash.
This does not add this new ref to the ref-bindings metadata in OSTree.
The missing metadata leads to OSTree verifcation failures when working with the new ref.
Fix this by adding the "--bind-ref" option to "ostree commit" which adds the needed
ref-binding metadata.
Signed-off-by: Jeremias Cordoba <js.cordoba8321@gmail.com>
|
|
|
|
|
|
|
| |
This mimics the intended behavior of the default in garage-sign, but
doesn't rely on the date in the unsigned targets.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
|
|
|
|
|
|
|
| |
Use GARAGE_TARGET_EXPIRES or GARAGE_TARGET_EXPIRE_AFTER (but not both!)
to set the garage-sign parameters.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
|
|
|
|
|
|
| |
This reverts commit 8e7a0aeb3682386ed674ed0f682634d6a50983b7.
Signed-off-by: Laurent Bonnans <laurent.bonnans@here.com>
|
|\
| |
| | |
Follow Filesystem Hierarchy Standard
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Add /usr/local support as outlined in OSTree documentation. This
makes sure that a writeable and persistent /usr/local directory
is available.
See also: https://ostree.readthedocs.io/en/latest/manual/adapting-existing/
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
| |
| |
| |
| |
| |
| |
| | |
Make the root home directory only accessible by root. Use 700
as commonly used for the root home directory.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
The Filesystem Hierarchy Standard defines several top-level directory
to be writeable. Add those even in the absence of files installed by
OpenEmbedded so a user might actually use them.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
|\ \
| | |
| | | |
Move OSTREE_BRANCHNAME to image_types_ostree.bbclass.
|
| |/
| |
| |
| |
| |
| |
| |
| | |
If it is set in sota.bbclass and overwritten in local.conf, bitbake will
rebuild everything. Now bitbake should only rerun the commands in
image_types_ostree (and image_types_ota) as expected.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
|
|/
|
|
|
|
|
| |
This allows a user to define their own script to be executed after
a target has been added to the repository but not yet signed.
Signed-off-by: Andy Doan <andy@foundries.io>
|
|
|
|
| |
Signed-off-by: Mykhaylo Sul <ext-mykhaylo.sul@here.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
To enable simultaneous bitbaking of two images with the same branch name, create
a new ref in the OSTree repo using the basename of the image.
As @OYTIS has pointed out, this probably won't solve every problem that might
come up with simultaneous bitbaking, such as if the two images use different
bootloaders. However, it does solve the immediate problem that comes up with our
primary-image + secondary-image example.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
|
|
|
|
|
|
|
| |
Search made with the following regex: getVar ?\((.*), True\), this is
to be consistent with OE.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
|
|
|
|
|
|
|
|
| |
Adds initramfs and/or devicetree into checksum calculation.
According to ostree documentation if devicetree and/or initramfs are
included into ostree, checksum should also include them.
Signed-off-by: Luka Pivk <luka.pivk@toradex.com>
|
|
|
|
|
|
|
|
|
|
|
| |
We remove GARAGE_SIGN_REPO at the start and end of this task, which
causes trouble if two images call this task at the same time. This
probably could be fixed in a better fashion (like putting the repo in an
image-specific subdirectory) but this is quick and easy, and the task
usually doesn't take long to run, so the lack of parallelization is not
a big loss.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
|
|\
| |
| | |
classes/image_types_ostree.bbclass: add device tree to boot/devicetree
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Include device trees into boot/devicetree-*-checksum. Device trees with
this name format get picked up by ostree and copied into boot/.
Ostree also generates entry inside uEnv.txt called fdt_file pointing to
this device tree.
Normaly one would include only one device tree. If KERNEL_DEVICETREE
includes more then one device tree this will add all the device trees
but ostree will still pick only one device tree and include it into
boot.
We are working on modifications to ostree so it will pickup all
the device trees.
Signed-off-by: Luka Pivk <luka.pivk@toradex.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
OpenEmbedded's usrmerge implementation checks that nothing is
installing in /bin, /sbin or /lib. Hence those directories
are empty by default. There is no need for the manual usrmove
anymore.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
| |
| |
| |
| |
| |
| |
| | |
Make usrmerge a mandatory DISTRO feature when using the ostree class.
This will allow to remove the "manual" usrmerge implementation.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
|/
|
|
|
|
|
|
|
|
|
|
|
| |
OSTree does not allow concurrent access to the repository. If
two bitbake instances use the same OSTree repository, then they
might access it simultanously. The lockfile to prevent such
simultaneous access should really be in the same location where
the OSTree repository is stored.
Revert back to the location inside the OSTree repository.
Fixes: e97975d6113c ("image_types_ostree/ota.bbclass: refactor ostree task")
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are several flaws with ostree tasks, as follows:
- ${IMAGE_NAME}.rootfs.ostree.tar.bz2 is generated, but it's not being
used during ostree commit, so it should be removed if it's just a
intermittent artifact. Or if we intend to deploy this tar.bz2 file,
it should be tracked by sstate cache, that is to day, it should be
generated in ${IMGDEPLOYDIR} rather than in ${DEPLOY_DIR_IMAGE}.
- There are quite a few redundant code like mktemp/cd/rm a directory,
which can be replaced by setting 'dirs', 'cleandirs' varflags.
- There are some redundant variable check logic in image_types_ostree
and image_types_ota bbclass.
To fix the above, we make the following changes:
- Introduce a new conversion image type 'tar', it could convert ostree
and ota to ostree.tar, ota.tar, hence we can drop the code generating
ostree.tar.bz2 in image_types_ostree.bbclass, and also drop the
do_image_ota-tar task. To let this conversion type take effect, the
otasetup task needs to be changed to ota.
- Introduce BUILD_OSTREE_TARBALL variable, when being set to 1, a
ostree.tar.bz2 tarball would be built, BUILD_OSTREE_TARBALL defaults
to be 1, to be consistent with original behavior.
- Replace 'ota-tar ota-tar.xz' with ota.tar.xz in IMAGE_FSTYPES.
- Add a sanity check bbclass sota_sanity.bbclass, to ensure ostree or
ota is not in OVERRIDES, this is to prevent potential naming
pollution with other meta layers, and also check the required
variables are not empty. This sota_sanity.bbclass is a common class
that could be extended easily in furture, and one of its most
advantages is that all the check are done in bb.event.SanityCheck
event handler, so the end users could get the error message at very
beginning of the recipe parsing time.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
| |
There are quite a few 'export' syntax, they are either not necessary or
being redundant. Actually only the variables being referred in ostree
or aktualizr need to be exported, we can move them into sota.bbclass so
they can be exported once only for all other classes referring to them.
And drop all other unnecessary exports.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- unzip-native:do_populate_sysroot should be depended by
do_image_garagesign task instead of by do_image_ostree task.
- openssl-native:do_populate_sysroot can be removed since it's being
depended by aktualizr-native already.
- do_image_garagesign and do_image_garagecheck does not have to depend
on aktualizr-native:do_populate_sysroot, that dependency is being
added by do_image_ostreepush -> aktualizr-native:do_populate_sysroot.
- drop ostreepush dependency from IMAGE_TYPEDEP_garagecheck, that is
redundant.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
|
|
|
|
|
|
|
|
| |
When calling bbfatal, it reports error message and exit 1, it should be
used to replace of 'bberror && exit 1' to avoid being redundant.
Also fixed some incorrect bberror usages and typos.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
|
|
|
|
| |
Signed-off-by: Serhiy Stetskovych <patriotyk@gmail.com>
|
|
|
|
|
|
|
|
| |
Use /etc/sota/ecus as using /var/sota/ecus was conflicting with the
provisioning recipes that also use /var/sota. Not totally ideal, but the
best compromise I could find.
Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
|
|\
| |
| | |
classes: image_types_ostree: use locking during OSTree repo update
|
| |
| |
| |
| |
| |
| |
| |
| | |
The OSTree repository might be shared accross several individual
OSTree builders. Use bitbakes lockfiles mechanism to lock the
OSTree for exclusive use.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Currently we assume if the OSTree repo exists, that there is a
OSTree repo in it. This does not need to be true in general, and
when using lockfiles bitbake will create the directory before
the do_image_ostree task is executed the first time.
Use ostree refs to detect whether the target directory contains a
OSTree repo.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
|
| | |
|
|/ |
|
|
|
|
|
|
|
| |
Use OSTREE_UPDATE_SUMMARY to automatically update summary after committing
to ostree repo
Signed-off-by: Luka Pivk <luka.pivk@toradex.com>
|
|
|
|
|
|
|
| |
Use OSTREE_COMMIT_BODY write custom text to ostree body
Use OSTREE_COMMIT_SUBJECT to write custom subject
Signed-off-by: Luka Pivk <luka.pivk@toradex.com>
|
| |
|
|
|
|
|
|
|
| |
Without this the build fails because the initramfs hasn't been build
before do_image_ostree. There should be a dependency through
virtual/kernel:do_deploy, but there is clearly some reason why this
isn't enough.
|
|
|
|
| |
Signed-off-by: Yevgeny Popovych <yevgenyp@pointgrab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The issue is that when only vmlinuz-* file is present
(the case when both DTB and initramfs are in FIT),
libostree will assume that there is no initramfs at all and will supply
different init= parameter on the kernel command line
(aimed to boot directly from sysroot).
This effectively breaks boot process as init specified
on the kernel cmdline is not present in initramfs.
Solution is to basically create an empty initramfs-* file
when we use FIT.
The proper solution would be to make libostree aware of whether
we use FIT or not.
Note, to actually boot with initramfs in FIT - a change to u-boot
script (env) is needed which will remove explicit usage of initramfs.
Signed-off-by: Yevgeny Popovych <yevgenyp@pointgrab.com>
|
|
|
|
|
|
|
|
| |
This will reduce the level of indirection and improve compatibility
with the rest of OE.
For example, FIT that includes initramfs may now be built.
Signed-off-by: Yevgeny Popovych <yevgenyp@pointgrab.com>
|
|\
| |
| | |
image_types_ostree: no need to create boot/loader folders when creating ostree repo
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
ostree repo
The boot/loader folders are only required at the deploy stage, which is
already created by image_types_ota.bbclass.
Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
|
|/
|
|
|
|
|
| |
Make garage-push logs more useful in case of errors when pushing to the
OTA+ server.
Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
|
|
|
|
|
|
|
| |
Both values can be defined by the user, allowing a custom version id and
URL, which is specially useful for CI builds.
Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
|
|\
| |
| | |
image_types_ostree.bbclass: clean up GARAGE_SIGN_REPO after push
|
| |
| |
| |
| |
| |
| | |
Avoid exposing the sign repo after the build is completed.
Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
|
|\ \
| |/
|/|
| | |
Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com>
|