mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 00:59:48 +00:00
patch.bbclass: when the patch fails show more info on the fatal error
There are situations when the user have the 'patchdir' defined
as a parameter on SRC_URI. However he doesn't know that with this
the patch is applied relatively to the receipe source dir 'S'.
- When user have 'patchdir' defined check if this directory exist.
- If the patch fails show addition info to the user:
- Import: show the striplevel
- Resolver: show the expanded 'patchdir' to the user.
The next example is from opencv in meta-oe layer, here the
patch is applied on the target directory ${WORKDIR}/git/contrib.
S = "${WORKDIR}/git"
SRCREV_FORMAT = "opencv_contrib"
SRC_URI = "git://github.com/opencv/opencv.git;name=opencv \
git://github.com/opencv/opencv_contrib.git;destsuffix=contrib;name=contrib \
file://0001-sfm-link-with-Glog_LIBS.patch;patchdir=../contrib \
"
* When the patch fail there are no message that indicates the real reason.
patchdir=../no-found-on-file-system
ERROR: opencv-4.5.2-r0 do_patch: Command Error: 'quilt --quiltrc /build/tmp/work/core2-64-poky-linux/opencv/4.5.2-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
stdout: Applying patch 0001-sfm-link-with-Glog_LIBS.patch
can't find file to patch at input line 37
Perhaps you used the wrong -p or --strip option?
* The check of the patchdir will add a new fatal error
when the user specifies a wrong path than don't exist.
patchdir=../no-found-on-file-system
ERROR: opencv-4.5.2-r0 do_patch: Target directory '/build/tmp/work/core2-64-poky-linux/opencv/4.5.2-r0/git/../no-found-on-file-system' not found, patchdir '../no-found-on-file-system' is incorrect in patch file '0001-sfm-link-with-Glog_LIBS.patch'
* When we can't aplly the patch but the patchdir exist,
show the expanded patchdir on fatal error.
patchdir=../git
ERROR: opencv-4.5.2-r0 do_patch: Applying patch '0001-sfm-link-with-Glog_LIBS.patch' on target directory '/build/tmp/work/core2-64-poky-linux/opencv/4.5.2-r0/git/../git'
Command Error: 'quilt --quiltrc /build/tmp/work/core2-64-poky-linux/opencv/4.5.2-r0/recipe-sysroot-native/etc/quiltrc push' exited with 0 Output:
stdout: Applying patch 0001-sfm-link-with-Glog_LIBS.patch
can't find file to patch at input line 37
Perhaps you used the wrong -p or --strip option?
(From OE-Core rev: c44bc7c0fb8b7c2e44dd93607a3bfd9733e1df80)
Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
7d3b5e8af3
commit
99ab2198e2
@@ -131,6 +131,9 @@ python patch_do_patch() {
|
|||||||
patchdir = parm["patchdir"]
|
patchdir = parm["patchdir"]
|
||||||
if not os.path.isabs(patchdir):
|
if not os.path.isabs(patchdir):
|
||||||
patchdir = os.path.join(s, patchdir)
|
patchdir = os.path.join(s, patchdir)
|
||||||
|
if not os.path.isdir(patchdir):
|
||||||
|
bb.fatal("Target directory '%s' not found, patchdir '%s' is incorrect in patch file '%s'" %
|
||||||
|
(patchdir, parm["patchdir"], parm['patchname']))
|
||||||
else:
|
else:
|
||||||
patchdir = s
|
patchdir = s
|
||||||
|
|
||||||
@@ -147,12 +150,12 @@ python patch_do_patch() {
|
|||||||
patchset.Import({"file":local, "strippath": parm['striplevel']}, True)
|
patchset.Import({"file":local, "strippath": parm['striplevel']}, True)
|
||||||
except Exception as exc:
|
except Exception as exc:
|
||||||
bb.utils.remove(process_tmpdir, True)
|
bb.utils.remove(process_tmpdir, True)
|
||||||
bb.fatal(str(exc))
|
bb.fatal("Importing patch '%s' with striplevel '%s'\n%s" % (parm['patchname'], parm['striplevel'], str(exc)))
|
||||||
try:
|
try:
|
||||||
resolver.Resolve()
|
resolver.Resolve()
|
||||||
except bb.BBHandledException as e:
|
except bb.BBHandledException as e:
|
||||||
bb.utils.remove(process_tmpdir, True)
|
bb.utils.remove(process_tmpdir, True)
|
||||||
bb.fatal(str(e))
|
bb.fatal("Applying patch '%s' on target directory '%s'\n%s" % (parm['patchname'], patchdir, str(e)))
|
||||||
|
|
||||||
bb.utils.remove(process_tmpdir, True)
|
bb.utils.remove(process_tmpdir, True)
|
||||||
del os.environ['TMPDIR']
|
del os.environ['TMPDIR']
|
||||||
|
|||||||
Reference in New Issue
Block a user