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 <[email protected]> > --- > ...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" <[email protected]> > -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 <[email protected]> > -Signed-off-by: Luis R. Rodriguez <[email protected]> > ---- > - 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 <[email protected]> > -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 <[email protected]> > -Signed-off-by: Chaitanya T K <[email protected]> > ---- > - 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 > [email protected] > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
