Bug 13708

Summary: meta/recipes-devtools/file/file/debian-742262.patch do not apply after commit in file git repo
Product: [Build System, Metadata & Runtime] OE-Core Reporter: Rui Faria <rui.goncalves>
Component: devtools / tool chainAssignee: Paul Eggleton <bluelightning>
Status: RESOLVED NOTABUG QA Contact:
Severity: normal    
Priority: Low CC: akuster, meta.mr.watcher, meta.watcher, ross.burton, rui.goncalves
Version: 2.0.3   
Target Milestone: 3.1 M2   
Hardware: x86   
OS: arm   
Whiteboard:
OS type for building Yocto: --- Type of Regression: ---
Verified: Documentation change: No (bug/feature does not impact docs)

Description Rui Faria 2019-12-16 12:02:08 UTC
The patch 'meta/recipes-devtools/file/file/debian-742262.patch' do not apply after commit in file git repo. To be more specific this commit:

> https://github.com/file/file/commit/898f5d27b66b5d5592cb56fa9da5b776628ea6ca
Comment 1 Ross Burton 2019-12-19 15:54:33 UTC
That's correct.

If you're upgrading file to a newer version, then you'll need to rebase any patches.  This isn't a bug but part of the work involved in upgrading a recipe.

Specifically this commit in oe-core a while ago:

commit cf6a32debcde5bfde94126c3b4200800d672e605
Author: Ross Burton <ross.burton@intel.com>
Date:   Tue Mar 5 16:30:01 2019 +0000

    file: upgrade to 5.36

    Upgrade to 5.36.

    Drop debian-742262.patch, this appears to have been fixed properly upstream some
    releases ago.