瀏覽代碼

package/crda: update patches to be applied with fuzz 0

Commit 8f88a644ed "support/scripts/apply-patches.sh: set the maximum
fuzz factor to 0" reduced the fuzz factor.

Due to this change, crda fails to build with output:

    Applying 0001-crda-support-python-3-in-utils-key2pub.py.patch using patch:
    patching file Makefile
    Hunk #1 FAILED at 112.
    1 out of 1 hunk FAILED -- saving rejects to file Makefile.rej

Rebase patch to fix the problem, problem was not yet caught by
autobuilders.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Bernd Kuhls 1 年之前
父節點
當前提交
e1c86e1cac
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch

+ 3 - 1
package/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch

@@ -33,6 +33,8 @@ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
 Signed-off-by: Peter Seiderer <ps.report@gmx.net>
 [Romain: Use pycryptodomex]
 Signed-off-by: Romain Naour <romain.naour@gmail.com>
+[Bernd: rebased for version 4.15]
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
 ---
  Makefile         |   2 +-
  utils/key2pub.py | 146 ++++++++++++++++++++++++-----------------------
@@ -49,7 +51,7 @@ index a3ead30..8da38d0 100644
 -	$(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
 +	$(Q) python utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@
  
- $(LIBREG): regdb.h reglib.h reglib.c
+ $(LIBREG): reglib.c regdb.h reglib.h
  	$(NQ) '  CC  ' $@
 diff --git a/utils/key2pub.py b/utils/key2pub.py
 index 9bb04cd..8a0ba2a 100755