From d882310c7e36b95c244f9f1b1d54ca8971efae4e Mon Sep 17 00:00:00 2001 From: Olga Kitaina Date: Wed, 3 Dec 2025 15:43:36 +0400 Subject: [PATCH] Changes for compilation on 26.x --- bbfdm/patches/001-cmake-bump.patch | 72 ++++++++++++++++++++++++++++++ ipt-trigger/Makefile | 4 +- 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 bbfdm/patches/001-cmake-bump.patch diff --git a/bbfdm/patches/001-cmake-bump.patch b/bbfdm/patches/001-cmake-bump.patch new file mode 100644 index 000000000..8e4e3b84b --- /dev/null +++ b/bbfdm/patches/001-cmake-bump.patch @@ -0,0 +1,72 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...3.6) + + PROJECT(bbf C) + +--- a/bbfdmd/CMakeLists.txt ++++ b/bbfdmd/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...3.6) + + PROJECT(bbfdmd C) + +--- a/bbfdmd/ubus/CMakeLists.txt ++++ b/bbfdmd/ubus/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...3.6) + + PROJECT(bbfdmd) + +--- a/dm-service/CMakeLists.txt ++++ b/dm-service/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...3.6) + + PROJECT(dm-service C) + +--- a/libbbfdm-api/CMakeLists.txt ++++ b/libbbfdm-api/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...3.6) + + PROJECT(libbbfdm-api) + +--- a/libbbfdm-api/legacy/CMakeLists.txt ++++ b/libbbfdm-api/legacy/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...3.6) + + PROJECT(libbbfdm-api-legacy) + +--- a/libbbfdm-api/version-2/CMakeLists.txt ++++ b/libbbfdm-api/version-2/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...3.6) + + PROJECT(libbbfdm-api-version-2) + +--- a/libbbfdm-ubus/CMakeLists.txt ++++ b/libbbfdm-ubus/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...3.6) + + PROJECT(libbbfdm-ubus) + +--- a/libbbfdm/CMakeLists.txt ++++ b/libbbfdm/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.0) ++cmake_minimum_required(VERSION 3.0...3.6) + + PROJECT(libbbfdm) + diff --git a/ipt-trigger/Makefile b/ipt-trigger/Makefile index e30704fcf..177384cf6 100644 --- a/ipt-trigger/Makefile +++ b/ipt-trigger/Makefile @@ -66,8 +66,8 @@ define Build/InstallDev endef define Build/Compile - $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src/ipv4/" modules - $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src/ipv6/" modules + $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src/ipv4" modules + $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/src/ipv6" modules endef $(eval $(call KernelPackage,ipt-trigger))