diff options
| -rw-r--r-- | meta/recipes-extended/net-tools/net-tools_1.60-23.bb | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb index 213fb6075c..c8d2c57923 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-23.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-23.bb @@ -31,11 +31,19 @@ PARALLEL_MAKE = "" # up all previously applied patches in the start nettools_do_patch() { cd ${S} - patch -p1 < ${WORKDIR}/${BPN}_${PV}.diff + quilt pop -a || true + if [ -d ${S}/.pc-nettools ]; then + mv ${S}/.pc-nettools ${S}/.pc + QUILT_PATCHES=${S}/debian/patches quilt pop -a + rm -rf ${S}/.pc ${S}/debian + fi + patch -p1 < ${WORKDIR}/${BPN}_${PV}.diff QUILT_PATCHES=${S}/debian/patches quilt push -a - rm -rf ${S}/patches ${S}/.pc + mv ${S}/.pc ${S}/.pc-nettools } +do_unpack[cleandirs] += "${S}" + # We invoke base do_patch at end, to incorporate any local patch python do_patch() { bb.build.exec_func('nettools_do_patch', d) |