Bug 13708 - meta/recipes-devtools/file/file/debian-742262.patch do not apply after commit in file git repo
Summary: meta/recipes-devtools/file/file/debian-742262.patch do not apply after commit...
Status: RESOLVED NOTABUG
Alias: None
Product: OE-Core
Classification: Build System, Metadata & Runtime
Component: devtools / tool chain (show other bugs)
Version: 2.0.3
Hardware: x86 arm
: Low normal
Target Milestone: 3.1 M2
Assignee: Paul Eggleton
QA Contact:
URL:
Whiteboard:
Depends on:
Blocks:
 
Reported: 2019-12-16 12:02 UTC by Rui Faria
Modified: 2019-12-19 15:54 UTC (History)
5 users (show)

See Also:
OS type for building Yocto: ---
Type of Regression: ---
Verified:
Documentation change: No (bug/feature does not impact docs)


Attachments

Note You need to log in before you can comment on or make changes to this bug.
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.