summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-08-17 16:51:52 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-19 09:29:19 -0700
commitbe71f55f27a7a7d9a7bbf736837d7358b5e9020f (patch)
treed10eab76dcbb7d592da12fc433a8ed86dba3800d /meta/recipes-core
parentd66c0672a4a9fef298d52d9ce2eac70caefbf685 (diff)
downloadpoky-be71f55f27a7a7d9a7bbf736837d7358b5e9020f.tar.gz
busybox: Change ${PN} to ${BPN} in file names
Some files in busybox are named with ${PN}. In multilib case, ${PN} will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead. (From OE-Core rev: d6c24d3944ed662591372fbd7bf855395655d634) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/busybox/busybox.inc30
-rw-r--r--meta/recipes-core/busybox/busybox_1.18.4.bb2
2 files changed, 16 insertions, 16 deletions
diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc
index d46c1357c2..3f9335892c 100644
--- a/meta/recipes-core/busybox/busybox.inc
+++ b/meta/recipes-core/busybox/busybox.inc
@@ -29,7 +29,7 @@ INITSCRIPT_NAME_${PN}-mdev = "mdev"
29INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." 29INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ."
30INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" 30INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd"
31INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" 31INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc"
32CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}" 32CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${BPN}"
33CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" 33CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf"
34 34
35RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" 35RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc"
@@ -152,24 +152,24 @@ do_install () {
152 install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir} 152 install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir}
153 cat busybox.links | while read FILE; do 153 cat busybox.links | while read FILE; do
154 NAME=`basename "$FILE"` 154 NAME=`basename "$FILE"`
155 install -m 0755 "0_lib/$NAME" "${D}$FILE.${PN}" 155 install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}"
156 done 156 done
157 # add suid bit where needed 157 # add suid bit where needed
158 for i in `grep -E "APPLET.*_BB_SUID_((MAYBE|REQUIRE))" include/applets.h | grep -v _BB_SUID_DROP | cut -f 3 -d '(' | cut -f 1 -d ','`; do 158 for i in `grep -E "APPLET.*_BB_SUID_((MAYBE|REQUIRE))" include/applets.h | grep -v _BB_SUID_DROP | cut -f 3 -d '(' | cut -f 1 -d ','`; do
159 find ${D} -name $i.${PN} -exec chmod a+s {} \; 159 find ${D} -name $i.${BPN} -exec chmod a+s {} \;
160 done 160 done
161 install -m 0755 0_lib/libbusybox.so.${PV} ${D}${libdir}/libbusybox.so.${PV} 161 install -m 0755 0_lib/libbusybox.so.${PV} ${D}${libdir}/libbusybox.so.${PV}
162 ln -sf sh.${PN} ${D}${base_bindir}/sh 162 ln -sf sh.${BPN} ${D}${base_bindir}/sh
163 ln -sf ln.${PN} ${D}${base_bindir}/ln 163 ln -sf ln.${BPN} ${D}${base_bindir}/ln
164 ln -sf test.${PN} ${D}${bindir}/test 164 ln -sf test.${BPN} ${D}${bindir}/test
165 if [ -f ${D}/linuxrc.${PN} ]; then 165 if [ -f ${D}/linuxrc.${BPN} ]; then
166 mv ${D}/linuxrc.${PN} ${D}/linuxrc 166 mv ${D}/linuxrc.${BPN} ${D}/linuxrc
167 fi 167 fi
168 fi 168 fi
169 169
170 if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then 170 if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then
171 install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN} 171 install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN}
172 install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN} 172 install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${BPN}
173 fi 173 fi
174 if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then 174 if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then
175 install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ 175 install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/
@@ -193,7 +193,7 @@ do_install () {
193 install -m 0755 ${WORKDIR}/busybox-udhcpc ${D}${sysconfdir}/init.d/ 193 install -m 0755 ${WORKDIR}/busybox-udhcpc ${D}${sysconfdir}/init.d/
194 fi 194 fi
195 if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then 195 if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then
196 install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${PN} 196 install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN}
197 install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ 197 install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
198 fi 198 fi
199 if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then 199 if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then
@@ -217,8 +217,8 @@ pkg_postinst_${PN} () {
217} 217}
218 218
219pkg_postinst_${PN}-syslog () { 219pkg_postinst_${PN}-syslog () {
220 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50 220 update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${BPN} 50
221 update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${PN} 50 221 update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${BPN} 50
222} 222}
223 223
224pkg_prerm_${PN} () { 224pkg_prerm_${PN} () {
@@ -260,6 +260,6 @@ pkg_prerm_${PN}-syslog () {
260 fi 260 fi
261 fi 261 fi
262 262
263 update-alternatives --remove syslog-init syslog.${PN} 263 update-alternatives --remove syslog-init syslog.${BPN}
264 update-alternatives --remove syslog-conf syslog.conf.${PN} 264 update-alternatives --remove syslog-conf syslog.conf.${BPN}
265} 265}
diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb
index b4681a4643..b2053ee60b 100644
--- a/meta/recipes-core/busybox/busybox_1.18.4.bb
+++ b/meta/recipes-core/busybox/busybox_1.18.4.bb
@@ -1,5 +1,5 @@
1require busybox.inc 1require busybox.inc
2PR = "r8" 2PR = "r9"
3 3
4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ 4SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \
5 file://udhcpscript.patch \ 5 file://udhcpscript.patch \