Updating fedora35 build to create new RPMs (#2791)

* Updating fedora35 build to create new RPMs
* Add fedora36 RPM build

Signed-off-by: Tim Whisonant <tim.whisonant@intel.com>

.github/workflows/build-rpms.yml

@@ -13,14 +13,14 @@ jobs:
   RPM:
     strategy:
       matrix:
-        distro: [centos7.6, fedora32, fedora33, fedora35]
+        distro: [centos7.6, fedora32, fedora33, fedora35, fedora36]
     runs-on: ubuntu-latest
     name: Build ${{ matrix.distro }}
     steps:
       - uses: actions/checkout@v2
-      - name: Build Docker image
+      - name: Build Docker Image
         run: docker build . -f docker/${{ matrix.distro }}/Dockerfile -t opae-${{ matrix.distro }}
-      - name: Build RPM
+      - name: Build RPMs
         run: |
           docker run --rm -v ${{ github.workspace }}:/opae-sdk opae-${{ matrix.distro }} /opae-sdk/${{ matrix.distro }} /opae-sdk
       - name: Install and Test RPMs

docker/fedora35/Dockerfile

@@ -1,12 +1,8 @@
 FROM fedora:35
-RUN dnf install -y python3 python3-pip python3-devel python3-pybind11 cmake make libuuid-devel json-c-devel gcc clang gcc-c++ hwloc-devel tbb-devel rpm-build rpmdevtools git
-RUN dnf install -y libedit-devel
-RUN dnf install -y libudev-devel
-RUN dnf install -y libcap-devel
-RUN python3 -m pip install setuptools --upgrade
+RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml python3-pybind11 git make cmake libuuid-devel json-c-devel gcc clang gcc-c++ libuuid-devel json-c-devel hwloc-devel tbb-devel libedit-devel rpm-build rpmdevtools pybind11-devel python3-virtualenv yaml-cpp-devel libudev-devel cli11-devel spdlog-devel
+RUN python3 -m pip install setuptools --upgrade --prefix=/usr
 RUN python3 -m pip install pyyaml jsonschema
 WORKDIR /root
-COPY scripts/build-rpms.sh /scripts/build-rpms.sh
+COPY scripts/build-rpms-new.sh /scripts/build-rpms-new.sh
 COPY scripts/test-rpms.sh /scripts/test-rpms.sh
-ENTRYPOINT [ "/scripts/build-rpms.sh" ]
-
+ENTRYPOINT ["/scripts/build-rpms-new.sh"]

docker/fedora36/Dockerfile

@@ -0,0 +1,8 @@
+FROM fedora:36
+RUN dnf install -y python3 python3-pip python3-devel python3-jsonschema python3-pyyaml python3-pybind11 git make cmake libuuid-devel json-c-devel gcc clang gcc-c++ libuuid-devel json-c-devel hwloc-devel tbb-devel libedit-devel rpm-build rpmdevtools pybind11-devel python3-virtualenv yaml-cpp-devel libudev-devel cli11-devel spdlog-devel
+RUN python3 -m pip install setuptools --upgrade --prefix=/usr
+RUN python3 -m pip install pyyaml jsonschema
+WORKDIR /root
+COPY scripts/build-rpms-new.sh /scripts/build-rpms-new.sh
+COPY scripts/test-rpms.sh /scripts/test-rpms.sh
+ENTRYPOINT ["/scripts/build-rpms-new.sh"]

scripts/build-rpms-new.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+set -x
+
+[ $# -eq 1 ] && src=$(realpath ${1:-$PWD})
+[ $# -eq 2 ] && src=$(realpath ${2:-$PWD})
+
+cmake=cmake
+if ! command -v cmake > /dev/null && command -v cmake3 > /dev/null; then
+  cmake=cmake3
+fi
+
+${src}/packaging/opae/rpm/create fedora