Patchwork [2/2] sysvinit: Change ${PN} to ${BPN} in file names

login
register
mail settings
Submitter Dongxiao Xu
Date Aug. 17, 2011, 8:57 a.m.
Message ID <aac36a6cdc896387cac317282652960943c54a07.1313571326.git.dongxiao.xu@intel.com>
Download mbox | patch
Permalink /patch/10089/
State New, archived
Headers show

Comments

Dongxiao Xu - Aug. 17, 2011, 8:57 a.m.
Some files in sysvinit are named with ${PN}. In multilib case, ${PN}
will be prefixed with "lib32-" or "lib64-". Use ${BPN} instead.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
---
 meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb |   52 ++++++++++++------------
 1 files changed, 26 insertions(+), 26 deletions(-)

Patch

diff --git a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
index bda8a51..663e298 100644
--- a/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb
@@ -5,7 +5,7 @@  SECTION = "base"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
                     file://COPYRIGHT;endline=15;md5=349c872e0066155e1818b786938876a4"
-PR = "r4"
+PR = "r5"
 
 RDEPENDS_${PN} = "${PN}-inittab"
 
@@ -65,41 +65,41 @@  do_install () {
 		install -d ${D}${sysconfdir}/rc$level.d
 		ln -s ../init.d/stop-bootlogd ${D}${sysconfdir}/rc$level.d/S99stop-bootlogd
 	done
-	mv                 ${D}${base_sbindir}/init               ${D}${base_sbindir}/init.${PN}
-	mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${PN}
-	mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${PN}
-	mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${PN}
-	mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${PN}
-	mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${PN}
-	mv ${D}${bindir}/last ${D}${bindir}/last.${PN}
-	mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${PN}
-	mv ${D}${bindir}/wall ${D}${bindir}/wall.${PN}
+	mv                 ${D}${base_sbindir}/init               ${D}${base_sbindir}/init.${BPN}
+	mv ${D}${base_bindir}/pidof ${D}${base_bindir}/pidof.${BPN}
+	mv ${D}${base_sbindir}/halt ${D}${base_sbindir}/halt.${BPN}
+	mv ${D}${base_sbindir}/reboot ${D}${base_sbindir}/reboot.${BPN}
+	mv ${D}${base_sbindir}/shutdown ${D}${base_sbindir}/shutdown.${BPN}
+	mv ${D}${base_sbindir}/poweroff ${D}${base_sbindir}/poweroff.${BPN}
+	mv ${D}${bindir}/last ${D}${bindir}/last.${BPN}
+	mv ${D}${bindir}/mesg ${D}${bindir}/mesg.${BPN}
+	mv ${D}${bindir}/wall ${D}${bindir}/wall.${BPN}
 }
 
 pkg_postinst_${PN} () {
-	update-alternatives --install ${base_sbindir}/halt halt halt.${PN} 200
-	update-alternatives --install ${base_sbindir}/reboot reboot reboot.${PN} 200
-	update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${PN} 200
-	update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${PN} 200
-	update-alternatives --install ${bindir}/last last last.${PN} 200
-	update-alternatives --install ${bindir}/mesg mesg mesg.${PN} 200
-	update-alternatives --install ${bindir}/wall wall wall.${PN} 200
+	update-alternatives --install ${base_sbindir}/halt halt halt.${BPN} 200
+	update-alternatives --install ${base_sbindir}/reboot reboot reboot.${BPN} 200
+	update-alternatives --install ${base_sbindir}/shutdown shutdown shutdown.${BPN} 200
+	update-alternatives --install ${base_sbindir}/poweroff poweroff poweroff.${BPN} 200
+	update-alternatives --install ${bindir}/last last last.${BPN} 200
+	update-alternatives --install ${bindir}/mesg mesg mesg.${BPN} 200
+	update-alternatives --install ${bindir}/wall wall wall.${BPN} 200
 }
 
 pkg_prerm_${PN} () {
-	update-alternatives --remove halt halt.${PN}
-	update-alternatives --remove reboot reboot.${PN}
-	update-alternatives --remove shutdown shutdown.${PN}
-	update-alternatives --remove poweroff poweroff.${PN}
-	update-alternatives --remove last last.${PN}
-	update-alternatives --remove mesg mesg.${PN}
-	update-alternatives --remove wall wall.${PN}
+	update-alternatives --remove halt halt.${BPN}
+	update-alternatives --remove reboot reboot.${BPN}
+	update-alternatives --remove shutdown shutdown.${BPN}
+	update-alternatives --remove poweroff poweroff.${BPN}
+	update-alternatives --remove last last.${BPN}
+	update-alternatives --remove mesg mesg.${BPN}
+	update-alternatives --remove wall wall.${BPN}
 }
 
 pkg_postinst_sysvinit-pidof () {
-	update-alternatives --install ${base_bindir}/pidof pidof pidof.${PN} 200
+	update-alternatives --install ${base_bindir}/pidof pidof pidof.${BPN} 200
 }
 
 pkg_prerm_sysvinit-pidof () {
-	update-alternatives --remove pidof pidof.${PN}
+	update-alternatives --remove pidof pidof.${BPN}
 }