From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 6081113888F for ; Tue, 6 Oct 2015 15:06:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4F54C21C055; Tue, 6 Oct 2015 15:05:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D94FB21C055 for ; Tue, 6 Oct 2015 15:05:38 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 0DBE2340A8E for ; Tue, 6 Oct 2015 15:05:37 +0000 (UTC) From: Mike Frysinger To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 12/13] targets: fix bad set_build_kernel_vars call Date: Tue, 6 Oct 2015 11:05:28 -0400 Message-Id: <1444143929-26705-12-git-send-email-vapier@gentoo.org> X-Mailer: git-send-email 2.5.2 In-Reply-To: <1444143929-26705-1-git-send-email-vapier@gentoo.org> References: <1444143929-26705-1-git-send-email-vapier@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Archives-Salt: c6f22845-c05d-49c8-a86d-116a22f7211f X-Archives-Hash: aad0295cf022180b7c3809cbea609ad2 These modules were calling set_build_kernel_vars with an argument that the func didn't accept. Plus, it's redundant as the super class init (which these guys call) already handles the call. So delete it. --- catalyst/targets/embedded.py | 1 - catalyst/targets/netboot.py | 1 - catalyst/targets/netboot2.py | 1 - 3 files changed, 3 deletions(-) diff --git a/catalyst/targets/embedded.py b/catalyst/targets/embedded.py index 3309278..6044e17 100644 --- a/catalyst/targets/embedded.py +++ b/catalyst/targets/embedded.py @@ -28,7 +28,6 @@ class embedded(StageBase): self.valid_values.append("embedded/fs-ops") StageBase.__init__(self,spec,addlargs) - self.set_build_kernel_vars(addlargs) def set_action_sequence(self): self.settings["action_sequence"]=["dir_setup","unpack","unpack_snapshot",\ diff --git a/catalyst/targets/netboot.py b/catalyst/targets/netboot.py index b0e322c..46ec4eb 100644 --- a/catalyst/targets/netboot.py +++ b/catalyst/targets/netboot.py @@ -44,7 +44,6 @@ class netboot(StageBase): raise CatalystError("configuration error in netboot/packages.") StageBase.__init__(self,spec,addlargs) - self.set_build_kernel_vars(addlargs) if "netboot/busybox_config" in addlargs: file_locate(self.settings, ["netboot/busybox_config"]) diff --git a/catalyst/targets/netboot2.py b/catalyst/targets/netboot2.py index f2d039c..5508367 100644 --- a/catalyst/targets/netboot2.py +++ b/catalyst/targets/netboot2.py @@ -46,7 +46,6 @@ class netboot2(StageBase): raise CatalystError("configuration error in netboot2/packages.") StageBase.__init__(self,spec,addlargs) - self.set_build_kernel_vars() self.settings["merge_path"]=normpath("/tmp/image/") def set_target_path(self): -- 2.5.2