updating build files with proper dist tag

ciq-rocky-fips · Nov 14, 2024 · 5c026d6 · 5c026d6
1 parent 0219fdc
commit 5c026d6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/fipsmodule.yml b/.github/workflows/fipsmodule.yml
@@ -31,7 +31,7 @@ jobs:
           else
               set -x
               set +e
-              touch RESULTS/openssl-libs-3.0.7-27.el9_2.ciqlts.0.2.1.x86_64.rpm
+              touch RESULTS/openssl-libs-3.0.7-27.el9_2.ciqfips.0.2.1.x86_64.rpm
               echo "Fake build log for your sprog" > RESULTS/build.log
           fi
           echo "Contents of result directory"
@@ -42,15 +42,15 @@ jobs:
           cd RESULTS/tmp
           if [ -z "$DEBUG" ]; then
               echo "Extracting FIPS module"
-              rpm2cpio ../openssl-libs-3*ciqlts*.x86_64.rpm | cpio -idmv ./usr/lib64/\*/fips.so
+              rpm2cpio ../openssl-libs-3*ciqfips*.x86_64.rpm | cpio -idmv ./usr/lib64/\*/fips.so
           else
               mkdir -p usr/lib64/ossl-modules
               echo Creating fake fips module
               touch usr/lib64/ossl-modules/fips.so
           fi
           mv ./usr/lib64/ossl-modules/fips.so ../fips_module/fips.so.x86_64
           cd ..
-          RPMVERSION=$(ls ./openssl-libs-3*ciqlts*.x86_64.rpm | sed -e 's/.*openssl-libs-\(3.*\)\.x86_64\.rpm/\1/')
+          RPMVERSION=$(ls ./openssl-libs-3*ciqfips*.x86_64.rpm | sed -e 's/.*openssl-libs-\(3.*\)\.x86_64\.rpm/\1/')
           echo "Creating fips module tarball"
           tar -czf fips_module-${RPMVERSION}.tar.gz fips_module
           sha256sum fips_module-${RPMVERSION}.tar.gz > fips_module-${RPMVERSION}.tar.gz.sha256

diff --git a/.mock-config/rocky-lts92-x86_64.cfg b/.mock-config/rocky-lts92-x86_64.cfg
@@ -5,7 +5,7 @@
 #
 
 config_opts['chroot_setup_cmd'] = 'install tar gcc-c++ redhat-rpm-config redhat-release which xz sed make bzip2 gzip gcc coreutils unzip shadow-utils diffutils cpio bash gawk rpm-build info patch util-linux findutils grep'
-config_opts['dist'] = 'el9_2.ciqlts'  # only useful for --resultdir variable subst
+config_opts['dist'] = 'el9_2.ciqfips'  # only useful for --resultdir variable subst
 config_opts['releasever'] = '9'
 config_opts['package_manager'] = 'dnf'
 config_opts['extra_chroot_dirs'] = [ '/run/lock', ]
@@ -14,7 +14,7 @@ config_opts['use_bootstrap_image'] = False
 #config_opts['bootstrap_image'] = 'quay.io/rockylinux/rockylinux:9'
 config_opts['description'] = 'Rocky Linux 9.2 LTS by CIQ'
 
-config_opts['macros']['%dist'] = '.el9_2.ciqlts'
+config_opts['macros']['%dist'] = '.el9_2.ciqfips'
 
 config_opts['dnf.conf'] = """
 [main]
@@ -79,6 +79,6 @@ enabled=1
 gpgkey=file:///usr/share/distribution-gpg-keys/rocky/RPM-GPG-KEY-Rocky-9
 """
 
-config_opts['root'] = 'rocky-CIQ-LTS92-x86_64'
+config_opts['root'] = 'rocky-FIPS92-x86_64'
 config_opts['target_arch'] = 'x86_64'
 config_opts['legal_host_arches'] = ('x86_64',)