From 193236933b0f4ab91b1625b64e2187e2db4e0e8f Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Fri, 5 Apr 2019 15:28:33 -0400 Subject: reset upstream subtrees to HEAD Reset the following subtrees on HEAD: poky: 8217b477a1(master) meta-xilinx: 64aa3d35ae(master) meta-openembedded: 0435c9e193(master) meta-raspberrypi: 490a4441ac(master) meta-security: cb6d1c85ee(master) Squashed patches: meta-phosphor: drop systemd 239 patches meta-phosphor: mrw-api: use correct install path Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d Signed-off-by: Brad Bishop --- poky/meta/recipes-devtools/ccache/ccache.inc | 13 +++- poky/meta/recipes-devtools/ccache/ccache_3.4.2.bb | 11 --- poky/meta/recipes-devtools/ccache/ccache_3.6.bb | 12 ++++ .../0002-dev.mk.in-fix-file-name-too-long.patch | 8 +-- ...mentation-fault-error-when-gcc-o-dev-null.patch | 79 ++++++++++++++++++++++ 5 files changed, 107 insertions(+), 16 deletions(-) delete mode 100644 poky/meta/recipes-devtools/ccache/ccache_3.4.2.bb create mode 100644 poky/meta/recipes-devtools/ccache/ccache_3.6.bb create mode 100644 poky/meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch (limited to 'poky/meta/recipes-devtools/ccache') diff --git a/poky/meta/recipes-devtools/ccache/ccache.inc b/poky/meta/recipes-devtools/ccache/ccache.inc index 656632893..7f800659a 100644 --- a/poky/meta/recipes-devtools/ccache/ccache.inc +++ b/poky/meta/recipes-devtools/ccache/ccache.inc @@ -9,8 +9,19 @@ LICENSE = "GPLv3+" DEPENDS = "zlib" -SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.xz" +SRC_URI = "https://download.samba.org/pub/${BPN}/${BP}.tar.gz" inherit autotools +# Remove ccache-native's dependencies, so that it can be used widely by +# other native recipes. +DEPENDS_class-native = "" +EXTRA_OECONF_class-native = "--with-bundled-zlib" +INHIBIT_AUTOTOOLS_DEPS_class-native = "1" +PATCHTOOL = "patch" + BBCLASSEXTEND = "native" + +do_configure_class-native() { + oe_runconf +} diff --git a/poky/meta/recipes-devtools/ccache/ccache_3.4.2.bb b/poky/meta/recipes-devtools/ccache/ccache_3.4.2.bb deleted file mode 100644 index 72309348b..000000000 --- a/poky/meta/recipes-devtools/ccache/ccache_3.4.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ccache.inc - -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=2722abeaf1750dbf175b9491112374e1" - -SRC_URI[md5sum] = "9e048f88f3897125864f9a5e1abfb72d" -SRC_URI[sha256sum] = "18a8b14367d63d3d37fb6c33cba60e1b7fcd7a63d608df97c9771ae0d234fee2" - -SRC_URI += " \ - file://0002-dev.mk.in-fix-file-name-too-long.patch \ -" diff --git a/poky/meta/recipes-devtools/ccache/ccache_3.6.bb b/poky/meta/recipes-devtools/ccache/ccache_3.6.bb new file mode 100644 index 000000000..60807be0a --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/ccache_3.6.bb @@ -0,0 +1,12 @@ +require ccache.inc + +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=70762511f9c509cc2a4e4ba2ef687ae3" + +SRC_URI[md5sum] = "bd6fd69db28426baf22ec0acdd5c4b2a" +SRC_URI[sha256sum] = "a3f2b91a2353b65a863c5901251efe48060ecdebec46b5eaec8ea8e092b9e871" + +SRC_URI += " \ + file://0002-dev.mk.in-fix-file-name-too-long.patch \ + file://0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch \ +" diff --git a/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch b/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch index 68c2371fb..16a6e9d80 100644 --- a/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch +++ b/poky/meta/recipes-devtools/ccache/files/0002-dev.mk.in-fix-file-name-too-long.patch @@ -1,13 +1,13 @@ From 7dab2995ed8eeccd7b0acd79668bc28f3a2427d5 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Wed, 16 Sep 2015 19:45:40 -0700 -Subject: [PATCH] dev.mk.in: fix file name too long +Subject: [PATCH] dev.mk.in: fix file name too long error -The all_cppflags change paths to filename which cause file name too long +The all_cppflags changes path to filename which causes file name too long error when the path is longer than NAME_MAX (usually 255). Strip srcdir to fix the problem. -Upstream-Status: Pending +Upstream-Status: Backport [https://github.com/ccache/ccache/commit/4d86e884d07ba1853a0c70507cc4d04107f57c29] Signed-off-by: Robert Yang @@ -22,7 +22,7 @@ index 91b0a57..583ade0 100644 @@ -1,7 +1,7 @@ # GNU make syntax reigns in this file. - all_cflags += -Werror + all_cflags += -Werror @more_warnings@ -all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$<)).d +all_cppflags += -MD -MP -MF .deps/$(subst .._,,$(subst /,_,$(subst $(srcdir)/,,$<))).d diff --git a/poky/meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch b/poky/meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch new file mode 100644 index 000000000..b3012b7e8 --- /dev/null +++ b/poky/meta/recipes-devtools/ccache/files/0003-Fix-Segmentation-fault-error-when-gcc-o-dev-null.patch @@ -0,0 +1,79 @@ +From c51b63758e95247e3c1e2f06e5f5bfb49849e66d Mon Sep 17 00:00:00 2001 +From: Robert Yang +Date: Tue, 22 Jan 2019 16:30:52 +0800 +Subject: [PATCH] Fix Segmentation fault error when gcc -o /dev/null + +Fixed: +$ export CCACHE_DEBUG=1 +$ ccache gcc -c hello.c -o /dev/null + +Segmentation fault (core dumped) + +This is because failed to open /dev/null.foo (Permission denied), check file +stream before write to it can fix the problem. + +Upstream-Status: Backport [https://github.com/ccache/ccache/commit/4d86e884d07ba1853a0c70507cc4d04107f57c29] + +Signed-off-by: Robert Yang +--- + src/ccache.c | 15 ++++++++++++--- + src/util.c | 8 ++++++-- + 2 files changed, 18 insertions(+), 5 deletions(-) + +diff --git a/src/ccache.c b/src/ccache.c +index b4cdb86..8c227df 100644 +--- a/src/ccache.c ++++ b/src/ccache.c +@@ -521,9 +521,13 @@ init_hash_debug(struct hash *hash, const char *obj_path, char type, + + char *path = format("%s.ccache-input-%c", obj_path, type); + FILE *debug_binary_file = fopen(path, "wb"); +- hash_enable_debug(hash, section_name, debug_binary_file, debug_text_file); ++ if (debug_binary_file) { ++ hash_enable_debug(hash, section_name, debug_binary_file, debug_text_file); ++ exitfn_add(fclose_exitfn, debug_binary_file); ++ } else { ++ cc_log("Failed to open %s: %s", path, strerror(errno)); ++ } + free(path); +- exitfn_add(fclose_exitfn, debug_binary_file); + } + + static enum guessed_compiler +@@ -3670,8 +3674,13 @@ ccache(int argc, char *argv[]) + if (conf->debug) { + char *path = format("%s.ccache-input-text", output_obj); + debug_text_file = fopen(path, "w"); ++ if (debug_text_file) { ++ exitfn_add(fclose_exitfn, debug_text_file); ++ } ++ else { ++ cc_log("Failed to open %s: %s", path, strerror(errno)); ++ } + free(path); +- exitfn_add(fclose_exitfn, debug_text_file); + } + + struct hash *common_hash = hash_init(); +diff --git a/src/util.c b/src/util.c +index e442cc4..a49fb4c 100644 +--- a/src/util.c ++++ b/src/util.c +@@ -219,8 +219,12 @@ void + cc_dump_log_buffer(const char *path) + { + FILE *file = fopen(path, "w"); +- (void) fwrite(logbuffer, 1, logsize, file); +- fclose(file); ++ if (file) { ++ (void) fwrite(logbuffer, 1, logsize, file); ++ fclose(file); ++ } else { ++ cc_log("Failed to open %s: %s", path, strerror(errno)); ++ } + } + + // Something went badly wrong! +-- +2.7.4 + -- cgit v1.2.3