-
John Johansen authored
Split the features file into compile features and kernel features which is needed for policy versioning and the new caching scheme. A new flag --kernel-features was added to set the kernel features but unfortunately -M, --features-file was setup to only specify the compile features, when it used to effectively specify both the compile and kernel features. This broke existing uses of -M. Fix this by having -M specify both the compile and kernel features, and a new flag --compile-features that can be used to specify the compile fature set separate from the kernel feature set. sbeattie> fixed up error message to refer to compile features when --compile-features argument fails. Backport-requested-by: intrigeri <intrigeri@debian.org> PR: https://gitlab.com/apparmor/apparmor/merge_requests/104 (cherry picked from commit e83fa67edfb534976dc4133e634519084153c0e7) Fixes: 9e48a5da ("parser: split kernel features from compile features.") Signed-off-by: John Johansen <john.johansen@canonical.com> Signed-off-by: Steve Beattie <steve.beattie@canonical.com>
8661ebcb