forked from aspiers/containment-rpm
-
Notifications
You must be signed in to change notification settings - Fork 4
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[RFC] unifying containment-rpm approaches #2
Open
aspiers
wants to merge
87
commits into
openSUSE:master
Choose a base branch
from
SUSE-Cloud:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…nt-rpm ---------------------------------------------------------------------------- r4 | jordimassaguerpla | 2012-11-12 11:08:13 | 82de988ec932428af6adf8cbc2da524d | 0.17 | osc copypac from project:Devel:StudioOnsite:1.3 package:containment-rpm revision:3 ----------------------------------------------------------------------------
…nt-rpm ---------------------------------------------------------------------------- r5 | bgeuken | 2012-11-13 17:31:31 | 2ddeaa86b073019d87ab0e0be7445fcd | 0.18 | Test build of containment with metadata patch ----------------------------------------------------------------------------
…nt-rpm ---------------------------------------------------------------------------- r6 | bgeuken | 2012-11-14 15:09:14 | bce28c757b568e80a0d3028cc6628aff | 0.18 | - Update create_metadata.rb script * Remove superfluous to_json call * Fix XPATH matcher * Adopted check for containment name to allow special chars, eg dots * Updated format of created metadata ----------------------------------------------------------------------------
…nt-rpm ---------------------------------------------------------------------------- r7 | bgeuken | 2012-11-14 17:35:55 | 4bacb44fa5fb56e74e65c0ad17c0c1be | 0.18 | <no message> ----------------------------------------------------------------------------
…nt-rpm ---------------------------------------------------------------------------- r8 | bgeuken | 2012-11-14 18:00:20 | 45c37c326154a40a366ad53c9cc54a4b | 0.18 | <no message> ----------------------------------------------------------------------------
…nt-rpm ---------------------------------------------------------------------------- r9 | bgeuken | 2012-11-14 18:29:42 | a22fec749d31000318562a6e7971e4f2 | 0.18 | - require rubygem-json in containment. This is needed to create the json format ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r10 | bgeuken | 2012-11-14 19:00:52 | b5894bcae9a0a8e4eff359fae0b80df3 | 0.18 | - Moved requiring ruby/rubygem-json from BuildRequires to Requires ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r15 | bgeuken | 2012-11-15 11:40:54 | 25c7e219388e6e5c47e88d6d42776fcc | 0.18 | - require rubygems explicitly in metadata script ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r16 | bgeuken | 2012-11-15 14:04:03 | 81a19165b189e9f1de1becbe7e6d4a26 | 0.18 | Adopted kiwi_post_run hook to get metadata files as part of created containment pkg ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r17 | bgeuken | 2012-11-15 15:03:00 | adb540df3fae48bcba9a1bacd43b5ce8 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r18 | bgeuken | 2012-11-15 15:44:09 | a923f502046519a732277a625ae348ab | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r19 | bgeuken | 2012-11-15 16:58:20 | b72a07b62e5970c1277299794d734e46 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r20 | bgeuken | 2012-11-15 20:49:33 | 6070b3c556007d694a8351ac1f40b8ff | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r21 | bgeuken | 2012-11-16 12:03:35 | 080ab382bb1eb11a66c0090731ad163d | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r22 | bgeuken | 2012-11-16 12:33:25 | 3e8531807c820286c62adccaa3455520 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r23 | bgeuken | 2012-11-16 12:51:41 | 8a4eccee23af4477c7da41fb5784c17c | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r24 | bgeuken | 2012-11-16 13:19:47 | 805f5504a9ae9f405a34bba7fc0d7381 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r25 | bgeuken | 2012-11-16 14:26:22 | 810c9b6d33eb939059cc27056cb8d844 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r26 | bgeuken | 2012-11-16 14:52:01 | ad96fbae91db256f395907b95f908656 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r27 | bgeuken | 2012-11-16 15:46:40 | 7dc54d537c05ccd33630ed9158f51c74 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r28 | bgeuken | 2012-11-16 16:24:39 | c6625b9ce660bf8b184a6c74e783ccd3 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r29 | bgeuken | 2012-11-16 16:59:02 | acb66061fef5b3a6e971f0c21cb529fd | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r30 | bgeuken | 2012-11-16 17:21:48 | 856660616f83291eb90da44a3ee6b1f4 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r31 | bgeuken | 2012-11-17 16:14:24 | 7533636dfd2fe803f6f2a03ddd610db7 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r32 | bgeuken | 2012-11-18 22:47:59 | 431bc0df099458e401024b8cecfde7a8 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r33 | bgeuken | 2012-11-19 07:59:25 | 409ce96e52294dc1df6c9c65b4550e06 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r34 | bgeuken | 2012-11-19 10:20:38 | 1c62818945a41cf6bfca43aa83843f83 | 0.18 | - Updated format of containment metadata ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r36 | bgeuken | 2012-11-19 14:29:45 | 014763880868d3a266a36a4419d06013 | 0.18 | <no message> ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r37 | bgeuken | 2012-11-19 17:50:00 | 438723006f9abc5af91201ee997da7d1 | 0.18 | - Fixes bug introduced by cc1be1b ----------------------------------------------------------------------------
…ent-rpm ---------------------------------------------------------------------------- r38 | bgeuken | 2012-11-19 18:09:08 | 8b5e6510b7649a4873164e1570be248d | 0.18 | <no message> ----------------------------------------------------------------------------
This *might* make the appliance a fraction more efficient in terms of storage (no compressed image nested in another compressed image) and performance (no need to go through the loopback device). It will also allow us to modify the repository, which seems to be required since at this stage of the image build. This is because the .iso provided doesn't have a proper signature in content.key, because the BS bs_signer backend service run asynchronously so hasn't yet signed the .iso. Consequently we'll have to ensure a valid signature ourselves.
At the kiwi_post_run stage of the image build, the .iso provided doesn't yet have a proper signature in content.key, because the BS bs_signer backend service run asynchronously so hasn't yet signed the .iso. Consequently we'll have to ensure a valid signature ourselves. For now we'll just disable key-checking, so it's good enough to have any key as long as it's the right format to keep "zypper refresh" happy.
Use %containment_extra_files to be able to specify extra filelist items, like for example extra %dir entries
Not sure what this was good for, its harmful.
This way the kiwi build result is fetched signed from the OBS before being repackaged into a RPM.
Rework containment rpms to use followup spec
Conflicts: README.rst
Without this, the package fails to build (for SLE12-based ISOs) because the files can't be removed after the build.
Otherwise, rpmlint complains about it.
Otherwise, we get a invalid-spec-name rpmlint warning.
This uses a new %containment_image_mail macro, for the mail address to use.
Various changes to fix build of containment rpm of SLE12 image
The generated spec file has build requirements that need to be installed to have a successful build; if we have them as Requires for containment-rpm, then they will get automatically installed and they won't require any additional change in the prjconf.
Update spec file to have Requires for packages needed by generated spec
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I'm submitting this not with the expectation it will be merged, but to raise awareness of the current divergence of
containment-rpm
forks, and to encourage discussion about potential ways of re-unifying them.In SUSE Cloud land, we have made quite a bit of progress with making the containment mechanism configurable and generic so that it can support building of containment rpms of parametrized config. We also switched to using the (undocumented?)
*-followup.spec
mechanism, which means that the containment rpm is built in a separate build. In the case where the artefact being wrapped in a containment rpm is an.iso
file, this means that it gets signed before being wrapped, which means that PXE-booting works.Would it make sense for the Studio team to unify with our fork?
Having said that, I heard from @dirkmueller that there might be plans afoot to support something similar natively in OBS, in which case maybe we can ditch this hack altogether.