fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge Mainline

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2021-04-04 23:24:08 +08:00
commit b5a3340a9b
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
10 changed files with 50 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/base-files/files/etc/shinit
View File

@ -22,7 +22,7 @@ service() {
printf "%-30s\t%10s\t%10s\n" "$F" \
$( $($F enabled) && echo "enabled" || echo "disabled" ) \
$( [ "$(ubus call service list "{ 'verbose': true, 'name': '$(basename $F)' }" \
| jsonfilter -q -e "@.$(basename $F).instances[*].running")" = "true" ] \
| jsonfilter -q -e "@.$(basename $F).instances[*].running" | uniq)" = "true" ] \
&& echo "running" || echo "stopped" )
done;
return 1

6
package/devel/binutils/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=binutils
PKG_VERSION:=2.35.1
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE_URL:=@GNU/binutils
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@ -34,7 +34,7 @@ define Package/libbfd
SECTION:=libs
CATEGORY:=Libraries
TITLE:=libbfd
DEPENDS:=+zlib $(ICONV_DEPENDS) $(INTL_DEPENDS)
DEPENDS:=+zlib $(INTL_DEPENDS)
endef
define Package/libctf
@ -79,6 +79,8 @@ endef
TARGET_CFLAGS += $(FPIC) -Wno-unused-value
TARGET_LDFLAGS += $(if $(INTL_FULL),-lintl)
CONFIGURE_ARGS += \
--host=$(REAL_GNU_TARGET_NAME) \
--target=$(REAL_GNU_TARGET_NAME) \

4
package/lean/uugamebooster/Makefile
View File

@ -69,6 +69,10 @@ endef
define Build/Compile
endef
define Package/$(PKG_NAME)/conffiles
/usr/share/$(PKG_NAME)/uu.conf
endef
define Package/$(PKG_NAME)/install
# $(INSTALL_DIR) $(1)/etc/init.d
# $(INSTALL_BIN) ./files/uugamebooster.init $(1)/etc/init.d/uuplugin

4
package/lean/v2ray/Makefile
View File

@ -9,13 +9,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=v2ray
PKG_VERSION:=4.36.2
PKG_VERSION:=4.37.0
PKG_RELEASE:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-core-$(PKG_VERSION)
PKG_SOURCE:=v2ray-core-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/v2fly/v2ray-core/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=e7f7ceefd4cd9d2e57d18cecf55228a5a126c6ed5ee53767660601c35e70535c
PKG_HASH:=64cd43776802493b43d33b0038b71c227cc54ace79164cf19d47c0c1c85aaaf2
PKG_LICENSE:=MIT
PKG_LICENSE_FILES:=LICENSE

6
package/lienol/trojan-go/Makefile
View File

@ -6,12 +6,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=trojan-go
PKG_VERSION:=0.8.2
PKG_RELEASE:=2
PKG_VERSION:=0.8.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/p4gefau1t/trojan-go/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=a335006813067f70763596c41ddf09454b151899b356661b055eb9113ec3081b
PKG_HASH:=dbfb536328327bcbbd310b7289ece47d40dcc6aaf7996b563f0e1041e120fb89
PKG_CONFIG_DEPENDS:= \
CONFIG_TROJAN_GO_COMPRESS_GOPROXY \

6
package/network/utils/bpftools/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=bpftools
PKG_VERSION:=5.11.2
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_SOURCE:=linux-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/kernel/v5.x
@ -93,10 +93,6 @@ ifneq ($(BUILD_VARIANT),lib)
TARGET_LDFLAGS += -Wl,--gc-sections
endif
ifneq ($(INTL_FULL),)
TARGET_LDFLAGS += -Wl,-lintl
endif
MAKE_FLAGS += \
EXTRA_CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS)" \

2
package/network/utils/iproute2/Makefile
View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=iproute2
PKG_VERSION:=5.11.0
PKG_RELEASE:=2
PKG_RELEASE:=3
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2

20
package/network/utils/iproute2/patches/190-fix-nls-rpath-link.patch Normal file
View File

@ -0,0 +1,20 @@
--- a/configure
+++ b/configure
@@ -259,7 +259,7 @@ int main(int argc, char **argv) {
}
EOF
- $CC -o $TMPDIR/libbpf_test $TMPDIR/libbpf_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS >/dev/null 2>&1
+ $CC -o $TMPDIR/libbpf_test $TMPDIR/libbpf_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS $LDFLAGS >/dev/null 2>&1
local ret=$?
rm -f $TMPDIR/libbpf_test.c $TMPDIR/libbpf_test
@@ -277,7 +277,7 @@ int main(int argc, char **argv) {
}
EOF
- $CC -o $TMPDIR/libbpf_sec_test $TMPDIR/libbpf_sec_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS >/dev/null 2>&1
+ $CC -o $TMPDIR/libbpf_sec_test $TMPDIR/libbpf_sec_test.c $LIBBPF_CFLAGS $LIBBPF_LDLIBS $LDFLAGS >/dev/null 2>&1
local ret=$?
rm -f $TMPDIR/libbpf_sec_test.c $TMPDIR/libbpf_sec_test

12
package/system/zram-swap/Makefile
View File

@ -17,14 +17,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_FEATURE_SWAPON_DISCARD +@BUSYBOX_CONFIG_FEATURE_SWAPON_PRI +@BUSYBOX_CONFIG_SWAPOFF
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

5
package/system/zram-swap/files/zram.init
View File

@ -149,6 +149,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