In refpolicy when a module is added/removed, the policy build config may need to be rebuilt. Currently we run `make conf` just once and then reuse it via cache. Instead, we need to run it unconditionally, since the other targets won't trigger that implictly. In Fedora policy the default module config is included and maintained in git, so we don't need to (and must not) call make conf at all. Reported-by: Stephen Smalley <stephen.smalley.work@xxxxxxxxx> Signed-off-by: Ondrej Mosnacek <omosnace@xxxxxxxxxx> --- travis-ci/setup-policy-fedora.sh | 2 -- travis-ci/setup-policy-refpolicy.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/travis-ci/setup-policy-fedora.sh b/travis-ci/setup-policy-fedora.sh index bce8698..a07c990 100644 --- a/travis-ci/setup-policy-fedora.sh +++ b/travis-ci/setup-policy-fedora.sh @@ -26,8 +26,6 @@ cd selinux-policy grep -q refpolicy build.conf && sed -i 's/refpolicy/targeted/' build.conf -[ -f policy/modules.conf ] || make conf - make -j`nproc --all` BINDIR=/usr/local/bin SBINDIR=/usr/local/sbin sudo make install install-headers diff --git a/travis-ci/setup-policy-refpolicy.sh b/travis-ci/setup-policy-refpolicy.sh index 3010467..d63e7e4 100644 --- a/travis-ci/setup-policy-refpolicy.sh +++ b/travis-ci/setup-policy-refpolicy.sh @@ -12,7 +12,7 @@ cd refpolicy git checkout origin/master -[ -f policy/modules.conf ] || make conf +make conf make -j`nproc --all` BINDIR=/usr/local/bin SBINDIR=/usr/local/sbin sudo make install install-headers -- 2.26.2
