diff options
| author | Noor, Ahsan <noor_ahsan@mentor.com> | 2011-07-29 17:24:50 +0500 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-04 15:01:17 +0100 |
| commit | 1ceaf45f634d11b65aab0f591a86865df49c8c90 (patch) | |
| tree | 42494cd1dddd4e13323ac39a35c5af02fd99a63c | |
| parent | 5fbea0f2614d5bc9aec0819a337cdec9b5331f71 (diff) | |
| download | openembedded-core-1ceaf45f634d11b65aab0f591a86865df49c8c90.tar.gz openembedded-core-1ceaf45f634d11b65aab0f591a86865df49c8c90.tar.bz2 openembedded-core-1ceaf45f634d11b65aab0f591a86865df49c8c90.zip | |
kernel,cml1.bbclass: Move menuconfig to cml1
* The menuconfig target exists in places other than the kernel that use kernel style config.
Signed-off-by: Noor, Ahsan <noor_ahsan@mentor.com>
| -rw-r--r-- | meta/classes/cml1.bbclass | 12 | ||||
| -rw-r--r-- | meta/classes/kernel.bbclass | 15 |
2 files changed, 12 insertions, 15 deletions
diff --git a/meta/classes/cml1.bbclass b/meta/classes/cml1.bbclass index 79218b4a12..a747af5e4d 100644 --- a/meta/classes/cml1.bbclass +++ b/meta/classes/cml1.bbclass @@ -6,3 +6,15 @@ cml1_do_configure() { EXPORT_FUNCTIONS do_configure addtask configure after do_unpack do_patch before do_compile + +do_menuconfig() { + export TERMWINDOWTITLE="${PN} Configuration" + export SHELLCMDS="make menuconfig" + ${TERMCMDRUN} + if [ $? -ne 0 ]; then + oefatal "'${TERMCMD}' not found. Check TERMCMD variable." + fi +} +do_menuconfig[nostamp] = "1" +addtask menuconfig after do_configure + diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 9c492a3ecc..25d2629a71 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -197,21 +197,6 @@ kernel_do_configure() { do_configure[depends] += "${INITRAMFS_TASK}" -do_menuconfig() { - export DISPLAY='${DISPLAY}' - export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}' - export XAUTHORITY='${XAUTHORITY}' - export TERMWINDOWTITLE="${PN} Kernel Configuration" - export SHELLCMDS="make menuconfig" - ${TERMCMDRUN} - if [ $? -ne 0 ]; then - echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable." - exit 1 - fi -} -do_menuconfig[nostamp] = "1" -addtask menuconfig after do_configure - pkg_postinst_kernel () { cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true } |