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:19 +0000
commitc44599d71b04e3ff7f5521fcd400f40b147c82c1 (patch)
tree4ab694d7384863b872c0034b8fdfba4f2fd89b5e
parentf29d642c2b776d3fd8ce3ddab9d1f8a003003087 (diff)
downloadpoky-c44599d71b04e3ff7f5521fcd400f40b147c82c1.tar.gz
readline: move inputrc into readline
inputrc is the global configuration file for the readline library. (From OE-Core rev: 619d15b9a2c53eb8496c807f0f229f5cb192e9d7) Signed-off-by: Joseph A. Lutz <joseph.lutz@novatechweb.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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"
13SRC_URI = "file://rotation \ 13SRC_URI = "file://rotation \
14 file://nsswitch.conf \ 14 file://nsswitch.conf \
15 file://motd \ 15 file://motd \
16 file://inputrc \
17 file://host.conf \ 16 file://host.conf \
18 file://profile \ 17 file://profile \
19 file://shells \ 18 file://shells \
@@ -55,7 +54,7 @@ dirs2775-lsb = "/var/mail"
55 54
56volatiles = "log tmp" 55volatiles = "log tmp"
57conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \ 56conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
58 ${sysconfdir}/inputrc ${sysconfdir}/issue /${sysconfdir}/issue.net \ 57 ${sysconfdir}/issue /${sysconfdir}/issue.net \
59 ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \ 58 ${sysconfdir}/nsswitch.conf ${sysconfdir}/profile \
60 ${sysconfdir}/default" 59 ${sysconfdir}/default"
61 60
@@ -124,7 +123,6 @@ do_install () {
124 install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells 123 install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells
125 install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile 124 install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile
126 install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc 125 install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc
127 install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
128 install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf 126 install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf
129 install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf 127 install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf
130 install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd 128 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"
12DEPENDS += "ncurses" 12DEPENDS += "ncurses"
13 13
14SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive" 14SRC_URI = "${GNU_MIRROR}/readline/${BPN}-${PV}.tar.gz;name=archive"
15SRC_URI += "file://inputrc"
15 16
16inherit autotools texinfo 17inherit autotools texinfo
17 18
@@ -31,6 +32,11 @@ do_install_append () {
31 oe_libinstall -so -C shlib libreadline ${D}${libdir} 32 oe_libinstall -so -C shlib libreadline ${D}${libdir}
32 33
33 rmdir ${D}${bindir} 34 rmdir ${D}${bindir}
35
36 install -m 0755 -d ${D}${sysconfdir}
37 install -m 0644 ${WORKDIR}/inputrc ${D}${sysconfdir}/inputrc
34} 38}
35 39
36BBCLASSEXTEND = "native nativesdk" 40BBCLASSEXTEND = "native nativesdk"
41
42CONFFILES_${PN} += "${sysconfdir}/inputrc"