From: Yue Tao <[email protected]> If run bitbake -c patch -f netcat-openbsd twice, the patch conflict will happen, so replace the patch with quilt to avoid do_patch failed.
Signed-off-by: Yue Tao <[email protected]> Signed-off-by: Wenzong Fan <[email protected]> --- meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb index 12409d4..89a646f 100644 --- a/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb +++ b/meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb @@ -20,7 +20,8 @@ do_configure[noexec] = "1" netcat_do_patch() { cd ${S} - while read line; do patch -p1 < ${WORKDIR}/debian/patches/$line; done < ${WORKDIR}/debian/patches/series + quilt pop -a || true + QUILT_PATCHES=${WORKDIR}/debian/patches QUILT_SERIES=${WORKDIR}/debian/patches/series quilt push -a } python do_patch() { -- 1.9.1 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
