diff options
| author |   Yue Tao <Yue.Tao@windriver.com> | 2015-11-02 00:12:36 -0500 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2015-12-20 14:05:27 -0800 |
| commit | c3c71b61082648a6e23ccf503972e5b8920cae6e (patch) | |
| tree | 3bfc544e1be48a386d433bee2a9def5ca19bb919 /meta-networking | |
| parent | a05d2b66e2aa0309c781fb46cd3fa5de8b26fd54 (diff) | |
| download | meta-openembedded-c3c71b61082648a6e23ccf503972e5b8920cae6e.tar.gz | |
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 <Yue.Tao@windriver.com>
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-support/netcat/netcat-openbsd_1.105.bb | 3 |
1 files changed, 2 insertions, 1 deletions
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() { |