mirror of
https://github.com/xcat2/xcat-dep.git
synced 2026-09-23 08:14:05 +00:00
Daniel Hilst
9f01a153e0
conserver.spec had not been built on a modern EL toolchain and no longer
compiled on EL9/EL10:
- %prep used the bare %patch / %patch1 macros, which rpm 4.18+ (EL9/EL10)
rejects with "Patch number not specified". Switched to explicit
Patch0:/Patch1: with the numbered %patch0/%patch1 macros, which apply
cleanly on EL8 through EL10.
- BuildRequires listed only openssl-devel, so on EL9/EL10's minimal mock
buildroot the toolchain was absent and %configure failed with
"C compiler cannot create executables". Added gcc, make and glibc-devel.
Also add conserver/mockbuild.pl, a standalone per-EL builder matching the
other xcat-dep builders (goconserver/ipmitool): it stages the sources and
spec, builds the SRPM, mock-rebuilds it in the target chroot, copies the
RPMs to --result-dir, and smoke-tests console/conserver in the chroot.
conserver is not in the default mockbuild-all.pl set (xCAT uses goconserver),
so this builder is run on demand. Built + smoke-tested conserver-xcat-8.2.1
for alma+epel-{8,9,10}-x86_64.
Signed-off-by: Daniel Hilst <392820+dhilst@users.noreply.github.com>
To make the conserver-xcat rpm, run: ./bldconserver.pl The original patches like initscript.patch and initscript1.patch have been replaced with initscript_8.2.1.patch, please follow the steps below to create patch for init script. 1. Copy conserver-8.2.1.tar.gz to a directory, say /root/conserverstart mkdir /root/conservertar cp conserver-8.2.1.tar.gz /root/conserverstart 2. Copy the initscript_8.2.1.patch to the same directory cp initscript_8.2.1.patch /root/conserverstart 3. Uncompress the conserver-8.2.1.tar.gz into two copies: tar zxvf conserver-8.2.1.tar.gz mv conserver-8.2.1 conserver-8.2.1-diffinit tar zxvf conserver-8.2.1.tar.gz 4. Patch the conserver.init with the original patch copied from Git repository cd /root/conservertar cat initscript_8.2.1.patch | /usr/bin/patch -s -p1 --fuzz=0 select conserver-8.2.1-diffinit/contrib/redhat-rpm/conserver.init as the file to patch 5. Update the conserver-8.2.1-diffinit/contrib/redhat-rpm/conserver.init with whatever changes that are needed 6. Generate the new patch: cd /root/conserverstart diff -ruN conserver-8.2.1/contrib/redhat-rpm/conserver.init conserver-8.2.1-diffinit/contrib/redhat-rpm/conserver.init > initscript_8.2.1.patch 7. Copy the new patch to the xcat-dep Git repository and checkin cp initscript_8.2.1.patch ~/xcat/xcat-dep/conserver/ cd ~/xcat/xcat-dep/conserver/ git commit -m "blah blah blah"