diff --git a/.github/workflows/coverity.yml b/.github/workflows/coverity.yml index 0d0d3ed..dc5a2f6 100644 --- a/.github/workflows/coverity.yml +++ b/.github/workflows/coverity.yml @@ -3,7 +3,9 @@ name: Coverity on: push: - branches: [main] + branches: + - coverity + # - main jobs: coverity: diff --git a/make-srpm.sh b/make-srpm.sh index d81bba5..2f282ba 100755 --- a/make-srpm.sh +++ b/make-srpm.sh @@ -79,7 +79,6 @@ fi cat > "$SPEC" << EOF # Disable in source builds on EPEL <9 %undefine __cmake_in_source_build -%undefine __cmake3_in_source_build %define csexec_archs aarch64 ppc64le s390x x86_64 @@ -93,7 +92,7 @@ URL: https://github.com/csutils/%{name} Source0: https://github.com/csutils/%{name}/releases/download/%{name}-%{version}/%{name}-%{version}.tar.xz BuildRequires: asciidoc -BuildRequires: cmake3 +BuildRequires: cmake BuildRequires: gcc # csmock copies the resulting cswrap binary into mock chroot, which may contain @@ -131,16 +130,16 @@ fully automatically. %autosetup %build -%cmake3 \\ +%cmake \\ -DPATH_TO_WRAP=\"%{_libdir}/cswrap\" \\ -DSTATIC_LINKING=ON -%cmake3_build +%cmake_build %check -%ctest3 +%ctest %install -%cmake3_install +%cmake_install install -m0755 -d "%{buildroot}%{_libdir}"{,/cswrap} for i in c++ cc g++ gcc clang clang++ cppcheck smatch \\ diff --git a/src/csexec-loader-ppc64le.c b/src/csexec-loader-ppc64le.c index 5643c2d..0367b84 100644 --- a/src/csexec-loader-ppc64le.c +++ b/src/csexec-loader-ppc64le.c @@ -60,8 +60,8 @@ void _start(void) "mr %%r4, %1;" // exec_args "mr %%r5, %2;" // env "sc;" // ppc64 syscall insn - "li %%r3, $0x7F;" // execve() has failed, handle it as ENOENT - "mr %%r0, 1;" // exit() + "li %%r3, 0x7F;" // execve() has failed, handle it as ENOENT + "li %%r0, 1;" // exit() "sc" : : "r" (CSEXEC_BIN) // %0 , "r" (exec_args) // %1