build: add --with-stage1-systemd-revision option for src build #3362
Conversation
|
Giving some time for @evverx to check this, postponing to next milestone. |
|
@s-urbaniak , thanks! But I can (accidentally) omit the # I extracted this from the bash history
./configure --enable-functional-tests --with-stage1-systemd-src=~/systemd --with-stage1-systemd-version=master --with-stage1-flavors=src
...
systemd git revision: 'master'
systemd version: 'master'
...
makeI think we should reject such versions. BTW: we know
Why not to run something like (git describe --contains BRANCH) || ($(git describe BRANCH) + 1)? |
Currently the systemd version can be specified using --with-stage1-systemd-version. The build system uses this value to chcek out the systemd revision and uses the same value to set the systemd version. While this works nicely for building `vXXX` based tags, it causes problems with custom systemd branch builds where an arbitrary branch name does not map to a qualified systemd version. Since rkt uses heuristics internally to evaluate the systemd version, this causes conflicts. This fixes it by introducing a new --with-stage1-systemd-revision configure parameter to distinguish the systemd version, and revision being built. Fixes rkt#3344
08ed253 to
ee425ad
Compare
|
@evverx The path is known in your example, i.e. So having a git-oneliner in the configure phase to determine the preceding/following tag name is not as easy as this patch; we need to check out the referenced repository first. As good as this sounds I won't have time right now to dig deeper in the Makefile architecture to find the right spots at least to implement the requested enhanced version validation :-( @lucab I added another small addition to the Finally I changed the defaults in the sec flavor build, |
|
@s-urbaniak , I think the |
Currently the systemd version can be specified using
--with-stage1-systemd-version. The build system uses this value to
chcek out the systemd revision and uses the same value to set the
systemd version.
While this works nicely for building
vXXXbased tags, it causesproblems with custom systemd branch builds where an arbitrary branch
name does not map to a qualified systemd version.
Since rkt uses heuristics internally to evaluate the systemd version,
this causes conflicts.
This fixes it by introducing a new --with-stage1-systemd-revision
configure parameter to distinguish the systemd version, and revision
being built.
Fixes #3344