diff --git a/package/lean/UnblockNeteaseMusic/Makefile b/package/lean/UnblockNeteaseMusic/Makefile index e04a78fbe10da..2a07475c6fb8e 100644 --- a/package/lean/UnblockNeteaseMusic/Makefile +++ b/package/lean/UnblockNeteaseMusic/Makefile @@ -1,59 +1,57 @@ + # -# Copyright (C) 2015-2020 OpenWrt.org +# Copyright (C) 2021 ImmortalWrt +# # # This is free software, licensed under the GNU General Public License v3. -# +# See /LICENSE for more information. # include $(TOPDIR)/rules.mk PKG_NAME:=UnblockNeteaseMusic -PKG_VERSION:=0.25.3 -PKG_RELEASE:=6 - -PKG_LICENSE:=MIT +PKG_BASE_VERSION:=0.25.3 +PKG_RELEASE:=7 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/1715173329/UnblockNeteaseMusic.git -PKG_SOURCE_VERSION:=7fe969342c2a977f00a4a7b6a275ffae04ffffea +PKG_SOURCE_DATE:=2021-06-05 +PKG_SOURCE_VERSION:=dc129707e96a5338eddac090ed4af9f0045604b5 +PKG_MIRROR_HASH:=e99c784f20db0a48d46cd6b05050a6cf8d6a07b29011d1017b08727b40f66972 -PKG_SOURCE_SUBDIR:=$(PKG_NAME) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(PKG_VERSION).tar.gz -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR) -PKG_BUILD_PARALLEL:=1 +PKG_VERSION:=$(PKG_BASE_VERSION)-$(PKG_SOURCE_DATE)-$(call version_abbrev,$(PKG_SOURCE_VERSION)) -include $(INCLUDE_DIR)/package.mk +PKG_LICENSE:=MIT +PKG_LICENSE_FILE:=LICENSE -define Package/$(PKG_NAME) - SECTION:=net - CATEGORY:=Network - TITLE:=Revive Netease Cloud Music (NodeJS) - DEPENDS:=+node - URL:=https://github.com/nondanee/UnblockNeteaseMusic/releases - SUBMENU:=NeteaseMusic - PKGARCH:=all -endef +include $(INCLUDE_DIR)/package.mk -define Package/$(PKG_NAME)/description -Revive Netease Cloud Music (NodeJS) +define Package/UnblockNeteaseMusic + SECTION:=multimedia + CATEGORY:=Multimedia + TITLE:=Revive Netease Cloud Music (NodeJS) + URL:=https://github.com/nondanee/UnblockNeteaseMusic + DEPENDS:=+node +libopenssl + PKGARCH:=all endef define Build/Prepare - tar -xzvf $(DL_DIR)/$(PKG_SOURCE) -C $(PKG_BUILD_DIR) - mkdir -p $(PKG_BUILD_DIR)/$(PKG_NAME) - echo -e $(PKG_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)/core_ver - echo -e $(PKG_SOURCE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)/local_ver + mkdir -p $(PKG_BUILD_DIR) + xzcat $(DL_DIR)/$(PKG_SOURCE) | $(TAR) -C $(PKG_BUILD_DIR) $(TAR_OPTIONS) endef define Build/Configure + echo -e $(PKG_BASE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/core_ver + echo -e $(PKG_SOURCE_VERSION) > $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/local_ver endef define Build/Compile + true endef -define Package/$(PKG_NAME)/install - $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME) - cp -pR $(PKG_BUILD_DIR)/$(PKG_NAME)/* $(1)/usr/share/$(PKG_NAME) +define Package/UnblockNeteaseMusic/install + $(INSTALL_DIR) $(1)/usr/share/UnblockNeteaseMusic + $(CP) $(PKG_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/* $(1)/usr/share/UnblockNeteaseMusic endef -$(eval $(call BuildPackage,$(PKG_NAME))) +$(eval $(call BuildPackage,UnblockNeteaseMusic)) diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile index 486a6008525db..a659db73e3398 100644 --- a/package/system/zram-swap/Makefile +++ b/package/system/zram-swap/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zram-swap PKG_VERSION:=1.1 -PKG_RELEASE:=6 +PKG_RELEASE:=8 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) @@ -18,14 +18,20 @@ include $(INCLUDE_DIR)/package.mk define Package/zram-swap SECTION:=utils CATEGORY:=Base system - DEPENDS:=+kmod-zram +!(BUSYBOX_CONFIG_MKSWAP&&BUSYBOX_CONFIG_SWAPON&&BUSYBOX_CONFIG_SWAPOFF):swap-utils + DEPENDS:= \ + +@BUSYBOX_CONFIG_FEATURE_SWAPON_DISCARD \ + +@BUSYBOX_CONFIG_FEATURE_SWAPON_PRI \ + +@BUSYBOX_CONFIG_MKSWAP \ + +@BUSYBOX_CONFIG_SWAPOFF \ + +@BUSYBOX_CONFIG_SWAPON \ + +kmod-zram TITLE:=ZRAM swap scripts PKGARCH:=all endef define Package/zram-swap/description - A script to activate swaping on a compressed zram partition. This - could be used to increase the available memory, by using compressed + A script to activate swaping on a compressed zram partition. This + could be used to increase the available memory, by using compressed memory. endef diff --git a/package/system/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init index 42c084855ab68..6338bdfa5fcf2 100755 --- a/package/system/zram-swap/files/zram.init +++ b/package/system/zram-swap/files/zram.init @@ -35,18 +35,18 @@ zram_applicable() return 1 } - command -v mkswap >/dev/null || { - logger -s -t zram_applicable -p daemon.err "[ERROR] 'mkswap' not installed" + [ -x /sbin/mkswap ] || { + logger -s -t zram_applicable -p daemon.err "[ERROR] 'BusyBox mkswap' not installed" return 1 } - command -v swapon >/dev/null || { - logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapon' not installed" + [ -x /sbin/swapon ] || { + logger -s -t zram_applicable -p daemon.err "[ERROR] 'BusyBox swapon' not installed" return 1 } - command -v swapoff >/dev/null || { - logger -s -t zram_applicable -p daemon.err "[ERROR] 'swapoff' not installed" + [ -x /sbin/swapoff ] || { + logger -s -t zram_applicable -p daemon.err "[ERROR] 'BusyBox swapoff' not installed" return 1 } } @@ -97,19 +97,6 @@ zram_comp_algo() fi } -zram_comp_streams() -{ - local dev="$1" - local logical_cpus=$( grep -ci "^processor" /proc/cpuinfo ) - [ $logical_cpus -gt 1 ] || return 1 - local zram_comp_streams="$( uci -q get system.@system[0].zram_comp_streams )" - [ -n "$zram_comp_streams" ] && [ "$zram_comp_streams" -le "$logical_cpus" ] || zram_comp_streams=$logical_cpus - if [ -e /sys/block/$( basename $dev )/max_comp_streams ]; then - logger -s -t zram_comp_streams -p daemon.debug "Set max compression streams to '$zram_comp_streams' for zram '$dev'" - echo $zram_comp_streams > /sys/block/$( basename $dev )/max_comp_streams - fi -} - #print various stats info about zram swap device zram_stats() { @@ -121,7 +108,6 @@ zram_stats() printf "%-25s - %s\n" "Block device" $zdev awk '{ printf "%-25s - %d MiB\n", "Device size", $1/1024/1024 }' <$zdev/disksize printf "%-25s - %s\n" "Compression algo" "$(cat $zdev/comp_algorithm)" - printf "%-25s - %s\n" "Compression streams" "$( cat $zdev/max_comp_streams)" awk 'BEGIN { fmt = "%-25s - %.2f %s\n" fmt2 = "%-25s - %d\n" @@ -164,6 +150,11 @@ zram_compact() start() { + [ -e /proc/swaps ] || { + logger -s -t zram_start -p daemon.crit "kernel doesn't support swap" + return 1 + } + if [ $( grep -cs zram /proc/swaps ) -ne 0 ]; then logger -s -t zram_start -p daemon.notice "[OK] zram swap is already mounted" return 1 @@ -179,10 +170,9 @@ start() zram_reset "$zram_dev" "enforcing defaults" zram_comp_algo "$zram_dev" - zram_comp_streams "$zram_dev" echo $(( $zram_size * 1024 * 1024 )) >"/sys/block/$( basename "$zram_dev" )/disksize" - mkswap "$zram_dev" - swapon -d $zram_priority "$zram_dev" + /sbin/mkswap "$zram_dev" + /sbin/swapon -d $zram_priority "$zram_dev" } stop() @@ -191,7 +181,7 @@ stop() for zram_dev in $( grep zram /proc/swaps |awk '{print $1}' ); do { logger -s -t zram_stop -p daemon.debug "deactivate swap $zram_dev" - swapoff "$zram_dev" && zram_reset "$zram_dev" "claiming memory back" + /sbin/swapoff "$zram_dev" && zram_reset "$zram_dev" "claiming memory back" local dev_index="$( echo $zram_dev | grep -o "[0-9]*$" )" if [ $dev_index -ne 0 ]; then logger -s -t zram_stop -p daemon.debug "removing zram $zram_dev" diff --git a/target/linux/bcm27xx/bcm2711/config-5.4 b/target/linux/bcm27xx/bcm2711/config-5.4 index c1b624be6a898..bcc1552cf7d96 100644 --- a/target/linux/bcm27xx/bcm2711/config-5.4 +++ b/target/linux/bcm27xx/bcm2711/config-5.4 @@ -109,6 +109,7 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_XGENE=y +CONFIG_COMPAT=y CONFIG_CONFIGFS_FS=y CONFIG_CONSOLE_TRANSLATIONS=y CONFIG_CONTIG_ALLOC=y