From 35eb06066e49ca94e75aac8f9d821652edb8ce84 Mon Sep 17 00:00:00 2001 From: Michael Heimpold Date: Sat, 27 Mar 2021 20:48:30 +0100 Subject: [PATCH 1/3] bcm27xx-userland: factor out a -dev package Installing headers and static libraries to the target system seems to be not required for most use cases, so let's factor them out into a dedicated -dev package. This cuts down to disk usage to around 50% of the original package to ~ 2MB - not that disk space is an issue normally, but when using inside an initramfs only project, it counts. Signed-off-by: Michael Heimpold --- package/utils/bcm27xx-userland/Makefile | 34 ++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/package/utils/bcm27xx-userland/Makefile b/package/utils/bcm27xx-userland/Makefile index 098c039f1f..b38e11d074 100644 --- a/package/utils/bcm27xx-userland/Makefile +++ b/package/utils/bcm27xx-userland/Makefile @@ -8,16 +8,18 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcm27xx-userland -PKG_VERSION:=4a0a19b88b43e48c6b51b526b9378289fb712a4c +PKG_VERSION:=3fd8527eefd8790b4e8393458efc5f94eb21a615 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)? -PKG_HASH:=0f42d48095d1f680cbe8781c2e974b76bdd0507aaef64cce8b8b472ca3a09588 +PKG_HASH:=7de1527d8e9bb7632f68aa083d3b79b44fa711360e3292d59e330e0591c65ebd PKG_FLAGS:=nonshared PKG_MAINTAINER:=Álvaro Fernández Rojas +PKG_LICENSE:=BSD-3-Clause +PKG_LICENSE_FILES:=LICENCE CMAKE_INSTALL:=1 CMAKE_OPTIONS+=-DVMCS_INSTALL_PREFIX=/usr @@ -46,6 +48,19 @@ define Package/bcm27xx-userland/description BCM27xx userland tools including vcgencmd and tvservice. endef +define Package/bcm27xx-userland-dev + SECTION:=devel + CATEGORY:=Development + SUBMENU:=Libraries + DEPENDS:=@TARGET_bcm27xx +bcm27xx-userland + TITLE:=Development files of BCM27xx userland tools +endef + +define Package/bcm27xx-userland-dev/description + This package contains the header and static libraries of + the BCM27xx userland tools. +endef + define Package/bcm27xx-userland/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dtmerge $(1)/usr/bin @@ -61,11 +76,22 @@ endif $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcgencmd $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/vcmailbox $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so $(1)/usr/lib/ +ifneq ($(ARCH),aarch64) + $(INSTALL_DIR) $(1)/usr/lib/plugins + $(CP) $(PKG_INSTALL_DIR)/usr/lib/plugins/ $(1)/usr/lib/ +endif +endef + +define Package/bcm27xx-userland-dev/install $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/ $(1)/usr/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/ $(1)/usr/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.a $(1)/usr/lib/ endef $(eval $(call BuildPackage,bcm27xx-userland)) +$(eval $(call BuildPackage,bcm27xx-userland-dev)) From 25d9fe8468451f1e0ddeb70ac3aa722f947311ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Sat, 21 Aug 2021 19:03:24 +0200 Subject: [PATCH 2/3] bcm27xx-userland: update to latest version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Properly recognise all BCM2711 variants Signed-off-by: Álvaro Fernández Rojas --- package/utils/bcm27xx-userland/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/utils/bcm27xx-userland/Makefile b/package/utils/bcm27xx-userland/Makefile index b38e11d074..8114fd6289 100644 --- a/package/utils/bcm27xx-userland/Makefile +++ b/package/utils/bcm27xx-userland/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcm27xx-userland -PKG_VERSION:=3fd8527eefd8790b4e8393458efc5f94eb21a615 +PKG_VERSION:=97bc8180ad682b004ea224d1db7b8e108eda4397 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)? -PKG_HASH:=7de1527d8e9bb7632f68aa083d3b79b44fa711360e3292d59e330e0591c65ebd +PKG_HASH:=d67def03931215f41b741aed5a3a1bc2bd62fa33f5cc14692e9a4d65f2e0ea27 PKG_FLAGS:=nonshared From 61c65acbda9720f445f1c696a871d1c79578cbdf Mon Sep 17 00:00:00 2001 From: Paul Blazejowski Date: Wed, 21 Jul 2021 18:28:20 -0400 Subject: [PATCH 3/3] ath79: kernel: Add missing quote to drivers/mfd/Kconfig A missing quote in target/linux/ath79/patches-5.x/920-mikrotik-rb4xx.patch produces: ... scripts/kconfig/conf --syncconfig Kconfig drivers/mfd/Kconfig:2016:warning: multi-line strings not supported ... This patch adds missing closing quote, fixing the above warning. Signed-off-by: Paul Blazejowski (cherry picked from commit f7374bce00a97fda78ace3acaef48369e8246814) --- target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch b/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch index 60f8bdff79..7f424bbfc6 100644 --- a/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch +++ b/target/linux/ath79/patches-5.4/920-mikrotik-rb4xx.patch @@ -5,7 +5,7 @@ device found on several devices in RAVE line of hardware. +config MFD_RB4XX_CPLD -+ tristate "CPLD driver for Mikrotik RB4xx series boards ++ tristate "CPLD driver for Mikrotik RB4xx series boards" + select MFD_CORE + depends on ATH79 || COMPILE_TEST + help