| Message ID | 20220610162831.704538-1-florian.bezdeka@siemens.com |
|---|---|
| State | Accepted, archived |
| Headers | show |
| Series | buildchroot: Install ccache into the buildchroot only when enabled | expand |
On 10.06.22 18:28, Florian Bezdeka wrote: > This fixes a corner case where the buildchroot is not directly fetched > from Debian upstream repos but from something like a (manually > maintained) snapshot. There is no guarantee that the ccache packet is > available inside the buildchroot packet feed. > > As soon as ccache is enabled by setting "USE_CCACHE" to "1" the packet > will be installed into the buildchroot. > > Fixes: 20a2ff7704a2 ("meta: Support for ccache for custom packages") Not really a fix, just a (valid) cleanup. Jan > Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com> > --- > meta/recipes-devtools/buildchroot/buildchroot.inc | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc > index aa190e9..c3067ad 100644 > --- a/meta/recipes-devtools/buildchroot/buildchroot.inc > +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc > @@ -32,7 +32,7 @@ BUILDCHROOT_PREINSTALL_COMMON = " \ > make \ > debhelper \ > autotools-dev \ > - ccache \ > + ${@ 'ccache' if d.getVar('USE_CCACHE') == '1' else ''} \ > dpkg \ > locales \ > docbook-to-man \
10.06.2022 19:28, Florian Bezdeka wrote: > This fixes a corner case where the buildchroot is not directly fetched > from Debian upstream repos but from something like a (manually > maintained) snapshot. There is no guarantee that the ccache packet is > available inside the buildchroot packet feed. > > As soon as ccache is enabled by setting "USE_CCACHE" to "1" the packet > will be installed into the buildchroot. > > Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com> Applied to next, thanks.
diff --git a/meta/recipes-devtools/buildchroot/buildchroot.inc b/meta/recipes-devtools/buildchroot/buildchroot.inc index aa190e9..c3067ad 100644 --- a/meta/recipes-devtools/buildchroot/buildchroot.inc +++ b/meta/recipes-devtools/buildchroot/buildchroot.inc @@ -32,7 +32,7 @@ BUILDCHROOT_PREINSTALL_COMMON = " \ make \ debhelper \ autotools-dev \ - ccache \ + ${@ 'ccache' if d.getVar('USE_CCACHE') == '1' else ''} \ dpkg \ locales \ docbook-to-man \
This fixes a corner case where the buildchroot is not directly fetched from Debian upstream repos but from something like a (manually maintained) snapshot. There is no guarantee that the ccache packet is available inside the buildchroot packet feed. As soon as ccache is enabled by setting "USE_CCACHE" to "1" the packet will be installed into the buildchroot. Fixes: 20a2ff7704a2 ("meta: Support for ccache for custom packages") Signed-off-by: Florian Bezdeka <florian.bezdeka@siemens.com> --- meta/recipes-devtools/buildchroot/buildchroot.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)