diff options
Diffstat (limited to 'meta/recipes-core/base-files')
-rw-r--r-- | meta/recipes-core/base-files/base-files/profile | 2 | ||||
-rw-r--r-- | meta/recipes-core/base-files/base-files_3.0.14.bb | 27 |
2 files changed, 15 insertions, 14 deletions
diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index bded3757cc..5e8393c91c 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile | |||
@@ -58,7 +58,7 @@ resize() { | |||
58 | fi | 58 | fi |
59 | # only do this for /dev/tty[A-z] which are typically | 59 | # only do this for /dev/tty[A-z] which are typically |
60 | # serial ports | 60 | # serial ports |
61 | if [ $FIRSTTIMESETUP -eq 1 -a $SHLVL -eq 1 ] ; then | 61 | if [ $FIRSTTIMESETUP -eq 1 -a ${SHLVL:-1} -eq 1 ] ; then |
62 | case $(tty 2>/dev/null) in | 62 | case $(tty 2>/dev/null) in |
63 | /dev/tty[A-z]*) resize >/dev/null;; | 63 | /dev/tty[A-z]*) resize >/dev/null;; |
64 | esac | 64 | esac |
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 9fab53ce63..1b6e9671e4 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 | |||
@@ -25,7 +25,8 @@ SRC_URI = "file://rotation \ | |||
25 | " | 25 | " |
26 | SRC_URI:append:libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd systemd-resolved', ' file://0001-add-nss-resolve-to-nsswitch.patch', '', d)}" | 26 | SRC_URI:append:libc-glibc = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd systemd-resolved', ' file://0001-add-nss-resolve-to-nsswitch.patch', '', d)}" |
27 | 27 | ||
28 | S = "${WORKDIR}" | 28 | S = "${WORKDIR}/sources" |
29 | UNPACKDIR = "${S}" | ||
29 | 30 | ||
30 | INHIBIT_DEFAULT_DEPS = "1" | 31 | INHIBIT_DEFAULT_DEPS = "1" |
31 | 32 | ||
@@ -113,23 +114,23 @@ do_install () { | |||
113 | ln -snf ../run ${D}${localstatedir}/run | 114 | ln -snf ../run ${D}${localstatedir}/run |
114 | ln -snf ../run/lock ${D}${localstatedir}/lock | 115 | ln -snf ../run/lock ${D}${localstatedir}/lock |
115 | 116 | ||
116 | install -m 0644 ${WORKDIR}/hosts ${D}${sysconfdir}/hosts | 117 | install -m 0644 ${S}/hosts ${D}${sysconfdir}/hosts |
117 | ${BASEFILESISSUEINSTALL} | 118 | ${BASEFILESISSUEINSTALL} |
118 | 119 | ||
119 | rotation=`cat ${WORKDIR}/rotation` | 120 | rotation=`cat ${S}/rotation` |
120 | if [ "$rotation" != "0" ]; then | 121 | if [ "$rotation" != "0" ]; then |
121 | install -m 0644 ${WORKDIR}/rotation ${D}${sysconfdir}/rotation | 122 | install -m 0644 ${S}/rotation ${D}${sysconfdir}/rotation |
122 | fi | 123 | fi |
123 | 124 | ||
124 | install -m 0644 ${WORKDIR}/fstab ${D}${sysconfdir}/fstab | 125 | install -m 0644 ${S}/fstab ${D}${sysconfdir}/fstab |
125 | install -m 0644 ${WORKDIR}/profile ${D}${sysconfdir}/profile | 126 | install -m 0644 ${S}/profile ${D}${sysconfdir}/profile |
126 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile | 127 | sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}${sysconfdir}/profile |
127 | sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile | 128 | sed -i 's#@BINDIR@#${bindir}#g' ${D}${sysconfdir}/profile |
128 | install -m 0644 ${WORKDIR}/shells ${D}${sysconfdir}/shells | 129 | install -m 0644 ${S}/shells ${D}${sysconfdir}/shells |
129 | install -m 0755 ${WORKDIR}/share/dot.profile ${D}${sysconfdir}/skel/.profile | 130 | install -m 0755 ${S}/share/dot.profile ${D}${sysconfdir}/skel/.profile |
130 | install -m 0755 ${WORKDIR}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc | 131 | install -m 0755 ${S}/share/dot.bashrc ${D}${sysconfdir}/skel/.bashrc |
131 | install -m 0644 ${WORKDIR}/host.conf ${D}${sysconfdir}/host.conf | 132 | install -m 0644 ${S}/host.conf ${D}${sysconfdir}/host.conf |
132 | install -m 0644 ${WORKDIR}/motd ${D}${sysconfdir}/motd | 133 | install -m 0644 ${S}/motd ${D}${sysconfdir}/motd |
133 | 134 | ||
134 | ln -sf /proc/mounts ${D}${sysconfdir}/mtab | 135 | ln -sf /proc/mounts ${D}${sysconfdir}/mtab |
135 | 136 | ||
@@ -145,12 +146,12 @@ do_install () { | |||
145 | } | 146 | } |
146 | 147 | ||
147 | do_install:append:libc-glibc () { | 148 | do_install:append:libc-glibc () { |
148 | install -m 0644 ${WORKDIR}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf | 149 | install -m 0644 ${S}/nsswitch.conf ${D}${sysconfdir}/nsswitch.conf |
149 | } | 150 | } |
150 | 151 | ||
151 | DISTRO_VERSION[vardepsexclude] += "DATE" | 152 | DISTRO_VERSION[vardepsexclude] += "DATE" |
152 | do_install_basefilesissue () { | 153 | do_install_basefilesissue () { |
153 | install -m 644 ${WORKDIR}/issue* ${D}${sysconfdir} | 154 | install -m 644 ${S}/issue* ${D}${sysconfdir} |
154 | if [ -n "${DISTRO_NAME}" ]; then | 155 | if [ -n "${DISTRO_NAME}" ]; then |
155 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue | 156 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue |
156 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net | 157 | printf "${DISTRO_NAME} " >> ${D}${sysconfdir}/issue.net |