Skip to contentSkip to conversation

Resend 3 patches for multilib with repo url

PATCH In review Yi Zhao 2 participants 5 messages May 14, 2015 – May 19, 2015

lore
Share & tools
lore

Yi Zhao

author
#0 lore raw

cover Resend 3 patches for multilib with repo url

Resend these 3 patches which marked as spam in previous email.

The following changes since commit 53d55216c8c721d3b66ec8f968737bf081def870:

tcpdump: upgrade to 4.7.4 (2015-05-13 09:51:27 -0400)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib yzhao/multilib-fixes
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=yzhao/multilib-fixes

Yi Zhao (3):
p7zip: fix PN -> BPN for multilib
mpich: fix ${PN}-${PV} -> ${BP} for multilib
sylpheed: remove do_install_append

 meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb     |    2 +-
 meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb    |    2 +-
 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb |   10 +---------
 3 files changed, 3 insertions(+), 11 deletions(-)
Signature · 1 line
1.7.9.5
author
#1 lore raw

PATCH 1/3 p7zip: fix PN -> BPN for multilib

Signed-off-by Yi Zhao <[email protected]>
---
 meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-extended/p7zip/p7zip_9.20.1.bb +1 -1
index 8905ae9..be706e1 100644
@@ -9,7 +9,7 @@ SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_al
 SRC_URI[md5sum] = "bd6caaea567dc0d995c990c5cc883c89"
 SRC_URI[sha256sum] = "49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782"
 
-S = "${WORKDIR}/${PN}_${PV}"
+S = "${WORKDIR}/${BPN}_${PV}"
 
 do_install() {
     install -d ${D}${bindir}
Signature · 1 line
1.7.9.5
author
#2 lore raw

PATCH 2/3 mpich: fix ${PN}-${PV} -> ${BP} for multilib

In reply to Yi Zhao
Signed-off-by Yi Zhao <[email protected]>
---
 meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-devtools/mpich/mpich_3.1.1.bb +1 -1
index 0225cee..19167b4 100644
@@ -13,7 +13,7 @@ SRC_URI[md5sum] = "40dc408b1e03cc36d80209baaa2d32b7"
 SRC_URI[sha256sum] = "455ccfaf4ec724d2cf5d8bff1f3d26a958ad196121e7ea26504fd3018757652d"
 
 RDEPENDS_${PN} += "bash perl libxml2"
-S = "${WORKDIR}/${PN}-${PV}"
+S = "${WORKDIR}/${BP}"
 
 EXTRA_OECONF = "--enable-debuginfo \
                 --enable-fast \
Signature · 1 line
1.7.9.5
author
#3 lore raw

PATCH 3/3 sylpheed: remove do_install_append

In reply to Yi Zhao

The .desktop and .png files alreay install by make install. So remove the do_install_append

Signed-off-by Yi Zhao <[email protected]>
---
 meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)
meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb +1 -9
index 1b010a5..304b654 100644
@@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \
 
 PR = "r2"
 
-PNBLACKLIST[sylpheed] ?= "BROKEN: Doesn't work with B!=S"
-
 SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \
     file://glib-2.32.patch \
 "

@@ -18,7 +16,7 @@ SRC_URI[sha256sum] = "8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4a
 FILES_${PN} += "${datadir}/pixmaps ${datadir}/applications"
 FILES_${PN}-doc += "${datadir}"
 
-EXTRA_OECONF = "--disable-ssl --enable-gnutls"
+EXTRA_OECONF = "--disable-ssl"
 
 CFLAGS += "-D_GNU_SOURCE"
 

@@ -31,9 +29,3 @@ do_configure_prepend() {
 
 inherit autotools pkgconfig
 
-do_install_append() {
-    install -d ${D}${datadir}/applications
-    install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
-    install -d ${D}${datadir}/pixmaps
-    install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
-}
Signature · 1 line
1.7.9.5
#4 lore raw

Re: [meta-oe][PATCH 3/3] sylpheed: remove do_install_append

Quoted 29 lines · Yi Zhao

The .desktop and .png files alreay install by make install. So remove the do_install_append

Signed-off-by Yi Zhao <[email protected]>

---
meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb | 10 +---------

1 file changed, 1 insertion(+), 9 deletions(-)
meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb +0 -0
index 1b010a5..304b654 100644
@@ -7,8 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4 \

PR = "r2"

meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb +0 -2
-PNBLACKLIST[sylpheed] ?= "BROKEN: Doesn't work with B!=S"
-

SRC_URI = "http://sylpheed.sraoss.jp/sylpheed/v2.7/sylpheed-${PV}.tar.bz2 \
    file://glib-2.32.patch \

"

meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb +0 -0
@@ -18,7 +16,7 @@ SRC_URI[sha256sum] = "8bb6457db4e2eea1877b487d9ac8513546372db9a6a2e4271d11229f4a

FILES_${PN} += "${datadir}/pixmaps ${datadir}/applications" FILES_${PN}-doc += "${datadir}"

meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb

Quoted 2 lines
meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb +1 -1
-EXTRA_OECONF = "--disable-ssl --enable-gnutls"
+EXTRA_OECONF = "--disable-ssl”

you did not explain this change

Quoted 20 lines

CFLAGS += "-D_GNU_SOURCE"

meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb +0 -0
@@ -31,9 +29,3 @@ do_configure_prepend() {

inherit autotools pkgconfig

meta-oe/recipes-sato/claws-mail/sylpheed_2.7.1.bb +0 -7
-do_install_append() {
-    install -d ${D}${datadir}/applications
-    install -m 0644 sylpheed.desktop ${D}${datadir}/applications/
-    install -d ${D}${datadir}/pixmaps
-    install -m 0644 sylpheed.png ${D}${datadir}/pixmaps/
-}
--

1.7.9.5

--
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel