diff options
| author |   Yue Tao <Yue.Tao@windriver.com> | 2015-11-02 00:12:36 -0500 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2015-11-30 12:44:52 -0500 |
| commit | 4bc9b5638dc2fe25b882f5ed4ef18b928b11ef05 (patch) | |
| tree | a0512e1638ecd0ef21f649e279871596e65f8b27 /meta-networking/recipes-support/netcat | |
| parent | 5a8d0deb8556eaebfcc2caee641420fc53e884d3 (diff) | |
| download | meta-openembedded-4bc9b5638dc2fe25b882f5ed4ef18b928b11ef05.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>
Diffstat (limited to 'meta-networking/recipes-support/netcat')
| -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() { |