Initial evaluation shows that we can rebase safely based on a new tarball released from the RHEL6 branch.
1) drop lots of unrequired code from cluster tarball (fence-agents, resource-agents, gfs and gfs-kernel)
2) kill patch queue from distcvs
3) simplify build / spec file
from distcvs RHEL6 branch in current release:
sed -i -e 's#\-b .*##g' cluster.spec
this would apply all patches to current 3.0.12 tree without extensions
(makes it easier to parse the diff)
replace 3.0.12 tarball with 184.108.40.206 tarball created from current git
RHEL6 branch (we cannot move to 3.1.x for several other reasons).
diff -Naurd cluster-3.0.12 cluster-220.127.116.11 | filterdiff -x '*.orig' -x
'*rgmanager*' -x '*fence/agents*' | less
The only change that will be pulled in is:
config/tools/xml/cluster.rng.in: schema description updates, no
functional changes. There is no BZ associated to this change, but it is
Changes to the build systems are necessary to drop fas, ras, gfs and gfs-kernel. No other changes will be introduced.
Technical note added. If any revisions are required, please edit the "Technical Notes" field
accordingly. All revisions will be proofread by the Engineering Content Services team.
This update fixes a few bugs, and will make future updates easier.
Unit test results:
> The only change that will be pulled in is:
> config/tools/xml/cluster.rng.in: schema description updates, no
> functional changes. There is no BZ associated to this change, but it is
> purely cosmetic.
[root@rhel6-node2 ~]# rpm -q -f /usr/sbin/ccs_config_validate
[root@rhel6-node2 ~]# ccs_config_validate
the changes to the schema do not introduce regression. schema still works as expected (without going into extreme paranoia, cluster.conf validated before and after the upgrade).
> Changes to the build systems are necessary to drop fas, ras, gfs and
> gfs-kernel. No other changes will be introduced.
Package has built in brew, changes to the build system appear sane. Code has been dropped as mentioned.
Since the problem described in this bug report should be
resolved in a recent advisory, it has been closed with a
resolution of ERRATA.
For information on the advisory, and where to find the updated
files, follow the link below.
If the solution does not work for you, open a new bug report.