diff options
| author | Marko Lindqvist <cazfi74@gmail.com> | 2012-12-17 09:25:40 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-19 17:54:53 +0000 |
| commit | b6db3f06ccfc9cdff482905061b13098ab3e3554 (patch) | |
| tree | 294c219f589f747159d805a927b8cc16b80564eb /meta/recipes-devtools/patch/patch_2.6.1.bb | |
| parent | 9e941bbfaa4785ed5870a3ecde35191957871adb (diff) | |
| download | poky-b6db3f06ccfc9cdff482905061b13098ab3e3554.tar.gz | |
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 <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/patch/patch_2.6.1.bb')
| -rw-r--r-- | meta/recipes-devtools/patch/patch_2.6.1.bb | 5 |
1 files changed, 1 insertions, 4 deletions
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 @@ | |||
| 1 | require patch.inc | 1 | require patch.inc |
| 2 | LICENSE = "GPLv3" | 2 | LICENSE = "GPLv3" |
| 3 | 3 | ||
| 4 | PR = "r1" | 4 | PR = "r2" |
| 5 | |||
| 6 | SRC_URI += " file://global-reject-file.diff " | ||
| 7 | 5 | ||
| 8 | SRC_URI[md5sum] = "d758eb96d3f75047efc004a720d33daf" | 6 | SRC_URI[md5sum] = "d758eb96d3f75047efc004a720d33daf" |
| 9 | SRC_URI[sha256sum] = "d1563731e9cffed11cc5f011b2b8e074c325e86a383a91889b5c5b80b09781b9" | 7 | SRC_URI[sha256sum] = "d1563731e9cffed11cc5f011b2b8e074c325e86a383a91889b5c5b80b09781b9" |
| @@ -11,4 +9,3 @@ SRC_URI[sha256sum] = "d1563731e9cffed11cc5f011b2b8e074c325e86a383a91889b5c5b80b0 | |||
| 11 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" |
| 12 | 10 | ||
| 13 | acpaths = "-I ${S}/gl/m4 -I ${S}/m4 " | 11 | acpaths = "-I ${S}/gl/m4 -I ${S}/m4 " |
| 14 | |||