Skip to content
  • Richard Purdie's avatar
    bitbake.conf/package: Collapse PKGDATA_DIR into a single machine specific directory · 8ebe7be3
    Richard Purdie authored
    
    
    Currently we have a hierarchy of pkgdata directories and the code has to put together
    a search path and look through each in turn until it finds the data it needs.
    
    This has lead to a number of hardcoded paths and file globing which
    is unpredictable and undesirable. Worse, certain tricks that should be
    easy like a GL specific package architecture become problematic with the
    curretn search paths.
    
    With the modern sstate code, we can do better and construct a single pkgdata
    directory for each machine in just the same way as we do for the sysroot. This
    is already tried and well tested. With such a single directory, all the code that
    iterated through multiple pkgdata directories and simply be removed and give
    a significant simplification of the code. Even existing build directories adapt
    to the change well since the package contents doesn't change, just the location
    they're installed to and the stamp for them.
    
    The only complication is the we need a different shlibs directory for each
    multilib. These are only used by package.bbclass and the simple fix is to
    add MLPREFIX to the shlib directory name. This means the multilib packages will
    repackage and the sstate checksum will change but an existing build directory
    will adapt to the changes safely.
    
    It is close to release however I believe the benefits this patch give us
    are worth consideration for inclusion and give us more options for dealing
    with problems like the GL one. It also sets the ground work well for
    shlibs improvements in 1.6.
    
    (From OE-Core rev: 1b8e4abd2d9c0901d38d89d0f944fe1ffd019379)
    
    Signed-off-by: default avatarRichard Purdie <richard.purdie@linuxfoundation.org>
    8ebe7be3