[PATCH] meta/classes/image: move sources-list as bootstrap.list in rootfs_finalize

15 views
Skip to first unread message

srinuv...@siemens.com

unread,
Dec 13, 2024, 8:37:41 AM12/13/24
to isar-...@googlegroups.com, ub...@ilbers.de, vidyas...@siemens.com, srinuvasan
From: srinuvasan <srinuv...@siemens.com>

Presently, sources-list is not moved as bootstrap.list, even though the source-list file
and sources.list.d directory present, this regression introduced in 8c10710

Make sure to use -d if the directory exists and use the correct name of the directory (sources.list.d).

Signed-off-by: srinuvasan <srinuv...@siemens.com>
---
meta/classes/image.bbclass | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 4ed9123f..db21cc76 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -416,7 +416,7 @@ do_rootfs_finalize() {
-maxdepth 1 -name 'qemu-*-static' -type f -delete
fi

- if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ] && [ -e "${ROOTFSDIR}/etc/apt/sources-list.d" ]; then
+ if [ -e "${ROOTFSDIR}/etc/apt/sources-list" ] && [ -d "${ROOTFSDIR}/etc/apt/sources.list.d" ]; then
mv "${ROOTFSDIR}/etc/apt/sources-list" \
"${ROOTFSDIR}/etc/apt/sources.list.d/bootstrap.list"
fi
--
2.39.5

Uladzimir Bely

unread,
Dec 20, 2024, 2:47:23 AM12/20/24
to srinuv...@siemens.com, isar-...@googlegroups.com
Applied to next, thanks.

--
Best regards,
Uladzimir.



Reply all
Reply to author
Forward
0 new messages