diff options
| -rw-r--r-- | meta-openpower/recipes-bsp/skiboot/skiboot.inc | 5 | ||||
| -rw-r--r-- | meta-openpower/recipes-bsp/skiboot/skiboot/0001-libffs-fix-gcc8-stringop-truncation-warnings.patch | 35 |
2 files changed, 2 insertions, 38 deletions
diff --git a/meta-openpower/recipes-bsp/skiboot/skiboot.inc b/meta-openpower/recipes-bsp/skiboot/skiboot.inc index 51d089ee9..4f7ba6502 100644 --- a/meta-openpower/recipes-bsp/skiboot/skiboot.inc +++ b/meta-openpower/recipes-bsp/skiboot/skiboot.inc @@ -2,14 +2,13 @@ HOMEPAGE = "https://github.com/open-power" LICENSE = "Apache-2.0" SRC_URI += "git://github.com/open-power/skiboot.git" -SRC_URI += "file://0001-libffs-fix-gcc8-stringop-truncation-warnings.patch" FILESEXTRAPATHS_prepend := "${THISDIR}/skiboot:" LIC_FILES_CHKSUM = "file://${S}/LICENCE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "30f8a6006de45fadedd80c98059b63d3874a5269" -PV = "6.0.13+git${SRCPV}" +SRCREV = "54811997b6d02dacaf8dd0d61cadaf3786dbabb0" +PV = "6.3.0+git${SRCPV}" S = "${WORKDIR}/git" diff --git a/meta-openpower/recipes-bsp/skiboot/skiboot/0001-libffs-fix-gcc8-stringop-truncation-warnings.patch b/meta-openpower/recipes-bsp/skiboot/skiboot/0001-libffs-fix-gcc8-stringop-truncation-warnings.patch deleted file mode 100644 index 0e7348ad9..000000000 --- a/meta-openpower/recipes-bsp/skiboot/skiboot/0001-libffs-fix-gcc8-stringop-truncation-warnings.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 0876e5091c5ed06bae8a2bac296d04b1d0e87f56 Mon Sep 17 00:00:00 2001 -From: Brad Bishop <bradleyb@fuzziesquirrel.com> -Date: Wed, 21 Nov 2018 08:54:45 -0500 -Subject: [PATCH] libffs: fix gcc8 stringop-truncation warnings - -Copy the null byte too in this copy operation to avoid the following -warning: - -| libflash/libffs.c: In function 'ffs_part_info': -| libflash/libffs.c:525:3: error: 'strncpy' output may be truncated copying 15 bytes from a string of length 15 [-Werror=stringop-truncation] -| strncpy(n, ent->name, FFS_PART_NAME_MAX); -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com> -Upstream-Status: Submitted ---- - libflash/libffs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libflash/libffs.c b/libflash/libffs.c -index 221c2b02..816153d3 100644 ---- a/libflash/libffs.c -+++ b/libflash/libffs.c -@@ -522,7 +522,7 @@ int ffs_part_info(struct ffs_handle *ffs, uint32_t part_idx, - n = calloc(1, FFS_PART_NAME_MAX + 1); - if (!n) - return FLASH_ERR_MALLOC_FAILED; -- strncpy(n, ent->name, FFS_PART_NAME_MAX); -+ strncpy(n, ent->name, FFS_PART_NAME_MAX +1); - *name = n; - } - return 0; --- -2.19.1 - |