| 1 |
commit: 41658d890d2aeffdd0c7c399883ae212a1ea3ae0 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 6 14:47:42 2015 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 6 14:47:42 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=41658d89 |
| 7 |
|
| 8 |
targets: fix bad set_build_kernel_vars call |
| 9 |
|
| 10 |
These modules were calling set_build_kernel_vars with an argument that |
| 11 |
the func didn't accept. Plus, it's redundant as the super class init |
| 12 |
(which these guys call) already handles the call. So delete it. |
| 13 |
|
| 14 |
catalyst/targets/embedded.py | 1 - |
| 15 |
catalyst/targets/netboot.py | 1 - |
| 16 |
catalyst/targets/netboot2.py | 1 - |
| 17 |
3 files changed, 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py |
| 20 |
index 3309278..6044e17 100644 |
| 21 |
--- a/catalyst/targets/embedded.py |
| 22 |
+++ b/catalyst/targets/embedded.py |
| 23 |
@@ -28,7 +28,6 @@ class embedded(StageBase): |
| 24 |
self.valid_values.append("embedded/fs-ops") |
| 25 |
|
| 26 |
StageBase.__init__(self,spec,addlargs) |
| 27 |
- self.set_build_kernel_vars(addlargs) |
| 28 |
|
| 29 |
def set_action_sequence(self): |
| 30 |
self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ |
| 31 |
|
| 32 |
diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py |
| 33 |
index b0e322c..46ec4eb 100644 |
| 34 |
--- a/catalyst/targets/netboot.py |
| 35 |
+++ b/catalyst/targets/netboot.py |
| 36 |
@@ -44,7 +44,6 @@ class netboot(StageBase): |
| 37 |
raise CatalystError("configuration error in netboot/packages.") |
| 38 |
|
| 39 |
StageBase.__init__(self,spec,addlargs) |
| 40 |
- self.set_build_kernel_vars(addlargs) |
| 41 |
if "netboot/busybox_config" in addlargs: |
| 42 |
file_locate(self.settings, ["netboot/busybox_config"]) |
| 43 |
|
| 44 |
|
| 45 |
diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py |
| 46 |
index f2d039c..5508367 100644 |
| 47 |
--- a/catalyst/targets/netboot2.py |
| 48 |
+++ b/catalyst/targets/netboot2.py |
| 49 |
@@ -46,7 +46,6 @@ class netboot2(StageBase): |
| 50 |
raise CatalystError("configuration error in netboot2/packages.") |
| 51 |
|
| 52 |
StageBase.__init__(self,spec,addlargs) |
| 53 |
- self.set_build_kernel_vars() |
| 54 |
self.settings["merge_path"]=normpath("/tmp/image/") |
| 55 |
|
| 56 |
def set_target_path(self): |
Archives