* [meta-oe][PATCH] bdftopcf: upgrade 1.0.4 -> 1.0.5
@ 2015-07-21 9:19 Li xin
2015-07-21 9:19 ` [meta-oe][PATCH] corosync: upgrade 2.3.4 -> 2.3.5 Li xin
2015-07-21 9:19 ` [meta-networking][PATCH] crda: upgrade 3.13 -> 3.18 Li xin
0 siblings, 2 replies; 5+ messages in thread
From: Li xin @ 2015-07-21 9:19 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com>
---
.../xorg-app/{bdftopcf_1.0.4.bb => bdftopcf_1.0.5.bb} | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta-oe/recipes-graphics/xorg-app/{bdftopcf_1.0.4.bb => bdftopcf_1.0.5.bb} (70%)
diff --git a/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.0.5.bb
similarity index 70%
rename from meta-oe/recipes-graphics/xorg-app/bdftopcf_1.0.4.bb
rename to meta-oe/recipes-graphics/xorg-app/bdftopcf_1.0.5.bb
index 5009d54..35d5002 100644
--- a/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.0.4.bb
+++ b/meta-oe/recipes-graphics/xorg-app/bdftopcf_1.0.5.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://COPYING;md5=f9a35333adf75edd1eaef84bca65a490"
DEPENDS = "libxfont"
-SRC_URI[md5sum] = "96a648a332160a7482885800f7a506fa"
-SRC_URI[sha256sum] = "eaf59057ba3d7cffe29526562ce50868da7da823487a4cfb3e16946e5ffd2798"
+SRC_URI[md5sum] = "53a48e1fdfec29ab2e89f86d4b7ca902"
+SRC_URI[sha256sum] = "38f447be0c61f94c473f128cf519dd0cff63b5d7775240a2e895a183a61e2026"
BBCLASSEXTEND = "native"
--
1.8.4.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [meta-oe][PATCH] corosync: upgrade 2.3.4 -> 2.3.5 2015-07-21 9:19 [meta-oe][PATCH] bdftopcf: upgrade 1.0.4 -> 1.0.5 Li xin @ 2015-07-21 9:19 ` Li xin 2015-07-21 9:19 ` [meta-networking][PATCH] crda: upgrade 3.13 -> 3.18 Li xin 1 sibling, 0 replies; 5+ messages in thread From: Li xin @ 2015-07-21 9:19 UTC (permalink / raw) To: openembedded-devel Drop "--enable-nss" configure option because it is not be supported any more. Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- .../corosync/{corosync_2.3.4.bb => corosync_2.3.5.bb} | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) rename meta-oe/recipes-extended/corosync/{corosync_2.3.4.bb => corosync_2.3.5.bb} (88%) diff --git a/meta-oe/recipes-extended/corosync/corosync_2.3.4.bb b/meta-oe/recipes-extended/corosync/corosync_2.3.5.bb similarity index 88% rename from meta-oe/recipes-extended/corosync/corosync_2.3.4.bb rename to meta-oe/recipes-extended/corosync/corosync_2.3.5.bb index b84257f..08c0893 100644 --- a/meta-oe/recipes-extended/corosync/corosync_2.3.4.bb +++ b/meta-oe/recipes-extended/corosync/corosync_2.3.5.bb @@ -7,11 +7,9 @@ SECTION = "base" inherit autotools pkgconfig systemd -SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz \ - " - -SRC_URI[md5sum] = "4b0f36a1dc014527e5b192265dbd7e70" -SRC_URI[sha256sum] = "3dae93fb1cf5c560295253b0560cbc25421ed053ee373852864f3a60c03247d4" +SRC_URI = "http://build.clusterlabs.org/corosync/releases/${BP}.tar.gz" +SRC_URI[md5sum] = "8894f00d499e0755467b381e6346f9ff" +SRC_URI[sha256sum] = "1d48cdfa224b0ceb02e27fe9d56b738fb2a92262b04b15bb3a67e1c4248da8e2" LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENSE;md5=a85eb4ce24033adb6088dd1d6ffc5e5d" @@ -27,10 +25,7 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', PACKAGECONFIG[systemd] = "--enable-systemd --with-systemddir=${systemd_unitdir}/system/,--with-systemddir=" -EXTRA_OECONF = "--disable-nss \ - --with-upstartdir=%{_sysconfdir}/init \ -" -EXTRA_OECONF += " --enable-nss " +EXTRA_OECONF = "--with-upstartdir=%{_sysconfdir}/init" do_configure_prepend() { ( cd ${S} -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* [meta-networking][PATCH] crda: upgrade 3.13 -> 3.18 2015-07-21 9:19 [meta-oe][PATCH] bdftopcf: upgrade 1.0.4 -> 1.0.5 Li xin 2015-07-21 9:19 ` [meta-oe][PATCH] corosync: upgrade 2.3.4 -> 2.3.5 Li xin @ 2015-07-21 9:19 ` Li xin 2015-07-29 14:59 ` Martin Jansa 1 sibling, 1 reply; 5+ messages in thread From: Li xin @ 2015-07-21 9:19 UTC (permalink / raw) To: openembedded-devel Dropped backported patches(commit-id): -crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch(2cabb258) -crda-Fix-the-linking-order-to-avoid-compilation-erro.patch(fefefdb2) Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- ...STDIR-support-in-install-libreg-rules-in-.patch | 35 --------------- ...e-linking-order-to-avoid-compilation-erro.patch | 51 ---------------------- .../do-not-run-ldconfig-if-destdir-is-set.patch | 0 .../fix-linking-of-libraries-used-by-reglib.patch | 0 .../crda/{crda_3.13.bb => crda_3.18.bb} | 6 +-- 5 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch delete mode 100644 meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch rename meta-networking/recipes-connectivity/crda/{crda-3.13 => crda}/do-not-run-ldconfig-if-destdir-is-set.patch (100%) rename meta-networking/recipes-connectivity/crda/{crda-3.13 => crda}/fix-linking-of-libraries-used-by-reglib.patch (100%) rename meta-networking/recipes-connectivity/crda/{crda_3.13.bb => crda_3.18.bb} (82%) diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch b/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch deleted file mode 100644 index 3646400..0000000 --- a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: "John W. Linville" <linville@tuxdriver.com> -Date: Fri, 14 Feb 2014 13:58:44 -0500 -Subject: [PATCH] crda: Add DESTDIR support in install-libreg* rules in Makefile -Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=2cabb2588da56735369131b709f191453c080be0 - -Upstream-Status: Backport - -Signed-off-by: John W. Linville <linville@tuxdriver.com> -Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> ---- - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 0b2f0d7..1f25509 100644 ---- a/Makefile -+++ b/Makefile -@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c - - install-libreg-headers: - $(NQ) ' INSTALL libreg-headers' -- $(Q)mkdir -p $(INCLUDE_DIR) -- $(Q)cp *.h $(INCLUDE_DIR)/ -+ $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR) -+ $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/ - - install-libreg: - $(NQ) ' INSTALL libreg' -- $(Q)mkdir -p $(LIBDIR) -- $(Q)cp $(LIBREG) $(LIBDIR)/ -+ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) -+ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ - $(Q)ldconfig - - %.o: %.c regdb.h $(LIBREG) diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch b/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch deleted file mode 100644 index 68b4b13..0000000 --- a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Krishna Chaitanya <chaitanya.mgit@gmail.com> -Date: Mon, 16 Dec 2013 21:57:39 +0530 -Subject: [PATCH] crda: Fix the linking order to avoid compilation error -Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=fefefdb2c52c8fbedbb339b4badb8226cad7e7e0 - -While linking the crda.o and libreg.so, first put crda.o -and then -lreg. This fixed the below error: - - GEN keys-gcrypt.c - Trusted pubkeys: pubkeys/linville.key.pub.pem - CC libreg.so - CC crda.o - LD crda -crda.o: In function `main': -crda/crda.c:196: undefined reference to `reglib_get_rd_alpha2' -collect2: ld returned 1 exit status -make: *** [crda] Error 1 - -Note: This still doesn't fix the below error (will send another mail) - - CHK /usr/lib/crda/regulatory.bin -Database signature verification failed. -Invalid or empty regulatory file, note: a binary regulatory file should be used. -make: *** [verify] Error 234 - -Upstream-Status: Backport - -Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> -Signed-off-by: Chaitanya T K <chaitanya.mgit@gmail.com> ---- - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 4a351c6..0b2f0d7 100644 ---- a/Makefile -+++ b/Makefile -@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys - CFLAGS += -O2 -fpic - CFLAGS += -std=gnu99 -Wall -Werror -pedantic - CFLAGS += -Wall -g --LDLIBS += -lm - LDLIBREG += -lreg -+LDLIBS += $(LDLIBREG) -+LDLIBS += -lm - LIBREG += libreg.so --LDFLAGS += -L ./ $(LDLIBREG) -+LDFLAGS += -L ./ - - all: all_noverify verify - diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/do-not-run-ldconfig-if-destdir-is-set.patch b/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch similarity index 100% rename from meta-networking/recipes-connectivity/crda/crda-3.13/do-not-run-ldconfig-if-destdir-is-set.patch rename to meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/fix-linking-of-libraries-used-by-reglib.patch b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch similarity index 100% rename from meta-networking/recipes-connectivity/crda/crda-3.13/fix-linking-of-libraries-used-by-reglib.patch rename to meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch diff --git a/meta-networking/recipes-connectivity/crda/crda_3.13.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb similarity index 82% rename from meta-networking/recipes-connectivity/crda/crda_3.13.bb rename to meta-networking/recipes-connectivity/crda/crda_3.18.bb index 12eefe0..931a053 100644 --- a/meta-networking/recipes-connectivity/crda/crda_3.13.bb +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb @@ -9,13 +9,11 @@ DEPENDS = "python-m2crypto-native python-native libgcrypt libnl" SRC_URI = "https://www.kernel.org/pub/software/network/crda/${BP}.tar.xz;name=crda \ https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2014.11.18.tar.xz;name=bin \ - file://crda-Fix-the-linking-order-to-avoid-compilation-erro.patch \ - file://crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch \ file://do-not-run-ldconfig-if-destdir-is-set.patch \ file://fix-linking-of-libraries-used-by-reglib.patch \ " -SRC_URI[crda.md5sum] = "66b1b0417c1ad19f0009a5c0c0c1aebc" -SRC_URI[crda.sha256sum] = "2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59" +SRC_URI[crda.md5sum] = "0431fef3067bf503dfb464069f06163a" +SRC_URI[crda.sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" SRC_URI[bin.md5sum] = "d750c402c5510add7380edcb1d9b75b2" SRC_URI[bin.sha256sum] = "eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd" -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [meta-networking][PATCH] crda: upgrade 3.13 -> 3.18 2015-07-21 9:19 ` [meta-networking][PATCH] crda: upgrade 3.13 -> 3.18 Li xin @ 2015-07-29 14:59 ` Martin Jansa 2015-07-30 10:31 ` [meta-python][PATCH] python-m2crypto: Error fix for swig >= 3.0.5 Li xin 0 siblings, 1 reply; 5+ messages in thread From: Martin Jansa @ 2015-07-29 14:59 UTC (permalink / raw) To: openembedded-devel [-- Attachment #1: Type: text/plain, Size: 8001 bytes --] On Tue, Jul 21, 2015 at 05:19:04PM +0800, Li xin wrote: > Dropped backported patches(commit-id): > -crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch(2cabb258) > -crda-Fix-the-linking-order-to-avoid-compilation-erro.patch(fefefdb2) Fails to build on jenkins http://errors.yoctoproject.org/Errors/Build/7660/ > > Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> > --- > ...STDIR-support-in-install-libreg-rules-in-.patch | 35 --------------- > ...e-linking-order-to-avoid-compilation-erro.patch | 51 ---------------------- > .../do-not-run-ldconfig-if-destdir-is-set.patch | 0 > .../fix-linking-of-libraries-used-by-reglib.patch | 0 > .../crda/{crda_3.13.bb => crda_3.18.bb} | 6 +-- > 5 files changed, 2 insertions(+), 90 deletions(-) > delete mode 100644 meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch > delete mode 100644 meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch > rename meta-networking/recipes-connectivity/crda/{crda-3.13 => crda}/do-not-run-ldconfig-if-destdir-is-set.patch (100%) > rename meta-networking/recipes-connectivity/crda/{crda-3.13 => crda}/fix-linking-of-libraries-used-by-reglib.patch (100%) > rename meta-networking/recipes-connectivity/crda/{crda_3.13.bb => crda_3.18.bb} (82%) > > diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch b/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch > deleted file mode 100644 > index 3646400..0000000 > --- a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch > +++ /dev/null > @@ -1,35 +0,0 @@ > -From: "John W. Linville" <linville@tuxdriver.com> > -Date: Fri, 14 Feb 2014 13:58:44 -0500 > -Subject: [PATCH] crda: Add DESTDIR support in install-libreg* rules in Makefile > -Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=2cabb2588da56735369131b709f191453c080be0 > - > -Upstream-Status: Backport > - > -Signed-off-by: John W. Linville <linville@tuxdriver.com> > -Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> > ---- > - Makefile | 8 ++++---- > - 1 file changed, 4 insertions(+), 4 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index 0b2f0d7..1f25509 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -120,13 +120,13 @@ $(LIBREG): regdb.h reglib.h reglib.c > - > - install-libreg-headers: > - $(NQ) ' INSTALL libreg-headers' > -- $(Q)mkdir -p $(INCLUDE_DIR) > -- $(Q)cp *.h $(INCLUDE_DIR)/ > -+ $(Q)mkdir -p $(DESTDIR)/$(INCLUDE_DIR) > -+ $(Q)cp *.h $(DESTDIR)/$(INCLUDE_DIR)/ > - > - install-libreg: > - $(NQ) ' INSTALL libreg' > -- $(Q)mkdir -p $(LIBDIR) > -- $(Q)cp $(LIBREG) $(LIBDIR)/ > -+ $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) > -+ $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ > - $(Q)ldconfig > - > - %.o: %.c regdb.h $(LIBREG) > diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch b/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch > deleted file mode 100644 > index 68b4b13..0000000 > --- a/meta-networking/recipes-connectivity/crda/crda-3.13/crda-Fix-the-linking-order-to-avoid-compilation-erro.patch > +++ /dev/null > @@ -1,51 +0,0 @@ > -From: Krishna Chaitanya <chaitanya.mgit@gmail.com> > -Date: Mon, 16 Dec 2013 21:57:39 +0530 > -Subject: [PATCH] crda: Fix the linking order to avoid compilation error > -Origin: https://git.kernel.org/?p=linux/kernel/git/mcgrof/crda.git/commit?id=fefefdb2c52c8fbedbb339b4badb8226cad7e7e0 > - > -While linking the crda.o and libreg.so, first put crda.o > -and then -lreg. This fixed the below error: > - > - GEN keys-gcrypt.c > - Trusted pubkeys: pubkeys/linville.key.pub.pem > - CC libreg.so > - CC crda.o > - LD crda > -crda.o: In function `main': > -crda/crda.c:196: undefined reference to `reglib_get_rd_alpha2' > -collect2: ld returned 1 exit status > -make: *** [crda] Error 1 > - > -Note: This still doesn't fix the below error (will send another mail) > - > - CHK /usr/lib/crda/regulatory.bin > -Database signature verification failed. > -Invalid or empty regulatory file, note: a binary regulatory file should be used. > -make: *** [verify] Error 234 > - > -Upstream-Status: Backport > - > -Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com> > -Signed-off-by: Chaitanya T K <chaitanya.mgit@gmail.com> > ---- > - Makefile | 5 +++-- > - 1 file changed, 3 insertions(+), 2 deletions(-) > - > -diff --git a/Makefile b/Makefile > -index 4a351c6..0b2f0d7 100644 > ---- a/Makefile > -+++ b/Makefile > -@@ -28,10 +28,11 @@ RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys > - CFLAGS += -O2 -fpic > - CFLAGS += -std=gnu99 -Wall -Werror -pedantic > - CFLAGS += -Wall -g > --LDLIBS += -lm > - LDLIBREG += -lreg > -+LDLIBS += $(LDLIBREG) > -+LDLIBS += -lm > - LIBREG += libreg.so > --LDFLAGS += -L ./ $(LDLIBREG) > -+LDFLAGS += -L ./ > - > - all: all_noverify verify > - > diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/do-not-run-ldconfig-if-destdir-is-set.patch b/meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch > similarity index 100% > rename from meta-networking/recipes-connectivity/crda/crda-3.13/do-not-run-ldconfig-if-destdir-is-set.patch > rename to meta-networking/recipes-connectivity/crda/crda/do-not-run-ldconfig-if-destdir-is-set.patch > diff --git a/meta-networking/recipes-connectivity/crda/crda-3.13/fix-linking-of-libraries-used-by-reglib.patch b/meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch > similarity index 100% > rename from meta-networking/recipes-connectivity/crda/crda-3.13/fix-linking-of-libraries-used-by-reglib.patch > rename to meta-networking/recipes-connectivity/crda/crda/fix-linking-of-libraries-used-by-reglib.patch > diff --git a/meta-networking/recipes-connectivity/crda/crda_3.13.bb b/meta-networking/recipes-connectivity/crda/crda_3.18.bb > similarity index 82% > rename from meta-networking/recipes-connectivity/crda/crda_3.13.bb > rename to meta-networking/recipes-connectivity/crda/crda_3.18.bb > index 12eefe0..931a053 100644 > --- a/meta-networking/recipes-connectivity/crda/crda_3.13.bb > +++ b/meta-networking/recipes-connectivity/crda/crda_3.18.bb > @@ -9,13 +9,11 @@ DEPENDS = "python-m2crypto-native python-native libgcrypt libnl" > > SRC_URI = "https://www.kernel.org/pub/software/network/crda/${BP}.tar.xz;name=crda \ > https://www.kernel.org/pub/software/network/wireless-regdb/wireless-regdb-2014.11.18.tar.xz;name=bin \ > - file://crda-Fix-the-linking-order-to-avoid-compilation-erro.patch \ > - file://crda-Add-DESTDIR-support-in-install-libreg-rules-in-.patch \ > file://do-not-run-ldconfig-if-destdir-is-set.patch \ > file://fix-linking-of-libraries-used-by-reglib.patch \ > " > -SRC_URI[crda.md5sum] = "66b1b0417c1ad19f0009a5c0c0c1aebc" > -SRC_URI[crda.sha256sum] = "2f85da7ab0170b140d6ed62596c8f268d4a7dedecf84cac7182ada979742ff59" > +SRC_URI[crda.md5sum] = "0431fef3067bf503dfb464069f06163a" > +SRC_URI[crda.sha256sum] = "43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf" > > SRC_URI[bin.md5sum] = "d750c402c5510add7380edcb1d9b75b2" > SRC_URI[bin.sha256sum] = "eab6b50f30748a8b0065ba38cf3df05aac161a5861ae0a6c3cfd01d38a71c9dd" > -- > 1.8.4.2 > > -- > _______________________________________________ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* [meta-python][PATCH] python-m2crypto: Error fix for swig >= 3.0.5 2015-07-29 14:59 ` Martin Jansa @ 2015-07-30 10:31 ` Li xin 0 siblings, 0 replies; 5+ messages in thread From: Li xin @ 2015-07-30 10:31 UTC (permalink / raw) To: openembedded-devel After swig upgrade to 3.0.6, build the recipes which depends on python-m2crypto will occur errors like this: "SALT_LEN = m2.PKCS5_SALT_LEN AttributeError: 'module' object has no attribute 'PKCS5_SALT_LEN'" Reference https://github.com/martinpaljak/M2Crypto/issues/60#issuecomment-75735489 Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- .../python-m2crypto/0001-M2Crypto-Error-fix.patch | 162 +++++++++++++++++++++ .../python/python-m2crypto_0.21.1.bb | 3 +- 2 files changed, 164 insertions(+), 1 deletion(-) create mode 100644 meta-python/recipes-devtools/python/python-m2crypto/0001-M2Crypto-Error-fix.patch diff --git a/meta-python/recipes-devtools/python/python-m2crypto/0001-M2Crypto-Error-fix.patch b/meta-python/recipes-devtools/python/python-m2crypto/0001-M2Crypto-Error-fix.patch new file mode 100644 index 0000000..2a74b68 --- /dev/null +++ b/meta-python/recipes-devtools/python/python-m2crypto/0001-M2Crypto-Error-fix.patch @@ -0,0 +1,162 @@ +From 02a24ac541df68033d4efd7e2f8a1b92dc49328d Mon Sep 17 00:00:00 2001 +From: Li xin <lixin.fnst@cn.fujitsu.com> +Date: Mon, 27 Jul 2015 05:06:20 +0900 +Subject: [PATCH] M2Crypto: Error fix. + +After swig upgrade from 3.0.2 to 3.0.6,build the recipes which +depends on python-m2crypto will occur errors like this: +SALT_LEN = m2.PKCS5_SALT_LEN +AttributeError: 'module' object has no attribute 'PKCS5_SALT_LEN' +since python-m2crypto depends on swig-native + +Ref: +https://github.com/martinpaljak/M2Crypto/issues/60#issuecomment-75735489 + +This patch is from: +http://pkgs.fedoraproject.org/cgit/m2crypto.git/tree/m2crypto-0.21.1-swig-3.0.5.patch + +Upstream-Status: pending + +Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> +--- + M2Crypto/__init__.py | 4 ++-- + M2Crypto/m2.py | 2 +- + SWIG/_lib.i | 4 ++++ + SWIG/_pkcs7.i | 1 + + setup.py | 26 +++++++++++++++++++++++++- + 5 files changed, 33 insertions(+), 4 deletions(-) + +diff --git a/M2Crypto/__init__.py b/M2Crypto/__init__.py +index e7acfe7..02f4d28 100644 +--- a/M2Crypto/__init__.py ++++ b/M2Crypto/__init__.py +@@ -19,7 +19,7 @@ Copyright 2008-2011 Heikki Toivonen. All rights reserved. + version_info = (0, 21, 1) + version = '.'.join([str(_v) for _v in version_info]) + +-import __m2crypto ++import _m2crypto + import m2 + import ASN1 + import AuthCookie +@@ -57,4 +57,4 @@ import util + encrypt=1 + decrypt=0 + +-__m2crypto.lib_init() ++_m2crypto.lib_init() +diff --git a/M2Crypto/m2.py b/M2Crypto/m2.py +index e4bb695..822143f 100644 +--- a/M2Crypto/m2.py ++++ b/M2Crypto/m2.py +@@ -25,7 +25,7 @@ Portions created by Open Source Applications Foundation (OSAF) are + Copyright (C) 2004 OSAF. All Rights Reserved. + """ + +-from __m2crypto import * ++from _m2crypto import * + lib_init() + + +diff --git a/SWIG/_lib.i b/SWIG/_lib.i +index 42dc180..47a53b8 100644 +--- a/SWIG/_lib.i ++++ b/SWIG/_lib.i +@@ -100,6 +100,7 @@ int ssl_verify_callback(int ok, X509_STORE_CTX *ctx) { + int cret; + int new_style_callback = 0, warning_raised_exception=0; + PyGILState_STATE gilstate; ++ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */ + + ssl = (SSL *)X509_STORE_CTX_get_app_data(ctx); + +@@ -185,6 +186,7 @@ int ssl_verify_callback(int ok, X509_STORE_CTX *ctx) { + void ssl_info_callback(const SSL *s, int where, int ret) { + PyObject *argv, *retval, *_SSL; + PyGILState_STATE gilstate; ++ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */ + + gilstate = PyGILState_Ensure(); + +@@ -204,6 +206,7 @@ DH *ssl_set_tmp_dh_callback(SSL *ssl, int is_export, int keylength) { + PyObject *argv, *ret, *_ssl; + DH *dh; + PyGILState_STATE gilstate; ++ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */ + + gilstate = PyGILState_Ensure(); + +@@ -227,6 +230,7 @@ RSA *ssl_set_tmp_rsa_callback(SSL *ssl, int is_export, int keylength) { + PyObject *argv, *ret, *_ssl; + RSA *rsa; + PyGILState_STATE gilstate; ++ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */ + + gilstate = PyGILState_Ensure(); + +diff --git a/SWIG/_pkcs7.i b/SWIG/_pkcs7.i +index 174f40a..7bffbfc 100644 +--- a/SWIG/_pkcs7.i ++++ b/SWIG/_pkcs7.i +@@ -157,6 +157,7 @@ PyObject *smime_read_pkcs7(BIO *bio) { + BIO *bcont = NULL; + PKCS7 *p7; + PyObject *tuple, *_p7, *_BIO; ++ PyObject *self = NULL; /* bug in SWIG_NewPointerObj as of 3.0.5 */ + + if (BIO_method_type(bio) == BIO_TYPE_MEM) { + /* OpenSSL FAQ explains that this is needed for mem BIO to return EOF, +diff --git a/setup.py b/setup.py +index e7c49eb..b98abe0 100644 +--- a/setup.py ++++ b/setup.py +@@ -20,6 +20,7 @@ except ImportError: + from distutils.command import build_ext + + from distutils.core import Extension ++from distutils.file_util import copy_file + + + class _M2CryptoBuildExt(build_ext.build_ext): +@@ -57,7 +58,17 @@ class _M2CryptoBuildExt(build_ext.build_ext): + self.swig_opts.append('-includeall') + #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails + #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled +- ++ self.swig_opts.append('-modern') ++ self.swig_opts.append('-builtin') ++ ++ # These two lines are a workaround for ++ # http://bugs.python.org/issue2624 , hard-coding that we are only ++ # building a single extension with a known path; a proper patch to ++ # distutils would be in the run phase, when extension name and path are ++ # known. ++ self.swig_opts.append('-outdir') ++ self.swig_opts.append(os.path.join(self.build_lib, 'M2Crypto')) ++ + self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir), + os.path.join(os.getcwd(), 'SWIG')] + +@@ -71,6 +82,19 @@ class _M2CryptoBuildExt(build_ext.build_ext): + + self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)] + ++ def run(self): ++ '''Overloaded build_ext implementation to allow inplace=1 to work, ++ which is needed for (python setup.py test).''' ++ # This is another workaround for http://bugs.python.org/issue2624 + the ++ # corresponding lack of support in setuptools' test command. Note that ++ # just using self.inplace in finalize_options() above does not work ++ # because swig is not rerun if the __m2crypto.so extension exists. ++ # Again, hard-coding our extension name and location. ++ build_ext.build_ext.run(self) ++ if self.inplace: ++ copy_file(os.path.join(self.build_lib, 'M2Crypto', '_m2crypto.py'), ++ os.path.join('M2Crypto', '_m2crypto.py'), ++ verbose=self.verbose, dry_run=self.dry_run) + + if sys.version_info < (2,4): + +-- +1.8.4.2 + diff --git a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb index 67ec921..ff6203f 100644 --- a/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb +++ b/meta-python/recipes-devtools/python/python-m2crypto_0.21.1.bb @@ -7,7 +7,8 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://LICENCE;md5=b0e1f0b7d0ce8a62c18b1287b991800e" SRC_URI = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${PV}.tar.gz \ - file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch" + file://0001-setup.py-link-in-sysroot-not-in-host-directories.patch \ + file://0001-M2Crypto-Error-fix.patch" SRC_URI[md5sum] = "f93d8462ff7646397a9f77a2fe602d17" SRC_URI[sha256sum] = "25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a" -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-07-30 10:31 UTC | newest] Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2015-07-21 9:19 [meta-oe][PATCH] bdftopcf: upgrade 1.0.4 -> 1.0.5 Li xin 2015-07-21 9:19 ` [meta-oe][PATCH] corosync: upgrade 2.3.4 -> 2.3.5 Li xin 2015-07-21 9:19 ` [meta-networking][PATCH] crda: upgrade 3.13 -> 3.18 Li xin 2015-07-29 14:59 ` Martin Jansa 2015-07-30 10:31 ` [meta-python][PATCH] python-m2crypto: Error fix for swig >= 3.0.5 Li xin
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.