diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-core/busybox/busybox.inc | 26 | ||||
-rw-r--r-- | meta/recipes-core/busybox/busybox_1.20.2.bb | 2 |
2 files changed, 14 insertions, 14 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 655cb3cd9b..a2e83ec92d 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc | |||
@@ -153,14 +153,14 @@ do_install () { | |||
153 | 153 | ||
154 | install -d ${D}${sysconfdir}/init.d | 154 | install -d ${D}${sysconfdir}/init.d |
155 | 155 | ||
156 | if ! grep -q "CONFIG_FEATURE_INDIVIDUAL=y" ${WORKDIR}/defconfig; then | 156 | if ! grep -q "CONFIG_FEATURE_INDIVIDUAL=y" ${B}/.config; then |
157 | # Install /bin/busybox, and the /bin/sh link so the postinst script | 157 | # Install /bin/busybox, and the /bin/sh link so the postinst script |
158 | # can run. Let update-alternatives handle the rest. | 158 | # can run. Let update-alternatives handle the rest. |
159 | install -d ${D}${base_bindir} | 159 | install -d ${D}${base_bindir} |
160 | if grep -q "CONFIG_FEATURE_SUID=y" ${WORKDIR}/defconfig; then | 160 | if grep -q "CONFIG_FEATURE_SUID=y" ${B}/.config; then |
161 | install -m 4755 ${S}/busybox ${D}${base_bindir} | 161 | install -m 4755 ${B}/busybox ${D}${base_bindir} |
162 | else | 162 | else |
163 | install -m 0755 ${S}/busybox ${D}${base_bindir} | 163 | install -m 0755 ${B}/busybox ${D}${base_bindir} |
164 | fi | 164 | fi |
165 | ln -sf busybox ${D}${base_bindir}/sh | 165 | ln -sf busybox ${D}${base_bindir}/sh |
166 | else | 166 | else |
@@ -183,36 +183,36 @@ do_install () { | |||
183 | fi | 183 | fi |
184 | fi | 184 | fi |
185 | 185 | ||
186 | if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then | 186 | if grep -q "CONFIG_SYSLOGD=y" ${B}/.config; then |
187 | install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN} | 187 | install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN} |
188 | install -m 644 ${WORKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf.${BPN} | 188 | install -m 644 ${WORKDIR}/syslog-startup.conf ${D}${sysconfdir}/syslog-startup.conf.${BPN} |
189 | fi | 189 | fi |
190 | if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then | 190 | if grep "CONFIG_CROND=y" ${B}/.config; then |
191 | install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ | 191 | install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ |
192 | fi | 192 | fi |
193 | if grep "CONFIG_HTTPD=y" ${WORKDIR}/defconfig; then | 193 | if grep "CONFIG_HTTPD=y" ${B}/.config; then |
194 | install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ | 194 | install -m 0755 ${WORKDIR}/busybox-httpd ${D}${sysconfdir}/init.d/ |
195 | install -d ${D}/srv/www | 195 | install -d ${D}/srv/www |
196 | fi | 196 | fi |
197 | if grep "CONFIG_UDHCPD=y" ${WORKDIR}/defconfig; then | 197 | if grep "CONFIG_UDHCPD=y" ${B}/.config; then |
198 | install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ | 198 | install -m 0755 ${WORKDIR}/busybox-udhcpd ${D}${sysconfdir}/init.d/ |
199 | fi | 199 | fi |
200 | if grep "CONFIG_HWCLOCK=y" ${WORKDIR}/defconfig; then | 200 | if grep "CONFIG_HWCLOCK=y" ${B}/.config; then |
201 | install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ | 201 | install -m 0755 ${WORKDIR}/hwclock.sh ${D}${sysconfdir}/init.d/ |
202 | fi | 202 | fi |
203 | if grep "CONFIG_UDHCPC=y" ${WORKDIR}/defconfig; then | 203 | if grep "CONFIG_UDHCPC=y" ${B}/.config; then |
204 | install -d ${D}${sysconfdir}/udhcpc.d | 204 | install -d ${D}${sysconfdir}/udhcpc.d |
205 | install -d ${D}${datadir}/udhcpc | 205 | install -d ${D}${datadir}/udhcpc |
206 | install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default | 206 | install -m 0755 ${WORKDIR}/simple.script ${D}${sysconfdir}/udhcpc.d/50default |
207 | install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script | 207 | install -m 0755 ${WORKDIR}/default.script ${D}${datadir}/udhcpc/default.script |
208 | fi | 208 | fi |
209 | if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then | 209 | if grep "CONFIG_INETD=y" ${B}/.config; then |
210 | install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} | 210 | install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} |
211 | install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ | 211 | install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ |
212 | fi | 212 | fi |
213 | if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then | 213 | if grep "CONFIG_MDEV=y" ${B}/.config; then |
214 | install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev | 214 | install -m 0755 ${WORKDIR}/mdev ${D}${sysconfdir}/init.d/mdev |
215 | if grep "CONFIG_FEATURE_MDEV_CONF=y" ${WORKDIR}/defconfig; then | 215 | if grep "CONFIG_FEATURE_MDEV_CONF=y" ${B}/.config; then |
216 | install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf | 216 | install -m 644 ${WORKDIR}/mdev.conf ${D}${sysconfdir}/mdev.conf |
217 | fi | 217 | fi |
218 | fi | 218 | fi |
diff --git a/meta/recipes-core/busybox/busybox_1.20.2.bb b/meta/recipes-core/busybox/busybox_1.20.2.bb index 401c1ebc16..bb97044183 100644 --- a/meta/recipes-core/busybox/busybox_1.20.2.bb +++ b/meta/recipes-core/busybox/busybox_1.20.2.bb | |||
@@ -1,5 +1,5 @@ | |||
1 | require busybox.inc | 1 | require busybox.inc |
2 | PR = "r5" | 2 | PR = "r6" |
3 | 3 | ||
4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ | 4 | SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ |
5 | file://B921600.patch \ | 5 | file://B921600.patch \ |