[meta-mentor] [PATCH 4/4] cml1.bbclass: remove file, pushed upstream

Fahad Usman fahad_usman at mentor.com
Wed Feb 20 08:00:30 PST 2013


Signed-off-by: Fahad Usman <fahad_usman at mentor.com>
---
 README               |  6 ------
 classes/cml1.bbclass | 40 ----------------------------------------
 2 files changed, 46 deletions(-)
 delete mode 100644 classes/cml1.bbclass

diff --git a/README b/README
index 45a9ad2..4d87bc1 100644
--- a/README
+++ b/README
@@ -97,12 +97,6 @@ To push upstream next
 
     - wireless-tools
 
-    - cml1 class: fix menuconfig terminal type issue. The fundamental issue
-      here is an ncurses-native relocation issue. The ncurses library is
-      looking at the compiled-in search path for the terminfo database, and
-      that path no longer exists, when using cached binaries (sstate). Export
-      TERMINFO pointing at the current sysroot, so the attempt to run mconf is
-      able to find the correct terminfo db.
     - copyleft_compliance class: if an scm mirror tarball is available, use
       that rather than grabbing the scm directory
 
diff --git a/classes/cml1.bbclass b/classes/cml1.bbclass
deleted file mode 100644
index bb95639..0000000
--- a/classes/cml1.bbclass
+++ /dev/null
@@ -1,40 +0,0 @@
-cml1_do_configure() {
-	set -e
-	unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
-	oe_runmake oldconfig
-}
-
-EXPORT_FUNCTIONS do_configure
-addtask configure after do_unpack do_patch before do_compile
-
-inherit terminal
-
-OE_TERMINAL_EXPORTS += "HOST_EXTRACFLAGS HOSTLDFLAGS HOST_LOADLIBES TERMINFO"
-HOST_EXTRACFLAGS = "${BUILD_CFLAGS} ${BUILD_LDFLAGS}"
-HOSTLDFLAGS = "${BUILD_LDFLAGS}"
-HOST_LOADLIBES = "-lncurses"
-TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo"
-
-python do_menuconfig() {
-    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)
-
-    # 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)
-}
-do_menuconfig[depends] += "ncurses-native:do_populate_sysroot"
-do_menuconfig[nostamp] = "1"
-addtask menuconfig after do_configure
-
-- 
1.8.1.3




More information about the meta-mentor mailing list