Skip to content

Commit

Permalink
Simplify build instructions by providing a Makefile
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
ekohl committed Nov 19, 2024
1 parent ee4fd6f commit 5989f03
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,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 build
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
*.pp
pulpcore_port.fc
pulpcore_port.if
pulpcore_rhsmcertd.fc
pulpcore_rhsmcertd.if
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
include /usr/share/selinux/devel/Makefile

build: pulpcore_port.pp pulpcore.pp pulpcore_rhsmcertd.pp ## Build SELinux policies

help: ## Show this help.
@sed -ne '/@sed/!s/## //p' $(MAKEFILE_LIST)

Expand All @@ -7,4 +11,4 @@ docs: ## Build unified docs.
servedocs: ## Serves unified docs.
pulp-docs serve

.PHONY: docs servedocs help
.PHONY: build docs servedocs help
5 changes: 1 addition & 4 deletions staging_docs/admin/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 build
```

### Installing
Expand Down

0 comments on commit 5989f03

Please sign in to comment.