diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-16 17:11:34 -0800 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-08 18:21:44 -0500 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | blackbird-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.gz blackbird-openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.zip |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch | 53 |
1 files changed, 0 insertions, 53 deletions
diff --git a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch b/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch deleted file mode 100644 index aa99735f6..000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/openocd/openocd/0002-Workaround-new-warnings-generated-by-GCC-7.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 8daaa8c27794653d02854c5982669a7638473224 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 16 Jun 2017 23:52:46 -0700 -Subject: [PATCH 2/5] Workaround new warnings generated by GCC 7 - -src/flash/nor/xmc4xxx.c: In function 'xmc4xxx_get_info_command': -src/flash/nor/xmc4xxx.c:939:43: error: '%d' directive output may be truncated writing between 1 and 10 bytes into a region of size 6 [-Werror=format-truncation=] - snprintf(otp_str, sizeof(otp_str), "- %d\n", i); - ^~ -src/flash/nor/xmc4xxx.c:939:40: note: directive argument in the range [0, 2147483647] - snprintf(otp_str, sizeof(otp_str), "- %d\n", i); - ^~~~~~~~ -src/flash/nor/xmc4xxx.c:939:5: note: 'snprintf' output between 5 and 14 bytes into a destination of size 8 - snprintf(otp_str, sizeof(otp_str), "- %d\n", i); - ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/flash/nor/xmc4xxx.c | 2 +- - src/target/arm_adi_v5.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/flash/nor/xmc4xxx.c b/src/flash/nor/xmc4xxx.c -index 02df46a3f..e6c398ff9 100644 ---- a/src/flash/nor/xmc4xxx.c -+++ b/src/flash/nor/xmc4xxx.c -@@ -931,7 +931,7 @@ static int xmc4xxx_get_info_command(struct flash_bank *bank, char *buf, int buf_ - - /* If OTP Write protection is enabled (User 2), list each - * sector that has it enabled */ -- char otp_str[8]; -+ char otp_str[14]; - if (otp_enabled) { - strcat(prot_str, "\nOTP Protection is enabled for sectors:\n"); - for (int i = 0; i < bank->num_sectors; i++) { -diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c -index d444db2b1..d0d95121f 100644 ---- a/src/target/arm_adi_v5.c -+++ b/src/target/arm_adi_v5.c -@@ -1062,7 +1062,7 @@ static int dap_rom_display(struct command_context *cmd_ctx, - int retval; - uint64_t pid; - uint32_t cid; -- char tabs[7] = ""; -+ char tabs[16] = ""; - - if (depth > 16) { - command_print(cmd_ctx, "\tTables too deep"); --- -2.13.1 - |