From 619d15b9a2c53eb8496c807f0f229f5cb192e9d7 Mon Sep 17 00:00:00 2001 From: "Joseph A. Lutz" Date: Tue, 29 Dec 2015 16:54:27 -0600 Subject: readline: move inputrc into readline inputrc is the global configuration file for the readline library. Signed-off-by: Joseph A. Lutz Signed-off-by: Ross Burton --- meta/recipes-core/base-files/base-files/inputrc | 61 ----------------------- meta/recipes-core/base-files/base-files_3.0.14.bb | 4 +- meta/recipes-core/readline/files/inputrc | 61 +++++++++++++++++++++++ meta/recipes-core/readline/readline.inc | 6 +++ 4 files changed, 68 insertions(+), 64 deletions(-) delete mode 100644 meta/recipes-core/base-files/base-files/inputrc create mode 100644 meta/recipes-core/readline/files/inputrc diff --git a/meta/recipes-core/base-files/base-files/inputrc b/meta/recipes-core/base-files/base-files/inputrc deleted file mode 100644 index b5c4c8af24..0000000000 --- a/meta/recipes-core/base-files/base-files/inputrc +++ /dev/null @@ -1,61 +0,0 @@ -# /etc/inputrc - global inputrc for libreadline -# See readline(3readline) and `info rluserman' for more information. - -# Be 8 bit clean. -set input-meta on -set output-meta on - -# To allow the use of 8bit-characters like the german umlauts, comment out -# the line below. However this makes the meta key not work as a meta key, -# which is annoying to those which don't need to type in 8-bit characters. - -# set convert-meta off - -# try to enable the application keypad when it is called. Some systems -# need this to enable the arrow keys. -# set enable-keypad on - -# see /usr/share/doc/bash/inputrc.arrows for other codes of arrow keys - -# do not bell on tab-completion -# set bell-style none - -# some defaults / modifications for the emacs mode -$if mode=emacs - -# allow the use of the Home/End keys -# "\e[1~": beginning-of-line -# "\e[4~": end-of-line - -# allow the use of the Delete/Insert keys -# "\e[3~": delete-char -# "\e[2~": quoted-insert - -# mappings for "page up" and "page down" to step to the beginning/end -# of the history -# "\e[5~": beginning-of-history -# "\e[6~": end-of-history - -# alternate mappings for "page up" and "page down" to search the history -# "\e[5~": history-search-backward -# "\e[6~": history-search-forward - -# # mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving -# "\e[5C": forward-word -# "\e[5D": backward-word -# "\e\e[C": forward-word -# "\e\e[D": backward-word - -# $if term=rxvt -# "\e[8~": end-of-line -# $endif - -# for non RH/Debian xterm, can't hurt for RH/DEbian xterm -# "\eOH": beginning-of-line -# "\eOF": end-of-line - -# for freebsd console -# "\e[H": beginning-of-line -# "\e[F": end-of-line - -$endif diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index b71d5c5341..d391707376 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/meta/recipes-core/base-files/base-files_3.0.14.bb @@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://licenses/GPL-2;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "file://rotation \ file://nsswitch.conf \ file://motd \ - file://inputrc \ file://host.conf \ file://profile \ file://shells \ @@ -55,7 +54,7 @@ dirs2775-lsb = "/var/mail" volatiles = "log tmp" conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ - ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ + ${sysconfdir}/issue /${sysconfdir}/issue.net \ ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ ${sysconfdir}/default" @@ -124,7 +123,6 @@ do_install () { install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc - install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd diff --git a/meta/recipes-core/readline/files/inputrc b/meta/recipes-core/readline/files/inputrc new file mode 100644 index 0000000000..b5c4c8af24 --- /dev/null +++ b/meta/recipes-core/readline/files/inputrc @@ -0,0 +1,61 @@ +# /etc/inputrc - global inputrc for libreadline +# See readline(3readline) and `info rluserman' for more information. + +# Be 8 bit clean. +set input-meta on +set output-meta on + +# To allow the use of 8bit-characters like the german umlauts, comment out +# the line below. However this makes the meta key not work as a meta key, +# which is annoying to those which don't need to type in 8-bit characters. + +# set convert-meta off + +# try to enable the application keypad when it is called. Some systems +# need this to enable the arrow keys. +# set enable-keypad on + +# see /usr/share/doc/bash/inputrc.arrows for other codes of arrow keys + +# do not bell on tab-completion +# set bell-style none + +# some defaults / modifications for the emacs mode +$if mode=emacs + +# allow the use of the Home/End keys +# "\e[1~": beginning-of-line +# "\e[4~": end-of-line + +# allow the use of the Delete/Insert keys +# "\e[3~": delete-char +# "\e[2~": quoted-insert + +# mappings for "page up" and "page down" to step to the beginning/end +# of the history +# "\e[5~": beginning-of-history +# "\e[6~": end-of-history + +# alternate mappings for "page up" and "page down" to search the history +# "\e[5~": history-search-backward +# "\e[6~": history-search-forward + +# # mappings for Ctrl-left-arrow and Ctrl-right-arrow for word moving +# "\e[5C": forward-word +# "\e[5D": backward-word +# "\e\e[C": forward-word +# "\e\e[D": backward-word + +# $if term=rxvt +# "\e[8~": end-of-line +# $endif + +# for non RH/Debian xterm, can't hurt for RH/DEbian xterm +# "\eOH": beginning-of-line +# "\eOF": end-of-line + +# for freebsd console +# "\e[H": beginning-of-line +# "\e[F": end-of-line + +$endif diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc index 30892e12dd..35df8b4bb6 100644 --- a/meta/recipes-core/readline/readline.inc +++ b/meta/recipes-core/readline/readline.inc @@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS += "ncurses" SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive" +SRC_URI += "file://inputrc" inherit autotools texinfo @@ -31,6 +32,11 @@ do_install_append () { oe_libinstall -so -C shlib libreadline ${D}${libdir} rmdir ${D}${bindir} + + install -m 0755 -d ${D}${sysconfdir} + install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc } BBCLASSEXTEND = "native nativesdk" + +CONFFILES_${PN} += "${sysconfdir}/inputrc" -- cgit v1.2.3