[yocto] [meta-raspberrypi][PATCH 1/1] linux-rpi: clean .config in before do_configure step

Andrei Gherzan andrei at gherzan.ro
Fri Dec 30 05:20:51 PST 2016


On Fri, Dec 30, 2016 at 08:20:00AM +0100, Piotr Lewicki wrote:
> On 29.12.2016 19:20, Andrei Gherzan wrote:
> > On Fri, Dec 16, 2016 at 08:58:22AM -0800, Khem Raj wrote:
> > > > On Dec 15, 2016, at 2:05 AM, Piotr Lewicki <piotr.lewicki at elfin.de> wrote:
> > > >
> > > > Signed-off-by: Piotr Lewicki <piotr.lewicki at elfin.de>
> > > > ---
> > > > recipes-kernel/linux/linux-rpi.inc | 11 +++++++++--
> > > > 1 file changed, 9 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/recipes-kernel/linux/linux-rpi.inc b/recipes-kernel/linux/linux-rpi.inc
> > > > index 95a9530..c665b9f 100644
> > > > --- a/recipes-kernel/linux/linux-rpi.inc
> > > > +++ b/recipes-kernel/linux/linux-rpi.inc
> > > > @@ -34,11 +34,13 @@ kernel_configure_variable() {
> > > >      fi
> > > > }
> > > >
> > > > -do_configure_prepend() {
> > > > +do_rpi_kconfig_clean() {
> > > >      # Clean .config
> > > > -    echo "" > ${B}/.config
> > > > +    echo -n "" > ${B}/.config
> > > >      CONF_SED_SCRIPT=""
> > > > +}
> > > >
> > > > +do_configure_prepend() {
> > > >      # oabi / eabi support
> > > >      kernel_configure_variable AEABI y
> > > >      if [ "${ARM_KEEP_OABI}" = "1" ] ; then
> > > > @@ -124,8 +126,11 @@ do_configure_prepend() {
> > > >      # Keep this the last line
> > > >      # Remove all modified configs and add the rest to .config
> > > >      sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config'
> > > > +    # Clean variable- useful when calling configure step multiple times
> > > > +    CONF_SED_SCRIPT=""
> > > >
> > > >      yes '' | oe_runmake oldconfig
> > > > +
> > > > }
> > > >
> > > > # Automatically depend on lzop-native if CONFIG_KERNEL_LZO is enabled
> > > > @@ -146,3 +151,5 @@ python () {
> > > >
> > > >      configfile.close()
> > > > }
> > > > +
> > > > +addtask rpi_kconfig_clean before do_configure after do_populate_lic
> > > we should investigate the kernel tooling from OE-Core and use that IMO
> > I'm all for this. We should get rid of this and unify with oe-core
> > tooling.
> >
> > @Piotr Would you like to work on this and remove completely this while
> > reworking on the kernel fragments configuration support? I'll take a
> > look on the old patches too.
> @Andrei: I'll try to do this.

That would be very helpful. This one of my top things to change in this
layer.

--
Andrei Gherzan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 801 bytes
Desc: not available
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20161230/fb55c199/attachment.pgp>


More information about the yocto mailing list