[PATCH] rootfs: fix base-apt.list cleanup

[PATCH] rootfs: fix base-apt.list cleanup

[Vidyasagar G C]

Ensure proper removal of all files matching *base-apt.list by
removing incorrect quoting, which prevented wildcard expansion.

Signed-off-by: Vidyasagar G C <vidyasagar.gc@siemens.com>
---
 meta/classes/rootfs.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 205da640..2348e269 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -368,7 +368,7 @@ rootfs_cleanup_base_apt[weight] = "2"
 rootfs_cleanup_base_apt() {
     sudo -s <<'EOSUDO'
         set -e
-        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/*base-apt.list"
+        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/"*base-apt.list
 EOSUDO
 }
 
-- 
2.39.5

-- 
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 visit https://groups.google.com/d/msgid/isar-users/20250219195046.15038-1-vidyasagar.gc%40siemens.com.

Re: [PATCH] rootfs: fix base-apt.list cleanup

[Uladzimir Bely]

On Thu, 2025-02-20 at 01:20 +0530, Vidyasagar G C wrote:
> Ensure proper removal of all files matching *base-apt.list by
> removing incorrect quoting, which prevented wildcard expansion.
> 
> Signed-off-by: Vidyasagar G C <vidyasagar.gc@siemens.com>
> ---
>  meta/classes/rootfs.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/rootfs.bbclass
> b/meta/classes/rootfs.bbclass
> index 205da640..2348e269 100644
> --- a/meta/classes/rootfs.bbclass
> +++ b/meta/classes/rootfs.bbclass
> @@ -368,7 +368,7 @@ rootfs_cleanup_base_apt[weight] = "2"
>  rootfs_cleanup_base_apt() {
>      sudo -s <<'EOSUDO'
>          set -e
> -        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/*base-apt.list"
> +        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/"*base-apt.list
>  EOSUDO
>  }
>  
> -- 
> 2.39.5
> 

Applied to next, thanks.

-- 
Best regards,
Uladzimir.



-- 
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 visit https://groups.google.com/d/msgid/isar-users/26b3b33dea9ea2240bcf7ce16db385449ef40229.camel%40ilbers.de.

Re: [PATCH] rootfs: fix base-apt.list cleanup

['MOESSBAUER, Felix' via isar-users]

On Thu, 2025-02-20 at 01:20 +0530, Vidyasagar G C wrote:
> Ensure proper removal of all files matching *base-apt.list by
> removing incorrect quoting, which prevented wildcard expansion.
> 
> Signed-off-by: Vidyasagar G C <vidyasagar.gc@siemens.com>
> ---
>  meta/classes/rootfs.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta/classes/rootfs.bbclass
> b/meta/classes/rootfs.bbclass
> index 205da640..2348e269 100644
> --- a/meta/classes/rootfs.bbclass
> +++ b/meta/classes/rootfs.bbclass
> @@ -368,7 +368,7 @@ rootfs_cleanup_base_apt[weight] = "2"
>  rootfs_cleanup_base_apt() {
>      sudo -s <<'EOSUDO'
>          set -e
> -        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/*base-apt.list"
> +        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/"*base-apt.list

Hi,

this only covers the base-apt part, but not the bootstrap part.
We also need to remove /etc/apt/sources.list.d/0000bootstrap.list.

In case of snapshot mirrors, this re-injects the snapshots into apt.

Felix

>  EOSUDO
>  }
>  
> -- 
> 2.39.5
> 

-- 
Siemens AG
Linux Expert Center
Friedrich-Ludwig-Bauer-Str. 3
85748 Garching, Germany


-- 
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 visit https://groups.google.com/d/msgid/isar-users/718ae8e9938430d8cdfb7d63c0db694c407e00fb.camel%40siemens.com.

[PATCH v2 1/3] rootfs: fix base-apt.list cleanup

[Vidyasagar G C]

From: Vidyasagar G C <gcvidyasagar@gmail.com>

Ensure proper removal of all files matching *base-apt.list by
removing incorrect quoting, which prevented wildcard expansion.

Also remove the leftover 0000bootstrap.list from
/etc/apt/sources.list.d/

Signed-off-by: Vidyasagar G C <vidyasagar.gc@siemens.com>
---
 meta/classes/rootfs.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 205da640..a25ec87b 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -358,6 +358,7 @@ rootfs_cleanup_isar_apt() {
     sudo -s <<'EOSUDO'
         set -e
         rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list"
+        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/"*bootstrap.list
         rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt"
         rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar"
 EOSUDO
@@ -368,7 +369,7 @@ rootfs_cleanup_base_apt[weight] = "2"
 rootfs_cleanup_base_apt() {
     sudo -s <<'EOSUDO'
         set -e
-        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/*base-apt.list"
+        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/"*base-apt.list
 EOSUDO
 }
 
-- 
2.39.5

-- 
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 visit https://groups.google.com/d/msgid/isar-users/20250303114217.11551-1-vidyasagar.gc%40siemens.com.

Re: [PATCH v2 1/3] rootfs: fix base-apt.list cleanup

['MOESSBAUER, Felix' via isar-users]

On Mon, 2025-03-03 at 17:12 +0530, Vidyasagar G C wrote:
> From: Vidyasagar G C <gcvidyasagar@gmail.com>
> 
> Ensure proper removal of all files matching *base-apt.list by
> removing incorrect quoting, which prevented wildcard expansion.
> 
> Also remove the leftover 0000bootstrap.list from
> /etc/apt/sources.list.d/

Hi, thanks!

I just manually added your patch as it does not apply on next. Please
rebase and send again.

Acked-by: Felix Moessbauer <felix.moessbauer@siemens.com>

Felix

> 
> Signed-off-by: Vidyasagar G C <vidyasagar.gc@siemens.com>
> ---
>  meta/classes/rootfs.bbclass | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes/rootfs.bbclass
> b/meta/classes/rootfs.bbclass
> index 205da640..a25ec87b 100644
> --- a/meta/classes/rootfs.bbclass
> +++ b/meta/classes/rootfs.bbclass
> @@ -358,6 +358,7 @@ rootfs_cleanup_isar_apt() {
>      sudo -s <<'EOSUDO'
>          set -e
>          rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list"
> +        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/"*bootstrap.list
>          rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt"
>          rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar"
>  EOSUDO
> @@ -368,7 +369,7 @@ rootfs_cleanup_base_apt[weight] = "2"
>  rootfs_cleanup_base_apt() {
>      sudo -s <<'EOSUDO'
>          set -e
> -        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/*base-apt.list"
> +        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/"*base-apt.list
>  EOSUDO
>  }
>  
> -- 
> 2.39.5
> 

-- 
Siemens AG
Linux Expert Center
Friedrich-Ludwig-Bauer-Str. 3
85748 Garching, Germany


-- 
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 visit https://groups.google.com/d/msgid/isar-users/6727bb3f34f22932d8da3a45091643d9935c796d.camel%40siemens.com.

[PATCH v2 3/3] fix(rootfs): cleanup leftover 0000bootstrap.list

[Vidyasagar G C]

remove 0000bootstrap.list from /etc/apt/sources.list.d/

Signed-off-by: Vidyasagar G C <vidyasagar.gc@siemens.com>
---
 meta/classes/rootfs.bbclass | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/classes/rootfs.bbclass b/meta/classes/rootfs.bbclass
index 2348e269..a25ec87b 100644
--- a/meta/classes/rootfs.bbclass
+++ b/meta/classes/rootfs.bbclass
@@ -358,6 +358,7 @@ rootfs_cleanup_isar_apt() {
     sudo -s <<'EOSUDO'
         set -e
         rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list"
+        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/"*bootstrap.list
         rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt"
         rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar"
 EOSUDO
-- 
2.39.5

-- 
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 visit https://groups.google.com/d/msgid/isar-users/20250304065926.4320-1-vidyasagar.gc%40siemens.com.

Re: [PATCH v2 3/3] fix(rootfs): cleanup leftover 0000bootstrap.list

[Uladzimir Bely]

On Tue, 2025-03-04 at 12:29 +0530, Vidyasagar G C wrote:
> remove 0000bootstrap.list from /etc/apt/sources.list.d/
> 
> Signed-off-by: Vidyasagar G C <vidyasagar.gc@siemens.com>
> ---
>  meta/classes/rootfs.bbclass | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/meta/classes/rootfs.bbclass
> b/meta/classes/rootfs.bbclass
> index 2348e269..a25ec87b 100644
> --- a/meta/classes/rootfs.bbclass
> +++ b/meta/classes/rootfs.bbclass
> @@ -358,6 +358,7 @@ rootfs_cleanup_isar_apt() {
>      sudo -s <<'EOSUDO'
>          set -e
>          rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/isar-apt.list"
> +        rm -f "${ROOTFSDIR}/etc/apt/sources.list.d/"*bootstrap.list
>          rm -f "${ROOTFSDIR}/etc/apt/preferences.d/isar-apt"
>          rm -f "${ROOTFSDIR}/etc/apt/apt.conf.d/50isar"
>  EOSUDO
> -- 
> 2.39.5
> 

Applied to next, thanks.

-- 
Best regards,
Uladzimir.

-- 
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 visit https://groups.google.com/d/msgid/isar-users/af33a5b2a2d88a98bb03c6e3c1ec981dc64b9a75.camel%40ilbers.de.