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-09-11 05:29:44 +08:00
commit d52aca81c9
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
7 changed files with 13 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/target.mk
View File

@ -51,31 +51,15 @@ DEFAULT_PACKAGES.router:=\
# For easy usage
DEFAULT_PACKAGES.tweak:=\
block-mount \
ca-certificates \
coreutils \
ddns-scripts_aliyun \
ddns-scripts_dnspod \
default-settings \
kmod-ipt-raw \
kmod-nf-nathelper \
kmod-nf-nathelper-extra \
luci \
luci-app-accesscontrol \
luci-app-arpbind \
luci-app-autoreboot \
luci-app-cpufreq \
luci-app-ddns \
luci-app-filetransfer \
luci-app-nlbwmon \
luci-app-turboacc \
luci-app-ramfree \
luci-app-ssr-plus \
luci-app-vlmcsd \
luci-app-wol \
luci-compat \
luci-lib-fs \
luci-proto-relay \
wget-ssl
luci-lib-fs
ifneq ($(DUMP),)
all: dumpinfo

12
package/emortal/default-settings/files/zzz-default-settings
View File

@ -11,18 +11,6 @@ rm -f /usr/lib/lua/luci/view/admin_status/index/upnp.htm
rm -f /usr/lib/lua/luci/view/admin_status/index/ddns.htm
rm -f /usr/lib/lua/luci/view/admin_status/index/minidlna.htm
sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/aria2.lua
sed -i 's/services/nas/g' /usr/lib/lua/luci/view/aria2/overview_status.htm
sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/hd_idle.lua
sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/samba.lua
sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/minidlna.lua
sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/transmission.lua
sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/mjpg-streamer.lua
sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/p910nd.lua
sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/usb_printer.lua
sed -i 's/\"services\"/\"nas\"/g' /usr/lib/lua/luci/controller/xunlei.lua
sed -i 's/services/nas/g' /usr/lib/lua/luci/view/minidlna_status.htm
ln -sf /sbin/ip /usr/bin/ip
sed -i '/immortalwrt_luci/ { s/snapshots/releases\/18.06.9/g; }' /etc/opkg/distfeeds.conf

4
package/kernel/exfat/Makefile
View File

@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=exfat
PKG_VERSION:=5.12.3
PKG_VERSION:=5.14.1
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/namjaejeon/linux-exfat-oot/tar.gz/$(PKG_VERSION)?
PKG_HASH:=43889c73af76c466bbc904aff80354a62ecaa24c7b20e354ff735f5949907982
PKG_HASH:=5452a7c48ff7d19e258d1521213c84f5e486ffeec65b8af913bd43c85b010e86
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-exfat-oot-$(PKG_VERSION)
PKG_MAINTAINER:=

4
target/linux/ipq40xx/Makefile
View File

@ -18,8 +18,6 @@ DEFAULT_PACKAGES += \
kmod-leds-gpio kmod-gpio-button-hotplug swconfig \
kmod-ath10k wpad-openssl uboot-envtools \
kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019 \
autocore-arm automount autosamba \
luci-app-zerotier openssh-sftp-server \
e2fsprogs ethtool htop
autocore-arm e2fsprogs
$(eval $(call BuildTarget))

3
target/linux/ipq806x/Makefile
View File

@ -23,7 +23,6 @@ DEFAULT_PACKAGES += \
kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \
kmod-phy-qcom-ipq806x-usb kmod-usb3 kmod-usb-dwc3-qcom \
kmod-ath10k-ct wpad-openssl uboot-envtools \
autocore-arm automount autosamba e2fsprogs \
luci-app-zerotier openssh-sftp-server
autocore-arm e2fsprogs
$(eval $(call BuildTarget))

3
target/linux/rockchip/Makefile
View File

@ -17,8 +17,7 @@ endef
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \
automount autocore-arm fdisk e2fsprogs ethtool haveged htop lm-sensors \
openssh-sftp-server luci-app-zerotier
automount autocore-arm fdisk e2fsprogs
KERNELNAME:=Image dtbs

13
target/linux/x86/Makefile
View File

@ -18,12 +18,13 @@ KERNELNAME:=bzImage
include $(INCLUDE_DIR)/target.mk
DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid kmod-ath5k kmod-ath9k kmod-ath9k-htc kmod-ath10k \
kmod-rt2800-usb kmod-e1000e kmod-igb kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-iavf kmod-r8125 kmod-r8168 kmod-8139cp kmod-8139too \
kmod-fs-f2fs htop lm-sensors autocore-x86 automount autosamba luci-app-ipsec-vpnd luci-proto-bonding luci-app-unblockmusic luci-app-zerotier openssh-sftp-server \
ath10k-firmware-qca988x ath10k-firmware-qca9888 ath10k-firmware-qca9984 brcmfmac-firmware-43602a1-pcie ddns-scripts_aliyun ddns-scripts_dnspod \
kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 kmod-usb-audio \
kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-mlx4-core kmod-mlx5-core
DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs wpad kmod-usb-hid kmod-e1000e kmod-igb kmod-igbvf \
kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e kmod-iavf kmod-r8125 \
kmod-r8168 kmod-8139cp kmod-8139too kmod-fs-f2fs autocore-x86 automount \
kmod-sound-hda-core kmod-sound-hda-codec-realtek kmod-sound-hda-codec-via \
kmod-sound-via82xx kmod-sound-hda-intel kmod-sound-hda-codec-hdmi kmod-sound-i8x0 \
kmod-usb-audio kmod-usb-net kmod-usb-net-asix kmod-usb-net-asix-ax88179 \
kmod-usb-net-rtl8150 kmod-usb-net-rtl8152 kmod-mlx4-core kmod-mlx5-core
$(eval $(call BuildTarget))