Allow "deleting" url/path of repo in override
Make "null" an allowed type for the `url` and `path` properties of a
repository.  This allows "deleting" them in an override kas-file to e.g.
point a repository at a local directory instead of a git remote:
"Original" file:
    repos:
      meta-foo:
        url: https://example.org/foo.git
        refspec: badc0ffee
Override:
    repos:
      meta-foo:
        url:
        path: /path/to/local/foo
Without the explicit "nulling" of the URL, kas would start messing with
the repo in /path/to/local/foo (changing remote URL, switching to a
different rev, etc.).  With this change, we can instead force kas to use
the recipes in that directory untouched.
Signed-off-by: Harald Seiler <hws@denx.de>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
			
			
This commit is contained in:
		
				
					committed by
					
						 Jan Kiszka
						Jan Kiszka
					
				
			
			
				
	
			
			
			
						parent
						
							0929101104
						
					
				
				
					commit
					5ecef9f919
				
			| @@ -28,5 +28,5 @@ __copyright__ = 'Copyright (c) Siemens AG, 2017-2020' | ||||
| __version__ = '3.0.2' | ||||
|  | ||||
| # Please update docs/format-changelog.rst when changing the file version. | ||||
| __file_version__ = 11 | ||||
| __file_version__ = 12 | ||||
| __compatible_file_version__ = 1 | ||||
|   | ||||
| @@ -125,7 +125,14 @@ | ||||
|                                 "type": "string" | ||||
|                             }, | ||||
|                             "url": { | ||||
|                                 "type": "string" | ||||
|                                 "oneOf": [ | ||||
|                                     { | ||||
|                                         "type": "string" | ||||
|                                     }, | ||||
|                                     { | ||||
|                                         "type": "null" | ||||
|                                     } | ||||
|                                 ] | ||||
|                             }, | ||||
|                             "type": { | ||||
|                                 "type": "string" | ||||
| @@ -134,7 +141,14 @@ | ||||
|                                 "type": "string" | ||||
|                             }, | ||||
|                             "path": { | ||||
|                                 "type": "string" | ||||
|                                 "oneOf": [ | ||||
|                                     { | ||||
|                                         "type": "string" | ||||
|                                     }, | ||||
|                                     { | ||||
|                                         "type": "null" | ||||
|                                     } | ||||
|                                 ] | ||||
|                             }, | ||||
|                             "layers": { | ||||
|                                 "type": "object", | ||||
|   | ||||
		Reference in New Issue
	
	Block a user