From: Saul Wold <sgw@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [CONSOLIDATED PULL 08/32] sysvinit: Change ${PN} to ${BPN} in file names
Date: Thu, 18 Aug 2011 13:55:27 -0700 [thread overview]
Message-ID: <591db57893e40b68fda67ec462baf3a09216b839.1313700595.git.sgw@linux.intel.com> (raw)
In-Reply-To: <cover.1313700595.git.sgw@linux.intel.com>
In-Reply-To: <cover.1313700595.git.sgw@linux.intel.com>
From: Dongxiao Xu <dongxiao.xu@intel.com>
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(-)
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}
}
--
1.7.6
next prev parent reply other threads:[~2011-08-18 21:00 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-18 20:55 [CONSOLIDATED PULL 00/32] Various Fixes, Updates Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 01/32] image.bbclass, kernel.bbclass: create warning file about deleting deploydir files Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 02/32] sanity.bbclass: add optional untested host distro warning Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 03/32] qt4: allow a reduction in build time Saul Wold
2011-08-19 14:34 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 04/32] glib-2.0: explicitly disable dtrace and systemtap for native varaint Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 05/32] tcl: fix networking breakage Saul Wold
2011-08-19 14:31 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 06/32] perl-native: Update find_perl to find the perl wrapper Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 07/32] busybox: Change ${PN} to ${BPN} in file names Saul Wold
2011-08-18 20:55 ` Saul Wold [this message]
2011-08-18 20:55 ` [CONSOLIDATED PULL 09/32] qemu: modify search paths for libgl Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 10/32] scripts/runqemu: " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 11/32] mtd-utils: Added recipe of newer version 1.4.4 Saul Wold
2011-08-19 14:28 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 12/32] libxkbcommon: new Saul Wold
2011-08-19 14:27 ` Richard Purdie
2011-08-19 14:33 ` Phil Blundell
2011-08-19 14:40 ` Martin Jansa
2011-08-19 16:08 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 13/32] libxslt: fix packaging of static libraries Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 14/32] at: make at usable for common user Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 15/32] conf, recipes: Redefine LINKER_HASH_STYLE Saul Wold
2011-08-19 9:24 ` Phil Blundell
2011-08-19 14:26 ` Richard Purdie
2011-08-19 15:27 ` Khem Raj
2011-08-19 16:13 ` Richard Purdie
2011-08-19 16:35 ` Khem Raj
2011-08-18 20:55 ` [CONSOLIDATED PULL 16/32] gcc-4.6: Use --with-linker-hash-style configure option Saul Wold
2011-08-19 16:23 ` Phil Blundell
2011-08-19 18:29 ` Khem Raj
2011-08-19 18:55 ` Khem Raj
2011-08-18 20:55 ` [CONSOLIDATED PULL 17/32] task-core-tools: Use LTTNGUST variable instead of hardcoding lttng-ust Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 18/32] gdb: Add lttng-ust to DEPENDS only for eglibc Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 19/32] task-core-boot: allow distribution to override default dev_manager provider with VIRTUAL-RUNTIME_dev_manager Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 20/32] bluez4: update recipe from meta-oe Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 21/32] initrdscripts: fix init-live.sh Saul Wold
2011-08-22 4:30 ` Tom Zanussi
2011-08-18 20:55 ` [CONSOLIDATED PULL 22/32] curl: Use BPN instead of PN for style like lib${PN} Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 23/32] ea-acl: " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 24/32] attr: " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 25/32] acl: " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 26/32] procps: Fix lib path to support multilib Saul Wold
2011-08-19 14:18 ` Richard Purdie
2011-08-18 20:55 ` [CONSOLIDATED PULL 27/32] eglibc: check dependencies among eglibc options Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 28/32] mailx: update license and distro tracking fileds Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 29/32] slang: add homepage and update distro tracking fields Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 30/32] alsa-tools: update license and add " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 31/32] newt: update " Saul Wold
2011-08-18 20:55 ` [CONSOLIDATED PULL 32/32] file: new file version 5.07 Saul Wold
2011-08-19 16:14 ` [CONSOLIDATED PULL 00/32] Various Fixes, Updates Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=591db57893e40b68fda67ec462baf3a09216b839.1313700595.git.sgw@linux.intel.com \
--to=sgw@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox