| Message ID | 20250303114217.11551-1-vidyasagar.gc@siemens.com |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | [v2,1/3] rootfs: fix base-apt.list cleanup | expand |
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 >
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 }