RPM: cleanup gobuild macro for CentOS Stream #2501
Conversation
|
The |
|
@mtrmac PTAL. |
| # c9s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227328 | ||
| # c8s bz: https://bugzilla.redhat.com/show_bug.cgi?id=2227331 | ||
| %if %{defined rhel} | ||
| %define gobuild(o:) go build -buildmode pie -compiler gc -tags="rpm_crashtraceback libtrust_openssl ${BUILDTAGS:-}" -ldflags "-linkmode=external -compressdwarf=false ${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n') -extldflags '%__global_ldflags'" -a -v -x %{?**}; |
There was a problem hiding this comment.
libtrust_openssl is not a global RHEL tag, it is specific to our github.com/containers/libtrust . Should we really just drop it?
I see that the c9s builds still include the tag (apparently it was hard-coded in go-srpm-macros in some versions/patches?) but the c10s builds don’t.
Should we add that tag back into our BUILDTAGS in skopeo.spec? Or is it truly OK to drop it?
There was a problem hiding this comment.
good catch. You're right and my bad for missing that. I'll fix that in spec in this PR itself. Putting back on draft.
There was a problem hiding this comment.
Alright, the latest build does show libtrust_openssl tag for centos stream builds: https://copr.fedorainfracloud.org/coprs/packit/containers-skopeo-2501/build/8566716/ . It will be set for rhel too.
I also included another commit to silence rpmlint.
lsm5
force-pushed
the
rpm-go-macro-cleanup
branch
from
d485a87 to
409a359
Compare
| @@ -146,6 +145,10 @@ cp -pav systemtest/* %{buildroot}/%{_datadir}/%{name}/test/system/ | |||
| #define license tag if not already defined | |||
| %{!?_licensedir:%global license %doc} | |||
|
|
|||
| # Include this to silence rpmlint. | |||
| # Especially annoying if you use syntastic vim plugin. | |||
| %check | |||
There was a problem hiding this comment.
Would we consider at least a smoke-test, like skopeo --version? Anyway, that’s not this PR.
The default gobuild macro on CentOS Stream now accounts for `BUILDTAGS`, so we don't need to redefine the macro in rpm spec. The `libtrust_openssl` has been set in the spec for RHEL environments. Signed-off-by: Lokesh Mandvekar <[email protected]>
We're not running any tests in the check section. Signed-off-by: Lokesh Mandvekar <[email protected]>
mtrmac
force-pushed
the
rpm-go-macro-cleanup
branch
from
409a359 to
5eba061
Compare
The default gobuild macro on CentOS Stream now accounts for
BUILDTAGS, so we don't need to redefine the macro in rpm spec.