* [PATCH 0/2] Add task to create kernel config fragments @ 2014-02-13 0:20 João Henrique Ferreira de Freitas 2014-02-13 0:20 ` [PATCH 1/2] kernel-yocto: Add do_fragmentconfig task João Henrique Ferreira de Freitas 2014-02-13 0:20 ` [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 João Henrique Ferreira de Freitas 0 siblings, 2 replies; 10+ messages in thread From: João Henrique Ferreira de Freitas @ 2014-02-13 0:20 UTC (permalink / raw) To: openembedded-core; +Cc: dvhart Hi, These patches add a new task called fragmentconfig which should be used when the user need to extract a diff between two kernel config files. For instance: bitbake -c menuconfig linux-yoco [do some changes and save] bitbake -c fragmentconfig linux-yocto See the fragment.cfg in $WORKDIR/fragment.cfg This closes [YOCTO #3862] Thanks. João Henrique Ferreira de Freitas (2): kernel-yocto: Add do_fragmentconfig task cml1.bbclass: Add fragmentconfig task to cml1 meta/classes/cml1.bbclass | 35 +++++++++++++++++++++++++++++++++++ meta/classes/kernel-yocto.bbclass | 2 ++ 2 files changed, 37 insertions(+) -- 1.8.3.2 ^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH 1/2] kernel-yocto: Add do_fragmentconfig task 2014-02-13 0:20 [PATCH 0/2] Add task to create kernel config fragments João Henrique Ferreira de Freitas @ 2014-02-13 0:20 ` João Henrique Ferreira de Freitas 2014-02-13 0:20 ` [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 João Henrique Ferreira de Freitas 1 sibling, 0 replies; 10+ messages in thread From: João Henrique Ferreira de Freitas @ 2014-02-13 0:20 UTC (permalink / raw) To: openembedded-core; +Cc: dvhart Instead of using 'diff' command between two kernel config files, the task fragmentconfig does the job creating the file $WORKDIR/fragment.cfg that user should review and use. [YOCTO #3862] Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> --- meta/classes/kernel-yocto.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index 8f79932..6597e54 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass @@ -411,3 +411,5 @@ do_kernel_link_vmlinux() { OE_TERMINAL_EXPORTS += "GUILT_BASE KBUILD_OUTPUT" GUILT_BASE = "meta" KBUILD_OUTPUT = "${B}" + +do_fragmentconfig[depends] += "virtual/kernel:do_kernel_configme" -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 2014-02-13 0:20 [PATCH 0/2] Add task to create kernel config fragments João Henrique Ferreira de Freitas 2014-02-13 0:20 ` [PATCH 1/2] kernel-yocto: Add do_fragmentconfig task João Henrique Ferreira de Freitas @ 2014-02-13 0:20 ` João Henrique Ferreira de Freitas 2014-02-13 0:45 ` Darren Hart 2014-02-13 11:33 ` Richard Purdie 1 sibling, 2 replies; 10+ messages in thread From: João Henrique Ferreira de Freitas @ 2014-02-13 0:20 UTC (permalink / raw) To: openembedded-core; +Cc: dvhart fragmentconfig() is a new task that makes a diff between the old and new config files and writes to the fragment.cfg result file. menuconfig() always copy the original config file, so the user doesn't need to copy it. Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> --- meta/classes/cml1.bbclass | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index e292ecb..2053361 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass @@ -16,8 +16,12 @@ HOST_LOADLIBES = "-lncurses" TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo" python do_menuconfig() { + import os + import shutil + try: mtime = os.path.getmtime(".config") + shutil.copy(".config", ".config.orig") except OSError: mtime = 0 @@ -38,3 +42,34 @@ do_menuconfig[depends] += "ncurses-native:do_populate_sysroot" do_menuconfig[nostamp] = "1" addtask menuconfig after do_configure +python do_fragmentconfig() { + import shutil + import subprocess + + workdir = d.getVar('WORKDIR', True) + fragment = workdir + '/fragment.cfg' + configorig = '.config.orig' + config = '.config' + + try: + md5newconfig = bb.utils.md5_file(configorig) + md5config = bb.utils.md5_file(config) + isdiff = md5newconfig != md5config + except OSError: + isdiff = 0 + + if isdiff: + bb.note("Dumping config fragment into: '%s'." % fragment) + bb.note("new '%s' old '%s'" % (md5newconfig,md5config)) + + statement = 'diff -Nurp ' + configorig + ' ' + config + '| sed -n "s/^\+//p" >' + fragment + subprocess.call(statement, shell=True) + + shutil.copy(configorig, config) + else: + if os.path.exists(fragment): + os.unlink(fragment) +} + +do_fragmentconfig[nostamp] = "1" +addtask fragmentconfig -- 1.8.3.2 ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 2014-02-13 0:20 ` [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 João Henrique Ferreira de Freitas @ 2014-02-13 0:45 ` Darren Hart 2014-02-15 23:51 ` João Henrique Ferreira de Freitas 2014-02-13 11:33 ` Richard Purdie 1 sibling, 1 reply; 10+ messages in thread From: Darren Hart @ 2014-02-13 0:45 UTC (permalink / raw) To: João Henrique Ferreira de Freitas, openembedded-core On 2/12/14, 16:20, "João Henrique Ferreira de Freitas" <joaohf@gmail.com> wrote: >fragmentconfig() is a new task that makes a diff between the >old and new config files and writes to the fragment.cfg result file. >menuconfig() always copy the original config file, so the user >doesn't need to copy it. Hi João, Generally looks pretty good. Some comments below, mostly about usability and robustness. I do have reservations about the task name, partly because it's long and hard to type.... I'm not coming up with something I like a lot better though.... Maybe.... $ bitbake linux-yocto -c diffcfg Or $ bitbake linux-yocto -c diffconfig I like the latter because it is consistent in naming, <action>config, with menuconfig. > >Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> >--- > meta/classes/cml1.bbclass | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > >diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass >index e292ecb..2053361 100644 >--- a/meta/classes/cml1.bbclass >+++ b/meta/classes/cml1.bbclass >@@ -16,8 +16,12 @@ HOST_LOADLIBES = "-lncurses" > TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo" > > python do_menuconfig() { >+ import os >+ import shutil >+ > try: > mtime = os.path.getmtime(".config") >+ shutil.copy(".config", ".config.orig") > except OSError: > mtime = 0 > >@@ -38,3 +42,34 @@ do_menuconfig[depends] += >"ncurses-native:do_populate_sysroot" > do_menuconfig[nostamp] = "1" > addtask menuconfig after do_configure > >+python do_fragmentconfig() { >+ import shutil >+ import subprocess >+ >+ workdir = d.getVar('WORKDIR', True) >+ fragment = workdir + '/fragment.cfg' >+ configorig = '.config.orig' >+ config = '.config' >+ >+ try: >+ md5newconfig = bb.utils.md5_file(configorig) >+ md5config = bb.utils.md5_file(config) >+ isdiff = md5newconfig != md5config >+ except OSError: We should be doing something to indicate failure here. >+ isdiff = 0 >+ >+ if isdiff: >+ bb.note("Dumping config fragment into: '%s'." % fragment) >+ bb.note("new '%s' old '%s'" % (md5newconfig,md5config)) Nit, add space after "," >+ >+ statement = 'diff -Nurp ' + configorig + ' ' + config + '| sed >-n "s/^\+//p" >' + fragment >+ subprocess.call(statement, shell=True) >+ >+ shutil.copy(configorig, config) We should be printing something to make it easy for the user to find the fragment. >+ else: >+ if os.path.exists(fragment): >+ os.unlink(fragment) >+} >+ >+do_fragmentconfig[nostamp] = "1" >+addtask fragmentconfig >-- >1.8.3.2 > > -- Darren Hart Yocto Project - Linux Kernel Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 2014-02-13 0:45 ` Darren Hart @ 2014-02-15 23:51 ` João Henrique Ferreira de Freitas 0 siblings, 0 replies; 10+ messages in thread From: João Henrique Ferreira de Freitas @ 2014-02-15 23:51 UTC (permalink / raw) To: Darren Hart; +Cc: openembedded-core Hi Darren, > $ bitbake linux-yocto -c diffconfig > > I like the latter because it is consistent in naming, <action>config, > with menuconfig. > Ok. > >+ try: > >+ md5newconfig = bb.utils.md5_file(configorig) > >+ md5config = bb.utils.md5_file(config) > >+ isdiff = md5newconfig != md5config > >+ except OSError: > > We should be doing something to indicate failure here. Ok. > > >+ > >+ statement = 'diff -Nurp ' + configorig + ' ' + config + '| > >sed -n "s/^\+//p" >' + fragment > >+ subprocess.call(statement, shell=True) > >+ > >+ shutil.copy(configorig, config) > > We should be printing something to make it easy for the user to find > the fragment. I've suppose that the bb.note did it. But the messages doesn't appear on console. Only in the log.do_diffconfig log file. What is the trick here? Should I use bb.warn() or logger.info() ? Thanks. -- João Henrique Ferreira de Freitas - joaohf_at_gmail.com Campinas-SP-Brasil ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 2014-02-13 0:20 ` [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 João Henrique Ferreira de Freitas 2014-02-13 0:45 ` Darren Hart @ 2014-02-13 11:33 ` Richard Purdie 2014-02-13 19:00 ` Darren Hart 1 sibling, 1 reply; 10+ messages in thread From: Richard Purdie @ 2014-02-13 11:33 UTC (permalink / raw) To: João Henrique Ferreira de Freitas; +Cc: dvhart, openembedded-core On Wed, 2014-02-12 at 22:20 -0200, João Henrique Ferreira de Freitas wrote: > fragmentconfig() is a new task that makes a diff between the > old and new config files and writes to the fragment.cfg result file. > menuconfig() always copy the original config file, so the user > doesn't need to copy it. > > Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> > --- > meta/classes/cml1.bbclass | 35 +++++++++++++++++++++++++++++++++++ > 1 file changed, 35 insertions(+) > > diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass > index e292ecb..2053361 100644 > --- a/meta/classes/cml1.bbclass > +++ b/meta/classes/cml1.bbclass > @@ -16,8 +16,12 @@ HOST_LOADLIBES = "-lncurses" > TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo" > > python do_menuconfig() { > + import os Don't import os please, this is always present so we don't need to. > + import shutil > + > try: > mtime = os.path.getmtime(".config") > + shutil.copy(".config", ".config.orig") > except OSError: > mtime = 0 > > @@ -38,3 +42,34 @@ do_menuconfig[depends] += "ncurses-native:do_populate_sysroot" > do_menuconfig[nostamp] = "1" > addtask menuconfig after do_configure > > +python do_fragmentconfig() { > + import shutil > + import subprocess > + > + workdir = d.getVar('WORKDIR', True) > + fragment = workdir + '/fragment.cfg' > + configorig = '.config.orig' > + config = '.config' > + > + try: > + md5newconfig = bb.utils.md5_file(configorig) > + md5config = bb.utils.md5_file(config) > + isdiff = md5newconfig != md5config > + except OSError: > + isdiff = 0 > + > + if isdiff: > + bb.note("Dumping config fragment into: '%s'." % fragment) > + bb.note("new '%s' old '%s'" % (md5newconfig,md5config)) > + > + statement = 'diff -Nurp ' + configorig + ' ' + config + '| sed -n "s/^\+//p" >' + fragment > + subprocess.call(statement, shell=True) > + > + shutil.copy(configorig, config) > + else: > + if os.path.exists(fragment): > + os.unlink(fragment) > +} > + > +do_fragmentconfig[nostamp] = "1" > +addtask fragmentconfig ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 2014-02-13 11:33 ` Richard Purdie @ 2014-02-13 19:00 ` Darren Hart 2014-02-14 15:46 ` Richard Purdie 0 siblings, 1 reply; 10+ messages in thread From: Darren Hart @ 2014-02-13 19:00 UTC (permalink / raw) To: Richard Purdie, João Henrique Ferreira de Freitas; +Cc: openembedded-core On 2/13/14, 3:33, "Richard Purdie" <richard.purdie@linuxfoundation.org> wrote: >On Wed, 2014-02-12 at 22:20 -0200, João Henrique Ferreira de Freitas >wrote: >> fragmentconfig() is a new task that makes a diff between the >> old and new config files and writes to the fragment.cfg result file. >> menuconfig() always copy the original config file, so the user >> doesn't need to copy it. >> >> Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> >> --- >> meta/classes/cml1.bbclass | 35 +++++++++++++++++++++++++++++++++++ >> 1 file changed, 35 insertions(+) >> >> diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass >> index e292ecb..2053361 100644 >> --- a/meta/classes/cml1.bbclass >> +++ b/meta/classes/cml1.bbclass One more thought on this. As this is currently linux-yocto specific, does it belong in cml1.bbclass? It may make sense in busybox as well, so maybe this is the right place. RP, do you have a preference? -- Darren Hart Yocto Project - Linux Kernel Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 2014-02-13 19:00 ` Darren Hart @ 2014-02-14 15:46 ` Richard Purdie 2014-02-14 16:15 ` Darren Hart 0 siblings, 1 reply; 10+ messages in thread From: Richard Purdie @ 2014-02-14 15:46 UTC (permalink / raw) To: Darren Hart; +Cc: openembedded-core On Thu, 2014-02-13 at 11:00 -0800, Darren Hart wrote: > On 2/13/14, 3:33, "Richard Purdie" <richard.purdie@linuxfoundation.org> > wrote: > > >On Wed, 2014-02-12 at 22:20 -0200, João Henrique Ferreira de Freitas > >wrote: > >> fragmentconfig() is a new task that makes a diff between the > >> old and new config files and writes to the fragment.cfg result file. > >> menuconfig() always copy the original config file, so the user > >> doesn't need to copy it. > >> > >> Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> > >> --- > >> meta/classes/cml1.bbclass | 35 +++++++++++++++++++++++++++++++++++ > >> 1 file changed, 35 insertions(+) > >> > >> diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass > >> index e292ecb..2053361 100644 > >> --- a/meta/classes/cml1.bbclass > >> +++ b/meta/classes/cml1.bbclass > > One more thought on this. As this is currently linux-yocto specific, does > it belong in cml1.bbclass? It may make sense in busybox as well, so maybe > this is the right place. > > RP, do you have a preference? Its starting to head in a direction we could probably use a kern-tools.bbclass to keep the code in a common place. Cheers, Richard ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 2014-02-14 15:46 ` Richard Purdie @ 2014-02-14 16:15 ` Darren Hart 2014-02-14 16:44 ` Richard Purdie 0 siblings, 1 reply; 10+ messages in thread From: Darren Hart @ 2014-02-14 16:15 UTC (permalink / raw) To: Richard Purdie; +Cc: openembedded-core On 2/14/14, 7:46, "Richard Purdie" <richard.purdie@linuxfoundation.org> wrote: >On Thu, 2014-02-13 at 11:00 -0800, Darren Hart wrote: >> On 2/13/14, 3:33, "Richard Purdie" <richard.purdie@linuxfoundation.org> >> wrote: >> >> >On Wed, 2014-02-12 at 22:20 -0200, João Henrique Ferreira de Freitas >> >wrote: >> >> fragmentconfig() is a new task that makes a diff between the >> >> old and new config files and writes to the fragment.cfg result file. >> >> menuconfig() always copy the original config file, so the user >> >> doesn't need to copy it. >> >> >> >> Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> >> >> --- >> >> meta/classes/cml1.bbclass | 35 +++++++++++++++++++++++++++++++++++ >> >> 1 file changed, 35 insertions(+) >> >> >> >> diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass >> >> index e292ecb..2053361 100644 >> >> --- a/meta/classes/cml1.bbclass >> >> +++ b/meta/classes/cml1.bbclass >> >> One more thought on this. As this is currently linux-yocto specific, >>does >> it belong in cml1.bbclass? It may make sense in busybox as well, so >>maybe >> this is the right place. >> >> RP, do you have a preference? > >Its starting to head in a direction we could probably use a >kern-tools.bbclass to keep the code in a common place. I wonder if something like kconfig.bbclass, rather than tying it to the linux-yocto tooling (as it doesn't use any of the tooling to create the fragment). Busybox could then use this, for example (not that it couldn't include kern-tools.bbclass, it just seems a bit less natural to do so). -- Darren Hart Yocto Project - Linux Kernel Intel Open Source Technology Center ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 2014-02-14 16:15 ` Darren Hart @ 2014-02-14 16:44 ` Richard Purdie 0 siblings, 0 replies; 10+ messages in thread From: Richard Purdie @ 2014-02-14 16:44 UTC (permalink / raw) To: Darren Hart; +Cc: openembedded-core On Fri, 2014-02-14 at 08:15 -0800, Darren Hart wrote: > On 2/14/14, 7:46, "Richard Purdie" <richard.purdie@linuxfoundation.org> > wrote: > > >On Thu, 2014-02-13 at 11:00 -0800, Darren Hart wrote: > >> On 2/13/14, 3:33, "Richard Purdie" <richard.purdie@linuxfoundation.org> > >> wrote: > >> > >> >On Wed, 2014-02-12 at 22:20 -0200, João Henrique Ferreira de Freitas > >> >wrote: > >> >> fragmentconfig() is a new task that makes a diff between the > >> >> old and new config files and writes to the fragment.cfg result file. > >> >> menuconfig() always copy the original config file, so the user > >> >> doesn't need to copy it. > >> >> > >> >> Signed-off-by: João Henrique Ferreira de Freitas <joaohf@gmail.com> > >> >> --- > >> >> meta/classes/cml1.bbclass | 35 +++++++++++++++++++++++++++++++++++ > >> >> 1 file changed, 35 insertions(+) > >> >> > >> >> diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass > >> >> index e292ecb..2053361 100644 > >> >> --- a/meta/classes/cml1.bbclass > >> >> +++ b/meta/classes/cml1.bbclass > >> > >> One more thought on this. As this is currently linux-yocto specific, > >>does > >> it belong in cml1.bbclass? It may make sense in busybox as well, so > >>maybe > >> this is the right place. > >> > >> RP, do you have a preference? > > > >Its starting to head in a direction we could probably use a > >kern-tools.bbclass to keep the code in a common place. > > I wonder if something like kconfig.bbclass, rather than tying it to the > linux-yocto tooling (as it doesn't use any of the tooling to create the > fragment). Busybox could then use this, for example (not that it couldn't > include kern-tools.bbclass, it just seems a bit less natural to do so). Well, busybox does DEPEND on the kern-tools-native package. cml1.bbclass is effectively a kconfig.bbclass. I'd be ok with this code there, the fragment is kern-tools specific at this point but its not a big deal... Cheers, Richard ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2014-02-15 23:51 UTC | newest] Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-02-13 0:20 [PATCH 0/2] Add task to create kernel config fragments João Henrique Ferreira de Freitas 2014-02-13 0:20 ` [PATCH 1/2] kernel-yocto: Add do_fragmentconfig task João Henrique Ferreira de Freitas 2014-02-13 0:20 ` [PATCH 2/2] cml1.bbclass: Add fragmentconfig task to cml1 João Henrique Ferreira de Freitas 2014-02-13 0:45 ` Darren Hart 2014-02-15 23:51 ` João Henrique Ferreira de Freitas 2014-02-13 11:33 ` Richard Purdie 2014-02-13 19:00 ` Darren Hart 2014-02-14 15:46 ` Richard Purdie 2014-02-14 16:15 ` Darren Hart 2014-02-14 16:44 ` Richard Purdie
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.