From f5a1b3c8f7e252def9ffb269f52f946c826ae851 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Fri, 16 Sep 2011 10:28:27 -0500 Subject: package.bbclass: fix spurious 'installed but not shipped' warning For packages that have files installed that aren't in a subdirectory, the following build WARNING is emitted (this for initramfs-live-boot as an example): WARNING: For recipe initramfs-live-boot, the following files were installed but not shipped in any package: WARNING: init The problem is that the filenames added to the 'seen' array are always added with a path separator at the beginning of the filename, but when the package dir is walked for comparison, any files at the top-level will be missing the beginning path separator and the comparison will fail despite the fact that the file was actually packaged. This because the remainder between the dirname and the dvar base name is used in the path join and in the case of files at the top-level, the remainder is the empty string, where it should be '/' for comparison purposes. (From OE-Core rev: cb19503139b9102f02ba3e5be63d5e85f280f2ef) Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- meta/classes/package.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes/package.bbclass') diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 73e8f6365f..3dbe308d0e 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -936,8 +936,11 @@ python populate_packages () { unshipped = [] for root, dirs, files in os.walk(dvar): + dir = root[len(dvar):] + if not dir: + dir = os.sep for f in files: - path = os.path.join(root[len(dvar):], f) + path = os.path.join(dir, f) if ('.' + path) not in seen: unshipped.append(path) -- cgit v1.2.3-54-g00ecf