From dd215c9f044e818e5fb5b635ef1f3719153ca484 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 6 Apr 2023 03:46:46 +0800 Subject: [PATCH] ipq40xx/806x: build with automount by default Signed-off-by: Tianling Shen --- package/emortal/automount/Makefile | 1 + target/linux/ipq40xx/Makefile | 2 +- target/linux/ipq806x/Makefile | 3 ++- target/linux/rockchip/Makefile | 2 +- target/linux/x86/Makefile | 8 ++++---- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/package/emortal/automount/Makefile b/package/emortal/automount/Makefile index b2240880e7..01d562eddd 100644 --- a/package/emortal/automount/Makefile +++ b/package/emortal/automount/Makefile @@ -22,6 +22,7 @@ define Package/automount MAINTAINER:=Lean DEPENDS:= \ +block-mount \ + +e2fsprogs \ +kmod-usb-storage \ +kmod-usb-storage-extras \ +!TARGET_ramips:kmod-usb-storage-uas \ diff --git a/target/linux/ipq40xx/Makefile b/target/linux/ipq40xx/Makefile index 5d3458b835..e2950c523a 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -18,6 +18,6 @@ DEFAULT_PACKAGES += \ kmod-leds-gpio kmod-gpio-button-hotplug \ kmod-ath10k-ct wpad-openssl \ kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \ - uboot-envtools + uboot-envtools automount $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index 8c08026d2c..86feda4440 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -20,6 +20,7 @@ DEFAULT_PACKAGES += \ kmod-ata-ahci kmod-ata-ahci-platform \ 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 + kmod-ath10k-ct wpad-openssl uboot-envtools \ + automount $(eval $(call BuildTarget)) diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile index ceb433c705..3456b8da00 100644 --- a/target/linux/rockchip/Makefile +++ b/target/linux/rockchip/Makefile @@ -16,7 +16,7 @@ endef include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += uboot-envtools partx-utils e2fsprogs mkf2fs kmod-gpio-button-hotplug \ - automount fdisk e2fsprogs + automount fdisk KERNELNAME:=Image dtbs diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 6441a6d819..2d94803470 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -16,10 +16,10 @@ KERNELNAME:=bzImage include $(INCLUDE_DIR)/target.mk -DEFAULT_PACKAGES += alsa-utils partx-utils mkf2fs fdisk e2fsprogs kmod-button-hotplug kmod-usb-hid \ - kmod-e1000e kmod-i40e kmod-igb kmod-igbvf kmod-igc kmod-ixgbe kmod-ixgbevf \ - kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-r8101 kmod-r8125 kmod-r8168 kmod-8139cp \ - kmod-8139too kmod-fs-f2fs kmod-ac97 kmod-sound-hda-core kmod-sound-hda-codec-realtek \ +DEFAULT_PACKAGES += alsa-utils partx-utils mkf2fs fdisk kmod-button-hotplug kmod-usb-hid kmod-e1000e \ + kmod-i40e kmod-igb kmod-igbvf kmod-igc kmod-ixgbe kmod-ixgbevf kmod-pcnet32 \ + kmod-tulip kmod-vmxnet3 kmod-r8101 kmod-r8125 kmod-r8168 kmod-8139cp kmod-8139too \ + kmod-fs-f2fs kmod-ac97 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-vendor grub2-bios-setup automount