mirror of
https://git.yoctoproject.org/meta-security
synced 2026-05-07 16:59:28 +00:00
mulhern
6e23502b38
[YOCTO #3867] Five additional patches which cause the --os flag to be accepted and observed are added. An additional distro, Yocto, is added. The individual patches are described below. upgrade_options_processing.patch: Changes setOptions procedure so that it accepts named parameters for greater flexibility and adjusts all invocations accordingly. Uses more precise specifications in invocatiosn of Getop::Long::GetOptions. Omits code associated with a commented out flag. accept_os_flag_in_backend.patch: Accepts and observes an additional --os flag in BastilleBackEnd. allow_os_with_assess.patch: No longer print a usage message and quit if --assess or its related flags are specified along with the --os flag. edit_usage_message.patch: Edit usage message to include the specification of an --os flag with the specification of an --assess flag. organize_distro_discovery.patch: Separates inferring the distro from specifying the distro. Adds a "Yocto" distro among the other Linux distros. Causes the specified distro to override the inferred distro with a warning message when they are different. Previously if either the inferred distro or the specified distro was not among supported distros Bastille would quit with an error. Signed-off-by: mulhern <mulhern@yoctoproject.org>
35 lines
998 B
Diff
35 lines
998 B
Diff
Upstream Status: Inappropriate [No upstream maintenance]
|
|
|
|
Signed-off-by: Anne Mulhern <mulhern@yoctoproject.org>
|
|
|
|
---
|
|
|
|
Index: Bastille/BastilleBackEnd
|
|
===================================================================
|
|
--- Bastille.orig/BastilleBackEnd 2013-08-21 12:40:54.000000000 -0400
|
|
+++ Bastille/BastilleBackEnd 2013-08-21 12:43:21.895950001 -0400
|
|
@@ -52,11 +52,13 @@
|
|
my $force = 0;
|
|
my $debug = 0;
|
|
my $alternate_config=undef;
|
|
+my $os_version=undef;
|
|
|
|
if( Getopt::Long::GetOptions( "n" => \$nodisclaim,
|
|
"v" => \$verbose,
|
|
"force" => \$force,
|
|
"f=s" => \$alternate_config,
|
|
+ "os=s" => \$os_version,
|
|
"debug" => \$debug) ) {
|
|
$error = 0; # no parse error
|
|
|
|
@@ -66,7 +68,8 @@
|
|
|
|
&setOptions(
|
|
debug => $debug,
|
|
- verbose => $verbose);
|
|
+ verbose => $verbose,
|
|
+ os => $os_version);
|
|
&ConfigureForDistro;
|
|
|
|
if ( $error ) { # GetOptions couldn't parse all of the args
|