diff options
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 20 | ||||
| -rw-r--r-- | meta/conf/local.conf.sample | 12 |
2 files changed, 4 insertions, 28 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 9938a676a5..d405b6a7ff 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -589,26 +589,6 @@ FAKEROOTENV = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} PSEUDO_LOCALS FAKEROOTDIRS = "${PSEUDO_LOCALSTATEDIR}" PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native" - -################################################################## -# UI/Interaction Configuration -################################################################## - -export SHELLCMDS = "bash" -# Some common terminal programs to choose from -GNOME_TERMCMD = 'gnome-terminal --disable-factory -t "$TERMWINDOWTITLE"' -GNOME_TERMCMDRUN = '${GNOME_TERMCMD} -x $SHELLCMDS' -SCREEN_TERMCMD = 'screen -D -m -t "$TERMWINDOWTITLE"' -SCREEN_TERMCMDRUN = '${SCREEN_TERMCMD} $SHELLCMDS' -XTERM_TERMCMD = 'xterm -T "$TERMWINDOWTITLE"' -XTERM_TERMCMDRUN = '${XTERM_TERMCMD} -e $SHELLCMDS' -KONSOLE_TERMCMD = 'konsole -T "$TERMWINDOWTITLE"' -KONSOLE_TERMCMDRUN = '${KONSOLE_TERMCMD} -e $SHELLCMDS' - -# Set a default -TERMCMD ?= "${XTERM_TERMCMD}" -TERMCMDRUN ?= "${XTERM_TERMCMDRUN}" - ################################################################## # Miscellaneous utilities. ################################################################## diff --git a/meta/conf/local.conf.sample b/meta/conf/local.conf.sample index 84ed964ccf..73ab9f8f13 100644 --- a/meta/conf/local.conf.sample +++ b/meta/conf/local.conf.sample @@ -168,20 +168,16 @@ USER_CLASSES ?= "image-mklibs image-prelink" # Under certain circumstances the system may need input from you and to do this it # can launch an interactive shell. It needs to do this since the build is # multithreaded and needs to be able to handle the case where more than one parallel -# process may require the user's attention. The default is to use xterm. +# process may require the user's attention. The default is iterate over the available +# terminal types to find one that works. # # Examples of the occasions this may happen are when resolving patches which cannot # be applied, to use the devshell or the kernel menuconfig # -# If you do not use (or have installed) xterm you will need to -# uncomment these variables and set them to the terminal you wish to use -# -# Supported shell prefixes for *_TERMCMD and *_TERMCMDRUN are: -# GNOME, SCREEN, XTERM and KONSOLE +# Supported values are auto, gnome, xfce, rxvt, xcreen, konsole (3.x only), none # Note: currently, Konsole support only works for KDE 3.x due to the way # newer Konsole versions behave -#TERMCMD = "${XTERM_TERMCMD}" -#TERMCMDRUN = "${XTERM_TERMCMDRUN}" +#OE_TERMINAL = "auto" # By default disable interactive patch resolution (tasks will just fail instead): PATCHRESOLVE = "noop" |