From 4bc9b5638dc2fe25b882f5ed4ef18b928b11ef05 Mon Sep 17 00:00:00 2001 From: Yue Tao Date: Mon, 2 Nov 2015 00:12:36 -0500 Subject: netcat-openbsd: replace patch with quilt 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 Signed-off-by: Wenzong Fan Signed-off-by: Martin Jansa Signed-off-by: Joe MacDonald --- meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-networking') 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 12409d4b19..89a646f519 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() { -- cgit 1.2.3-korg