diff --git a/roles/grobisplitter/files/rhel8-split.sh b/roles/grobisplitter/files/rhel8-split.sh index 1850b3f5a3..d62f83daa6 100755 --- a/roles/grobisplitter/files/rhel8-split.sh +++ b/roles/grobisplitter/files/rhel8-split.sh @@ -35,17 +35,17 @@ for ARCH in ${ARCHES}; do fi # Begin splitting the various packages into their subtrees - ${BINDIR}/splitter.py --action hardlink --target RHEL-8-001 --create-repos ${ARCHDIR}/rhel-8-for-${ARCH}-baseos-rpms/ --only-defaults &> /dev/null + ${BINDIR}/splitter.py --action hardlink --target RHEL-8-001 ${ARCHDIR}/rhel-8-for-${ARCH}-baseos-rpms/ --only-defaults &> /dev/null if [ $? -ne 0 ]; then echo "splitter ${ARCH} baseos failed" exit fi - ${BINDIR}/splitter.py --action hardlink --target RHEL-8-002 --create-repos ${ARCHDIR}/rhel-8-for-${ARCH}-appstream-rpms/ --only-defaults &> /dev/null + ${BINDIR}/splitter.py --action hardlink --target RHEL-8-002 ${ARCHDIR}/rhel-8-for-${ARCH}-appstream-rpms/ --only-defaults &> /dev/null if [ $? -ne 0 ]; then echo "splitter ${ARCH} appstream failed" exit fi - ${BINDIR}/splitter.py --action hardlink --target RHEL-8-003 --create-repos ${ARCHDIR}/codeready-builder-for-rhel-8-${ARCH}-rpms/ &> /dev/null + ${BINDIR}/splitter.py --action hardlink --target RHEL-8-003 ${ARCHDIR}/codeready-builder-for-rhel-8-${ARCH}-rpms/ &> /dev/null if [ $? -ne 0 ]; then echo "splitter ${ARCH} codeready failed" exit @@ -58,22 +58,20 @@ for ARCH in ${ARCHES}; do cp -anlr RHEL-8-003/* RHEL-8-001 # Go into the main tree pushd RHEL-8-001 - # Go into its non_modular subtree and update its repo as its data - # is based off of the first split - pushd non_modular - createrepo -v . - popd - # Build out the repos we have and merge them together with - # mergerepo -k - echo "Merging all the repos" - repos="" - for i in $( ls -1 ); do - repos+="-r $i " - done - mergerepo_c -k ${repos} - mv merged_repo/repodata/ . - rmdir merged_repo/ + # # Build out the repos we have and merge them together with + # # mergerepo -k + # echo "Merging all the repos" + # repos="" + # for i in $( ls -1 ); do + # repos+="-r $i " + # done + # mergerepo_c -k ${repos} + # mv merged_repo/repodata/ . + # rmdir merged_repo/ + + # Mergerepo didn't work so lets just createrepo in the top directory. + createrepo_c . popd # Cleanup the trash