summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph A. Lutz <joseph.lutz@novatechweb.com>2015-12-29 16:54:27 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-07 13:40:08 +0000
commit619d15b9a2c53eb8496c807f0f229f5cb192e9d7 (patch)
tree98031a880ea8db45abdd84dfe10b7ccf75fea814
parentf7bb2d4cf18ca8d2a90b4b3b5c6c48dad106ca28 (diff)
downloadopenembedded-core-contrib-619d15b9a2c53eb8496c807f0f229f5cb192e9d7.tar.gz
openembedded-core-contrib-619d15b9a2c53eb8496c807f0f229f5cb192e9d7.tar.bz2
openembedded-core-contrib-619d15b9a2c53eb8496c807f0f229f5cb192e9d7.zip
readline: move inputrc into readline
inputrc is the global configuration file for the readline library. Signed-off-by: Joseph A. Lutz <joseph.lutz@novatechweb.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/base-files/base-files_3.0.14.bb4
-rw-r--r--meta/recipes-core/readline/files/inputrc (renamed from meta/recipes-core/base-files/base-files/inputrc)0
-rw-r--r--meta/recipes-core/readline/readline.inc6
3 files changed, 7 insertions, 3 deletions
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/base-files/base-files/inputrc b/meta/recipes-core/readline/files/inputrc
index b5c4c8af24..b5c4c8af24 100644
--- a/meta/recipes-core/base-files/base-files/inputrc
+++ b/meta/recipes-core/readline/files/inputrc
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"