Skip to content

Commit

Permalink
Merge branch 'openwrt:main' into v14_luci-be-eht-danpawlik-rmadrad
Browse files Browse the repository at this point in the history
  • Loading branch information
nextgen-networks authored Oct 7, 2024
2 parents 05da98f + dae6a87 commit e48d16c
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 37 deletions.
1 change: 1 addition & 0 deletions include/cmake.mk
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ define Host/Configure/Default
-DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=TRUE \
-DCMAKE_FIND_USE_SYSTEM_PACKAGE_REGISTRY=FALSE \
-DCMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY=TRUE \
-DBUILD_SHARED_LIBS=OFF \
$(CMAKE_HOST_OPTIONS) \
$(HOST_CMAKE_SOURCE_DIR) \
)
Expand Down
7 changes: 6 additions & 1 deletion package/base-files/files/etc/init.d/led
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,12 @@ start() {
echo "$color" | sed 's/:/\ /g' > \
"/sys/class/leds/$led/multi_intensity"
done < /var/run/led.state
rm /var/run/led.state
if [ "$1" ]; then
grep -v "^$1 " /var/run/led.state > /var/run/led.state.new
mv /var/run/led.state.new /var/run/led.state
else
rm /var/run/led.state
fi
}

config_load system
Expand Down
2 changes: 1 addition & 1 deletion package/kernel/ath10k-ct/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
define KernelPackage/ath10k-ct
SUBMENU:=Wireless Drivers
TITLE:=ath10k-ct driver optimized for CT ath10k firmware
DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11AC_SUPPORT @PCI_SUPPORT +kmod-hwmon-core
DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11AC_SUPPORT @PCI_SUPPORT +kmod-hwmon-core +@PACKAGE_MAC80211_DEBUGFS
FILES:=\
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_pci.ko \
$(PKG_BUILD_DIR)/ath10k$(CT_KVER)/ath10k_core.ko
Expand Down
6 changes: 3 additions & 3 deletions tools/libdeflate/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=libdeflate
PKG_VERSION:=1.20
PKG_RELEASE:=2
PKG_VERSION:=1.22
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/ebiggers/libdeflate/releases/download/v$(PKG_VERSION)
PKG_HASH:=c52cf0239fd644d71c9e88613dd7431a5306ebee1280c5791c71ca264869250a
PKG_HASH:=7834d9adbc9a809e0fb0d7b486060a9ae5f7819eb7f55bb8c22b10d7b3bed8da

include $(INCLUDE_DIR)/host-build.mk

Expand Down

This file was deleted.

0 comments on commit e48d16c

Please sign in to comment.