* [PATCH 0/2][PULL] multilib: use ${BPN} in file names
@ 2011-08-17 8:57 Dongxiao Xu
2011-08-17 8:57 ` [PATCH 1/2] busybox: Change ${PN} to " Dongxiao Xu
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Dongxiao Xu @ 2011-08-17 8:57 UTC (permalink / raw)
To: openembedded-core
Hi Richard,
This pull request is to fix some file names in certain recipes,
please help to review and pull.
Thanks,
Dongxiao
The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4:
distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. (2011-08-15 15:26:04 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib dxu4/ml2
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml2
Dongxiao Xu (2):
busybox: Change ${PN} to ${BPN} in file names
sysvinit: Change ${PN} to ${BPN} in file names
meta/recipes-core/busybox/busybox.inc | 30 +++++++-------
meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +-
meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 52 ++++++++++++------------
3 files changed, 42 insertions(+), 42 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] busybox: Change ${PN} to ${BPN} in file names
2011-08-17 8:57 [PATCH 0/2][PULL] multilib: use ${BPN} in file names Dongxiao Xu
@ 2011-08-17 8:57 ` Dongxiao Xu
2011-08-17 8:57 ` [PATCH 2/2] sysvinit: " Dongxiao Xu
2011-08-22 23:48 ` [PATCH 0/2][PULL] multilib: use " Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Dongxiao Xu @ 2011-08-17 8:57 UTC (permalink / raw)
To: openembedded-core
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 <dongxiao.xu@intel.com>
---
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.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] sysvinit: Change ${PN} to ${BPN} in file names
2011-08-17 8:57 [PATCH 0/2][PULL] multilib: use ${BPN} in file names Dongxiao Xu
2011-08-17 8:57 ` [PATCH 1/2] busybox: Change ${PN} to " Dongxiao Xu
@ 2011-08-17 8:57 ` Dongxiao Xu
2011-08-22 23:48 ` [PATCH 0/2][PULL] multilib: use " Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Dongxiao Xu @ 2011-08-17 8:57 UTC (permalink / raw)
To: openembedded-core
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.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/2][PULL] multilib: use ${BPN} in file names
2011-08-17 8:57 [PATCH 0/2][PULL] multilib: use ${BPN} in file names Dongxiao Xu
2011-08-17 8:57 ` [PATCH 1/2] busybox: Change ${PN} to " Dongxiao Xu
2011-08-17 8:57 ` [PATCH 2/2] sysvinit: " Dongxiao Xu
@ 2011-08-22 23:48 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2011-08-22 23:48 UTC (permalink / raw)
To: Patches and discussions about the oe-core layer
On 08/17/2011 01:57 AM, Dongxiao Xu wrote:
> Hi Richard,
>
> This pull request is to fix some file names in certain recipes,
> please help to review and pull.
>
> Thanks,
> Dongxiao
>
> The following changes since commit 13db5f420ca9bff98561f80d78958278734ad1f4:
>
> distro-tracking: Update info for gpgme, libassuan, apr... after last upgrade. (2011-08-15 15:26:04 +0100)
>
> are available in the git repository at:
> git://git.pokylinux.org/poky-contrib dxu4/ml2
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dxu4/ml2
>
> Dongxiao Xu (2):
> busybox: Change ${PN} to ${BPN} in file names
> sysvinit: Change ${PN} to ${BPN} in file names
>
> meta/recipes-core/busybox/busybox.inc | 30 +++++++-------
> meta/recipes-core/busybox/busybox_1.18.4.bb | 2 +-
> meta/recipes-core/sysvinit/sysvinit_2.88dsf.bb | 52 ++++++++++++------------
> 3 files changed, 42 insertions(+), 42 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-08-22 23:53 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-08-17 8:57 [PATCH 0/2][PULL] multilib: use ${BPN} in file names Dongxiao Xu
2011-08-17 8:57 ` [PATCH 1/2] busybox: Change ${PN} to " Dongxiao Xu
2011-08-17 8:57 ` [PATCH 2/2] sysvinit: " Dongxiao Xu
2011-08-22 23:48 ` [PATCH 0/2][PULL] multilib: use " Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox