From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1Qu9hk-0006Z6-EY for openembedded-core@lists.openembedded.org; Thu, 18 Aug 2011 23:00:44 +0200 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 18 Aug 2011 13:56:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.68,247,1312182000"; d="scan'208";a="39980228" Received: from unknown (HELO swold-MOBL.local) ([10.255.13.226]) by azsmga001.ch.intel.com with ESMTP; 18 Aug 2011 13:56:01 -0700 From: Saul Wold To: openembedded-core@lists.openembedded.org Date: Thu, 18 Aug 2011 13:55:26 -0700 Message-Id: <2463e3dd6ec42b3514ffd830608ea2285254eeb2.1313700595.git.sgw@linux.intel.com> X-Mailer: git-send-email 1.7.6 In-Reply-To: References: In-Reply-To: References: Subject: [CONSOLIDATED PULL 07/32] busybox: Change ${PN} to ${BPN} in file names X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Aug 2011 21:00:44 -0000 From: Dongxiao Xu Some files in busybox are named with ${PN}. In multilib case, ${PN} will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead. Signed-off-by: Dongxiao Xu --- meta/recipes-core/busybox/busybox.inc | 30 +++++++++++++------------- meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index d46c135..3f93358 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -29,7 +29,7 @@ INITSCRIPT_NAME_${PN}-mdev = "mdev" INITSCRIPT_PARAMS_${PN}-mdev = "start 06 S ." INITSCRIPT_NAME_${PN}-udhcpd = "busybox-udhcpd" INITSCRIPT_NAME_${PN}-udhcpc = "busybox-udhcpc" -CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${PN}" +CONFFILES_${PN}-syslog = "${sysconfdir}/syslog.conf.${BPN}" CONFFILES_${PN}-mdev = "${sysconfdir}/mdev.conf" RRECOMMENDS_${PN} = "${PN}-syslog ${PN}-udhcpc" @@ -152,24 +152,24 @@ do_install () { install -d ${D}${libdir} ${D}${bindir} ${D}${sbindir} cat busybox.links | while read FILE; do NAME=`basename "$FILE"` - install -m 0755 "0_lib/$NAME" "${D}$FILE.${PN}" + install -m 0755 "0_lib/$NAME" "${D}$FILE.${BPN}" done # add suid bit where needed 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 - find ${D} -name $i.${PN} -exec chmod a+s {} \; + find ${D} -name $i.${BPN} -exec chmod a+s {} \; done install -m 0755 0_lib/libbusybox.so.${PV} ${D}${libdir}/libbusybox.so.${PV} - ln -sf sh.${PN} ${D}${base_bindir}/sh - ln -sf ln.${PN} ${D}${base_bindir}/ln - ln -sf test.${PN} ${D}${bindir}/test - if [ -f ${D}/linuxrc.${PN} ]; then - mv ${D}/linuxrc.${PN} ${D}/linuxrc + ln -sf sh.${BPN} ${D}${base_bindir}/sh + ln -sf ln.${BPN} ${D}${base_bindir}/ln + ln -sf test.${BPN} ${D}${bindir}/test + if [ -f ${D}/linuxrc.${BPN} ]; then + mv ${D}/linuxrc.${BPN} ${D}/linuxrc fi fi if grep -q "CONFIG_SYSLOGD=y" ${WORKDIR}/defconfig; then - install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${PN} - install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${PN} + install -m 0755 ${WORKDIR}/syslog ${D}${sysconfdir}/init.d/syslog.${BPN} + install -m 644 ${WORKDIR}/syslog.conf ${D}${sysconfdir}/syslog.conf.${BPN} fi if grep "CONFIG_CROND=y" ${WORKDIR}/defconfig; then install -m 0755 ${WORKDIR}/busybox-cron ${D}${sysconfdir}/init.d/ @@ -193,7 +193,7 @@ do_install () { install -m 0755 ${WORKDIR}/busybox-udhcpc ${D}${sysconfdir}/init.d/ fi if grep "CONFIG_INETD=y" ${WORKDIR}/defconfig; then - install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${PN} + install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN} install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/ fi if grep "CONFIG_MDEV=y" ${WORKDIR}/defconfig; then @@ -217,8 +217,8 @@ pkg_postinst_${PN} () { } pkg_postinst_${PN}-syslog () { - update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${PN} 50 - update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${PN} 50 + update-alternatives --install ${sysconfdir}/init.d/syslog syslog-init syslog.${BPN} 50 + update-alternatives --install ${sysconfdir}/syslog.conf syslog-conf syslog.conf.${BPN} 50 } pkg_prerm_${PN} () { @@ -260,6 +260,6 @@ pkg_prerm_${PN}-syslog () { fi fi - update-alternatives --remove syslog-init syslog.${PN} - update-alternatives --remove syslog-conf syslog.conf.${PN} + update-alternatives --remove syslog-init syslog.${BPN} + update-alternatives --remove syslog-conf syslog.conf.${BPN} } diff --git a/meta/recipes-core/busybox/busybox_1.18.4.bb b/meta/recipes-core/busybox/busybox_1.18.4.bb index b4681a4..b2053ee 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 @@ require busybox.inc -PR = "r8" +PR = "r9" SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://udhcpscript.patch \ -- 1.7.6