[OE-core] [PATCH] readline: move inputrc into readline
Joseph A. Lutz
joseph.lutz at novatechweb.com
Tue Dec 29 22:54:27 UTC 2015
inputrc is the global configuration file for the readline library.
Signed-off-by: Joseph A. Lutz <joseph.lutz at novatechweb.com>
# Conflicts:
# meta/recipes-core/readline/readline.inc
---
meta/recipes-core/base-files/base-files_3.0.14.bb | 4 +---
meta/recipes-core/{base-files/base-files => readline/files}/inputrc | 0
meta/recipes-core/readline/readline.inc | 6 ++++++
3 files changed, 7 insertions(+), 3 deletions(-)
rename meta/recipes-core/{base-files/base-files => readline/files}/inputrc (100%)
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 b71d5c5..d391707 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
similarity index 100%
rename from meta/recipes-core/base-files/base-files/inputrc
rename to meta/recipes-core/readline/files/inputrc
diff --git a/meta/recipes-core/readline/readline.inc b/meta/recipes-core/readline/readline.inc
index 30892e1..35df8b4 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"
--
2.6.2
More information about the Openembedded-core
mailing list