Fix upgrading to this package on multilib systems
The pacemaker-libs-devel package contains /usr/include/pacemaker/crm_config.h which defines BUILD_VERSION. This macro is set to the git commit ID that was used to build this package. In previous releases, we had a bug in configure.ac that caused us to incorrectly fail to find git, resulting in using the fallback of the source tree directory name. This is something like pacemaker-1234abcd, which is the same on all builders. However, 2.1.7 includes a fixed configure.ac that can now find the git binary which means we now use the latest git commit ID. Unfortunately, this varies from builder to builder even for the same release. This is because the first steps in package building are running "git commit" to initialize a repo, and then running "git am" to apply all the patches. Creating the repo means it will get a different commit ID every time, which means the applied patches will have a different parent, giving them different commit IDs. The end result of this is that each builder sees its own distinct commit ID, and therefore each arch has its own BUILD_VERSION. This means the x86_64 and i686 packages now differ, introducing a file conflict, which means rpm will refuse to upgrade. The fix is to simply remove the automatically created git repo after we are done with it, causing configure.ac to use the directory name fallback. - Resolves: RHEL-29007
This commit is contained in:
parent
eb1c591307
commit
858d65b35c
@ -36,7 +36,7 @@
|
||||
## can be incremented to build packages reliably considered "newer"
|
||||
## than previously built packages with the same pcmkversion)
|
||||
%global pcmkversion 2.1.7
|
||||
%global specversion 4
|
||||
%global specversion 5
|
||||
|
||||
## Upstream commit (full commit ID, abbreviated commit ID, or tag) to build
|
||||
%global commit 0f7f88312f7a1ccedee60bf768aba79ee13d41e0
|
||||
@ -585,6 +585,12 @@ export LDFLAGS_HARDENED_EXE="%{?_hardening_ldflags}"
|
||||
export LDFLAGS_HARDENED_LIB="%{?_hardening_ldflags}"
|
||||
%endif
|
||||
|
||||
# DO NOT REMOVE THE FOLLOWING LINE!
|
||||
# This is necessary to ensure we use the git commit ID from the
|
||||
# pacemaker-abcd1234 directory name as the latest commit ID when
|
||||
# generating crm_config.h.
|
||||
rm -rf .git
|
||||
|
||||
./autogen.sh
|
||||
|
||||
%{configure} \
|
||||
@ -1020,6 +1026,10 @@ exit 0
|
||||
%license %{nagios_name}-%{nagios_hash}/COPYING
|
||||
|
||||
%changelog
|
||||
* Thu Mar 21 2024 Chris Lumens <clumens@redhat.com> - 2.1.7-5
|
||||
- Fix upgrading to this package on multilib systems
|
||||
- Resolves: RHEL-29007
|
||||
|
||||
* Thu Feb 1 2024 Chris Lumens <clumens@redhat.com> - 2.1.7-4
|
||||
- Properly validate attribute set type in pacemaker-attrd
|
||||
- Fix `crm_attribute -t nodes --node localhost`
|
||||
|
Loading…
Reference in New Issue
Block a user