Conversation
mcr
force-pushed
the
sanitize-tss-version-number-too
branch
from
9ae4929 to
bdd2e39
Compare
|
I am not against this. But I would like for the sanitize of the TSS version to be opt-in by using environment variable or by some other means. |
okay, that sounds okay to me. |
|
Every other environment variable that has to deal with tpm2-tss is named something with TPM2_TSS_*. So something like Interesting I tried to build it with static linkage when I finished bundled. But it a bit more complicated so I left it for the future. But if it would be possible to have static linkage on all platforms I think that would be great. |
|
--------
Jesper Brynolf ***@***.***> wrote:
Interesting I tried to build it with static linkage when I finished
bundled. But it a bit more complicated so I left it for the future. But
if it would be possible to have static linkage on all platforms I think
that would be great.
Both swtpm and libtss need a few small patches to build completely
statically.
|
mcr
force-pushed
the
sanitize-tss-version-number-too
branch
from
bdd2e39 to
34656f7
Compare
|
I went with: $TPM2_TSS_VERSION_IGNORE_PRERELEASE |
|
Yes, put the documentation in a logical place for me it does not matter if that is README or BUILD. |
mcr
force-pushed
the
sanitize-tss-version-number-too
branch
from
34656f7 to
a47c19c
Compare
mcr
force-pushed
the
sanitize-tss-version-number-too
branch
from
a47c19c to
b9b4a27
Compare
mcr
force-pushed
the
sanitize-tss-version-number-too
branch
from
b9b4a27 to
c9aa525
Compare
|
@ionut-arm can you review? |
FWIW I still see formatting and DCO issues. You can fix them via |
mcr
force-pushed
the
sanitize-tss-version-number-too
branch
from
c9aa525 to
ce28a1d
Compare
|
Hi @mcr, it seems only the DCO check fails which you can correct by with It's almost merged~! 🤏 🥹 |
…t-dirty, the rest of the version still has to match Signed-off-by: Michael Richardson <mcr@sandelman.ca>
mcr
force-pushed
the
sanitize-tss-version-number-too
branch
from
ce28a1d to
5de8141
Compare
wiktor-k
left a comment
wiktor-k
left a comment
There was a problem hiding this comment.
I'm really sorry for the next round of nits 😬
| The [TSS](https://github.com/tpm2-software/tpm2-tss) library can be installed from Debian, RPM, or other packaging manager. | ||
| It will install a pkg-config definition to indicate how to compile and link against the library. | ||
| When it is installed via source, and/or if it has been edited (such as to debug things), then the version number will be marked with the git commit (and dirty flag). The resulting version string is unfortunately not compatible with the semver parser/comparing mechanism, and it can be rejected. | ||
| Setting the environment variable TPM2\_TSS\_VERSION\_IGNORE\_PRERELEASE to a non-empty string will cause the build system to ignore this pre-release information. |
There was a problem hiding this comment.
| Setting the environment variable TPM2\_TSS\_VERSION\_IGNORE\_PRERELEASE to a non-empty string will cause the build system to ignore this pre-release information. | |
| Setting the environment variable `TPM2_TSS_VERSION_IGNORE_PRERELEASE` to a non-empty string will cause the build system to ignore this pre-release information. |
| assert!( | ||
| supported_tss_version.matches(&tss_version), | ||
| "Unsupported TSS version {tss_version}" | ||
| "Unsupported TSS version {tss_version}, maybe try {TPM2_TSS_VERSION_IGNORE_PRERELEASE}=true" |
There was a problem hiding this comment.
| "Unsupported TSS version {tss_version}, maybe try {TPM2_TSS_VERSION_IGNORE_PRERELEASE}=true" | |
| "Unsupported TSS version {tss_version}, maybe try setting the environment variable {TPM2_TSS_VERSION_IGNORE_PRERELEASE}=true" |
3 participants
This replaces PR #578.
It is rebased after ther DOCS_RS changes.
Without this patch, the version number does not parse with VersionReq::parse.
(This depends upon #603, please merge that first)