[PATCH v4 0/6] Fixes usage of additional apt keys and repos

["Andreas J. Reichel" <andreas.reichel.ext@siemens.com>]

From: Andreas Reichel <andreas.reichel.ext@siemens.com>

Diff to v3:
	* Remove apt-get update in target root file systems,
	  and use the isar-apt again as the only apt source, to support
	  consistent target root file systems without intermediate
	  updates.
	* Add the keyring in the right place (isar-bootstrap function
	  in isar-bootstrap.inc, which needs Claudius' flock patch
	  to fix the reversed double-ticks usage, which breaks
	  everything
	* only add gnupg if we add apt-keys
	* better commit message for revert commit
	* include Claudius' patch to make it clear that it should
	  be merged before
	* isar keyring file is specified in bitbake.conf, where
	  it should be to be available to all image generation
	  steps

What this series does:

Enable the user to really ADD bootstrap repos and keys without
replacing existing ones.

The existing keyring is not replaced but keys are added to
/ect/apt/trusted.gpg.d/isar.gpg instead, where debootstrap and any apt
call can find it.

Furthermore, the code to add keys is simplified by removing duplicate
code and not manually parsing URIs and guessing about download locations
as well as not manually handling gpg and giving apt config overrides.

It is much simpler by using `apt-key` and default apt keyring paths.

The patch of Claudius is included here because it is not yet merged
but required (fix of awful flock usage).

Signed-off-by: Andreas Reichel <andreas.reichel.ext@siemens.com>


Andreas Reichel (5):
  Revert "isar-bootstrap: Allow to set local keys in DISTRO_APT_KEYS"
  Remove duplicate code from apt-keyring generation
  Fix fetched key location in apt-keyring generator
  Use apt-key to generate apt-keyring
  If we use a custom keyring debootstrap may fall to https

Claudius Heine (1):
  meta: refactored flock usage

 .../conf/multiconfig/qemuamd64-buster.conf    |  1 -
 .../conf/multiconfig/qemuamd64-jessie.conf    |  1 -
 meta/classes/buildchroot.bbclass              |  6 +-
 meta/classes/isar-bootstrap-helper.bbclass    |  2 +
 meta/classes/isar-image.bbclass               |  1 +
 meta/classes/wic-img.bbclass                  |  6 +-
 meta/conf/bitbake.conf                        |  1 +
 .../isar-bootstrap/isar-bootstrap.inc         | 76 +++++++++++++------
 8 files changed, 65 insertions(+), 29 deletions(-)

-- 
2.21.0