summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMichael Opdenacker <michael.opdenacker@bootlin.com>2021-10-05 08:33:34 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-11 17:41:39 (GMT)
commit12ca5f7209126ea6e07b3ba93fbdb31065971454 (patch)
tree4921b85e12de4445a61a0f0cbd055ca561275d90 /meta
parente89193298ada8ea35fde2fe6a88b638766db1bde (diff)
downloadpoky-12ca5f7209126ea6e07b3ba93fbdb31065971454.tar.gz
devpyshell: rename to pydevshell
For consistency with "pydevshell" which is also used. This addresses [YOCTO #14531] (From OE-Core rev: 958133f4e97275d1f2c74a7e715c4506cca3582f) Signed-off-by: Michael Opdenacker <michael.opdenacker@bootlin.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/devshell.bbclass10
-rw-r--r--meta/conf/documentation.conf2
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass
index 76dd0b4..62dc958 100644
--- a/meta/classes/devshell.bbclass
+++ b/meta/classes/devshell.bbclass
@@ -34,7 +34,7 @@ python () {
34 d.delVarFlag("do_devshell", "fakeroot") 34 d.delVarFlag("do_devshell", "fakeroot")
35} 35}
36 36
37def devpyshell(d): 37def pydevshell(d):
38 38
39 import code 39 import code
40 import select 40 import select
@@ -140,17 +140,17 @@ def devpyshell(d):
140 os.kill(child, signal.SIGTERM) 140 os.kill(child, signal.SIGTERM)
141 break 141 break
142 142
143python do_devpyshell() { 143python do_pydevshell() {
144 import signal 144 import signal
145 145
146 try: 146 try:
147 devpyshell(d) 147 pydevshell(d)
148 except SystemExit: 148 except SystemExit:
149 # Stop the SIGTERM above causing an error exit code 149 # Stop the SIGTERM above causing an error exit code
150 return 150 return
151 finally: 151 finally:
152 return 152 return
153} 153}
154addtask devpyshell after do_patch 154addtask pydevshell after do_patch
155 155
156do_devpyshell[nostamp] = "1" 156do_pydevshell[nostamp] = "1"
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index c5a38b0..80ad8e1 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -17,7 +17,7 @@ do_compile_ptest_base[doc] = "Compiles the runtime test suite included in the so
17do_configure[doc] = "Configures the source by enabling and disabling any build-time and configuration options for the software being built" 17do_configure[doc] = "Configures the source by enabling and disabling any build-time and configuration options for the software being built"
18do_configure_ptest_base[doc] = "Configures the runtime test suite included in the software being built" 18do_configure_ptest_base[doc] = "Configures the runtime test suite included in the software being built"
19do_deploy[doc] = "Writes deployable output files to the deploy directory" 19do_deploy[doc] = "Writes deployable output files to the deploy directory"
20do_devpyshell[doc] = "Starts an interactive Python shell for development/debugging" 20do_pydevshell[doc] = "Starts an interactive Python shell for development/debugging"
21do_devshell[doc] = "Starts a shell with the environment set up for development/debugging" 21do_devshell[doc] = "Starts a shell with the environment set up for development/debugging"
22do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel" 22do_diffconfig[doc] = "Compares the old and new config files after running do_menuconfig for the kernel"
23do_fetch[doc] = "Fetches the source code" 23do_fetch[doc] = "Fetches the source code"