From b6db3f06ccfc9cdff482905061b13098ab3e3554 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Mon, 17 Dec 2012 09:25:40 +0200 Subject: patch: drop global-reject-file patch global-reject-file.diff was patch ported from Debian that Debian itself has dropped as upstream now has equivalent functionality. To update users of this functionality, replace "--global-reject-file=file" with simple "--reject-file=file" which no longer overwrites reject hunks from different files. (From OE-Core rev: 1c15ffab4d68e86f1ffcfd538e1d0ab77c21cb97) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-devtools/patch/patch_2.6.1.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'meta/recipes-devtools/patch/patch_2.6.1.bb') diff --git a/meta/recipes-devtools/patch/patch_2.6.1.bb b/meta/recipes-devtools/patch/patch_2.6.1.bb index 50557477da..2733854bb7 100644 --- a/meta/recipes-devtools/patch/patch_2.6.1.bb +++ b/meta/recipes-devtools/patch/patch_2.6.1.bb @@ -1,9 +1,7 @@ require patch.inc LICENSE = "GPLv3" -PR = "r1" - -SRC_URI += " file://global-reject-file.diff " +PR = "r2" SRC_URI[md5sum] = "d758eb96d3f75047efc004a720d33daf" SRC_URI[sha256sum] = "d1563731e9cffed11cc5f011b2b8e074c325e86a383a91889b5c5b80b09781b9" @@ -11,4 +9,3 @@ SRC_URI[sha256sum] = "d1563731e9cffed11cc5f011b2b8e074c325e86a383a91889b5c5b80b0 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" acpaths = "-I ${S}/gl/m4 -I ${S}/m4 " - -- cgit v1.2.3-54-g00ecf