diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-29 13:30:59 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2021-10-19 04:04:49 -1000 |
| commit | 00615c9edb8b9b644e853453603846eddfff2054 (patch) | |
| tree | e756f984746a40651f8aceadcb5a3b2e941c752c | |
| parent | 03b4b26ced1d3fb3646b366b5178bb6cdcb9addd (diff) | |
| download | openembedded-core-00615c9edb8b9b644e853453603846eddfff2054.tar.gz | |
package: Ensure pclist files are deterministic and don't use full paths
Currently the pkgconfig pclist files contain full paths which are build
host specific and the order of entries is not deterministic.
Fix both these issues so the files are deterministic.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit e422e29bca4af3ab4073e04490f38b05cd7c38c0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes/package.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 3ff74c9f31..702427fecc 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1989,12 +1989,12 @@ python package_do_pkgconfig () { for pkg in packages.split(): pkgconfig_provided[pkg] = [] pkgconfig_needed[pkg] = [] - for file in pkgfiles[pkg]: + for file in sorted(pkgfiles[pkg]): m = pc_re.match(file) if m: pd = bb.data.init() name = m.group(1) - pkgconfig_provided[pkg].append(name) + pkgconfig_provided[pkg].append(os.path.basename(name)) if not os.access(file, os.R_OK): continue with open(file, 'r') as f: @@ -2017,7 +2017,7 @@ python package_do_pkgconfig () { pkgs_file = os.path.join(shlibswork_dir, pkg + ".pclist") if pkgconfig_provided[pkg] != []: with open(pkgs_file, 'w') as f: - for p in pkgconfig_provided[pkg]: + for p in sorted(pkgconfig_provided[pkg]): f.write('%s\n' % p) # Go from least to most specific since the last one found wins |