summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2016-06-12 01:25:07 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-14 12:56:31 +0100
commit3ff14b3fb23746139e359e34f80dfaea6722a0cf (patch)
treeefe20df8e85dd04f07994ad3dafd6e50d08aea60
parent1d55b4d66f1fb82662b0be8f525a68798da23d01 (diff)
downloadopenembedded-core-contrib-3ff14b3fb23746139e359e34f80dfaea6722a0cf.tar.gz
openembedded-core-contrib-3ff14b3fb23746139e359e34f80dfaea6722a0cf.tar.bz2
openembedded-core-contrib-3ff14b3fb23746139e359e34f80dfaea6722a0cf.zip
make: 4.1 -> 4.2
Remove backport patch 0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/make/make-4.2/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch (renamed from meta/recipes-devtools/make/make-4.1/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch)0
-rw-r--r--meta/recipes-devtools/make/make_4.2.bb (renamed from meta/recipes-devtools/make/make_4.1.bb)6
2 files changed, 2 insertions, 4 deletions
diff --git a/meta/recipes-devtools/make/make-4.1/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch b/meta/recipes-devtools/make/make-4.2/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
index 7a5f4ba055..7a5f4ba055 100644
--- a/meta/recipes-devtools/make/make-4.1/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
+++ b/meta/recipes-devtools/make/make-4.2/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
diff --git a/meta/recipes-devtools/make/make_4.1.bb b/meta/recipes-devtools/make/make_4.2.bb
index 78fe0b5471..6327d6ce51 100644
--- a/meta/recipes-devtools/make/make_4.1.bb
+++ b/meta/recipes-devtools/make/make_4.2.bb
@@ -4,11 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
file://glob/COPYING.LIB;md5=4a770b67e6be0f60da244beb2de0fce4"
require make.inc
-SRC_URI += "file://0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch"
-
EXTRA_OECONF += "--without-guile"
-SRC_URI[md5sum] = "57a7a224a822f94789a587ccbcedff69"
-SRC_URI[sha256sum] = "0bc7613389650ee6a24554b52572a272f7356164fd2c4132b0bcf13123e4fca5"
+SRC_URI[md5sum] = "85ad14d08766201ffe71efa866f4fb91"
+SRC_URI[sha256sum] = "4e5ce3b62fe5d75ff8db92b7f6df91e476d10c3aceebf1639796dc5bfece655f"
BBCLASSEXTEND = "native nativesdk"