diff --git a/patches/turrispackages/to-upstream/0022-knot-resolver-lighttpd-change-meson-location.patch b/patches/turrispackages/to-upstream/0022-knot-resolver-lighttpd-change-meson-location.patch deleted file mode 100644 index ac809a1f64831eb74f96a2fb109a5ac5561a8b46..0000000000000000000000000000000000000000 --- a/patches/turrispackages/to-upstream/0022-knot-resolver-lighttpd-change-meson-location.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e3baaa14d1fedf889e31246cb7bdcc925589cc9a Mon Sep 17 00:00:00 2001 -From: Josef Schlehofer <pepe.schlehofer@gmail.com> -Date: Sun, 17 Oct 2021 12:06:06 +0200 -Subject: [PATCH] knot-resolver & lighttpd: change meson location - -Due to upstream change, we need to move this. - -Fixes: -Makefile:29: /turris-os-packages-crashlab-mox/build/feeds/packages/devel/meson/meson.mk: No such file or directory -make[1]: *** No rule to make target '/turris-os-packages-crashlab-mox/build/feeds/packages/devel/meson/meson.mk'. Stop. ---- - net/knot-resolver/Makefile | 2 +- - net/lighttpd/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/net/knot-resolver/Makefile b/net/knot-resolver/Makefile -index bfdddb7e2..b88f37dbf 100644 ---- a/net/knot-resolver/Makefile -+++ b/net/knot-resolver/Makefile -@@ -26,7 +26,7 @@ PKG_BUILD_DEPENDS:=meson/host - PKG_INSTALL:=1 - - include $(INCLUDE_DIR)/package.mk --include $(TOPDIR)/feeds/packages/devel/meson/meson.mk -+include $(INCLUDE_DIR)/meson.mk - - define Package/knot-resolver - SECTION:=net -diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile -index 1a7958530..394d30611 100644 ---- a/net/lighttpd/Makefile -+++ b/net/lighttpd/Makefile -@@ -28,7 +28,7 @@ PKG_CONFIG_DEPENDS:=CONFIG_LIGHTTPD_SSL $(patsubst %,CONFIG_PACKAGE_lighttpd-mod - REBUILD_MODULES=authn_gssapi authn_ldap magnet webdav - - include $(INCLUDE_DIR)/package.mk --include $(TOPDIR)/feeds/packages/devel/meson/meson.mk -+include $(INCLUDE_DIR)/meson.mk - - define Package/lighttpd/Default - SUBMENU:=Web Servers/Proxies --- -2.30.2 - diff --git a/patches/turrispackages/to-upstream/0023-remove-broken-dependencies-on-meson-host.patch b/patches/turrispackages/to-upstream/0023-remove-broken-dependencies-on-meson-host.patch deleted file mode 100644 index 68f9cc3148597996edc57b2fc64d26fb1232d990..0000000000000000000000000000000000000000 --- a/patches/turrispackages/to-upstream/0023-remove-broken-dependencies-on-meson-host.patch +++ /dev/null @@ -1,40 +0,0 @@ -From a8a9933ae0e373125b745e0ba6e786f408a23489 Mon Sep 17 00:00:00 2001 -From: Michal Vasilek <michal.vasilek@nic.cz> -Date: Fri, 3 Jun 2022 17:36:38 +0200 -Subject: [PATCH] {lighttpd, kresd}: remove broken deps on meson/host - -since https://github.com/openwrt/packages/pull/16644 meson/host isn't -necessary ---- - net/knot-resolver/Makefile | 2 -- - net/lighttpd/Makefile | 1 - - 2 files changed, 3 deletions(-) - -diff --git a/net/knot-resolver/Makefile b/net/knot-resolver/Makefile -index 065b77449..4fd5fbf41 100644 ---- a/net/knot-resolver/Makefile -+++ b/net/knot-resolver/Makefile -@@ -21,8 +21,6 @@ PKG_MAINTAINER:=Knot DNS <knot-dns@labs.nic.cz> - PKG_LICENSE:=GPL-3.0-later - PKG_LICENSE_FILES:=COPYING - --PKG_BUILD_DEPENDS:=meson/host -- - PKG_INSTALL:=1 - - include $(INCLUDE_DIR)/package.mk -diff --git a/net/lighttpd/Makefile b/net/lighttpd/Makefile -index e567ed55e..b7e6ae5b3 100644 ---- a/net/lighttpd/Makefile -+++ b/net/lighttpd/Makefile -@@ -20,7 +20,6 @@ PKG_LICENSE:=BSD-3-Clause - PKG_LICENSE_FILES:=COPYING - - PKG_FIXUP:=autoreconf --PKG_BUILD_DEPENDS:=meson/host - PKG_INSTALL:=1 - - PKG_CONFIG_DEPENDS:=CONFIG_LIGHTTPD_SSL $(patsubst %,CONFIG_PACKAGE_lighttpd-mod-%,$(REBUILD_MODULES)) --- -2.36.1 -