[apparmor] [patch] Add several files created during libapparmor build to .bzrignore

John Johansen john.johansen at canonical.com
Wed Oct 21 17:34:38 UTC 2015


On 10/21/2015 05:16 AM, Christian Boltz wrote:
> Hello,
> 
> Am Dienstag, 20. Oktober 2015 schrieb John Johansen:
>> On 10/20/2015 02:57 PM, Christian Boltz wrote:
>>> Now that   make -C utils   needs the in-tree libapparmor, those
>>> files become annoying in the bzr status output ;-)
>>
>> err needs? I remember a patch that provides USE_SYSTEM=
>> I don't remember anything that required in-tree libapparmor, I would
>> have NAKed it :)
> 
> I missed to include "check", so actually I'm talking about
>     make -C utils check
> (just "make"ing the utils doesn't need libapparmor)
> 
> The patch you are talking about means that by default (= without 
> USE_SYSTEM=1), the in-tree libapparmor and python modules will be used.
> 
> With USE_SYSTEM, the system libapparmor (and - new! - also the system 
> python modules) will be used.
> 
> So in practise it's easier to compile the in-tree libapparmor than to 
> type USE_SYSTEM=1 every time ;-)
> 
> 
> That said - what about the .bzrignore additions?
> 
oh thats a much less fun

Acked-by: John Johansen <john.johansen at canonical.com>

>>> I propose this patch for trunk and 2.9.
>>>
>>>
>>> [ bzrignore-libapparmor.diff ]
>>>
>>> --- .bzrignore  2015-06-06 18:15:56.084323368 +0200
>>> +++ .bzrignore  2015-10-20 23:50:55.913670577 +0200
>>> @@ -46,7 +46,10 @@
>>>
>>>  libraries/libapparmor/doc/Makefile
>>>  libraries/libapparmor/doc/Makefile.in
>>>  libraries/libapparmor/doc/*.2
>>>
>>> +libraries/libapparmor/doc/aa_*.3
>>> +libraries/libapparmor/include/Makefile
>>>
>>>  libraries/libapparmor/include/Makefile.in
>>>
>>> +libraries/libapparmor/include/sys/Makefile
>>>
>>>  libraries/libapparmor/include/sys/Makefile.in
>>>  libraries/libapparmor/src/.deps
>>>  libraries/libapparmor/src/.libs
>>>
>>> @@ -54,10 +57,16 @@
>>>
>>>  libraries/libapparmor/src/Makefile.in
>>>  libraries/libapparmor/src/af_protos.h
>>>  libraries/libapparmor/src/change_hat.lo
>>>
>>> +libraries/libapparmor/src/features.lo
>>>
>>>  libraries/libapparmor/src/grammar.lo
>>>
>>> +libraries/libapparmor/src/kernel.lo
>>> +libraries/libapparmor/src/kernel_interface.lo
>>>
>>>  libraries/libapparmor/src/libaalogparse.lo
>>>  libraries/libapparmor/src/libimmunix_warning.lo
>>>
>>> +libraries/libapparmor/src/policy_cache.lo
>>> +libraries/libapparmor/src/private.lo
>>>
>>>  libraries/libapparmor/src/scanner.lo
>>>
>>> +libraries/libapparmor/src/libapparmor.pc
>>>
>>>  libraries/libapparmor/src/libapparmor.la
>>>  libraries/libapparmor/src/libimmunix.la
>>>  libraries/libapparmor/src/grammar.c
>>>
>>> @@ -74,12 +83,18 @@
>>>
>>>  libraries/libapparmor/swig/perl/Makefile.in
>>>  libraries/libapparmor/swig/perl/Makefile.perl
>>>  libraries/libapparmor/swig/perl/Makefile.perle
>>>
>>> +libraries/libapparmor/swig/perl/MYMETA.json
>>> +libraries/libapparmor/swig/perl/MYMETA.yml
>>>
>>>  libraries/libapparmor/swig/perl/blib
>>>  libraries/libapparmor/swig/perl/libapparmor_wrap.c
>>>  libraries/libapparmor/swig/perl/pm_to_blib
>>>
>>> +libraries/libapparmor/swig/python/__init__.py
>>> +libraries/libapparmor/swig/python/build/
>>> +libraries/libapparmor/swig/python/libapparmor_wrap.c
>>>
>>>  libraries/libapparmor/swig/python/Makefile
>>>  libraries/libapparmor/swig/python/Makefile.in
>>>  libraries/libapparmor/swig/python/setup.py
>>>
>>> +libraries/libapparmor/swig/python/test/Makefile
>>>
>>>  libraries/libapparmor/swig/python/test/Makefile.in
>>>  libraries/libapparmor/swig/ruby/Makefile
>>>  libraries/libapparmor/swig/ruby/Makefile.in
> 
> 
> Regards,
> 
> Christian Boltz
> 




More information about the AppArmor mailing list