[PATCH] Remove unwanted inherits of base-apt-helper

[PATCH] Remove unwanted inherits of base-apt-helper

[vijaikumar.kanagarajan]

From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>

After bff4e89a changes, we do not require to inherit the base-apt-helper
class in isar-bootstrap.inc and base-apt.bb files. Remove them.

Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
---
 meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 --
 meta/recipes-devtools/base-apt/base-apt.bb          | 2 --
 2 files changed, 4 deletions(-)

diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
index ff8ab01..3410b64 100644
--- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
+++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
@@ -32,8 +32,6 @@ HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list"
 
 DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org/\S* file:///${REPO_BASE_DIR}/${BASE_DISTRO} \n" if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) else "" }"
 
-inherit base-apt-helper
-
 python () {
     distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS", False) or "").split()
 
diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb
index 1c0b4c6..9f55ad5 100644
--- a/meta/recipes-devtools/base-apt/base-apt.bb
+++ b/meta/recipes-devtools/base-apt/base-apt.bb
@@ -3,8 +3,6 @@
 
 SRC_URI = "file://distributions.in"
 
-inherit base-apt-helper
-
 BASE_REPO_KEY ?= ""
 
 CACHE_CONF_DIR = "${REPO_BASE_DIR}/${BASE_DISTRO}/conf"
-- 
2.17.1

Re: [PATCH] Remove unwanted inherits of base-apt-helper

[Jan Kiszka]

On 19.08.19 12:54, vijaikumar.kanagarajan@gmail.com wrote:
> From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> 
> After bff4e89a changes, we do not require to inherit the base-apt-helper
> class in isar-bootstrap.inc and base-apt.bb files. Remove them.
> 
> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com>
> ---
>   meta/recipes-core/isar-bootstrap/isar-bootstrap.inc | 2 --
>   meta/recipes-devtools/base-apt/base-apt.bb          | 2 --
>   2 files changed, 4 deletions(-)
> 
> diff --git a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> index ff8ab01..3410b64 100644
> --- a/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> +++ b/meta/recipes-core/isar-bootstrap/isar-bootstrap.inc
> @@ -32,8 +32,6 @@ HOST_DISTRO_APT_SOURCES += "conf/distro/${HOST_DISTRO}.list"
>   
>   DISTRO_APT_PREMIRRORS ?= "${@ "http://ftp\.(\S+\.)?debian.org/\S* file:///${REPO_BASE_DIR}/${BASE_DISTRO} \n" if bb.utils.to_boolean(d.getVar('ISAR_USE_CACHED_BASE_REPO')) else "" }"
>   
> -inherit base-apt-helper
> -
>   python () {
>       distro_bootstrap_keys = (d.getVar("DISTRO_BOOTSTRAP_KEYS", False) or "").split()
>   
> diff --git a/meta/recipes-devtools/base-apt/base-apt.bb b/meta/recipes-devtools/base-apt/base-apt.bb
> index 1c0b4c6..9f55ad5 100644
> --- a/meta/recipes-devtools/base-apt/base-apt.bb
> +++ b/meta/recipes-devtools/base-apt/base-apt.bb
> @@ -3,8 +3,6 @@
>   
>   SRC_URI = "file://distributions.in"
>   
> -inherit base-apt-helper
> -
>   BASE_REPO_KEY ?= ""
>   
>   CACHE_CONF_DIR = "${REPO_BASE_DIR}/${BASE_DISTRO}/conf"
> 

Good cleanup, thanks.

Reviewed-by: Jan Kiszka <jan.kiszka@siemens.com>

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux

Re: [PATCH] Remove unwanted inherits of base-apt-helper

[Baurzhan Ismagulov]

Hello Vijai Kumar,

On Mon, Aug 19, 2019 at 04:24:47PM +0530, vijaikumar.kanagarajan@gmail.com wrote:
> After bff4e89a changes, we do not require to inherit the base-apt-helper
> class in isar-bootstrap.inc and base-apt.bb files. Remove them.

Thanks, applied to next.

The patch didn't apply to the current next, so I've applied the changes
manually and overridden the author and the date. Could you please see if
everything is ok?

With kind regards,
Baurzhan.

Re: [PATCH] Remove unwanted inherits of base-apt-helper

[Vijai Kumar K]

On Wed, Sep 04, 2019 at 02:28:04PM +0200, Baurzhan Ismagulov wrote:
> Hello Vijai Kumar,
> 
> On Mon, Aug 19, 2019 at 04:24:47PM +0530, vijaikumar.kanagarajan@gmail.com wrote:
> > After bff4e89a changes, we do not require to inherit the base-apt-helper
> > class in isar-bootstrap.inc and base-apt.bb files. Remove them.
> 
> Thanks, applied to next.
> 
> The patch didn't apply to the current next, so I've applied the changes
> manually and overridden the author and the date. Could you please see if
> everything is ok?

Just had a look. Everthing seems ok. Thanks Baurzhan.

BR,
Vijai Kumar K
> 
> With kind regards,
> Baurzhan.
> 
> -- 
> You received this message because you are subscribed to the Google Groups "isar-users" group.
> To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
> To view this discussion on the web visit https://groups.google.com/d/msgid/isar-users/20190904122804.GH6062%40yssyq.m.ilbers.de.