diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-06-27 17:42:46 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2017-06-27 17:42:46 +0000 |
| commit | e9ef5458ac571c1ac78c6eb02230f6ee289ec034 (patch) | |
| tree | 0ba176d9a131f402a28f59d0f084046202f5dbad /elements | |
| parent | da6edd7c453b0a6a02d1bf65fe82ec903a966421 (diff) | |
| download | definitions-e9ef5458ac571c1ac78c6eb02230f6ee289ec034.tar.gz | |
Revert "gnu-toolchain: Move `ldconfig` to first element of stage 3"
This reverts commit ad00652f93416d4dfc4ce13c02640430dcf4b83b.
With this change, the final build of GCC breaks due to not finding libz.so.1
all for want of an `ldconfig` run.
We will need another approach for cross stage2, since ldconfig can't run
there and currently this breaks `bst checkout` etc.
Diffstat (limited to 'elements')
| -rw-r--r-- | elements/gnu-toolchain/fhs-dirs.bst | 5 | ||||
| -rw-r--r-- | elements/gnu-toolchain/stage2.bst | 9 |
2 files changed, 9 insertions, 5 deletions
diff --git a/elements/gnu-toolchain/fhs-dirs.bst b/elements/gnu-toolchain/fhs-dirs.bst index 982ca051..df715755 100644 --- a/elements/gnu-toolchain/fhs-dirs.bst +++ b/elements/gnu-toolchain/fhs-dirs.bst @@ -24,8 +24,3 @@ config: - install -m 644 services "%{install-root}/etc/services" - install -m 644 protocols "%{install-root}/etc/protocols" - echo baserock > "%{install-root}/etc/hostname" - - # This is the first component that builds in the stage2.bst sysroot. - # We need to ldconfig manually here. It can't be done as an integration - # command in stage2 because that breaks when stage2 is cross-built. - - ldconfig || exit 0 diff --git a/elements/gnu-toolchain/stage2.bst b/elements/gnu-toolchain/stage2.bst index 70884374..ccabaf58 100644 --- a/elements/gnu-toolchain/stage2.bst +++ b/elements/gnu-toolchain/stage2.bst @@ -11,3 +11,12 @@ depends: - gnu-toolchain/stage2-make.bst - gnu-toolchain/stage2-fake-bash.bst - gnu-toolchain/stage2-reset-specs.bst + +# Stage 2 is a minimal base used to build the +# base runtime, must ldconfig when building on stage2 +public: + bst: + integration-commands: + - | + # In this stage, it may be that ld.so.conf doesnt exist yet + ldconfig || exit 0 |