Fix rpm build. Add rpm build to github actions

Author: svpcom

.github/workflows/build_redhat.yml

@@ -0,0 +1,33 @@
+name: WFB-ng package builder for RedHat
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+
+jobs:
+  build_and_test:
+    runs-on: ubuntu-22.04
+    strategy:
+      fail-fast: false
+      matrix:
+        version: [8, 9]
+        arch: [ "amd64.amd64.max" ]
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: build package
+        run: |
+          curl -s -L https://github.com/svpcom/wfb-ng/releases/download/wifibroadcast-17.10/qemu-7.2.15-fixed.tar.gz | sudo tar xzv -C /
+          make rpm_docker QEMU_CPU=$(echo ${{ matrix.arch }} | cut -f3 -d.) DOCKER_ARCH=$(echo ${{ matrix.arch }} | cut -f1 -d.) DOCKER_SRC_IMAGE=$(echo ${{ matrix.arch }} | cut -f2 -d.)/rockylinux:${{ matrix.version }}
+      - name: Archive production artifacts
+        uses: actions/upload-artifact@v4
+        id: artifact-upload-step
+        if: github.event_name != 'pull_request'
+        with:
+          name: wfb-ng-${{ github.ref_name }}-redhat${{ matrix.version }}-${{ matrix.arch }}
+          path: |
+            dist/*.rpm

Makefile

@@ -68,19 +68,19 @@ wfb_rtsp: src/rtsp_server.c
 test: all_bin
 	PYTHONPATH=`pwd` trial3 wfb_ng.tests
 
-rpm:  all_bin $(ENV)
+rpm:  all_bin wfb_rtsp $(ENV)
 	rm -rf dist
-	$(PYTHON) ./setup.py bdist_rpm --force-arch $(ARCH)
+	$$(PATH=$(ENV)/bin:$(ENV)/local/bin:$(PATH) which python3) ./setup.py bdist_rpm --force-arch $(ARCH) --requires python3-twisted,python3-pyroute2,python3-pyserial,python3-msgpack,python3-jinja2,python3-yaml,socat,iw
 	rm -rf wfb_ng.egg-info/
 
 deb:  all_bin wfb_rtsp $(ENV)
 	rm -rf deb_dist
 	$$(PATH=$(ENV)/bin:$(ENV)/local/bin:$(PATH) which python3) ./setup.py --command-packages=stdeb.command sdist_dsc --debian-version 0~$(OS_CODENAME) bdist_deb
 	rm -rf wfb_ng.egg-info/ wfb-ng-$(VERSION).tar.gz
 
-bdist: all_bin
+bdist: all_bin wfb_rtsp
 	rm -rf dist
-	$(PYTHON) ./setup.py bdist --plat-name linux-$(ARCH)
+	$$(PATH=$(ENV)/bin:$(ENV)/local/bin:$(PATH) which python3) ./setup.py bdist --plat-name linux-$(ARCH)
 	rm -rf wfb_ng.egg-info/
 
 check:
@@ -99,6 +99,14 @@ deb_docker:  /opt/qemu/bin
 	@if ! [ -d /opt/qemu ]; then echo "Docker cross build requires patched QEMU!\nApply ./scripts/qemu/qemu.patch to qemu-7.2.0 and build it:\n  ./configure --prefix=/opt/qemu --static --disable-system && make && sudo make install"; exit 1; fi
 	if ! ls /proc/sys/fs/binfmt_misc | grep -q qemu ; then sudo ./scripts/qemu/qemu-binfmt-conf.sh --qemu-path /opt/qemu/bin --persistent yes; fi
 	cp -a Makefile docker/src/
-	TAG="wfb-ng:build-`date +%s`"; docker build --platform linux/$(DOCKER_ARCH) -t $$TAG --build-arg SRC_IMAGE=$(DOCKER_SRC_IMAGE) --build-arg QEMU_CPU=$(QEMU_CPU) docker && \
+	TAG="wfb-ng:build-`date +%s`"; docker build --platform linux/$(DOCKER_ARCH) -t $$TAG --build-arg SRC_IMAGE=$(DOCKER_SRC_IMAGE) --build-arg QEMU_CPU=$(QEMU_CPU) -f docker/Dockerfile.debian docker && \
 	docker run --privileged --platform linux/$(DOCKER_ARCH) -i --rm -v $(PWD):/build $$TAG bash -c "trap 'chown -R --reference=. .' EXIT; export VERSION=$(VERSION) COMMIT=$(COMMIT) SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) && /sbin/sysctl net.unix.max_dgram_qlen=512 && cd /build && make clean && make test && make deb"
 	docker image ls -q "wfb-ng:build-*" | uniq | tail -n+6 | while read i ; do docker rmi -f $$i; done
+
+rpm_docker:  /opt/qemu/bin
+	@if ! [ -d /opt/qemu ]; then echo "Docker cross build requires patched QEMU!\nApply ./scripts/qemu/qemu.patch to qemu-7.2.0 and build it:\n  ./configure --prefix=/opt/qemu --static --disable-system && make && sudo make install"; exit 1; fi
+	if ! ls /proc/sys/fs/binfmt_misc | grep -q qemu ; then sudo ./scripts/qemu/qemu-binfmt-conf.sh --qemu-path /opt/qemu/bin --persistent yes; fi
+	cp -a Makefile docker/src/
+	TAG="wfb-ng:build-`date +%s`"; docker build --platform linux/$(DOCKER_ARCH) -t $$TAG --build-arg SRC_IMAGE=$(DOCKER_SRC_IMAGE) --build-arg QEMU_CPU=$(QEMU_CPU) -f docker/Dockerfile.redhat docker && \
+	docker run --privileged --platform linux/$(DOCKER_ARCH) -i --rm -v $(PWD):/build $$TAG bash -c "trap 'chown -R --reference=. .' EXIT; export VERSION=$(VERSION) COMMIT=$(COMMIT) SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) && /sbin/sysctl net.unix.max_dgram_qlen=512 && cd /build && make clean && make test && make rpm"
+	docker image ls -q "wfb-ng:build-*" | uniq | tail -n+6 | while read i ; do docker rmi -f $$i; done

docker/Dockerfile renamed to docker/Dockerfile.debian

@@ -0,0 +1,24 @@
+ARG SRC_IMAGE
+FROM $SRC_IMAGE
+
+ARG QEMU_CPU
+ENV QEMU_CPU=$QEMU_CPU
+
+RUN (. /etc/os-release; echo $VERSION_ID | cut -f1 -d .) > /etc/release
+RUN rpm -ihv https://dl.fedoraproject.org/pub/epel/epel-release-latest-$(cat /etc/release).noarch.rpm
+RUN dnf -y upgrade
+RUN dnf -y groupinstall "Development Tools"
+RUN dnf -y install --enablerepo=devel git wget \
+    python3-virtualenv rpm-build \
+    libpcap-devel libsodium-devel libevent-devel \
+    python3-twisted python3-pyroute2 \
+    python3-devel \
+    python3-pyserial python3-setuptools python3-msgpack python3-jinja2 python3-yaml \
+    gstreamer1-rtsp-server-devel gstreamer1-devel procps net-tools iproute iputils
+
+RUN ln -sf /usr/bin/trial /usr/bin/trial3
+RUN echo "%debug_package %{nil}" > ~/.rpmmacros
+COPY src/Makefile /tmp
+ENV ENV=/opt/env
+ENV PYTHON=python3
+RUN cd /tmp && make $ENV

docker/Dockerfile.redhat

@@ -39,7 +39,7 @@ def _long_description():
 
 setup(
     url="http://wfb-ng.org",
-    name="wfb-ng",
+    name="wfb_ng",
     version=version,
     packages=find_packages(exclude=["*.tests", "*.tests.*", "tests.*", "tests"]),
     zip_safe=False,

setup.py

@@ -1,4 +1,4 @@
-[DEFAULT]
+[wfb_ng]
 Depends3: python3-twisted, python3-pyroute2, python3-serial, python3-msgpack, python3-jinja2, python3-yaml, socat, iw
 Package3: wfb-ng
 Replaces3: wifibroadcast