From 145b8fd486473655d9318b73eabe3245e566a144 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 11 Sep 2021 04:31:35 +0800 Subject: [PATCH 1/4] exfat: Update to 5.14.1 Signed-off-by: Tianling Shen --- package/kernel/exfat/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/exfat/Makefile b/package/kernel/exfat/Makefile index 965db54a01..8b1d22211d 100644 --- a/package/kernel/exfat/Makefile +++ b/package/kernel/exfat/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=exfat -PKG_VERSION:=5.11.1 +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:=85324f1edb1c03f65700164ba4f5750fe5cc7a8b956add321626be69149790f5 +PKG_HASH:=5452a7c48ff7d19e258d1521213c84f5e486ffeec65b8af913bd43c85b010e86 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/linux-exfat-oot-$(PKG_VERSION) PKG_MAINTAINER:= From d9b91146a10005c72f31d6bd67f6a1110440495b Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 11 Sep 2021 04:53:12 +0800 Subject: [PATCH 2/4] default-settings: remove nas hack Signed-off-by: Tianling Shen --- .../default-settings/files/zzz-default-settings | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/package/emortal/default-settings/files/zzz-default-settings b/package/emortal/default-settings/files/zzz-default-settings index 67dedc78b7..f0cec7b7ff 100755 --- a/package/emortal/default-settings/files/zzz-default-settings +++ b/package/emortal/default-settings/files/zzz-default-settings @@ -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 From 1ebbbbfec656d18815f15e63507b1747f178a8c0 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 11 Sep 2021 04:59:25 +0800 Subject: [PATCH 3/4] target: drop some default packages Let users to decide build them or not. Signed-off-by: Tianling Shen --- include/target.mk | 18 +----------------- target/linux/ipq40xx/Makefile | 4 +--- target/linux/ipq806x/Makefile | 4 +--- target/linux/x86/Makefile | 13 +++++++------ 4 files changed, 10 insertions(+), 29 deletions(-) diff --git a/include/target.mk b/include/target.mk index 857844fb74..4a09e63bb6 100644 --- a/include/target.mk +++ b/include/target.mk @@ -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 diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index dd4392215c..a502c844ba 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -19,8 +19,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-ipsec-vpnd \ - luci-app-zerotier openssh-sftp-server \ - e2fsprogs ethtool htop + autocore-arm e2fsprogs $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index b6104da036..ed1e58978e 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -23,8 +23,6 @@ DEFAULT_PACKAGES += \ kmod-ata-core kmod-ata-ahci kmod-ata-ahci-platform \ kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-usb-ledtrig-usbport \ kmod-usb3 kmod-usb-dwc3-of-simple kmod-usb-phy-qcom-dwc3 \ - kmod-ath10k-ct wpad uboot-envtools e2fsprogs htop \ - autocore-arm automount autosamba luci-app-ipsec-vpnd \ - luci-app-zerotier openssh-sftp-server + kmod-ath10k-ct wpad uboot-envtools e2fsprogs autocore-arm $(eval $(call BuildTarget)) diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 99b223b7f4..ba891a339e 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -19,12 +19,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-i40evf 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 kmod-usb-hid kmod-rt2800-usb kmod-e1000e \ + kmod-igb kmod-igbvf kmod-ixgbe kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-i40e \ + kmod-i40evf kmod-r8125 kmod-r8168 kmod-8139cp kmod-8139too kmod-fs-f2fs \ + autocore-x86 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)) From db3a9e39870cfb2d4700e3ede73a46e5b126af44 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 11 Sep 2021 05:02:45 +0800 Subject: [PATCH 4/4] x86: add automount Signed-off-by: Tianling Shen --- target/linux/x86/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index ba891a339e..3d03e20b05 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -25,7 +25,7 @@ DEFAULT_PACKAGES += partx-utils mkf2fs fdisk e2fsprogs kmod-usb-hid kmod-rt2800- autocore-x86 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 + kmod-usb-net-rtl8152 kmod-mlx4-core kmod-mlx5-core automount $(eval $(call BuildTarget))