| Submitter | Jason Wessel |
|---|---|
| Date | Sept. 27, 2012, 1:52 p.m. |
| Message ID | <1348753966-45893-1-git-send-email-jason.wessel@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/37355/ |
| State | Accepted |
| Commit | e4c1c37bb37e9eba635bc0a9308ab593abd299ec |
| Headers | show |
Comments
On 09/27/2012 06:52 AM, Jason Wessel wrote: > Based on the previous commit 604d46c686d06d62d5a07b9c7f4fa170f99307d8 > (Convert tab indentation in python functions into four-space), the > cml.bbclass was not converted, and in order to properly extend it > with external bbappend's it needs to be converted. > > Signed-off-by: Jason Wessel <jason.wessel@windriver.com> > --- > meta/classes/cml1.bbclass | 28 ++++++++++++++-------------- > 1 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass > index 37ed792..ba44196 100644 > --- a/meta/classes/cml1.bbclass > +++ b/meta/classes/cml1.bbclass > @@ -15,23 +15,23 @@ HOSTLDFLAGS = "${BUILD_LDFLAGS}" > HOST_LOADLIBES = "-lncurses" > > python do_menuconfig() { > - try: > - mtime = os.path.getmtime(".config") > - except OSError: > - mtime = 0 > + try: > + mtime = os.path.getmtime(".config") > + except OSError: > + mtime = 0 > > - oe_terminal("${SHELL} -c \"make menuconfig; if [ $? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"", '${PN} Configuration', d) > + oe_terminal("${SHELL} -c \"make menuconfig; if [ $? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"", '${PN} Configuration', d) > > - # FIXME this check can be removed when the minimum bitbake version has been bumped > - if hasattr(bb.build, 'write_taint'): > - try: > - newmtime = os.path.getmtime(".config") > - except OSError: > - newmtime = 0 > + # FIXME this check can be removed when the minimum bitbake version has been bumped > + if hasattr(bb.build, 'write_taint'): > + try: > + newmtime = os.path.getmtime(".config") > + except OSError: > + newmtime = 0 > > - if newmtime > mtime: > - bb.note("Configuration changed, recompile will be forced") > - bb.build.write_taint('do_compile', d) > + if newmtime > mtime: > + bb.note("Configuration changed, recompile will be forced") > + bb.build.write_taint('do_compile', d) > } > do_menuconfig[depends] += "ncurses-native:do_populate_sysroot" > do_menuconfig[nostamp] = "1" > Merged into OE-Core Thanks Sau!
Patch
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index 37ed792..ba44196 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass @@ -15,23 +15,23 @@ HOSTLDFLAGS = "${BUILD_LDFLAGS}" HOST_LOADLIBES = "-lncurses" python do_menuconfig() { - try: - mtime = os.path.getmtime(".config") - except OSError: - mtime = 0 + try: + mtime = os.path.getmtime(".config") + except OSError: + mtime = 0 - oe_terminal("${SHELL} -c \"make menuconfig; if [ $? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"", '${PN} Configuration', d) + oe_terminal("${SHELL} -c \"make menuconfig; if [ $? -ne 0 ]; then echo 'Command failed.'; printf 'Press any key to continue... '; read r; fi\"", '${PN} Configuration', d) - # FIXME this check can be removed when the minimum bitbake version has been bumped - if hasattr(bb.build, 'write_taint'): - try: - newmtime = os.path.getmtime(".config") - except OSError: - newmtime = 0 + # FIXME this check can be removed when the minimum bitbake version has been bumped + if hasattr(bb.build, 'write_taint'): + try: + newmtime = os.path.getmtime(".config") + except OSError: + newmtime = 0 - if newmtime > mtime: - bb.note("Configuration changed, recompile will be forced") - bb.build.write_taint('do_compile', d) + if newmtime > mtime: + bb.note("Configuration changed, recompile will be forced") + bb.build.write_taint('do_compile', d) } do_menuconfig[depends] += "ncurses-native:do_populate_sysroot" do_menuconfig[nostamp] = "1"
Based on the previous commit 604d46c686d06d62d5a07b9c7f4fa170f99307d8 (Convert tab indentation in python functions into four-space), the cml.bbclass was not converted, and in order to properly extend it with external bbappend's it needs to be converted. Signed-off-by: Jason Wessel <jason.wessel@windriver.com> --- meta/classes/cml1.bbclass | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-)