From 9c1f750a95e756b2331d16d1469b33a6303bf8f4 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 10 Feb 2021 19:52:36 +0100 Subject: [PATCH] OpenWrt: remove libustream and certs from default packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This effectively reverts upstream commit e79df3516d3e ("build: add libustream and certs to default pkgs"). The libustream-wolfssl library conflicts with the libustream-mbedtls we are selecting in fff-web-ui and is probably much bigger. Signed-off-by: Adrian Schmutzler Reviewed-by: Fabian Bläse --- ...ustream-and-certs-from-default-packa.patch | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 build_patches/openwrt/0004-build-remove-libustream-and-certs-from-default-packa.patch diff --git a/build_patches/openwrt/0004-build-remove-libustream-and-certs-from-default-packa.patch b/build_patches/openwrt/0004-build-remove-libustream-and-certs-from-default-packa.patch new file mode 100644 index 00000000..3c1369f4 --- /dev/null +++ b/build_patches/openwrt/0004-build-remove-libustream-and-certs-from-default-packa.patch @@ -0,0 +1,29 @@ +From: Adrian Schmutzler +Date: Wed, 10 Feb 2021 19:12:59 +0100 +Subject: build: remove libustream and certs from default packages + +This effectively reverts upstream commit e79df3516d3e ("build: add +libustream and certs to default pkgs"). + +The libustream-wolfssl library conflicts with the libustream-mbedtls +we are selecting in fff-web-ui and is probably much bigger. + +Signed-off-by: Adrian Schmutzler + +diff --git a/include/target.mk b/include/target.mk +index 7526224972e18148fec8a12318ca7f90a382475f..338e97f836759fc454986210e5818ad390ba6efb 100644 +--- a/include/target.mk ++++ b/include/target.mk +@@ -12,12 +12,10 @@ DEVICE_TYPE?=router + # Default packages - the really basic set + DEFAULT_PACKAGES:=\ + base-files \ +- ca-bundle \ + dropbear \ + fstools \ + libc \ + libgcc \ +- libustream-wolfssl \ + logd \ + mtd \ + netifd \