* [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN in do_install for multilibs
@ 2013-03-15 6:41 jackie.huang
2013-03-15 6:41 ` [meta-networking][PATCH 2/3] netcat: " jackie.huang
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: jackie.huang @ 2013-03-15 6:41 UTC (permalink / raw)
To: openembedded-devel; +Cc: Jackie.Huang
From: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
.../inetutils/inetutils_1.9.1.bb | 35 ++++++++++---------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
index 81457d7..155befe 100644
--- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
+++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
@@ -8,6 +8,7 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7"
+PR = "r1"
SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
file://disable-pre-ANSI-compilers.patch \
@@ -37,27 +38,27 @@ do_configure_prepend () {
do_install () {
autotools_do_install
install -d ${D}${base_sbindir} ${D}${base_bindir}
- mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${PN}
- mv ${D}${bindir}/telnet ${D}${bindir}/telnet.${PN}
- mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
- mv ${D}${bindir}/traceroute ${D}${bindir}/traceroute.${PN}
- mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
- mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ifconfig.${PN}
+ mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${BPN}
+ mv ${D}${bindir}/telnet ${D}${bindir}/telnet.${BPN}
+ mv ${D}${bindir}/logger ${D}${bindir}/logger.${BPN}
+ mv ${D}${bindir}/traceroute ${D}${bindir}/traceroute.${BPN}
+ mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${BPN}
+ mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ifconfig.${BPN}
}
pkg_postinst_${PN} () {
- update-alternatives --install ${bindir}/tftp tftp tftp.${PN} 100
- update-alternatives --install ${bindir}/telnet telnet telnet.${PN} 100
- update-alternatives --install ${bindir}/logger logger logger.${PN} 100
- update-alternatives --install ${bindir}/traceroute traceroute traceroute.${PN} 100
- update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 100
- update-alternatives --install ${base_sbindir}/ifconfig ifconfig ifconfig.${PN} 100
+ update-alternatives --install ${bindir}/tftp tftp tftp.${BPN} 100
+ update-alternatives --install ${bindir}/telnet telnet telnet.${BPN} 100
+ update-alternatives --install ${bindir}/logger logger logger.${BPN} 100
+ update-alternatives --install ${bindir}/traceroute traceroute traceroute.${BPN} 100
+ update-alternatives --install ${base_bindir}/hostname hostname hostname.${BPN} 100
+ update-alternatives --install ${base_sbindir}/ifconfig ifconfig ifconfig.${BPN} 100
}
pkg_prerm_${PN} () {
- update-alternatives --remove tftp tftp.${PN}
- update-alternatives --remove telnet telnet.${PN}
- update-alternatives --remove logger logger.${PN}
- update-alternatives --remove traceroute traceroute.${PN}
- update-alternatives --remove ifconfig ifconfig.${PN}
+ update-alternatives --remove tftp tftp.${BPN}
+ update-alternatives --remove telnet telnet.${BPN}
+ update-alternatives --remove logger logger.${BPN}
+ update-alternatives --remove traceroute traceroute.${BPN}
+ update-alternatives --remove ifconfig ifconfig.${BPN}
}
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-networking][PATCH 2/3] netcat: fix PN -> BPN in do_install for multilibs
2013-03-15 6:41 [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN in do_install for multilibs jackie.huang
@ 2013-03-15 6:41 ` jackie.huang
2013-03-15 6:41 ` [meta-webserver][PATCH 3/3] phpmyadmin: fix PN->BPN " jackie.huang
2013-03-18 19:19 ` [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN " Joe MacDonald
2 siblings, 0 replies; 4+ messages in thread
From: jackie.huang @ 2013-03-15 6:41 UTC (permalink / raw)
To: openembedded-devel; +Cc: Jackie.Huang
From: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
.../recipes-support/netcat/netcat_0.7.1.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
index 8dacdec..2d98122 100644
--- a/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
+++ b/meta-networking/recipes-support/netcat/netcat_0.7.1.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://netcat.sourceforge.net"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r2"
+PR = "r3"
SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2 \
file://obsolete_autoconf_macros.patch \
@@ -17,6 +17,6 @@ inherit autotools
do_install_append() {
install -d ${D}${bindir}
- mv ${D}${bindir}/nc ${D}${bindir}/nc.${PN}
+ mv ${D}${bindir}/nc ${D}${bindir}/nc.${BPN}
}
ALTERNATIVE_PRIORITY = "100"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-webserver][PATCH 3/3] phpmyadmin: fix PN->BPN in do_install for multilibs
2013-03-15 6:41 [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN in do_install for multilibs jackie.huang
2013-03-15 6:41 ` [meta-networking][PATCH 2/3] netcat: " jackie.huang
@ 2013-03-15 6:41 ` jackie.huang
2013-03-18 19:19 ` [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN " Joe MacDonald
2 siblings, 0 replies; 4+ messages in thread
From: jackie.huang @ 2013-03-15 6:41 UTC (permalink / raw)
To: openembedded-devel; +Cc: Jackie.Huang
From: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
.../recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb
index e3a581c..1118e23 100644
--- a/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb
+++ b/meta-webserver/recipes-php/phpmyadmin/phpmyadmin_3.5.2.2.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2 & LGPLv3 & MIT"
LIC_FILES_CHKSUM = "file://LICENSE;md5=eb723b61539feef013de476e68b5c50a \
file://libraries/tcpdf/LICENSE.TXT;md5=5c87b66a5358ebcc495b03e0afcd342c"
-PR = "r0"
+PR = "r1"
SRC_URI = "${SOURCEFORGE_MIRROR}/phpmyadmin/phpMyAdmin/${PV}/phpMyAdmin-${PV}-all-languages.tar.xz \
file://apache.conf"
@@ -18,13 +18,13 @@ S = "${WORKDIR}/phpMyAdmin-${PV}-all-languages"
inherit allarch
do_install() {
- install -d ${D}${datadir}/${PN}
- cp -a * ${D}${datadir}/${PN}
+ install -d ${D}${datadir}/${BPN}
+ cp -a * ${D}${datadir}/${BPN}
install -d ${D}${sysconfdir}/apache2/conf.d
install -m 0644 ${WORKDIR}/apache.conf ${D}${sysconfdir}/apache2/conf.d/phpmyadmin.conf
}
-FILES_${PN} = "${datadir}/${PN} \
+FILES_${PN} = "${datadir}/${BPN} \
${sysconfdir}/apache2/conf.d"
--
1.7.4.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN in do_install for multilibs
2013-03-15 6:41 [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN in do_install for multilibs jackie.huang
2013-03-15 6:41 ` [meta-networking][PATCH 2/3] netcat: " jackie.huang
2013-03-15 6:41 ` [meta-webserver][PATCH 3/3] phpmyadmin: fix PN->BPN " jackie.huang
@ 2013-03-18 19:19 ` Joe MacDonald
2 siblings, 0 replies; 4+ messages in thread
From: Joe MacDonald @ 2013-03-18 19:19 UTC (permalink / raw)
To: openembedded-devel; +Cc: Jackie.Huang
[-- Attachment #1: Type: text/plain, Size: 3587 bytes --]
Hi Jackie,
I merged the three-pack. Thanks.
-J.
[[oe] [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN in do_install for multilibs] On 13.03.15 (Fri 14:41) jackie.huang@windriver.com wrote:
> From: Jackie Huang <jackie.huang@windriver.com>
>
> Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
> ---
> .../inetutils/inetutils_1.9.1.bb | 35 ++++++++++---------
> 1 files changed, 18 insertions(+), 17 deletions(-)
>
> diff --git a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
> index 81457d7..155befe 100644
> --- a/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
> +++ b/meta-networking/recipes-connectivity/inetutils/inetutils_1.9.1.bb
> @@ -8,6 +8,7 @@ LICENSE = "GPLv3"
>
> LIC_FILES_CHKSUM = "file://COPYING;md5=0c7051aef9219dc7237f206c5c4179a7"
>
> +PR = "r1"
>
> SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
> file://disable-pre-ANSI-compilers.patch \
> @@ -37,27 +38,27 @@ do_configure_prepend () {
> do_install () {
> autotools_do_install
> install -d ${D}${base_sbindir} ${D}${base_bindir}
> - mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${PN}
> - mv ${D}${bindir}/telnet ${D}${bindir}/telnet.${PN}
> - mv ${D}${bindir}/logger ${D}${bindir}/logger.${PN}
> - mv ${D}${bindir}/traceroute ${D}${bindir}/traceroute.${PN}
> - mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${PN}
> - mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ifconfig.${PN}
> + mv ${D}${bindir}/tftp ${D}${bindir}/tftp.${BPN}
> + mv ${D}${bindir}/telnet ${D}${bindir}/telnet.${BPN}
> + mv ${D}${bindir}/logger ${D}${bindir}/logger.${BPN}
> + mv ${D}${bindir}/traceroute ${D}${bindir}/traceroute.${BPN}
> + mv ${D}${bindir}/hostname ${D}${base_bindir}/hostname.${BPN}
> + mv ${D}${bindir}/ifconfig ${D}${base_sbindir}/ifconfig.${BPN}
> }
>
> pkg_postinst_${PN} () {
> - update-alternatives --install ${bindir}/tftp tftp tftp.${PN} 100
> - update-alternatives --install ${bindir}/telnet telnet telnet.${PN} 100
> - update-alternatives --install ${bindir}/logger logger logger.${PN} 100
> - update-alternatives --install ${bindir}/traceroute traceroute traceroute.${PN} 100
> - update-alternatives --install ${base_bindir}/hostname hostname hostname.${PN} 100
> - update-alternatives --install ${base_sbindir}/ifconfig ifconfig ifconfig.${PN} 100
> + update-alternatives --install ${bindir}/tftp tftp tftp.${BPN} 100
> + update-alternatives --install ${bindir}/telnet telnet telnet.${BPN} 100
> + update-alternatives --install ${bindir}/logger logger logger.${BPN} 100
> + update-alternatives --install ${bindir}/traceroute traceroute traceroute.${BPN} 100
> + update-alternatives --install ${base_bindir}/hostname hostname hostname.${BPN} 100
> + update-alternatives --install ${base_sbindir}/ifconfig ifconfig ifconfig.${BPN} 100
> }
>
> pkg_prerm_${PN} () {
> - update-alternatives --remove tftp tftp.${PN}
> - update-alternatives --remove telnet telnet.${PN}
> - update-alternatives --remove logger logger.${PN}
> - update-alternatives --remove traceroute traceroute.${PN}
> - update-alternatives --remove ifconfig ifconfig.${PN}
> + update-alternatives --remove tftp tftp.${BPN}
> + update-alternatives --remove telnet telnet.${BPN}
> + update-alternatives --remove logger logger.${BPN}
> + update-alternatives --remove traceroute traceroute.${BPN}
> + update-alternatives --remove ifconfig ifconfig.${BPN}
> }
--
-Joe MacDonald.
:wq
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-03-18 19:36 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-15 6:41 [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN in do_install for multilibs jackie.huang
2013-03-15 6:41 ` [meta-networking][PATCH 2/3] netcat: " jackie.huang
2013-03-15 6:41 ` [meta-webserver][PATCH 3/3] phpmyadmin: fix PN->BPN " jackie.huang
2013-03-18 19:19 ` [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN " Joe MacDonald
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.