From 06c7f0a19e962e651961f478a6ef7766e80bffc8 Mon Sep 17 00:00:00 2001 From: Ewoud Kohl van Wijngaarden Date: Tue, 5 Mar 2024 17:42:42 +0100 Subject: [PATCH] Simplify build instructions by providing a Makefile This creates a gitignore file to deal with generated files. The Makefile replaces the manual instructions and makes sure CI and user instructions are in sync. It even allows for parallel builds, even though the building is already super fast. --- .github/workflows/tests.yml | 4 +--- .gitignore | 5 +++++ Makefile | 3 +++ staging_docs/admin/index.md | 5 +---- 4 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 .gitignore create mode 100644 Makefile diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cb18efa..474dcb7 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -17,6 +17,4 @@ jobs: run: yum install -y selinux-policy-devel policycoreutils - name: Build policies run: | - make -f /usr/share/selinux/devel/Makefile pulpcore_port.pp - make -f /usr/share/selinux/devel/Makefile pulpcore.pp - make -f /usr/share/selinux/devel/Makefile pulpcore_rhsmcertd.pp + make diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..5c1baa9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.pp +pulpcore_port.fc +pulpcore_port.if +pulpcore_rhsmcertd.fc +pulpcore_rhsmcertd.if diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..2a0af5f --- /dev/null +++ b/Makefile @@ -0,0 +1,3 @@ +include /usr/share/selinux/devel/Makefile + +all: pulpcore_port.pp pulpcore.pp pulpcore_rhsmcertd.pp diff --git a/staging_docs/admin/index.md b/staging_docs/admin/index.md index a640b55..dbfbef1 100644 --- a/staging_docs/admin/index.md +++ b/staging_docs/admin/index.md @@ -10,10 +10,7 @@ The SELinux policy for Pulp 3.Y releases. sudo yum install -y selinux-policy-devel policycoreutils git clone https://github.com/pulp/pulpcore-selinux cd pulpcore-selinux - -make -f /usr/share/selinux/devel/Makefile pulpcore_port.pp -make -f /usr/share/selinux/devel/Makefile pulpcore.pp -make -f /usr/share/selinux/devel/Makefile pulpcore_rhsmcertd.pp +make ``` ### Installing