From 1667f80fa8629bf55beda4e96d1a29282dc55ac9 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Mon, 17 Jan 2022 19:38:32 +0100 Subject: packages: T3164: Dropbear - apply VyOS patches without quilt This prevents error: dpkg-source: error: expected [ +-] at start of line 16 of diff 'dropbear/debian/patches/0001-Enable-PAM-support.patch' dpkg-source: info: applying 0001-Enable-PAM-support.patch dpkg-source: info: the patch has fuzz which is not allowed, or is malformed --- packages/dropbear/build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/dropbear/build.sh b/packages/dropbear/build.sh index 0934f4f7..6ac51d4f 100755 --- a/packages/dropbear/build.sh +++ b/packages/dropbear/build.sh @@ -8,16 +8,15 @@ if [ ! -d ${SRC} ]; then exit 1 fi +cd ${SRC} PATCH_DIR=${CWD}/patches if [ -d $PATCH_DIR ]; then for patch in $(ls ${PATCH_DIR}) do echo "I: Apply patch: ${patch} to main repository" - cp ${PATCH_DIR}/${patch} ${SRC}/debian/patches/ - echo ${patch} >> ${SRC}/debian/patches/series + patch -p1 < ${PATCH_DIR}/${patch} done fi -cd ${SRC} echo "I: Build Debian Package" dpkg-buildpackage -uc -us -tc -b -- cgit v1.2.3