[oe-commits] [openembedded-core] 11/26: make: 4.1 -> 4.2

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 731c6786c11df7d9c8af413bbcb045bf1fdd3f60
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Sun Jun 12 01:25:07 2016 -0700

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 .../0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch | 0
 meta/recipes-devtools/make/{make_4.1.bb => make_4.2.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
similarity index 100%
rename from meta/recipes-devtools/make/make-4.1/0001-main.c-main-SV-43434-Handle-NULL-returns-from-ttynam.patch
rename to 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
similarity index 60%
rename from meta/recipes-devtools/make/make_4.1.bb
rename to meta/recipes-devtools/make/make_4.2.bb
index 78fe0b5..6327d6c 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"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.