Skip to content
This repository has been archived by the owner on Feb 24, 2020. It is now read-only.

build: Allow packagers to override stage1 version #1821

Merged
merged 3 commits into from Dec 14, 2015

Conversation

krnowak
Copy link
Collaborator

@krnowak krnowak commented Dec 1, 2015

Fixes #1813.

@@ -154,6 +160,15 @@ AS_CASE([${RKT_STAGE1_SETUP_KIND}],
RKT_STAGE1_DEFAULT_VERSION=''],
[AC_MSG_ERROR([*** Unknown setup kind, should not happen])])

## Stage1 flavor version override verfication
Copy link
Member

Choose a reason for hiding this comment

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

s/verfication/verification

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Bah, thanks for spotting.

@alban
Copy link
Member

alban commented Dec 1, 2015

@krnowak Thanks! Can you explain in packaging.md why and how should packagers use this option?

@krnowak
Copy link
Collaborator Author

krnowak commented Dec 1, 2015

I suppose I will have to simply write a separate document about configure flags and their uses and link to it from the other places that mention configure script or its parameters.

@krnowak
Copy link
Collaborator Author

krnowak commented Dec 1, 2015

@alban: ^

@alban
Copy link
Member

alban commented Dec 1, 2015

@krnowak good idea. As long as packaging.md mentions this problem with a link.

@krnowak krnowak force-pushed the krnowak/override-stage1-version branch 2 times, most recently from 0814036 to 2fde56a Compare December 2, 2015 17:41
@krnowak
Copy link
Collaborator Author

krnowak commented Dec 2, 2015

Depends on #1824 for documentation fixes.

@krnowak krnowak force-pushed the krnowak/override-stage1-version branch from 2fde56a to 1ed56ec Compare December 4, 2015 12:40
@krnowak krnowak force-pushed the krnowak/override-stage1-version branch 2 times, most recently from 8e3d9ef to b5355aa Compare December 7, 2015 10:18
@krnowak
Copy link
Collaborator Author

krnowak commented Dec 7, 2015

Rebased.


This parameter takes a comma-separated list of all the flavors that the build system should assemble.
Depending on a default stage1 image setup, this list is by default either empty or set to `coreos,kvm` for, respectively, detailed setup and flavor setup.
Note that specifying this parameter does not necessarily means that rkt will use them in the end.
Copy link
Member

Choose a reason for hiding this comment

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

s/means/mean/

#### `--with-stage1-default-location`

This parameter tells rkt where to find the default stage1 image if it is not found in the store.
For the detailed setup, the default value of this parameter is empty, so if it is not provided, you may be forced to inform rkt about the location of stage1 image at runtime.
Copy link
Member

Choose a reason for hiding this comment

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

about the location of the stage1 image

This flag overrides the version used in built stage1 image
manifests. Also, when using --with-stage1-default-flavor, the new flag
changes the default stage1 version to the overridden one, so rkt will
search in the store for an image with the standard coreos name and
with an overridden version.

This flag is useful for distros serving updated revisions of rkt, like
for example in Debian, they might want to put a version 0.12.0-2.
@krnowak krnowak force-pushed the krnowak/override-stage1-version branch from b5355aa to 55ad3b8 Compare December 7, 2015 16:04
@krnowak
Copy link
Collaborator Author

krnowak commented Dec 9, 2015

Khem, I thought it was merged... Anyway, I updated this branch some time ago.

@iaguis
Copy link
Member

iaguis commented Dec 14, 2015

LGTM

iaguis added a commit that referenced this pull request Dec 14, 2015
build: Allow packagers to override stage1 version
@iaguis iaguis merged commit 8687a38 into rkt:master Dec 14, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants