* [PATCH 0/6] Packages Upgrade @ 2017-07-12 10:15 Robert Yang 2017-07-12 10:15 ` [PATCH 1/6] automake: 1.15 -> 1.15.1 Robert Yang ` (5 more replies) 0 siblings, 6 replies; 25+ messages in thread From: Robert Yang @ 2017-07-12 10:15 UTC (permalink / raw) To: openembedded-core The following changes since commit b1c4661742d12cfd444043e597d01bd627ee4ca4: libiconv: remove 0001-Fix-link-error-when-compiling-with-gcc-O0.patch (2017-07-11 15:41:35 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/PU http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/PU Robert Yang (6): automake: 1.15 -> 1.15.1 cryptodev: 1.8 -> 1.9 debianutils: 4.8.1 -> 4.8.1.1 git: 2.11.1 -> 2.13.2 gnu-efi: 3.0.5 -> 3.0.6 libbsd: 0.8.3 -> 0.8.5 ...plicit-fall-through-so-Wextra-will-work-i.patch | 34 --- .../gnu-efi/gnu-efi/parallel-make-archives.patch | 30 +-- .../gnu-efi/{gnu-efi_3.0.5.bb => gnu-efi_3.0.6.bb} | 5 +- ...0001-automake-port-to-Perl-5.22-and-later.patch | 32 --- .../{automake_1.15.bb => automake_1.15.1.bb} | 5 +- meta/recipes-devtools/git/git.inc | 1 - meta/recipes-devtools/git/git_2.11.1.bb | 11 - meta/recipes-devtools/git/git_2.13.2.bb | 11 + ...yptodev-linux_1.8.bb => cryptodev-linux_1.9.bb} | 0 ...todev-module_1.8.bb => cryptodev-module_1.9.bb} | 0 ...yptodev-tests_1.8.bb => cryptodev-tests_1.9.bb} | 2 +- meta/recipes-kernel/cryptodev/cryptodev.inc | 10 +- ...st-to-another-change-in-the-user-page-API.patch | 40 --- ...talling-header-file-provided-by-another-p.patch | 18 +- .../06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch | 54 ---- .../cb186f682679383e8b5806240927903730ce85d9.patch | 279 --------------------- .../cryptodev/files/kernel-4-10-changes.patch | 57 ----- ...debianutils_4.8.1.bb => debianutils_4.8.1.1.bb} | 7 +- .../libbsd/{libbsd_0.8.3.bb => libbsd_0.8.5.bb} | 6 +- 19 files changed, 39 insertions(+), 563 deletions(-) delete mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.5.bb => gnu-efi_3.0.6.bb} (92%) delete mode 100644 meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch rename meta/recipes-devtools/automake/{automake_1.15.bb => automake_1.15.1.bb} (84%) delete mode 100644 meta/recipes-devtools/git/git_2.11.1.bb create mode 100644 meta/recipes-devtools/git/git_2.13.2.bb rename meta/recipes-kernel/cryptodev/{cryptodev-linux_1.8.bb => cryptodev-linux_1.9.bb} (100%) rename meta/recipes-kernel/cryptodev/{cryptodev-module_1.8.bb => cryptodev-module_1.9.bb} (100%) rename meta/recipes-kernel/cryptodev/{cryptodev-tests_1.8.bb => cryptodev-tests_1.9.bb} (88%) delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Adjust-to-another-change-in-the-user-page-API.patch delete mode 100644 meta/recipes-kernel/cryptodev/files/06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch delete mode 100644 meta/recipes-kernel/cryptodev/files/cb186f682679383e8b5806240927903730ce85d9.patch delete mode 100644 meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch rename meta/recipes-support/debianutils/{debianutils_4.8.1.bb => debianutils_4.8.1.1.bb} (86%) rename meta/recipes-support/libbsd/{libbsd_0.8.3.bb => libbsd_0.8.5.bb} (88%) -- 2.10.2 ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 1/6] automake: 1.15 -> 1.15.1 2017-07-12 10:15 [PATCH 0/6] Packages Upgrade Robert Yang @ 2017-07-12 10:15 ` Robert Yang 2017-07-12 10:15 ` [PATCH 2/6] cryptodev: 1.8 -> 1.9 Robert Yang ` (4 subsequent siblings) 5 siblings, 0 replies; 25+ messages in thread From: Robert Yang @ 2017-07-12 10:15 UTC (permalink / raw) To: openembedded-core * Remove backported patch: - 0001-automake-port-to-Perl-5.22-and-later.patch Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- ...0001-automake-port-to-Perl-5.22-and-later.patch | 32 ---------------------- .../{automake_1.15.bb => automake_1.15.1.bb} | 5 ++-- 2 files changed, 2 insertions(+), 35 deletions(-) delete mode 100644 meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch rename meta/recipes-devtools/automake/{automake_1.15.bb => automake_1.15.1.bb} (84%) diff --git a/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch b/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch deleted file mode 100644 index 0e6895f..0000000 --- a/meta/recipes-devtools/automake/automake/0001-automake-port-to-Perl-5.22-and-later.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 13f00eb4493c217269b76614759e452d8302955e Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Thu, 31 Mar 2016 16:35:29 -0700 -Subject: [PATCH] automake: port to Perl 5.22 and later - -Without this change, Perl 5.22 complains "Unescaped left brace in -regex is deprecated" and this is planned to become a hard error in -Perl 5.26. See: -http://search.cpan.org/dist/perl-5.22.0/pod/perldelta.pod#A_literal_%22{%22_should_now_be_escaped_in_a_pattern -* bin/automake.in (substitute_ac_subst_variables): Escape left brace. - -Upstream-Status: Backport [13f00eb4493c217269b76614759e452d8302955e] ---- - bin/automake.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/automake.in b/bin/automake.in -index a3a0aa318..2c8f31e14 100644 ---- a/bin/automake.in -+++ b/bin/automake.in -@@ -3878,7 +3878,7 @@ sub substitute_ac_subst_variables_worker - sub substitute_ac_subst_variables - { - my ($text) = @_; -- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; -+ $text =~ s/\$[{]([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge; - return $text; - } - --- -2.11.0 - diff --git a/meta/recipes-devtools/automake/automake_1.15.bb b/meta/recipes-devtools/automake/automake_1.15.1.bb similarity index 84% rename from meta/recipes-devtools/automake/automake_1.15.bb rename to meta/recipes-devtools/automake/automake_1.15.1.bb index 902dd63..4812341 100644 --- a/meta/recipes-devtools/automake/automake_1.15.bb +++ b/meta/recipes-devtools/automake/automake_1.15.1.bb @@ -24,11 +24,10 @@ SRC_URI += "file://python-libdir.patch \ file://performance.patch \ file://new_rt_path_for_test-driver.patch \ file://automake-replace-w-option-in-shebangs-with-modern-use-warnings.patch \ - file://0001-automake-port-to-Perl-5.22-and-later.patch \ " -SRC_URI[md5sum] = "716946a105ca228ab545fc37a70df3a3" -SRC_URI[sha256sum] = "7946e945a96e28152ba5a6beb0625ca715c6e32ac55f2e353ef54def0c8ed924" +SRC_URI[md5sum] = "95df3f2d6eb8f81e70b8cb63a93c8853" +SRC_URI[sha256sum] = "988e32527abe052307d21c8ca000aa238b914df363a617e38f4fb89f5abf6260" PERL = "${USRBINPATH}/perl" PERL_class-native = "${USRBINPATH}/env perl" -- 2.10.2 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-12 10:15 [PATCH 0/6] Packages Upgrade Robert Yang 2017-07-12 10:15 ` [PATCH 1/6] automake: 1.15 -> 1.15.1 Robert Yang @ 2017-07-12 10:15 ` Robert Yang 2017-07-12 12:32 ` Burton, Ross 2017-07-12 10:15 ` [PATCH 3/6] debianutils: 4.8.1 -> 4.8.1.1 Robert Yang ` (3 subsequent siblings) 5 siblings, 1 reply; 25+ messages in thread From: Robert Yang @ 2017-07-12 10:15 UTC (permalink / raw) To: openembedded-core * Remove backported patch: - 0001-Adjust-to-another-change-in-the-user-page-API.patch - 06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch - cb186f682679383e8b5806240927903730ce85d9.patch - kernel-4-10-changes.patch * Update patch: - 0001-Disable-installing-header-file-provided-by-another-p.patch * Update FILES_${PN} since there are files in bindir: /usr/bin/hmac_comp /usr/bin/cipher_comp /usr/bin/async_hmac /usr/bin/cipher-aead-srtp /usr/bin/hash_comp /usr/bin/async_speed /usr/bin/async_cipher /usr/bin/sha_speed /usr/bin/hashcrypt_speed /usr/bin/hmac /usr/bin/cipher-gcm /usr/bin/cipher /usr/bin/fullspeed /usr/bin/speed /usr/bin/cipher-aead Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- ...yptodev-linux_1.8.bb => cryptodev-linux_1.9.bb} | 0 ...todev-module_1.8.bb => cryptodev-module_1.9.bb} | 0 ...yptodev-tests_1.8.bb => cryptodev-tests_1.9.bb} | 2 +- meta/recipes-kernel/cryptodev/cryptodev.inc | 10 +- ...st-to-another-change-in-the-user-page-API.patch | 40 --- ...talling-header-file-provided-by-another-p.patch | 18 +- .../06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch | 54 ---- .../cb186f682679383e8b5806240927903730ce85d9.patch | 279 --------------------- .../cryptodev/files/kernel-4-10-changes.patch | 57 ----- 9 files changed, 11 insertions(+), 449 deletions(-) rename meta/recipes-kernel/cryptodev/{cryptodev-linux_1.8.bb => cryptodev-linux_1.9.bb} (100%) rename meta/recipes-kernel/cryptodev/{cryptodev-module_1.8.bb => cryptodev-module_1.9.bb} (100%) rename meta/recipes-kernel/cryptodev/{cryptodev-tests_1.8.bb => cryptodev-tests_1.9.bb} (88%) delete mode 100644 meta/recipes-kernel/cryptodev/files/0001-Adjust-to-another-change-in-the-user-page-API.patch delete mode 100644 meta/recipes-kernel/cryptodev/files/06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch delete mode 100644 meta/recipes-kernel/cryptodev/files/cb186f682679383e8b5806240927903730ce85d9.patch delete mode 100644 meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch diff --git a/meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb b/meta/recipes-kernel/cryptodev/cryptodev-linux_1.9.bb similarity index 100% rename from meta/recipes-kernel/cryptodev/cryptodev-linux_1.8.bb rename to meta/recipes-kernel/cryptodev/cryptodev-linux_1.9.bb diff --git a/meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb b/meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb similarity index 100% rename from meta/recipes-kernel/cryptodev/cryptodev-module_1.8.bb rename to meta/recipes-kernel/cryptodev/cryptodev-module_1.9.bb diff --git a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb similarity index 88% rename from meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb rename to meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb index c400524..9cb5dcb 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev-tests_1.8.bb +++ b/meta/recipes-kernel/cryptodev/cryptodev-tests_1.9.bb @@ -18,4 +18,4 @@ do_install() { oe_runmake install_tests } -FILES_${PN} = "${bindir}/tests_cryptodev/*" +FILES_${PN} = "${bindir}/*" diff --git a/meta/recipes-kernel/cryptodev/cryptodev.inc b/meta/recipes-kernel/cryptodev/cryptodev.inc index 4ae0a2b..50366e7 100644 --- a/meta/recipes-kernel/cryptodev/cryptodev.inc +++ b/meta/recipes-kernel/cryptodev/cryptodev.inc @@ -3,14 +3,10 @@ HOMEPAGE = "http://cryptodev-linux.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRC_URI = "http://nwl.cc/pub/cryptodev-linux/cryptodev-linux-${PV}.tar.gz \ - file://06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch \ - file://cb186f682679383e8b5806240927903730ce85d9.patch \ - file://0001-Adjust-to-another-change-in-the-user-page-API.patch \ - file://kernel-4-10-changes.patch" +SRC_URI = "http://nwl.cc/pub/cryptodev-linux/cryptodev-linux-${PV}.tar.gz" -SRC_URI[md5sum] = "02644cc4cd02301e0b503a332eb2f0b5" -SRC_URI[sha256sum] = "67fabde9fb67b286a96c4f45b594b0eccd0f761b495705c18f2ae9461b831376" +SRC_URI[md5sum] = "cb4e0ed9e5937716c7c8a7be84895b6d" +SRC_URI[sha256sum] = "9f4c0b49b30e267d776f79455d09c70cc9c12c86eee400a0d0a0cd1d8e467950" S = "${WORKDIR}/cryptodev-linux-${PV}" diff --git a/meta/recipes-kernel/cryptodev/files/0001-Adjust-to-another-change-in-the-user-page-API.patch b/meta/recipes-kernel/cryptodev/files/0001-Adjust-to-another-change-in-the-user-page-API.patch deleted file mode 100644 index fb75278..0000000 --- a/meta/recipes-kernel/cryptodev/files/0001-Adjust-to-another-change-in-the-user-page-API.patch +++ /dev/null @@ -1,40 +0,0 @@ -From f126e4837e6334d0464540995df7426fedf6b175 Mon Sep 17 00:00:00 2001 -From: Michael Weiser <michael.weiser@gmx.de> -Date: Fri, 11 Nov 2016 18:09:32 +0100 -Subject: [PATCH] Adjust to another change in the user page API - -4.9.0 will replace the write and force flags of get_user_pages_remote() -with a gup_flags parameter[1]. Distinguish the two APIs based on kernel -version we're compiling for. - -[1] https://github.com/torvalds/linux/commit/9beae1ea89305a9667ceaab6d0bf46a045ad71e7 - -Upstream-Status: Backport - -Signed-off-by: Daniel Schultz <d.schultz@phytec.de> ---- - zc.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/zc.c b/zc.c -index a97b49f..e766ee3 100644 ---- a/zc.c -+++ b/zc.c -@@ -65,7 +65,13 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write, - ret = get_user_pages( - #endif - task, mm, -- (unsigned long)addr, pgcount, write, 0, pg, NULL); -+ (unsigned long)addr, pgcount, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) -+ write ? FOLL_WRITE : 0, -+#else -+ write, 0, -+#endif -+ pg, NULL); - up_read(&mm->mmap_sem); - if (ret != pgcount) - return -EINVAL; --- -1.9.1 - diff --git a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch index a580fc6..885b582 100644 --- a/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch +++ b/meta/recipes-kernel/cryptodev/files/0001-Disable-installing-header-file-provided-by-another-p.patch @@ -7,22 +7,18 @@ Signed-off-by: Denys Dmytriyenko <denys@ti.com> Upstream-Status: Inappropriate [ OE specific ] --- - Makefile | 2 -- - 1 file changed, 2 deletions(-) + Makefile | 1 - + 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile -index d66ef26..8e97c6a 100644 +index 5a080e0..bf02396 100644 --- a/Makefile +++ b/Makefile -@@ -23,8 +23,6 @@ install: modules_install +@@ -33,7 +33,6 @@ install: modules_install modules_install: - make -C $(KERNEL_DIR) SUBDIRS=`pwd` modules_install -- @echo "Installing cryptodev.h in $(PREFIX)/usr/include/crypto ..." -- @install -D crypto/cryptodev.h $(PREFIX)/usr/include/crypto/cryptodev.h + $(MAKE) $(KERNEL_MAKE_OPTS) modules_install +- install -m 644 -D crypto/cryptodev.h $(DESTDIR)/$(includedir)/crypto/cryptodev.h clean: - make -C $(KERNEL_DIR) SUBDIRS=`pwd` clean --- -1.9.1 - + $(MAKE) $(KERNEL_MAKE_OPTS) clean diff --git a/meta/recipes-kernel/cryptodev/files/06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch b/meta/recipes-kernel/cryptodev/files/06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch deleted file mode 100644 index cb556e1..0000000 --- a/meta/recipes-kernel/cryptodev/files/06d6b560c6e45dc317dae47c74706fa43f4a31d8.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f14b4706b0d04988e7e5bc8c4d2aefef9f029d9d Mon Sep 17 00:00:00 2001 -From: Michael Weiser <michael.weiser@gmx.de> -Date: Fri, 5 Aug 2016 18:43:55 +0200 -Subject: [PATCH] Adjust to recent user page API changes - -4.6.0 basically renamed get_user_pages() to get_user_pages_remote() and -introduced a new get_user_pages() that always works on the current -task.[1] Distinguish the two APIs based on kernel version we're -compiling for. - -Also, there seems to have been a massive cleansing of -page_cache_release(page) in favour of put_page(page)[2] which was an -alias for put_page(page)[3] since 2.6.0. Before that beginning with -2.4.0 both page_cache_release(page) and put_page(page) have been aliases -for __free_page(page). So using put_page() instead of -page_cache_release(page) will produce identical code for anything after -2.4.0. - -[1] https://lkml.org/lkml/2016/2/10/555 -[2] https://www.spinics.net/lists/linux-fsdevel/msg95923.html -[3] https://www.spinics.net/lists/linux-fsdevel/msg95922.html ---- - zc.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -Upstream-Status: Backport [from master for 4.8 kernels] - -Index: cryptodev-linux-1.8/zc.c -=================================================================== ---- cryptodev-linux-1.8.orig/zc.c -+++ cryptodev-linux-1.8/zc.c -@@ -59,7 +59,12 @@ int __get_userbuf(uint8_t __user *addr, - } - - down_read(&mm->mmap_sem); -- ret = get_user_pages(task, mm, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)) -+ ret = get_user_pages_remote( -+#else -+ ret = get_user_pages( -+#endif -+ task, mm, - (unsigned long)addr, pgcount, write, 0, pg, NULL); - up_read(&mm->mmap_sem); - if (ret != pgcount) -@@ -119,7 +124,7 @@ void release_user_pages(struct csession - else - ses->readonly_pages--; - -- page_cache_release(ses->pages[i]); -+ put_page(ses->pages[i]); - } - ses->used_pages = 0; - } diff --git a/meta/recipes-kernel/cryptodev/files/cb186f682679383e8b5806240927903730ce85d9.patch b/meta/recipes-kernel/cryptodev/files/cb186f682679383e8b5806240927903730ce85d9.patch deleted file mode 100644 index eb0eab6..0000000 --- a/meta/recipes-kernel/cryptodev/files/cb186f682679383e8b5806240927903730ce85d9.patch +++ /dev/null @@ -1,279 +0,0 @@ -From cb186f682679383e8b5806240927903730ce85d9 Mon Sep 17 00:00:00 2001 -From: Michael Weiser <michael.weiser@gmx.de> -Date: Fri, 5 Aug 2016 17:26:27 +0200 -Subject: [PATCH] Support skcipher in addition to ablkcipher API - -The ablkcipher API is being phased out[1]. The unified skcipher API -seems to have made its entry with 4.3.[3, 4] By what can be seen from -migration patches[1.ff.], it's a drop-in replacement. - -Also, deallocators such as crypto_free_skcipher() are NULL-safe now[2]. - -Add a new header cipherapi.h to aid migration from ablkcipher to skcipher and -retain support for old kernels. Make it decide which API to use and provide -appropriate function calls and type definitions. Since the ablkcipher and -skcipher APIs are so similar, those are mainly defines for corresponding -pseudo-functions in namespace cryptodev_ derived directly from their API -counterparts. - -Compiles and works (i.e. checks pass) with Debian testing 4.6.4 kernel -as well as 4.8-rc2+ Linus git tree as of today. (Both require a fix for -changed page access API[5].) - -[1] https://www.spinics.net/lists/linux-crypto/msg18133.html -[2] https://www.spinics.net/lists/linux-crypto/msg18154.html, line 120 -[3] https://www.spinics.net/lists/linux-crypto/msg16373.html -[4] https://www.spinics.net/lists/linux-crypto/msg16294.html -[5] https://github.com/cryptodev-linux/cryptodev-linux/pull/14 ---- - cipherapi.h | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - cryptlib.c | 40 ++++++++++++++++++---------------------- - cryptlib.h | 6 ++++-- - ioctl.c | 4 ++-- - 4 files changed, 84 insertions(+), 26 deletions(-) - create mode 100644 cipherapi.h - -Upstream-Status: Backport [from master for 4.8 kernels] - -Index: cryptodev-linux-1.8/cipherapi.h -=================================================================== ---- /dev/null -+++ cryptodev-linux-1.8/cipherapi.h -@@ -0,0 +1,60 @@ -+#ifndef CIPHERAPI_H -+# define CIPHERAPI_H -+ -+#include <linux/version.h> -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) -+# include <linux/crypto.h> -+ -+typedef struct ablkcipher_alg cryptodev_blkcipher_alg_t; -+typedef struct crypto_ablkcipher cryptodev_crypto_blkcipher_t; -+typedef struct ablkcipher_request cryptodev_blkcipher_request_t; -+ -+# define cryptodev_crypto_alloc_blkcipher crypto_alloc_ablkcipher -+# define cryptodev_crypto_blkcipher_alg crypto_ablkcipher_alg -+# define cryptodev_crypto_blkcipher_blocksize crypto_ablkcipher_blocksize -+# define cryptodev_crypto_blkcipher_ivsize crypto_ablkcipher_ivsize -+# define cryptodev_crypto_blkcipher_alignmask crypto_ablkcipher_alignmask -+# define cryptodev_crypto_blkcipher_setkey crypto_ablkcipher_setkey -+ -+static inline void cryptodev_crypto_free_blkcipher(cryptodev_crypto_blkcipher_t *c) { -+ if (c) -+ crypto_free_ablkcipher(c); -+} -+ -+# define cryptodev_blkcipher_request_alloc ablkcipher_request_alloc -+# define cryptodev_blkcipher_request_set_callback ablkcipher_request_set_callback -+ -+static inline void cryptodev_blkcipher_request_free(cryptodev_blkcipher_request_t *r) { -+ if (r) -+ ablkcipher_request_free(r); -+} -+ -+# define cryptodev_blkcipher_request_set_crypt ablkcipher_request_set_crypt -+# define cryptodev_crypto_blkcipher_encrypt crypto_ablkcipher_encrypt -+# define cryptodev_crypto_blkcipher_decrypt crypto_ablkcipher_decrypt -+# define cryptodev_crypto_blkcipher_tfm crypto_ablkcipher_tfm -+#else -+#include <crypto/skcipher.h> -+ -+typedef struct skcipher_alg cryptodev_blkcipher_alg_t; -+typedef struct crypto_skcipher cryptodev_crypto_blkcipher_t; -+typedef struct skcipher_request cryptodev_blkcipher_request_t; -+ -+# define cryptodev_crypto_alloc_blkcipher crypto_alloc_skcipher -+# define cryptodev_crypto_blkcipher_alg crypto_skcipher_alg -+# define cryptodev_crypto_blkcipher_blocksize crypto_skcipher_blocksize -+# define cryptodev_crypto_blkcipher_ivsize crypto_skcipher_ivsize -+# define cryptodev_crypto_blkcipher_alignmask crypto_skcipher_alignmask -+# define cryptodev_crypto_blkcipher_setkey crypto_skcipher_setkey -+# define cryptodev_crypto_free_blkcipher crypto_free_skcipher -+# define cryptodev_blkcipher_request_alloc skcipher_request_alloc -+# define cryptodev_blkcipher_request_set_callback skcipher_request_set_callback -+# define cryptodev_blkcipher_request_free skcipher_request_free -+# define cryptodev_blkcipher_request_set_crypt skcipher_request_set_crypt -+# define cryptodev_crypto_blkcipher_encrypt crypto_skcipher_encrypt -+# define cryptodev_crypto_blkcipher_decrypt crypto_skcipher_decrypt -+# define cryptodev_crypto_blkcipher_tfm crypto_skcipher_tfm -+#endif -+ -+#endif -Index: cryptodev-linux-1.8/cryptlib.c -=================================================================== ---- cryptodev-linux-1.8.orig/cryptlib.c -+++ cryptodev-linux-1.8/cryptlib.c -@@ -23,7 +23,6 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - --#include <linux/crypto.h> - #include <linux/mm.h> - #include <linux/highmem.h> - #include <linux/ioctl.h> -@@ -37,6 +36,7 @@ - #include <linux/rtnetlink.h> - #include <crypto/authenc.h> - #include "cryptodev_int.h" -+#include "cipherapi.h" - - - struct cryptodev_result { -@@ -133,15 +133,15 @@ int cryptodev_cipher_init(struct cipher_ - int ret; - - if (aead == 0) { -- struct ablkcipher_alg *alg; -+ cryptodev_blkcipher_alg_t *alg; - -- out->async.s = crypto_alloc_ablkcipher(alg_name, 0, 0); -+ out->async.s = cryptodev_crypto_alloc_blkcipher(alg_name, 0, 0); - if (unlikely(IS_ERR(out->async.s))) { - ddebug(1, "Failed to load cipher %s", alg_name); - return -EINVAL; - } - -- alg = crypto_ablkcipher_alg(out->async.s); -+ alg = cryptodev_crypto_blkcipher_alg(out->async.s); - if (alg != NULL) { - /* Was correct key length supplied? */ - if (alg->max_keysize > 0 && -@@ -154,11 +154,11 @@ int cryptodev_cipher_init(struct cipher_ - } - } - -- out->blocksize = crypto_ablkcipher_blocksize(out->async.s); -- out->ivsize = crypto_ablkcipher_ivsize(out->async.s); -- out->alignmask = crypto_ablkcipher_alignmask(out->async.s); -+ out->blocksize = cryptodev_crypto_blkcipher_blocksize(out->async.s); -+ out->ivsize = cryptodev_crypto_blkcipher_ivsize(out->async.s); -+ out->alignmask = cryptodev_crypto_blkcipher_alignmask(out->async.s); - -- ret = crypto_ablkcipher_setkey(out->async.s, keyp, keylen); -+ ret = cryptodev_crypto_blkcipher_setkey(out->async.s, keyp, keylen); - } else { - out->async.as = crypto_alloc_aead(alg_name, 0, 0); - if (unlikely(IS_ERR(out->async.as))) { -@@ -191,14 +191,14 @@ int cryptodev_cipher_init(struct cipher_ - init_completion(&out->async.result->completion); - - if (aead == 0) { -- out->async.request = ablkcipher_request_alloc(out->async.s, GFP_KERNEL); -+ out->async.request = cryptodev_blkcipher_request_alloc(out->async.s, GFP_KERNEL); - if (unlikely(!out->async.request)) { - derr(1, "error allocating async crypto request"); - ret = -ENOMEM; - goto error; - } - -- ablkcipher_request_set_callback(out->async.request, -+ cryptodev_blkcipher_request_set_callback(out->async.request, - CRYPTO_TFM_REQ_MAY_BACKLOG, - cryptodev_complete, out->async.result); - } else { -@@ -218,10 +218,8 @@ int cryptodev_cipher_init(struct cipher_ - return 0; - error: - if (aead == 0) { -- if (out->async.request) -- ablkcipher_request_free(out->async.request); -- if (out->async.s) -- crypto_free_ablkcipher(out->async.s); -+ cryptodev_blkcipher_request_free(out->async.request); -+ cryptodev_crypto_free_blkcipher(out->async.s); - } else { - if (out->async.arequest) - aead_request_free(out->async.arequest); -@@ -237,10 +235,8 @@ void cryptodev_cipher_deinit(struct ciph - { - if (cdata->init) { - if (cdata->aead == 0) { -- if (cdata->async.request) -- ablkcipher_request_free(cdata->async.request); -- if (cdata->async.s) -- crypto_free_ablkcipher(cdata->async.s); -+ cryptodev_blkcipher_request_free(cdata->async.request); -+ cryptodev_crypto_free_blkcipher(cdata->async.s); - } else { - if (cdata->async.arequest) - aead_request_free(cdata->async.arequest); -@@ -289,10 +285,10 @@ ssize_t cryptodev_cipher_encrypt(struct - reinit_completion(&cdata->async.result->completion); - - if (cdata->aead == 0) { -- ablkcipher_request_set_crypt(cdata->async.request, -+ cryptodev_blkcipher_request_set_crypt(cdata->async.request, - (struct scatterlist *)src, dst, - len, cdata->async.iv); -- ret = crypto_ablkcipher_encrypt(cdata->async.request); -+ ret = cryptodev_crypto_blkcipher_encrypt(cdata->async.request); - } else { - aead_request_set_crypt(cdata->async.arequest, - (struct scatterlist *)src, dst, -@@ -311,10 +307,10 @@ ssize_t cryptodev_cipher_decrypt(struct - - reinit_completion(&cdata->async.result->completion); - if (cdata->aead == 0) { -- ablkcipher_request_set_crypt(cdata->async.request, -+ cryptodev_blkcipher_request_set_crypt(cdata->async.request, - (struct scatterlist *)src, dst, - len, cdata->async.iv); -- ret = crypto_ablkcipher_decrypt(cdata->async.request); -+ ret = cryptodev_crypto_blkcipher_decrypt(cdata->async.request); - } else { - aead_request_set_crypt(cdata->async.arequest, - (struct scatterlist *)src, dst, -Index: cryptodev-linux-1.8/cryptlib.h -=================================================================== ---- cryptodev-linux-1.8.orig/cryptlib.h -+++ cryptodev-linux-1.8/cryptlib.h -@@ -3,6 +3,8 @@ - - #include <linux/version.h> - -+#include "cipherapi.h" -+ - struct cipher_data { - int init; /* 0 uninitialized */ - int blocksize; -@@ -12,8 +14,8 @@ struct cipher_data { - int alignmask; - struct { - /* block ciphers */ -- struct crypto_ablkcipher *s; -- struct ablkcipher_request *request; -+ cryptodev_crypto_blkcipher_t *s; -+ cryptodev_blkcipher_request_t *request; - - /* AEAD ciphers */ - struct crypto_aead *as; -Index: cryptodev-linux-1.8/ioctl.c -=================================================================== ---- cryptodev-linux-1.8.orig/ioctl.c -+++ cryptodev-linux-1.8/ioctl.c -@@ -34,7 +34,6 @@ - */ - - #include <crypto/hash.h> --#include <linux/crypto.h> - #include <linux/mm.h> - #include <linux/highmem.h> - #include <linux/ioctl.h> -@@ -53,6 +52,7 @@ - #include "cryptodev_int.h" - #include "zc.h" - #include "version.h" -+#include "cipherapi.h" - - MODULE_AUTHOR("Nikos Mavrogiannopoulos <nmav@gnutls.org>"); - MODULE_DESCRIPTION("CryptoDev driver"); -@@ -765,7 +765,7 @@ static int get_session_info(struct fcryp - - if (ses_ptr->cdata.init) { - if (ses_ptr->cdata.aead == 0) -- tfm = crypto_ablkcipher_tfm(ses_ptr->cdata.async.s); -+ tfm = cryptodev_crypto_blkcipher_tfm(ses_ptr->cdata.async.s); - else - tfm = crypto_aead_tfm(ses_ptr->cdata.async.as); - tfm_info_to_alg_info(&siop->cipher_info, tfm); diff --git a/meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch b/meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch deleted file mode 100644 index 93d608b..0000000 --- a/meta/recipes-kernel/cryptodev/files/kernel-4-10-changes.patch +++ /dev/null @@ -1,57 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 2b29be8ac41414ed19cb4f5d5626d9bd0d7b11a8 Mon Sep 17 00:00:00 2001 -From: Cristian Stoica <cristian.stoica@nxp.com> -Date: Wed, 8 Feb 2017 12:11:04 +0200 -Subject: [PATCH] adjust to API changes in kernel >=4.10 - -There are many changes related to get_user_pages and the code is rewritten -for clarity. - -Signed-off-by: Cristian Stoica <cristian.stoica@nxp.com> ---- - zc.c | 28 +++++++++++++++++----------- - 1 file changed, 17 insertions(+), 11 deletions(-) - -diff --git a/zc.c b/zc.c -index e766ee3..2f4ea99 100644 ---- a/zc.c -+++ b/zc.c -@@ -59,19 +59,25 @@ int __get_userbuf(uint8_t __user *addr, uint32_t len, int write, - } - - down_read(&mm->mmap_sem); --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 6, 0)) -- ret = get_user_pages_remote( -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 6, 0)) -+ ret = get_user_pages(task, mm, -+ (unsigned long)addr, pgcount, write, 0, pg, NULL); - #else -- ret = get_user_pages( --#endif -- task, mm, -- (unsigned long)addr, pgcount, --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) -- write ? FOLL_WRITE : 0, --#else -- write, 0, --#endif -+# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)) -+ ret = get_user_pages_remote(task, mm, -+ (unsigned long)addr, pgcount, write, 0, pg, NULL); -+# else -+# if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 10, 0)) -+ ret = get_user_pages_remote(task, mm, -+ (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, - pg, NULL); -+# else -+ ret = get_user_pages_remote(task, mm, -+ (unsigned long)addr, pgcount, write ? FOLL_WRITE : 0, -+ pg, NULL, NULL); -+# endif -+# endif -+#endif - up_read(&mm->mmap_sem); - if (ret != pgcount) - return -EINVAL; -- 2.10.2 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-12 10:15 ` [PATCH 2/6] cryptodev: 1.8 -> 1.9 Robert Yang @ 2017-07-12 12:32 ` Burton, Ross 2017-07-12 13:36 ` Robert Yang 0 siblings, 1 reply; 25+ messages in thread From: Burton, Ross @ 2017-07-12 12:32 UTC (permalink / raw) To: Robert Yang; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 475 bytes --] ERROR: cryptodev-module-1.9-r0 do_patch: Command Error: 'quilt --quiltrc /data/poky-tmp/master/work/intel_corei7_64-poky-linux/cryptodev-module/1.9-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output: Applying patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch patching file zc.c Hunk #1 FAILED at 67. 1 out of 1 hunk FAILED -- rejects in file zc.c Patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch does not apply (enforce with -f) Ross [-- Attachment #2: Type: text/html, Size: 580 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-12 12:32 ` Burton, Ross @ 2017-07-12 13:36 ` Robert Yang 2017-07-12 13:39 ` Burton, Ross 0 siblings, 1 reply; 25+ messages in thread From: Robert Yang @ 2017-07-12 13:36 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core On 07/12/2017 08:32 PM, Burton, Ross wrote: > ERROR: cryptodev-module-1.9-r0 do_patch: Command Error: 'quilt --quiltrc > /data/poky-tmp/master/work/intel_corei7_64-poky-linux/cryptodev-module/1.9-r0/recipe-sysroot-native/etc/quiltrc > push' exited with 0 Output: > Applying patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch > patching file zc.c > Hunk #1 FAILED at 67. > 1 out of 1 hunk FAILED -- rejects in file zc.c > Patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch does not apply (enforce > with -f) This patch is from meta-intel which I didn't build, sorry, I will fix it. // Robert > > Ross ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-12 13:36 ` Robert Yang @ 2017-07-12 13:39 ` Burton, Ross 2017-07-13 2:51 ` Robert Yang 0 siblings, 1 reply; 25+ messages in thread From: Burton, Ross @ 2017-07-12 13:39 UTC (permalink / raw) To: Robert Yang, Saul Wold; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 889 bytes --] Oh, didn't notice that. Not sure I want to know why meta-intel has to patch cryptodev! CCing Saul for his input. Ross On 12 July 2017 at 14:36, Robert Yang <liezhi.yang@windriver.com> wrote: > > > On 07/12/2017 08:32 PM, Burton, Ross wrote: > >> ERROR: cryptodev-module-1.9-r0 do_patch: Command Error: 'quilt --quiltrc >> /data/poky-tmp/master/work/intel_corei7_64-poky-linux/crypto >> dev-module/1.9-r0/recipe-sysroot-native/etc/quiltrc >> push' exited with 0 Output: >> Applying patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch >> patching file zc.c >> Hunk #1 FAILED at 67. >> 1 out of 1 hunk FAILED -- rejects in file zc.c >> Patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch does not apply >> (enforce >> with -f) >> > > This patch is from meta-intel which I didn't build, sorry, I will fix it. > > // Robert > > > >> Ross >> > [-- Attachment #2: Type: text/html, Size: 1545 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-12 13:39 ` Burton, Ross @ 2017-07-13 2:51 ` Robert Yang 2017-07-13 9:50 ` Burton, Ross 0 siblings, 1 reply; 25+ messages in thread From: Robert Yang @ 2017-07-13 2:51 UTC (permalink / raw) To: Burton, Ross, Saul Wold; +Cc: OE-core On 07/12/2017 09:39 PM, Burton, Ross wrote: > Oh, didn't notice that. Not sure I want to know why meta-intel has to patch > cryptodev! > > CCing Saul for his input. I've sent a patch to meta-intel@yoctoproject.org to update the patch. If a layer has a bbappend and it patches the source, I usually prefer not using wildcard as the version: cryptodev-module_%.bbappend And also set BB_DANGLINGAPPENDS_WARNONLY in layer.conf during development, then we can have time to fix the errors. BTW, I sent a meta-gplv2 patch to poky@yoctoproject.org two days ago, but I didn't find it in poky@yoctoproject.org, Ross, did you see it, please ? Maybe I should send it again. // Robert > > Ross > > On 12 July 2017 at 14:36, Robert Yang <liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com>> wrote: > > > > On 07/12/2017 08:32 PM, Burton, Ross wrote: > > ERROR: cryptodev-module-1.9-r0 do_patch: Command Error: 'quilt --quiltrc > /data/poky-tmp/master/work/intel_corei7_64-poky-linux/cryptodev-module/1.9-r0/recipe-sysroot-native/etc/quiltrc > push' exited with 0 Output: > Applying patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch > patching file zc.c > Hunk #1 FAILED at 67. > 1 out of 1 hunk FAILED -- rejects in file zc.c > Patch 0001-zc-Force-4.10-get_user_pages_remote-API.patch does not apply > (enforce > with -f) > > > This patch is from meta-intel which I didn't build, sorry, I will fix it. > > // Robert > > > > Ross > > ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-13 2:51 ` Robert Yang @ 2017-07-13 9:50 ` Burton, Ross 2017-07-13 10:03 ` Robert Yang 0 siblings, 1 reply; 25+ messages in thread From: Burton, Ross @ 2017-07-13 9:50 UTC (permalink / raw) To: Robert Yang; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 349 bytes --] On 13 July 2017 at 03:51, Robert Yang <liezhi.yang@windriver.com> wrote: > BTW, I sent a meta-gplv2 patch to poky@yoctoproject.org two days ago, but > I didn't find it in poky@yoctoproject.org, Ross, did you see it, please ? > Maybe I should send it again. > The list is yocto@yoctoproject.org. Please resend to the list. Cheer, Ross [-- Attachment #2: Type: text/html, Size: 1187 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-13 9:50 ` Burton, Ross @ 2017-07-13 10:03 ` Robert Yang 2017-07-15 13:13 ` Khem Raj 2017-07-18 8:45 ` Paul Eggleton 0 siblings, 2 replies; 25+ messages in thread From: Robert Yang @ 2017-07-13 10:03 UTC (permalink / raw) To: Burton, Ross; +Cc: OE-core On 07/13/2017 05:50 PM, Burton, Ross wrote: > > On 13 July 2017 at 03:51, Robert Yang <liezhi.yang@windriver.com > <mailto:liezhi.yang@windriver.com>> wrote: > > BTW, I sent a meta-gplv2 patch to poky@yoctoproject.org > <mailto:poky@yoctoproject.org> two days ago, but > I didn't find it in poky@yoctoproject.org <mailto:poky@yoctoproject.org>, > Ross, did you see it, please ? > Maybe I should send it again. > > > The list is yocto@yoctoproject.org <mailto:yocto@yoctoproject.org>. Please > resend to the list. Sorry, I had sent it to yocto@lists.yoctoproject.org which is from README, but I didn't get it in my mailing list, and I resent it to yocto@yoctoproject.org just now, I got it, should we update README, please ? // Robert > > Cheer, > Ross ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-13 10:03 ` Robert Yang @ 2017-07-15 13:13 ` Khem Raj 2017-07-18 18:54 ` Denys Dmytriyenko 2017-07-18 8:45 ` Paul Eggleton 1 sibling, 1 reply; 25+ messages in thread From: Khem Raj @ 2017-07-15 13:13 UTC (permalink / raw) To: Robert Yang; +Cc: OE-core On Thu, Jul 13, 2017 at 3:03 AM, Robert Yang <liezhi.yang@windriver.com> wrote: > > > On 07/13/2017 05:50 PM, Burton, Ross wrote: >> >> >> On 13 July 2017 at 03:51, Robert Yang <liezhi.yang@windriver.com >> <mailto:liezhi.yang@windriver.com>> wrote: >> >> BTW, I sent a meta-gplv2 patch to poky@yoctoproject.org >> <mailto:poky@yoctoproject.org> two days ago, but >> I didn't find it in poky@yoctoproject.org >> <mailto:poky@yoctoproject.org>, >> Ross, did you see it, please ? >> Maybe I should send it again. >> >> >> The list is yocto@yoctoproject.org <mailto:yocto@yoctoproject.org>. >> Please >> resend to the list. > > > Sorry, I had sent it to yocto@lists.yoctoproject.org which is from README, > but > I didn't get it in my mailing list, and I resent it to > yocto@yoctoproject.org > just now, I got it, should we update README, please ? now meta-intel stepped ahead by applying the patch where as OE-Core does not (yet) have this patch applied. meta-intel should have waited for this patch to land in master. ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-15 13:13 ` Khem Raj @ 2017-07-18 18:54 ` Denys Dmytriyenko 2017-07-20 15:14 ` Burton, Ross 0 siblings, 1 reply; 25+ messages in thread From: Denys Dmytriyenko @ 2017-07-18 18:54 UTC (permalink / raw) To: Khem Raj; +Cc: openembedded-architecture, OE-core On Sat, Jul 15, 2017 at 06:13:55AM -0700, Khem Raj wrote: > On Thu, Jul 13, 2017 at 3:03 AM, Robert Yang <liezhi.yang@windriver.com> wrote: > > > > > > On 07/13/2017 05:50 PM, Burton, Ross wrote: > >> > >> > >> On 13 July 2017 at 03:51, Robert Yang <liezhi.yang@windriver.com > >> <mailto:liezhi.yang@windriver.com>> wrote: > >> > >> BTW, I sent a meta-gplv2 patch to poky@yoctoproject.org > >> <mailto:poky@yoctoproject.org> two days ago, but > >> I didn't find it in poky@yoctoproject.org > >> <mailto:poky@yoctoproject.org>, > >> Ross, did you see it, please ? > >> Maybe I should send it again. > >> > >> > >> The list is yocto@yoctoproject.org <mailto:yocto@yoctoproject.org>. > >> Please > >> resend to the list. > > > > > > Sorry, I had sent it to yocto@lists.yoctoproject.org which is from README, > > but > > I didn't get it in my mailing list, and I resent it to > > yocto@yoctoproject.org > > just now, I got it, should we update README, please ? > > now meta-intel stepped ahead by applying the patch where as OE-Core > does not (yet) > have this patch applied. meta-intel should have waited for this patch > to land in master. Should this kind of behavior be addressed by BSP Guidelines and the Yocto Project Compatible 2.0 requirements? Also, which BSPs are enabled on the OE-Core autobuilder by default? -- Denys ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-18 18:54 ` Denys Dmytriyenko @ 2017-07-20 15:14 ` Burton, Ross 0 siblings, 0 replies; 25+ messages in thread From: Burton, Ross @ 2017-07-20 15:14 UTC (permalink / raw) To: Denys Dmytriyenko; +Cc: openembedded-architecture, OE-core [-- Attachment #1: Type: text/plain, Size: 265 bytes --] On 18 July 2017 at 19:54, Denys Dmytriyenko <denis@denix.org> wrote: > Should this kind of behavior be addressed by BSP Guidelines and the Yocto > Project Compatible 2.0 requirements? > Not sure what it would say other than "don't jump the gun"... Ross [-- Attachment #2: Type: text/html, Size: 683 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-13 10:03 ` Robert Yang 2017-07-15 13:13 ` Khem Raj @ 2017-07-18 8:45 ` Paul Eggleton 2017-07-18 8:48 ` Robert Yang 1 sibling, 1 reply; 25+ messages in thread From: Paul Eggleton @ 2017-07-18 8:45 UTC (permalink / raw) To: Robert Yang; +Cc: openembedded-core On Thursday, 13 July 2017 12:03:19 PM CEST Robert Yang wrote: > On 07/13/2017 05:50 PM, Burton, Ross wrote: > > The list is yocto@yoctoproject.org <mailto:yocto@yoctoproject.org>. > > Please resend to the list. > > Sorry, I had sent it to yocto@lists.yoctoproject.org which is from README, > but I didn't get it in my mailing list, and I resent it to > yocto@yoctoproject.org just now, I got it, should we update README, please ? As far as I am aware both of these addresses go to the same list, so there shouldn't be any need to change it. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 2/6] cryptodev: 1.8 -> 1.9 2017-07-18 8:45 ` Paul Eggleton @ 2017-07-18 8:48 ` Robert Yang 0 siblings, 0 replies; 25+ messages in thread From: Robert Yang @ 2017-07-18 8:48 UTC (permalink / raw) To: Paul Eggleton; +Cc: openembedded-core On 07/18/2017 04:45 PM, Paul Eggleton wrote: > On Thursday, 13 July 2017 12:03:19 PM CEST Robert Yang wrote: >> On 07/13/2017 05:50 PM, Burton, Ross wrote: >>> The list is yocto@yoctoproject.org <mailto:yocto@yoctoproject.org>. >>> Please resend to the list. >> >> Sorry, I had sent it to yocto@lists.yoctoproject.org which is from README, >> but I didn't get it in my mailing list, and I resent it to >> yocto@yoctoproject.org just now, I got it, should we update README, please ? > > As far as I am aware both of these addresses go to the same list, so there > shouldn't be any need to change it. Unfortunately, yocto@lists.yoctoproject.org seemed not work, I can't receive the email that I had sent to it. // Robert > > Cheers, > Paul > ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 3/6] debianutils: 4.8.1 -> 4.8.1.1 2017-07-12 10:15 [PATCH 0/6] Packages Upgrade Robert Yang 2017-07-12 10:15 ` [PATCH 1/6] automake: 1.15 -> 1.15.1 Robert Yang 2017-07-12 10:15 ` [PATCH 2/6] cryptodev: 1.8 -> 1.9 Robert Yang @ 2017-07-12 10:15 ` Robert Yang 2017-07-12 10:15 ` [PATCH 4/6] git: 2.11.1 -> 2.13.2 Robert Yang ` (2 subsequent siblings) 5 siblings, 0 replies; 25+ messages in thread From: Robert Yang @ 2017-07-12 10:15 UTC (permalink / raw) To: openembedded-core Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- .../debianutils/{debianutils_4.8.1.bb => debianutils_4.8.1.1.bb} | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) rename meta/recipes-support/debianutils/{debianutils_4.8.1.bb => debianutils_4.8.1.1.bb} (86%) diff --git a/meta/recipes-support/debianutils/debianutils_4.8.1.bb b/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb similarity index 86% rename from meta/recipes-support/debianutils/debianutils_4.8.1.bb rename to meta/recipes-support/debianutils/debianutils_4.8.1.1.bb index 54c345e..23f8421 100644 --- a/meta/recipes-support/debianutils/debianutils_4.8.1.bb +++ b/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb @@ -3,14 +3,13 @@ SECTION = "base" LICENSE = "GPLv2 & SMAIL_GPL" LIC_FILES_CHKSUM = "file://debian/copyright;md5=f01a5203d50512fc4830b4332b696a9f" -SRC_URI = "http://snapshot.debian.org/archive/debian/20161118T033019Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" +SRC_URI = "http://snapshot.debian.org/archive/debian/20170402T211732Z/pool/main/d/${BPN}/${BPN}_${PV}.tar.xz" # the package is taken from snapshots.debian.org; that source is static and goes stale # so we check the latest upstream from a directory that does get updated UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/d/${BPN}/" - -SRC_URI[md5sum] = "44083fc66164746880dffd30d62d054b" -SRC_URI[sha256sum] = "2c395c0bdcfe89de30828b1d25cc5549ded5225a6d3625fbcb2cc0881ef5f026" +SRC_URI[md5sum] = "ee5fcecaab071bd0c93e8a0cee65d6c4" +SRC_URI[sha256sum] = "06446cd4c0d309fd31a0682c5c2f07f7613fb867f769414b9cc51f155ad73172" inherit autotools update-alternatives -- 2.10.2 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 4/6] git: 2.11.1 -> 2.13.2 2017-07-12 10:15 [PATCH 0/6] Packages Upgrade Robert Yang ` (2 preceding siblings ...) 2017-07-12 10:15 ` [PATCH 3/6] debianutils: 4.8.1 -> 4.8.1.1 Robert Yang @ 2017-07-12 10:15 ` Robert Yang 2017-07-12 15:38 ` Leonardo Sandoval 2017-07-12 10:15 ` [PATCH 5/6] gnu-efi: 3.0.5 -> 3.0.6 Robert Yang 2017-07-12 10:15 ` [PATCH 6/6] libbsd: 0.8.3 -> 0.8.5 Robert Yang 5 siblings, 1 reply; 25+ messages in thread From: Robert Yang @ 2017-07-12 10:15 UTC (permalink / raw) To: openembedded-core * Remove git-relink from PERLTOOLS: git-2.13.2/Documentation/RelNotes/2.12.0.txt: * An ancient script "git relink" has been removed. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- meta/recipes-devtools/git/git.inc | 1 - meta/recipes-devtools/git/git_2.11.1.bb | 11 ----------- meta/recipes-devtools/git/git_2.13.2.bb | 11 +++++++++++ 3 files changed, 11 insertions(+), 12 deletions(-) delete mode 100644 meta/recipes-devtools/git/git_2.11.1.bb create mode 100644 meta/recipes-devtools/git/git_2.13.2.bb diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 9b0d328..4390b8d 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -86,7 +86,6 @@ PERLTOOLS = " \ ${libexecdir}/git-core/git-cvsserver \ ${bindir}/git-cvsserver \ ${libexecdir}/git-core/git-difftool \ - ${libexecdir}/git-core/git-relink \ ${libexecdir}/git-core/git-send-email \ ${libexecdir}/git-core/git-svn \ ${libexecdir}/git-core/git-instaweb \ diff --git a/meta/recipes-devtools/git/git_2.11.1.bb b/meta/recipes-devtools/git/git_2.11.1.bb deleted file mode 100644 index f2f072c..0000000 --- a/meta/recipes-devtools/git/git_2.11.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -require git.inc - -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ - ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ - " -EXTRA_OEMAKE += "NO_GETTEXT=1" - -SRC_URI[tarball.md5sum] = "6a7a73db076bb0514b602720669d685c" -SRC_URI[tarball.sha256sum] = "a1cdd7c820f92c44abb5003b36dc8cb7201ba38e8744802399f59c97285ca043" -SRC_URI[manpages.md5sum] = "e4268a6b514ccdb624b6450ff55881a3" -SRC_URI[manpages.sha256sum] = "ee567e7b0f95333816793714bb31c54e288cf8041f77a0092b85e62c9c2974f9" diff --git a/meta/recipes-devtools/git/git_2.13.2.bb b/meta/recipes-devtools/git/git_2.13.2.bb new file mode 100644 index 0000000..e7cae40 --- /dev/null +++ b/meta/recipes-devtools/git/git_2.13.2.bb @@ -0,0 +1,11 @@ +require git.inc + +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ + ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ + " +EXTRA_OEMAKE += "NO_GETTEXT=1" + +SRC_URI[tarball.md5sum] = "894583cddfb0ec3b0156484966f9db9c" +SRC_URI[tarball.sha256sum] = "e19d450648d6d100eb93abaa5d06ffbc778394fb502354b7026d73e9bcbc3160" +SRC_URI[manpages.md5sum] = "97384d23f2ee88d5ce51ffc75096bd3e" +SRC_URI[manpages.sha256sum] = "1c2bd0a2340b2ef118b7b167a8fec6cc05eb18cad9043e6e7a95fd8a70bb8c4c" -- 2.10.2 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH 4/6] git: 2.11.1 -> 2.13.2 2017-07-12 10:15 ` [PATCH 4/6] git: 2.11.1 -> 2.13.2 Robert Yang @ 2017-07-12 15:38 ` Leonardo Sandoval 2017-07-13 2:55 ` Robert Yang 0 siblings, 1 reply; 25+ messages in thread From: Leonardo Sandoval @ 2017-07-12 15:38 UTC (permalink / raw) To: Robert Yang; +Cc: openembedded-core for some reason git did not detect (as other patches in this series) the renaming (delete/create), make it easier to review. On Wed, 2017-07-12 at 03:15 -0700, Robert Yang wrote: > * Remove git-relink from PERLTOOLS: > git-2.13.2/Documentation/RelNotes/2.12.0.txt: > * An ancient script "git relink" has been removed. > > Signed-off-by: Robert Yang <liezhi.yang@windriver.com> > --- > meta/recipes-devtools/git/git.inc | 1 - > meta/recipes-devtools/git/git_2.11.1.bb | 11 ----------- > meta/recipes-devtools/git/git_2.13.2.bb | 11 +++++++++++ > 3 files changed, 11 insertions(+), 12 deletions(-) > delete mode 100644 meta/recipes-devtools/git/git_2.11.1.bb > create mode 100644 meta/recipes-devtools/git/git_2.13.2.bb > > diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc > index 9b0d328..4390b8d 100644 > --- a/meta/recipes-devtools/git/git.inc > +++ b/meta/recipes-devtools/git/git.inc > @@ -86,7 +86,6 @@ PERLTOOLS = " \ > ${libexecdir}/git-core/git-cvsserver \ > ${bindir}/git-cvsserver \ > ${libexecdir}/git-core/git-difftool \ > - ${libexecdir}/git-core/git-relink \ > ${libexecdir}/git-core/git-send-email \ > ${libexecdir}/git-core/git-svn \ > ${libexecdir}/git-core/git-instaweb \ > diff --git a/meta/recipes-devtools/git/git_2.11.1.bb b/meta/recipes-devtools/git/git_2.11.1.bb > deleted file mode 100644 > index f2f072c..0000000 > --- a/meta/recipes-devtools/git/git_2.11.1.bb > +++ /dev/null > @@ -1,11 +0,0 @@ > -require git.inc > - > -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ > - ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ > - " > -EXTRA_OEMAKE += "NO_GETTEXT=1" > - > -SRC_URI[tarball.md5sum] = "6a7a73db076bb0514b602720669d685c" > -SRC_URI[tarball.sha256sum] = "a1cdd7c820f92c44abb5003b36dc8cb7201ba38e8744802399f59c97285ca043" > -SRC_URI[manpages.md5sum] = "e4268a6b514ccdb624b6450ff55881a3" > -SRC_URI[manpages.sha256sum] = "ee567e7b0f95333816793714bb31c54e288cf8041f77a0092b85e62c9c2974f9" > diff --git a/meta/recipes-devtools/git/git_2.13.2.bb b/meta/recipes-devtools/git/git_2.13.2.bb > new file mode 100644 > index 0000000..e7cae40 > --- /dev/null > +++ b/meta/recipes-devtools/git/git_2.13.2.bb > @@ -0,0 +1,11 @@ > +require git.inc > + > +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ > + ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ > + " > +EXTRA_OEMAKE += "NO_GETTEXT=1" > + > +SRC_URI[tarball.md5sum] = "894583cddfb0ec3b0156484966f9db9c" > +SRC_URI[tarball.sha256sum] = "e19d450648d6d100eb93abaa5d06ffbc778394fb502354b7026d73e9bcbc3160" > +SRC_URI[manpages.md5sum] = "97384d23f2ee88d5ce51ffc75096bd3e" > +SRC_URI[manpages.sha256sum] = "1c2bd0a2340b2ef118b7b167a8fec6cc05eb18cad9043e6e7a95fd8a70bb8c4c" > -- > 2.10.2 > ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 4/6] git: 2.11.1 -> 2.13.2 2017-07-12 15:38 ` Leonardo Sandoval @ 2017-07-13 2:55 ` Robert Yang 2017-07-13 12:50 ` Jose Lamego 0 siblings, 1 reply; 25+ messages in thread From: Robert Yang @ 2017-07-13 2:55 UTC (permalink / raw) To: Leonardo Sandoval; +Cc: openembedded-core On 07/12/2017 11:38 PM, Leonardo Sandoval wrote: > for some reason git did not detect (as other patches in this series) > the renaming (delete/create), make it easier to review. > By default, git format-patch handles similarity > 50% as rename, the git_2.13.2.bb changes a lot, so no renames. // Robert > > > On Wed, 2017-07-12 at 03:15 -0700, Robert Yang wrote: >> * Remove git-relink from PERLTOOLS: >> git-2.13.2/Documentation/RelNotes/2.12.0.txt: >> * An ancient script "git relink" has been removed. >> >> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> >> --- >> meta/recipes-devtools/git/git.inc | 1 - >> meta/recipes-devtools/git/git_2.11.1.bb | 11 ----------- >> meta/recipes-devtools/git/git_2.13.2.bb | 11 +++++++++++ >> 3 files changed, 11 insertions(+), 12 deletions(-) >> delete mode 100644 meta/recipes-devtools/git/git_2.11.1.bb >> create mode 100644 meta/recipes-devtools/git/git_2.13.2.bb >> >> diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc >> index 9b0d328..4390b8d 100644 >> --- a/meta/recipes-devtools/git/git.inc >> +++ b/meta/recipes-devtools/git/git.inc >> @@ -86,7 +86,6 @@ PERLTOOLS = " \ >> ${libexecdir}/git-core/git-cvsserver \ >> ${bindir}/git-cvsserver \ >> ${libexecdir}/git-core/git-difftool \ >> - ${libexecdir}/git-core/git-relink \ >> ${libexecdir}/git-core/git-send-email \ >> ${libexecdir}/git-core/git-svn \ >> ${libexecdir}/git-core/git-instaweb \ >> diff --git a/meta/recipes-devtools/git/git_2.11.1.bb b/meta/recipes-devtools/git/git_2.11.1.bb >> deleted file mode 100644 >> index f2f072c..0000000 >> --- a/meta/recipes-devtools/git/git_2.11.1.bb >> +++ /dev/null >> @@ -1,11 +0,0 @@ >> -require git.inc >> - >> -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ >> - ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ >> - " >> -EXTRA_OEMAKE += "NO_GETTEXT=1" >> - >> -SRC_URI[tarball.md5sum] = "6a7a73db076bb0514b602720669d685c" >> -SRC_URI[tarball.sha256sum] = "a1cdd7c820f92c44abb5003b36dc8cb7201ba38e8744802399f59c97285ca043" >> -SRC_URI[manpages.md5sum] = "e4268a6b514ccdb624b6450ff55881a3" >> -SRC_URI[manpages.sha256sum] = "ee567e7b0f95333816793714bb31c54e288cf8041f77a0092b85e62c9c2974f9" >> diff --git a/meta/recipes-devtools/git/git_2.13.2.bb b/meta/recipes-devtools/git/git_2.13.2.bb >> new file mode 100644 >> index 0000000..e7cae40 >> --- /dev/null >> +++ b/meta/recipes-devtools/git/git_2.13.2.bb >> @@ -0,0 +1,11 @@ >> +require git.inc >> + >> +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ >> + ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ >> + " >> +EXTRA_OEMAKE += "NO_GETTEXT=1" >> + >> +SRC_URI[tarball.md5sum] = "894583cddfb0ec3b0156484966f9db9c" >> +SRC_URI[tarball.sha256sum] = "e19d450648d6d100eb93abaa5d06ffbc778394fb502354b7026d73e9bcbc3160" >> +SRC_URI[manpages.md5sum] = "97384d23f2ee88d5ce51ffc75096bd3e" >> +SRC_URI[manpages.sha256sum] = "1c2bd0a2340b2ef118b7b167a8fec6cc05eb18cad9043e6e7a95fd8a70bb8c4c" >> -- >> 2.10.2 >> > > > ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 4/6] git: 2.11.1 -> 2.13.2 2017-07-13 2:55 ` Robert Yang @ 2017-07-13 12:50 ` Jose Lamego 0 siblings, 0 replies; 25+ messages in thread From: Jose Lamego @ 2017-07-13 12:50 UTC (permalink / raw) To: openembedded-core On 07/12/2017 09:55 PM, Robert Yang wrote: > > > On 07/12/2017 11:38 PM, Leonardo Sandoval wrote: >> for some reason git did not detect (as other patches in this series) >> the renaming (delete/create), make it easier to review. >> > > By default, git format-patch handles similarity > 50% as rename, > the git_2.13.2.bb changes a lot, so no renames. FWIW, in cases like this I include option "-M30" to git format-patch to detect similarities from 30%. Jose > > // Robert > >> >> >> On Wed, 2017-07-12 at 03:15 -0700, Robert Yang wrote: >>> * Remove git-relink from PERLTOOLS: >>> git-2.13.2/Documentation/RelNotes/2.12.0.txt: >>> * An ancient script "git relink" has been removed. >>> >>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> >>> --- >>> meta/recipes-devtools/git/git.inc | 1 - >>> meta/recipes-devtools/git/git_2.11.1.bb | 11 ----------- >>> meta/recipes-devtools/git/git_2.13.2.bb | 11 +++++++++++ >>> 3 files changed, 11 insertions(+), 12 deletions(-) >>> delete mode 100644 meta/recipes-devtools/git/git_2.11.1.bb >>> create mode 100644 meta/recipes-devtools/git/git_2.13.2.bb >>> >>> diff --git a/meta/recipes-devtools/git/git.inc >>> b/meta/recipes-devtools/git/git.inc >>> index 9b0d328..4390b8d 100644 >>> --- a/meta/recipes-devtools/git/git.inc >>> +++ b/meta/recipes-devtools/git/git.inc >>> @@ -86,7 +86,6 @@ PERLTOOLS = " \ >>> ${libexecdir}/git-core/git-cvsserver \ >>> ${bindir}/git-cvsserver \ >>> ${libexecdir}/git-core/git-difftool \ >>> - ${libexecdir}/git-core/git-relink \ >>> ${libexecdir}/git-core/git-send-email \ >>> ${libexecdir}/git-core/git-svn \ >>> ${libexecdir}/git-core/git-instaweb \ >>> diff --git a/meta/recipes-devtools/git/git_2.11.1.bb >>> b/meta/recipes-devtools/git/git_2.11.1.bb >>> deleted file mode 100644 >>> index f2f072c..0000000 >>> --- a/meta/recipes-devtools/git/git_2.11.1.bb >>> +++ /dev/null >>> @@ -1,11 +0,0 @@ >>> -require git.inc >>> - >>> -EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ >>> - >>> ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ >>> - " >>> -EXTRA_OEMAKE += "NO_GETTEXT=1" >>> - >>> -SRC_URI[tarball.md5sum] = "6a7a73db076bb0514b602720669d685c" >>> -SRC_URI[tarball.sha256sum] = >>> "a1cdd7c820f92c44abb5003b36dc8cb7201ba38e8744802399f59c97285ca043" >>> -SRC_URI[manpages.md5sum] = "e4268a6b514ccdb624b6450ff55881a3" >>> -SRC_URI[manpages.sha256sum] = >>> "ee567e7b0f95333816793714bb31c54e288cf8041f77a0092b85e62c9c2974f9" >>> diff --git a/meta/recipes-devtools/git/git_2.13.2.bb >>> b/meta/recipes-devtools/git/git_2.13.2.bb >>> new file mode 100644 >>> index 0000000..e7cae40 >>> --- /dev/null >>> +++ b/meta/recipes-devtools/git/git_2.13.2.bb >>> @@ -0,0 +1,11 @@ >>> +require git.inc >>> + >>> +EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ >>> + >>> ac_cv_fread_reads_directories=${ac_cv_fread_reads_directories=yes} \ >>> + " >>> +EXTRA_OEMAKE += "NO_GETTEXT=1" >>> + >>> +SRC_URI[tarball.md5sum] = "894583cddfb0ec3b0156484966f9db9c" >>> +SRC_URI[tarball.sha256sum] = >>> "e19d450648d6d100eb93abaa5d06ffbc778394fb502354b7026d73e9bcbc3160" >>> +SRC_URI[manpages.md5sum] = "97384d23f2ee88d5ce51ffc75096bd3e" >>> +SRC_URI[manpages.sha256sum] = >>> "1c2bd0a2340b2ef118b7b167a8fec6cc05eb18cad9043e6e7a95fd8a70bb8c4c" >>> -- >>> 2.10.2 >>> >> >> >> -- Jose Lamego | OTC Embedded Platform & Tools | GDC ^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 5/6] gnu-efi: 3.0.5 -> 3.0.6 2017-07-12 10:15 [PATCH 0/6] Packages Upgrade Robert Yang ` (3 preceding siblings ...) 2017-07-12 10:15 ` [PATCH 4/6] git: 2.11.1 -> 2.13.2 Robert Yang @ 2017-07-12 10:15 ` Robert Yang 2017-07-12 10:15 ` [PATCH 6/6] libbsd: 0.8.3 -> 0.8.5 Robert Yang 5 siblings, 0 replies; 25+ messages in thread From: Robert Yang @ 2017-07-12 10:15 UTC (permalink / raw) To: openembedded-core * Update parallel-make-archives.patch, the patch for lib/Makefile is already in the source. * Remove 0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch, the source uses a similar way to fix it. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- ...plicit-fall-through-so-Wextra-will-work-i.patch | 34 ---------------------- .../gnu-efi/gnu-efi/parallel-make-archives.patch | 30 +++++-------------- .../gnu-efi/{gnu-efi_3.0.5.bb => gnu-efi_3.0.6.bb} | 5 ++-- 3 files changed, 9 insertions(+), 60 deletions(-) delete mode 100644 meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch rename meta/recipes-bsp/gnu-efi/{gnu-efi_3.0.5.bb => gnu-efi_3.0.6.bb} (92%) diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch deleted file mode 100644 index d0aeb2d..0000000 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 676a8a9001f06808b4dbe0a545d76b5d9a8ebf48 Mon Sep 17 00:00:00 2001 -From: Peter Jones <pjones@redhat.com> -Date: Thu, 2 Feb 2017 13:51:27 -0500 -Subject: [PATCH] Mark our explicit fall through so -Wextra will work in gcc 7 - -gcc 7 introduces detection of fall-through behavior in switch/case -statements, and will warn if -Wimplicit-fallthrough is present and there -is no comment stating that the fall-through is intentional. This is -also triggered by -Wextra, as it enables -Wimplicit-fallthrough=1. - -This patch adds the comment in the one place we use fall-through. - -Signed-off-by: Peter Jones <pjones@redhat.com> ---- -Upstream-Status: Pending - - lib/print.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/print.c b/lib/print.c -index b8a9d38..cb732f0 100644 ---- a/lib/print.c -+++ b/lib/print.c -@@ -1131,6 +1131,7 @@ Returns: - case 'X': - Item.Width = Item.Long ? 16 : 8; - Item.Pad = '0'; -+ /* falls through */ - case 'x': - ValueToHex ( - Item.Scratch, --- -2.12.2 - diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch index e5b47c1..5404051 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch +++ b/meta/recipes-bsp/gnu-efi/gnu-efi/parallel-make-archives.patch @@ -13,30 +13,14 @@ for details. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> --- ---- - gnuefi/Makefile | 3 ++- - lib/Makefile | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) + gnuefi/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) -Index: gnu-efi-3.0/lib/Makefile -=================================================================== ---- gnu-efi-3.0.orig/lib/Makefile -+++ gnu-efi-3.0/lib/Makefile -@@ -66,7 +66,8 @@ all: libsubdirs libefi.a - libsubdirs: - for sdir in $(SUBDIRS); do mkdir -p $$sdir; done - --libefi.a: $(patsubst %,libefi.a(%),$(OBJS)) -+libefi.a: $(OBJS) -+ $(AR) rv $@ $(OBJS) - - clean: - rm -f libefi.a *~ $(OBJS) */*.o -Index: gnu-efi-3.0/gnuefi/Makefile -=================================================================== ---- gnu-efi-3.0.orig/gnuefi/Makefile -+++ gnu-efi-3.0/gnuefi/Makefile -@@ -51,7 +51,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a +diff --git a/gnuefi/Makefile b/gnuefi/Makefile +index 2a61699..148106e 100644 +--- a/gnuefi/Makefile ++++ b/gnuefi/Makefile +@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a all: $(TARGETS) diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb similarity index 92% rename from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb rename to meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb index 7346737..2a60717 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.5.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.6.bb @@ -16,11 +16,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.bz2 \ file://parallel-make-archives.patch \ file://lib-Makefile-fix-parallel-issue.patch \ file://gcc46-compatibility.patch \ - file://0001-Mark-our-explicit-fall-through-so-Wextra-will-work-i.patch \ " -SRC_URI[md5sum] = "1f719c9c135778aa6b087b89a1cc2423" -SRC_URI[sha256sum] = "bd8fcd5914f18fc0e4ba948ab03b00013e528504f529c60739b748f6ef130b22" +SRC_URI[md5sum] = "46f633758a8a37db9fd6909fe270c26b" +SRC_URI[sha256sum] = "21515902d80fbea23328a61d70d3d51a47204abd1507ebfa27550a7b9bf22c91" COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*)-linux" COMPATIBLE_HOST_armv4 = 'null' -- 2.10.2 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* [PATCH 6/6] libbsd: 0.8.3 -> 0.8.5 2017-07-12 10:15 [PATCH 0/6] Packages Upgrade Robert Yang ` (4 preceding siblings ...) 2017-07-12 10:15 ` [PATCH 5/6] gnu-efi: 3.0.5 -> 3.0.6 Robert Yang @ 2017-07-12 10:15 ` Robert Yang 2017-07-13 9:40 ` Burton, Ross 5 siblings, 1 reply; 25+ messages in thread From: Robert Yang @ 2017-07-12 10:15 UTC (permalink / raw) To: openembedded-core * The LIC_FILES_CHKSUM is changed becauses the files updated the date, and added a BSD-3-clause-John-Birrell for man/timeradd.3bsd, this license is already there for other files. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- meta/recipes-support/libbsd/{libbsd_0.8.3.bb => libbsd_0.8.5.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-support/libbsd/{libbsd_0.8.3.bb => libbsd_0.8.5.bb} (88%) diff --git a/meta/recipes-support/libbsd/libbsd_0.8.3.bb b/meta/recipes-support/libbsd/libbsd_0.8.5.bb similarity index 88% rename from meta/recipes-support/libbsd/libbsd_0.8.3.bb rename to meta/recipes-support/libbsd/libbsd_0.8.5.bb index e85ee21..33190a7 100644 --- a/meta/recipes-support/libbsd/libbsd_0.8.3.bb +++ b/meta/recipes-support/libbsd/libbsd_0.8.5.bb @@ -30,7 +30,7 @@ HOMEPAGE = "http://libbsd.freedesktop.org/wiki/" # License: public-domain # License: public-domain-Colin-Plumb LICENSE = "BSD-4-Clause & ISC & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=0b9c89d861915b86655b96e5e32fa2aa" +LIC_FILES_CHKSUM = "file://COPYING;md5=08fc4e66be4526715dab09c5fba5e9e8" SECTION = "libs" SRC_URI = " \ @@ -43,8 +43,8 @@ SRC_URI_append_libc-musl = " \ file://0003-Fix-build-breaks-due-to-missing-a.out.h.patch \ " -SRC_URI[md5sum] = "e935c1bb6cc98a4a43cb1da22795493a" -SRC_URI[sha256sum] = "934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8" +SRC_URI[md5sum] = "f1a0dc285f5d21ea40ef5bfc9b647346" +SRC_URI[sha256sum] = "7647d024f41389305272c263da933a6f2a978213c1801592f47e68d83ac05b28" inherit autotools pkgconfig -- 2.10.2 ^ permalink raw reply related [flat|nested] 25+ messages in thread
* Re: [PATCH 6/6] libbsd: 0.8.3 -> 0.8.5 2017-07-12 10:15 ` [PATCH 6/6] libbsd: 0.8.3 -> 0.8.5 Robert Yang @ 2017-07-13 9:40 ` Burton, Ross 2017-07-13 9:45 ` Burton, Ross 0 siblings, 1 reply; 25+ messages in thread From: Burton, Ross @ 2017-07-13 9:40 UTC (permalink / raw) To: Robert Yang; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 681 bytes --] On 12 July 2017 at 11:15, Robert Yang <liezhi.yang@windriver.com> wrote: > * The LIC_FILES_CHKSUM is changed becauses the files updated the date, and > added > a BSD-3-clause-John-Birrell for man/timeradd.3bsd, this license is > already > there for other files. > The musl-specific patches don't apply: Applying patch 0002-Remove-funopen.patch patching file man/Makefile.am Hunk #1 FAILED at 29. 1 out of 1 hunk FAILED -- rejects in file man/Makefile.am patching file src/Makefile.am patching file test/Makefile.am Patch 0002-Remove-funopen.patch does not apply (enforce with -f) Determining if any of those can be applied always would be good. Ross [-- Attachment #2: Type: text/html, Size: 1287 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 6/6] libbsd: 0.8.3 -> 0.8.5 2017-07-13 9:40 ` Burton, Ross @ 2017-07-13 9:45 ` Burton, Ross 2017-07-13 11:10 ` Robert Yang 0 siblings, 1 reply; 25+ messages in thread From: Burton, Ross @ 2017-07-13 9:45 UTC (permalink / raw) To: Robert Yang; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 263 bytes --] On 13 July 2017 at 10:40, Burton, Ross <ross.burton@intel.com> wrote: > Determining if any of those can be applied always would be good. > FWIW it looks like the __BEGIN_DECLS patch still isn't upstream, but the other two may have been resolved. Ross [-- Attachment #2: Type: text/html, Size: 632 bytes --] ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 6/6] libbsd: 0.8.3 -> 0.8.5 2017-07-13 9:45 ` Burton, Ross @ 2017-07-13 11:10 ` Robert Yang 2017-07-13 13:32 ` Khem Raj 0 siblings, 1 reply; 25+ messages in thread From: Robert Yang @ 2017-07-13 11:10 UTC (permalink / raw) To: Burton, Ross, Khem Raj; +Cc: OE-core On 07/13/2017 05:45 PM, Burton, Ross wrote: > > On 13 July 2017 at 10:40, Burton, Ross <ross.burton@intel.com > <mailto:ross.burton@intel.com>> wrote: > > Determining if any of those can be applied always would be good. > > > FWIW it looks like the __BEGIN_DECLS patch still isn't upstream, but the other > two may have been resolved. Sorry, fixed it in the repo, I update 0002-Remove-funopen.patch, and drop 0003-Fix-build-breaks-due-to-missing-a.out.h.patch since the a.out code is gone in the source, so I think that the patch is not needed any more. Add Khem who is the author in the CC list. Tested build on qemux86-64 and qemuarm. Repo: git://git.openembedded.org/openembedded-core-contrib rbt/PU http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/PU Robert Yang (6): automake: 1.15 -> 1.15.1 cryptodev: 1.8 -> 1.9 debianutils: 4.8.1 -> 4.8.1.1 git: 2.11.1 -> 2.13.2 gnu-efi: 3.0.5 -> 3.0.6 libbsd: 0.8.3 -> 0.8.5 // Robert > > Ross > ^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 6/6] libbsd: 0.8.3 -> 0.8.5 2017-07-13 11:10 ` Robert Yang @ 2017-07-13 13:32 ` Khem Raj 0 siblings, 0 replies; 25+ messages in thread From: Khem Raj @ 2017-07-13 13:32 UTC (permalink / raw) To: Robert Yang; +Cc: OE-core On Thu, Jul 13, 2017 at 4:10 AM, Robert Yang <liezhi.yang@windriver.com> wrote: > > > On 07/13/2017 05:45 PM, Burton, Ross wrote: >> >> >> On 13 July 2017 at 10:40, Burton, Ross <ross.burton@intel.com >> <mailto:ross.burton@intel.com>> wrote: >> >> Determining if any of those can be applied always would be good. >> >> >> FWIW it looks like the __BEGIN_DECLS patch still isn't upstream, but the >> other >> two may have been resolved. > > > Sorry, fixed it in the repo, I update 0002-Remove-funopen.patch, and drop > 0003-Fix-build-breaks-due-to-missing-a.out.h.patch since the a.out code is > gone in the source, so I think that the patch is not needed any more. Add > Khem who is the author in the CC list. > if a.out.h is removed then we should be ok > Tested build on qemux86-64 and qemuarm. > > > Repo: > > git://git.openembedded.org/openembedded-core-contrib rbt/PU > http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/PU > > Robert Yang (6): > automake: 1.15 -> 1.15.1 > cryptodev: 1.8 -> 1.9 > debianutils: 4.8.1 -> 4.8.1.1 > git: 2.11.1 -> 2.13.2 > gnu-efi: 3.0.5 -> 3.0.6 > libbsd: 0.8.3 -> 0.8.5 > > // Robert > >> >> Ross >> > ^ permalink raw reply [flat|nested] 25+ messages in thread
end of thread, other threads:[~2017-07-20 15:15 UTC | newest] Thread overview: 25+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-07-12 10:15 [PATCH 0/6] Packages Upgrade Robert Yang 2017-07-12 10:15 ` [PATCH 1/6] automake: 1.15 -> 1.15.1 Robert Yang 2017-07-12 10:15 ` [PATCH 2/6] cryptodev: 1.8 -> 1.9 Robert Yang 2017-07-12 12:32 ` Burton, Ross 2017-07-12 13:36 ` Robert Yang 2017-07-12 13:39 ` Burton, Ross 2017-07-13 2:51 ` Robert Yang 2017-07-13 9:50 ` Burton, Ross 2017-07-13 10:03 ` Robert Yang 2017-07-15 13:13 ` Khem Raj 2017-07-18 18:54 ` Denys Dmytriyenko 2017-07-20 15:14 ` Burton, Ross 2017-07-18 8:45 ` Paul Eggleton 2017-07-18 8:48 ` Robert Yang 2017-07-12 10:15 ` [PATCH 3/6] debianutils: 4.8.1 -> 4.8.1.1 Robert Yang 2017-07-12 10:15 ` [PATCH 4/6] git: 2.11.1 -> 2.13.2 Robert Yang 2017-07-12 15:38 ` Leonardo Sandoval 2017-07-13 2:55 ` Robert Yang 2017-07-13 12:50 ` Jose Lamego 2017-07-12 10:15 ` [PATCH 5/6] gnu-efi: 3.0.5 -> 3.0.6 Robert Yang 2017-07-12 10:15 ` [PATCH 6/6] libbsd: 0.8.3 -> 0.8.5 Robert Yang 2017-07-13 9:40 ` Burton, Ross 2017-07-13 9:45 ` Burton, Ross 2017-07-13 11:10 ` Robert Yang 2017-07-13 13:32 ` Khem Raj
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.