Skip to content
Snippets Groups Projects
Verified Commit ecf76550 authored by Josef Schlehofer's avatar Josef Schlehofer
Browse files

Merge branch 'hotfix/conflict-ct' into hbl

parents 11229a38 e338968c
Branches
Tags
1 merge request!377Turris OS 5.2 (HBK)
Hide whitespace changes
Inline Side-by-side
Showing
with 4229 additions and 8 deletions
lists/base-fix.lua.m4
+ 10
− 0
View file @ ecf76550
......@@ -102,3 +102,13 @@ if version_match and installed and installed["shield-support"] and
Install("fix-all-lan-ports-in-lan")
Package("fix-all-lan-ports-in-lan", { replan = finished })
end
-- Transmission previously implemented multiple variants but that was later
-- abandoned in favor of single SSL variant. This covers previously defined
-- variants of packages and simply marks them as virtual and request installation
-- of package instead.
for _, ssl in pairs({"openssl", "mbedtls"}) do
for _, pkg in pairs({"transmission-daemon", "transmission-cli", "transmission-remote"}) do
Package(pkg .. "-" .. ssl, { virtual = true, deps = pkg })
end
end
lists/conflicts.lua deleted 100644 → 0
+ 0
− 6
View file @ 11229a38
--[[
These are packages that are known to provide same functionality but upstream does
not specify conflict.
]]
Package("ath10k-firmware-qca988x-ct-htt", { deps = Not("ath10k-firmware-qca988x-ct") })
lists/repository.lua.m4
+ 0
− 2
View file @ ecf76550
......@@ -17,5 +17,3 @@ end
INFO("Target Turris OS: _TURRIS_OS_VERSION_")
DBG("Current Turris OS: " .. tostring(os_release.VERSION))
list_script('conflicts.lua')
patches/luci/hack/0001-luci-app-transmission-add-dependency-for-transmissio.patch 0 → 100644
+ 32
− 0
View file @ ecf76550
From b71556896e2f424b9930fd24c2ff1e749223f70e Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Tue, 27 Oct 2020 11:01:32 +0100
Subject: [PATCH] luci-app-transmission: add dependency for transmission-daemon
In recent changes in packages feed
(https://github.com/openwrt/packages/commit/56e4edad82211c14528122566f56168f1bee0fd8),
there were removed variants, so if you will install
luci-app-transmission now, it will pull also transmission-daemon
and users do not need to install it separately.
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---
applications/luci-app-transmission/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/applications/luci-app-transmission/Makefile b/applications/luci-app-transmission/Makefile
index 1a1166f2d..0696bdac8 100644
--- a/applications/luci-app-transmission/Makefile
+++ b/applications/luci-app-transmission/Makefile
@@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk
LUCI_TITLE:=LuCI Support for Transmission
-LUCI_DEPENDS:=+luci-compat +luci-lib-ipkg
+LUCI_DEPENDS:=+luci-compat +luci-lib-ipkg +transmission-daemon
include ../../luci.mk
--
2.17.1
patches/openwrt/to-upstream/0039-ath10k-ct-firmware-add-conflicts-and-better-provides.patch 0 → 100644
+ 123
− 0
View file @ ecf76550
From 5291bb9614c295af4deaefa7c9f448891e72d2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Mon, 19 Oct 2020 11:34:03 +0200
Subject: [PATCH] ath10k-ct-firmware: add conflicts and better provides
This expands packages to define not only provides but also conflicts.
These packages provides same files so they should specify conflicts.
Second expansion is that *-ct-htt firmwares can also provide *-ct
variant as those make it also compatible.
---
package/firmware/ath10k-ct-firmware/Makefile | 24 +++++++++++++++-----
1 file changed, 18 insertions(+), 6 deletions(-)
diff --git a/package/firmware/ath10k-ct-firmware/Makefile b/package/firmware/ath10k-ct-firmware/Makefile
index 12fb031..20514fa 100644
--- a/package/firmware/ath10k-ct-firmware/Makefile
+++ b/package/firmware/ath10k-ct-firmware/Makefile
@@ -191,13 +191,15 @@ $(Package/ath10k-ct-firmware-default)
SECTION:=firmware
CATEGORY:=Firmware
PROVIDES:=ath10k-firmware-qca988x
+ CONFLICTS:=ath10k-firmware-qca988x
endef
define Package/ath10k-firmware-qca988x-ct-htt
$(Package/ath10k-ct-firmware-default)
TITLE:=ath10k CT 10.1 htt-mgt fw for QCA988x
SECTION:=firmware
CATEGORY:=Firmware
- PROVIDES:=ath10k-firmware-qca988x
+ PROVIDES:=ath10k-firmware-qca988x ath10k-firmware-qca988x-ct
+ CONFLICTS:=ath10k-firmware-qca988x ath10k-firmware-qca988x-ct
DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
endef
@@ -207,13 +209,15 @@ $(Package/ath10k-ct-firmware-default)
SECTION:=firmware
CATEGORY:=Firmware
PROVIDES:=ath10k-firmware-qca9887
+ CONFLICTS:=ath10k-firmware-qca9887
endef
define Package/ath10k-firmware-qca9887-ct-htt
$(Package/ath10k-ct-firmware-default)
TITLE:=ath10k CT 10.1 htt-mgt fw for QCA9887
SECTION:=firmware
CATEGORY:=Firmware
- PROVIDES:=ath10k-firmware-qca9887
+ PROVIDES:=ath10k-firmware-qca9887 ath10k-firmware-qca9887-ct
+ CONFLICTS:=ath10k-firmware-qca9887 ath10k-firmware-qca9887-ct
DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
endef
@@ -223,13 +227,15 @@ $(Package/ath10k-ct-firmware-default)
SECTION:=firmware
CATEGORY:=Firmware
PROVIDES:=ath10k-firmware-qca99x0
+ CONFLICTS:=ath10k-firmware-qca99x0
endef
define Package/ath10k-firmware-qca99x0-ct-htt
$(Package/ath10k-ct-firmware-default)
TITLE:=ath10k CT 10.4 htt-mgt fw for QCA99x0
SECTION:=firmware
CATEGORY:=Firmware
- PROVIDES:=ath10k-firmware-qca99x0
+ PROVIDES:=ath10k-firmware-qca99x0 ath10k-firmware-qca99x0-ct
+ CONFLICTS:=ath10k-firmware-qca99x0 ath10k-firmware-qca99x0-ct
DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
endef
@@ -239,13 +245,15 @@ $(Package/ath10k-ct-firmware-default)
SECTION:=firmware
CATEGORY:=Firmware
PROVIDES:=ath10k-firmware-qca9984
+ CONFLICTS:=ath10k-firmware-qca9984
endef
define Package/ath10k-firmware-qca9984-ct-htt
$(Package/ath10k-ct-firmware-default)
TITLE:=ath10k CT 10.4 htt-mgt fw for QCA9984
SECTION:=firmware
CATEGORY:=Firmware
- PROVIDES:=ath10k-firmware-qca9984
+ PROVIDES:=ath10k-firmware-qca9984 ath10k-firmware-qca9984-ct
+ CONFLICTS:=ath10k-firmware-qca9984 ath10k-firmware-qca9984-ct
DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
endef
@@ -255,13 +263,15 @@ $(Package/ath10k-ct-firmware-default)
SECTION:=firmware
CATEGORY:=Firmware
PROVIDES:=ath10k-firmware-qca4019
+ CONFLICTS:=ath10k-firmware-qca4019
endef
define Package/ath10k-firmware-qca4019-ct-htt
$(Package/ath10k-ct-firmware-default)
TITLE:=ath10k CT 10.4 htt-mgt for QCA4018/9
SECTION:=firmware
CATEGORY:=Firmware
- PROVIDES:=ath10k-firmware-qca4019
+ PROVIDES:=ath10k-firmware-qca4019 ath10k-firmware-qca4019-ct
+ CONFLICTS:=ath10k-firmware-qca4019 ath10k-firmware-qca4019-ct
DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
endef
@@ -271,13 +281,15 @@ $(Package/ath10k-ct-firmware-default)
SECTION:=firmware
CATEGORY:=Firmware
PROVIDES:=ath10k-firmware-qca9888
+ CONFLICTS:=ath10k-firmware-qca9888
endef
define Package/ath10k-firmware-qca9888-ct-htt
$(Package/ath10k-ct-firmware-default)
TITLE:=ath10k CT 10.4 htt-mgt fw for QCA9886/8
SECTION:=firmware
CATEGORY:=Firmware
- PROVIDES:=ath10k-firmware-qca9888
+ PROVIDES:=ath10k-firmware-qca9888 ath10k-firmware-qca9888-ct
+ CONFLICTS:=ath10k-firmware-qca9888 ath10k-firmware-qca9888-ct
DEPENDS:=+!PACKAGE_kmod-ath10k-ct-smallbuffers:kmod-ath10k-ct
endef
--
2.28.0
patches/packages/backport/0001-transmission-remove-variants-and-use-libcurl-s-TLS-l.patch 0 → 100644
+ 213
− 0
View file @ ecf76550
From b17711da11b7779889b9566d74a6169954ee5a24 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 19 Oct 2020 16:54:05 -0700
Subject: [PATCH] transmission: remove variants and use libcurl's TLS library
Allows the Makefile to be cleaned up and to have fewer dependencies.
There's no need for multiple TLS libraries to be installed.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
net/transmission/Makefile | 106 +++++++++++---------------------------
1 file changed, 31 insertions(+), 75 deletions(-)
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 37d6398ac..62dd28da8 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=transmission
PKG_VERSION:=3.00
-PKG_RELEASE:=4
+PKG_RELEASE:=7
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GITHUB/transmission/transmission-releases/master
@@ -22,6 +22,12 @@ PKG_CPE_ID:=cpe:/a:transmissionbt:transmission
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
+PKG_CONFIG_DEPENDS:= \
+ CONFIG_LIBCURL_GNUTLS \
+ CONFIG_LIBCURL_MBEDTLS \
+ CONFIG_LIBCURL_OPENSSL \
+ CONFIG_LIBCURL_WOLFSSL \
+ CONFIG_LIBCURL_NOSSL
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package-seccomp.mk
@@ -32,93 +38,53 @@ define Package/transmission/template
CATEGORY:=Network
TITLE:=BitTorrent client
URL:=https://www.transmissionbt.com
- DEPENDS:=+libcurl +libevent2 +libminiupnpc +libnatpmp +libpthread +librt +zlib
+ DEPENDS:=+libcurl +libevent2 +libminiupnpc +libnatpmp +libpthread +librt +zlib +LIBCURL_NOSSL:libmbedtls +LIBCURL_GNUTLS:libmbedtls $(ICONV_DEPENDS)
endef
-define Package/transmission-daemon/Default
+define Package/transmission-daemon
$(call Package/transmission/template)
USERID:=transmission=224:transmission=224
endef
-define Package/transmission-daemon-openssl
- $(call Package/transmission-daemon/Default)
- TITLE+= (with OpenSSL)
- DEPENDS+=+libopenssl
- VARIANT:=openssl
-endef
-
-define Package/transmission-daemon-mbedtls
- $(call Package/transmission-daemon/Default)
- TITLE+= (with mbed TLS)
- DEPENDS+=+libmbedtls
- VARIANT:=mbedtls
-endef
-
-define Package/transmission-cli-openssl
+define Package/transmission-cli
$(call Package/transmission/template)
- TITLE+= (with OpenSSL)
- DEPENDS+=+libopenssl
- VARIANT:=openssl
+ TITLE+= (utilities)
endef
-define Package/transmission-cli-mbedtls
+define Package/transmission-remote
$(call Package/transmission/template)
- TITLE+= (with mbed TLS)
- DEPENDS+=+libmbedtls
- VARIANT:=mbedtls
-endef
-
-define Package/transmission-remote-openssl
- $(call Package/transmission/template)
- TITLE+= (with OpenSSL)
- DEPENDS+=+libopenssl
- VARIANT:=openssl
-endef
-
-define Package/transmission-remote-mbedtls
- $(call Package/transmission/template)
- TITLE+= (with mbed TLS)
- DEPENDS+=+libmbedtls
- VARIANT:=mbedtls
+ TITLE+= (remote)
endef
define Package/transmission-web
$(call Package/transmission/template)
TITLE+= (webinterface)
- DEPENDS:=@(PACKAGE_transmission-daemon-openssl||PACKAGE_transmission-daemon-mbedtls)
+ DEPENDS:=+transmission-daemon
PKGARCH:=all
endef
-
-define Package/transmission-daemon/Default/description
+define Package/transmission-daemon/description
Transmission is a simple BitTorrent client.
It features a very simple, intuitive interface
on top on an efficient, cross-platform back-end.
This package contains the daemon itself.
endef
-Package/transmission-daemon-openssl/description = $(Package/transmission-daemon/Default/description)
-Package/transmission-daemon-mbedtls/description = $(Package/transmission-daemon/Default/description)
-define Package/transmission-cli/Default/description
+define Package/transmission-cli/description
CLI utilities for transmission.
endef
-Package/transmission-cli-openssl/description = $(Package/transmission-cli/Default/description)
-Package/transmission-cli-mbedtls/description = $(Package/transmission-cli/Default/description)
-define Package/transmission-remote/Default/description
+define Package/transmission-remote/description
CLI remote interface for transmission.
endef
-Package/transmission-remote-openssl/description = $(Package/transmission-remote/Default/description)
-Package/transmission-remote-mbedtls/description = $(Package/transmission-remote/Default/description)
define Package/transmission-web/description
Webinterface resources for transmission.
endef
-define Package/transmission-daemon-openssl/conffiles
+define Package/transmission-daemon/conffiles
/etc/config/transmission
endef
-Package/transmission-daemon-mbedtls/conffiles = $(Package/transmission-daemon-openssl/conffiles)
TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
TARGET_LDFLAGS += -Wl,--gc-sections -Wl,--as-needed
@@ -131,18 +97,14 @@ CONFIGURE_ARGS += \
--enable-lightweight \
--without-gtk \
--without-kqueue \
- --without-systemd-daemon
-
-ifeq ($(BUILD_VARIANT),mbedtls)
- CONFIGURE_ARGS += --with-crypto=polarssl
- CONFIGURE_VARS += \
- MBEDTLS_CFLAGS="-I$(STAGING_DIR)/usr/include/mbedtls" \
- MBEDTLS_LIBS="-lmbedtls -lmbedcrypto"
-else
- CONFIGURE_ARGS += --with-crypto=openssl
-endif
-
-define Package/transmission-daemon-openssl/install
+ --without-systemd-daemon \
+ $(if $(CONFIG_LIBCURL_NOSSL),--with-crypto=polarssl) \
+ $(if $(CONFIG_LIBCURL_GNUTLS),--with-crypto=polarssl) \
+ $(if $(CONFIG_LIBCURL_MBEDTLS),--with-crypto=polarssl) \
+ $(if $(CONFIG_LIBCURL_OPENSSL),--with-crypto=openssl) \
+ $(if $(CONFIG_LIBCURL_WOLFSSL),--with-crypto=cyassl)
+
+define Package/transmission-daemon/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-daemon $(1)/usr/bin/
$(INSTALL_DIR) $(1)/etc/init.d/
@@ -153,9 +115,8 @@ define Package/transmission-daemon-openssl/install
$(INSTALL_CONF) files/transmission.sysctl $(1)/etc/sysctl.d/20-transmission.conf
$(call InstallSeccomp,$(1),./files/transmission-daemon.json)
endef
-Package/transmission-daemon-mbedtls/install = $(Package/transmission-daemon-openssl/install)
-define Package/transmission-cli-openssl/install
+define Package/transmission-cli/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-cli \
$(PKG_INSTALL_DIR)/usr/bin/transmission-create \
@@ -163,23 +124,18 @@ define Package/transmission-cli-openssl/install
$(PKG_INSTALL_DIR)/usr/bin/transmission-show \
$(1)/usr/bin/
endef
-Package/transmission-cli-mbedtls/install = $(Package/transmission-cli-openssl/install)
-define Package/transmission-remote-openssl/install
+define Package/transmission-remote/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/transmission-remote $(1)/usr/bin/
endef
-Package/transmission-remote-mbedtls/install = $(Package/transmission-remote-openssl/install)
define Package/transmission-web/install
$(INSTALL_DIR) $(1)/usr/share/transmission
$(CP) $(PKG_INSTALL_DIR)/usr/share/transmission/web $(1)/usr/share/transmission/
endef
-$(eval $(call BuildPackage,transmission-daemon-openssl))
-$(eval $(call BuildPackage,transmission-daemon-mbedtls))
-$(eval $(call BuildPackage,transmission-cli-openssl))
-$(eval $(call BuildPackage,transmission-cli-mbedtls))
-$(eval $(call BuildPackage,transmission-remote-openssl))
-$(eval $(call BuildPackage,transmission-remote-mbedtls))
+$(eval $(call BuildPackage,transmission-daemon))
+$(eval $(call BuildPackage,transmission-cli))
+$(eval $(call BuildPackage,transmission-remote))
$(eval $(call BuildPackage,transmission-web))
--
2.17.1
patches/packages/branding/0001-transmission-Add-to-webapps.patch 0 → 100644
+ 3851
− 0
View file @ ecf76550
This source diff could not be displayed because it is too large. You can view the blob instead.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment