[oe] [meta-webserver][PATCH 3/3] phpmyadmin: fix PN->BPN in do_install for multilibs
From: Jackie Huang
Signed-off-by: Jackie Huang
---
.../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
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [meta-networking][PATCH 1/3] inetutils: fix PN -> BPN in do_install for multilibs
From: Jackie Huang
Signed-off-by: Jackie Huang
---
.../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
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
[oe] [PATCH] wpa_supplicant: Location of systemd services files changed
Signed-off-by: Jukka Rissanen
---
.../recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
index 23dcc82..91ee4ad 100644
---
a/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
+++
b/meta-systemd/oe-core/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.0.bbappend
@@ -8,7 +8,7 @@ SYSTEMD_AUTO_ENABLE = "disable"
do_install_append () {
install -d ${D}${systemd_unitdir}/system
-install -m 644 ${S}/systemd/*.service ${D}${systemd_unitdir}/system
+install -m 644 ${S}/wpa_supplicant/systemd/*.service
${D}${systemd_unitdir}/system
}
# systemd.bbclass does not catch all multiple-instance-service-files
--
1.7.11.4
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v3] fingerterm: Added 1.0.2 recipe
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Op 15-03-13 01:11, Felipe Ferreri Tonello schreef: > Hi Koen, > > On 03/14/2013 07:35 AM, Koen Kooi wrote: Op 13-03-13 17:37, > e...@felipetonello.com schreef: From: "Felipe F. Tonello" Fingerterm is a terminal emulator for Nokia Harmattan, but it works in any Qt4 environment. This recipe can be extended by a .bbappend to add .desktop, icon and others to the target device. > > Why not include a default .desktop in the recipe so it actually works out > of the box? > >> The binary is been installed. So it will work out of the box. Eh, no. You need a .desktop to launch it properly. > >> Regarding the .desktop file, it is not installed by default because it >> was done for MeeGo only. It needs some hack to work for generic >> desktops that follow desktop-entry spec[1]. Then add a .desktop that adheres to the spec, I see no reason why this recipe has to be so 'special' that it needs a .bbappend to work as intended. -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.5 (Darwin) Comment: GPGTools - http://gpgtools.org iD8DBQFRQulAMkyGM64RGpERAmgSAJ4ig6vvXAYDa6Z/YAKH+p7YNetshACgj/Xm nt4iz6waFF9QQjtytfRo/2Q= =wmfE -END PGP SIGNATURE- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Re: [oe] [meta-oe][PATCH v3] fingerterm: Added 1.0.2 recipe
On 03/15/2013 05:26 AM, Koen Kooi wrote: > Op 15-03-13 01:11, Felipe Ferreri Tonello schreef: >> Hi Koen, > >> On 03/14/2013 07:35 AM, Koen Kooi wrote: Op 13-03-13 17:37, >> e...@felipetonello.com schreef: > From: "Felipe F. Tonello" > > Fingerterm is a terminal emulator for Nokia Harmattan, but > it works in any Qt4 environment. > > This recipe can be extended by a .bbappend to add .desktop, > icon and others to the target device. > >> Why not include a default .desktop in the recipe so it actually >> works out of the box? > >>> The binary is been installed. So it will work out of the box. > > Eh, no. You need a .desktop to launch it properly. > > >>> Regarding the .desktop file, it is not installed by default >>> because it was done for MeeGo only. It needs some hack to work >>> for generic desktops that follow desktop-entry spec[1]. > > Then add a .desktop that adheres to the spec, I see no reason why > this recipe has to be so 'special' that it needs a .bbappend to > work as intended. We should minimize the need for distros to add bbappends to recipes to add basic functions. This should be true for all layers. bbappends for be for special use cases. Philip > > > ___ Openembedded-devel > mailing list Openembedded-devel@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel > > > ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
