[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 <vidyas...@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

[Uladzimir Bely]

Applied to next, thanks.

--
Best regards,
Uladzimir.

[MOESSBAUER, Felix]

On Thu, 2025-02-20 at 01:20 +0530, Vidyasagar G C wrote:

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

[Vidyasagar G C]

From: Vidyasagar G C <gcvidy...@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 <vidyas...@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"

[MOESSBAUER, Felix]

On Mon, 2025-03-03 at 17:12 +0530, Vidyasagar G C wrote:
> From: Vidyasagar G C <gcvidy...@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.mo...@siemens.com>

Felix

[Vidyasagar G C]

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

Signed-off-by: Vidyasagar G C <vidyas...@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

[Uladzimir Bely]