diff options
| author | allgdante <allan.garret@gmail.com> | 2018-01-26 11:09:38 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-13 15:33:55 +0000 |
| commit | ad8994e692705cfffed1c2ec14070b7b6ce85de9 (patch) | |
| tree | ff3d65b3bd20a240e4c370239e3b9a86afcdf96c /testing/apparmor/0004-Remove-vim-from-default-utils-build.patch | |
| parent | eec0dec579994a499def4c1ab349672b8404b80b (diff) | |
| download | aports-ad8994e692705cfffed1c2ec14070b7b6ce85de9.tar.gz aports-ad8994e692705cfffed1c2ec14070b7b6ce85de9.tar.bz2 aports-ad8994e692705cfffed1c2ec14070b7b6ce85de9.tar.xz | |
testing/apparmor: upgrade to 2.12
Diffstat (limited to 'testing/apparmor/0004-Remove-vim-from-default-utils-build.patch')
| -rw-r--r-- | testing/apparmor/0004-Remove-vim-from-default-utils-build.patch | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/testing/apparmor/0004-Remove-vim-from-default-utils-build.patch b/testing/apparmor/0004-Remove-vim-from-default-utils-build.patch new file mode 100644 index 0000000000..56845739c4 --- /dev/null +++ b/testing/apparmor/0004-Remove-vim-from-default-utils-build.patch @@ -0,0 +1,36 @@ +diff --git a/utils/Makefile b/utils/Makefile +index 68f8c376..01604796 100644 +--- a/utils/Makefile ++++ b/utils/Makefile +@@ -32,7 +32,6 @@ MANPAGES = ${TOOLS:=.8} logprof.conf.5 + + all: docs + $(MAKE) -C po all +- $(MAKE) -C vim all + + .PHONY: docs + docs: ${MANPAGES} ${HTMLMANPAGES} +@@ -58,7 +57,6 @@ install: ${MANPAGES} ${HTMLMANPAGES} + install -m 755 $(filter-out aa-easyprof, ${TOOLS}) ${BINDIR} + $(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME} + $(MAKE) install_manpages DESTDIR=${DESTDIR} +- $(MAKE) -C vim install DESTDIR=${DESTDIR} + ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8 + ${PYTHON} ${PYSETUP} install --prefix=${PYPREFIX} --root=${DESTDIR} --version=${VERSION} + +@@ -69,7 +67,6 @@ endif + clean: pod_clean + rm -f core core.* *.o *.s *.a *~ + $(MAKE) -C po clean +- $(MAKE) -C vim clean + $(MAKE) -C test clean + rm -rf staging/ build/ + rm -f apparmor/*.pyc apparmor/rule/*.pyc +@@ -100,4 +97,3 @@ check: check_severity_db check_pod_files + $(PYFLAKES) $$i || exit 1; \ + done + $(MAKE) -C test check +- $(MAKE) -C vim check +-- +2.16.1 + |