Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

simplify image content and bundles #104

Merged
merged 1 commit into from
Apr 14, 2016

Conversation

pohly
Copy link
Contributor

@pohly pohly commented Apr 12, 2016

Removes the extra "ostro-image-swupd-reference" image and the
"reference" bundle and instead moves the content into the base images
of both ostro-image-swupd and ostro-image-noswupd.

Because the doc changes would conflict with the changes in PR #100,
this PR here includes all of those commits, too. That way we can
merge PR #100 and then this one, or this one directly.

@barbieri I hope this addresses your review feedback from PR #95.

@olev @mikko @kad I expect this to speed up the builds a bit.

-----------------

When building production images, first follow the instructions
provided in :file:`meta-intel-iot-security/meta-integrity/README.md` for creating your own

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dbkinder and @gvancuts should we convert that doc to .rst and then integrate it in our website autogen documentation?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this should be included in the documentation set.

README files are OK for some explanatory information about the component, but we should not have users wandering around components looking for them. We (Geoffroy/David) should take a look around the other components and see if there are substantial gems of information scattered around in README files we can incorporate into the documentation set.

-- david

From: Gustavo Sverzut Barbieri [mailto:[email protected]]
Sent: Tuesday, April 12, 2016 7:27 AM
To: ostroproject/meta-ostro [email protected]
Cc: Kinder, David B [email protected]
Subject: Re: [ostroproject/meta-ostro] simplify image content and bundles (#104)

In doc/howtos/building-images.rsthttps://github.com//pull/104#discussion_r59385123:

+Developers building their own images for personal use can follow these

+instructions to replicate the configuration of the published Ostro OS images. All necessary

+private keys are provided in the ostro-os repository.

+To do this, before building, edit the :file:conf/local.conf configuration file,

+find the line

+with # require conf/distro/include/ostro-os-development.inc and

+uncomment it. This will also add some recommended software to the ostro-image-noswupd

+reference image, see below for details.

+Production Images

+-----------------

+When building production images, first follow the instructions

+provided in :file:meta-intel-iot-security/meta-integrity/README.md for creating your own

@dbkinderhttps://github.com/dbkinder and @gvancutshttps://github.com/gvancuts should we convert that doc to .rst and then integrate it in our website autogen documentation?


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHubhttps://github.com//pull/104/files/706737ae1b53d4576a0c68c3f4ebcb961063b620#r59385123

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1 on adding a subset of the README.md file to our main doc (via .rst file).

@barbieri
Copy link

+1 for me, very good.

@pohly
Copy link
Contributor Author

pohly commented Apr 12, 2016

PR #100 is currently more recent than this PR here. I suggest we merge PR #100 first, then rebase this one here and merge it later.

Now both ostro-image-swupd.bb and ostro-image-noswupd.bb contain the
same components in the base image, which means that we can remove the
then redundant "reference" bundle and the awkward changing the
ostro-image-noswupd content when including ostro-os-development.inc.

The main motivation for this change is the observation that there is
no need to keep components like ConnMan out of the "os-core" bundle,
because we never expect it to be removed from our example
images. Therefore including it in the "os-core" is consistent with
what other OEMs would also do.

A side effect is that the former "ostro-image-swupd-reference" image
recipe and files are gone and get replaced just by
"ostro-image-swupd". This could have been avoided in various ways (renaming
image files, renaming base recipe), but ultimately those would all have
led to awkward name space inconsistencies. It is better to change the
name one more (last?) time while the "ostro-image-swupd-reference"
name is new and not established yet.

The actual "Ostro OS core" remains unchanged, i.e. it is what
ostro-image.bbclass without additional customization pulls in.

The unused "full" bundle gets removed, too. Removing one image recipe
and (in total) two bundles improves build times.

Some other feedback for the initial meta-swupd integration and
observations also get addressed:
- bundle definitions are image-specific and thus belong into the
  image recipe (ostro-image-swupd.bb in our case)
- developers can modify the additional bundle content added on top
  of ostro-image-swupd by modifying BUNDLE_CONTENTS_WORLD
- better explanation in conf-notes.txt about the purpose of
  ostro-image-swupd
- better explanation that defining SWUPD_IMAGES creates virtual
  image recipes
- ssh-server never has been a valid image feature, it only worked
  as bundle -> removed because we now use ssh-server-openssh as
  part of the reference software
- the recently added app-framework only adds content and thus must
  be added to OSTRO_IMAGE_PKG_FEATURES
- Python automatically switches to bigger ints instead of
  overflowing, so the OS_VERSION code is safe.

Signed-off-by: Patrick Ohly <[email protected]>
@pohly
Copy link
Contributor Author

pohly commented Apr 13, 2016

Rebased on top of the recent app-framework image feature change and also fixed that (must be added to OSTRO_IMAGE_PKG_FEATURES). It also turned out that "full" is a reserved bundle name (with some subtle implications, like include os-core in pack-full-from-0.tar when it should have contained only the additional files), so now ostro-image-swupd.bb uses "world" as bundle name for "all our additional software".

@mythi mythi merged commit ac498e1 into ostroproject:master Apr 14, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants