summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorNoor, Ahsan <noor_ahsan@mentor.com>2011-07-29 17:24:50 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-04 15:04:32 +0100
commitb77f1f327ba3979559fd3756283cb8c1374fcc17 (patch)
tree0bbb2b324cf1e42b33613f5b15695171fbb16e8f /meta/classes
parent9a78cb7980861291df8e8f8c6782735c9b4440ec (diff)
downloadpoky-b77f1f327ba3979559fd3756283cb8c1374fcc17.tar.gz
kernel,cml1.bbclass: Move menuconfig to cml1
* The menuconfig target exists in places other than the kernel that use kernel style config. (From OE-Core rev: 1ceaf45f634d11b65aab0f591a86865df49c8c90) Signed-off-by: Noor, Ahsan <noor_ahsan@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/cml1.bbclass12
-rw-r--r--meta/classes/kernel.bbclass15
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() {
6 6
7EXPORT_FUNCTIONS do_configure 7EXPORT_FUNCTIONS do_configure
8addtask configure after do_unpack do_patch before do_compile 8addtask configure after do_unpack do_patch before do_compile
9
10do_menuconfig() {
11 export TERMWINDOWTITLE="${PN} Configuration"
12 export SHELLCMDS="make menuconfig"
13 ${TERMCMDRUN}
14 if [ $? -ne 0 ]; then
15 oefatal "'${TERMCMD}' not found. Check TERMCMD variable."
16 fi
17}
18do_menuconfig[nostamp] = "1"
19addtask menuconfig after do_configure
20
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() {
197 197
198do_configure[depends] += "${INITRAMFS_TASK}" 198do_configure[depends] += "${INITRAMFS_TASK}"
199 199
200do_menuconfig() {
201 export DISPLAY='${DISPLAY}'
202 export DBUS_SESSION_BUS_ADDRESS='${DBUS_SESSION_BUS_ADDRESS}'
203 export XAUTHORITY='${XAUTHORITY}'
204 export TERMWINDOWTITLE="${PN} Kernel Configuration"
205 export SHELLCMDS="make menuconfig"
206 ${TERMCMDRUN}
207 if [ $? -ne 0 ]; then
208 echo "Fatal: '${TERMCMD}' not found. Check TERMCMD variable."
209 exit 1
210 fi
211}
212do_menuconfig[nostamp] = "1"
213addtask menuconfig after do_configure
214
215pkg_postinst_kernel () { 200pkg_postinst_kernel () {
216 cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true 201 cd /${KERNEL_IMAGEDEST}; update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true
217} 202}