From 8f13ebc66036ddad467282107f88007046f9cc9f Mon Sep 17 00:00:00 2001 From: Josef Schlehofer Date: Sun, 20 Jul 2025 22:25:01 +0200 Subject: [PATCH] Revert "scapy: fix build by including pip requirements" 1. This commit was pushed to the master branch without review, it is causing that scapy is not compiled anymore due to wrong hashes. This error from the buildbots: Collecting packaging==25.0 (from -r ./host-pip-requirements.txt (line 1)) Using cached packaging-25.0.tar.gz (165 kB) ERROR: THESE PACKAGES DO NOT MATCH THE HASHES FROM THE REQUIREMENTS FILE. If you have updated the package versions, please update the hashes. Otherwise, examine the package contents carefully; someone may have tampered with them. packaging==25.0 from https://files.pythonhosted.org/packages/a1/d4/1fc4078c65507b51b96ca8f8c3ba19e6a61c8253c72794544580a7b6c24d/packaging-25.0.tar.gz (from -r ./host-pip-requirements.txt (line 1)): Expected sha256 29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 Got d443872c98d677bf60f6a1f2f8c1cb748e8fe762d2bf9d3148b5599295b0fc4f make[3]: *** [Makefile:46: /builder/shared-workdir/build/sdk/build_dir/target-arm_cortex-a9+neon_musl_eabi/pypi/scapy-2.6.1/.built] Error 1 time: package/feeds/packages/scapy/compile#1.15#0.41#1.71 2. While at it, the commit implements old solution by using host-pip-requirements This was removed in https://github.com/openwrt/packages/pull/20657 This reverts commit ebb0ed3ba2cbcc64b20ce21010b6aad7c9abff29. Signed-off-by: Josef Schlehofer --- net/scapy/Makefile | 1 - net/scapy/host-pip-requirements.txt | 4 ---- 2 files changed, 5 deletions(-) delete mode 100644 net/scapy/host-pip-requirements.txt diff --git a/net/scapy/Makefile b/net/scapy/Makefile index 3412da2171..6fc1859ed2 100644 --- a/net/scapy/Makefile +++ b/net/scapy/Makefile @@ -18,7 +18,6 @@ PKG_MAINTAINER:=W. Michael Petullo PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE PKG_CPE_ID:=cpe:/a:scapy:scapy -HOST_PYTHON3_PACKAGE_BUILD_DEPENDS:=./host-pip-requirements.txt include ../../lang/python/pypi.mk include $(INCLUDE_DIR)/package.mk diff --git a/net/scapy/host-pip-requirements.txt b/net/scapy/host-pip-requirements.txt deleted file mode 100644 index 235d9a006b..0000000000 --- a/net/scapy/host-pip-requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -packaging==25.0 --hash=sha256:29572ef2b1f17581046b3a2227d5c611fb25ec70ca1ba8554b24b0e69331a484 -pyproject_hooks==1.2.0 --hash=sha256:9e5c6bfa8dcc30091c74b0cf803c81fdd29d94f01992a7707bc97babb1141913 -build==1.2.2.post1 --hash=sha256:1d61c0887fa860c01971625baae8bdd338e517b836a2f70dd1f7aa3a6b2fc5b5 -installer==0.7.0 --hash=sha256:05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53 -- 2.30.2