From 93e9ad63c90af263f05ce9ac1d99ac832bf65bda Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Thu, 6 Apr 2023 03:43:59 +0800 Subject: [PATCH] ipq: build with automount by default Signed-off-by: Tianling Shen --- package/emortal/automount/Makefile | 1 + target/linux/ipq40xx/Makefile | 3 +-- target/linux/ipq806x/Makefile | 2 +- target/linux/ipq806x/image/Makefile | 2 +- target/linux/rockchip/Makefile | 2 +- target/linux/x86/Makefile | 14 +++++++------- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/emortal/automount/Makefile b/package/emortal/automount/Makefile index bf139ae216..d444ffdcde 100644 --- a/package/emortal/automount/Makefile +++ b/package/emortal/automount/Makefile @@ -20,6 +20,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 5679c337e1..d71f278ce3 100644 --- a/target/linux/ipq40xx/Makefile +++ b/target/linux/ipq40xx/Makefile @@ -19,7 +19,6 @@ DEFAULT_PACKAGES += \ kmod-leds-gpio kmod-gpio-button-hotplug swconfig \ kmod-ath10k-ct wpad-openssl \ kmod-usb3 kmod-usb-dwc3 ath10k-firmware-qca4019-ct \ - e2fsprogs uboot-envtools \ - autocore-arm luci-app-cpufreq + uboot-envtools automount autocore-arm luci-app-cpufreq $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/Makefile b/target/linux/ipq806x/Makefile index c1b36b5aae..5b70b5d5a6 100644 --- a/target/linux/ipq806x/Makefile +++ b/target/linux/ipq806x/Makefile @@ -21,6 +21,6 @@ DEFAULT_PACKAGES += \ 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 \ - e2fsprogs autocore-arm luci-app-cpufreq + automount autocore-arm luci-app-cpufreq $(eval $(call BuildTarget)) diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile index 6982c14f73..e9985e1549 100644 --- a/target/linux/ipq806x/image/Makefile +++ b/target/linux/ipq806x/image/Makefile @@ -358,7 +358,7 @@ define Device/ruijie_rg-mtfi-m520 IMAGE/factory.bin := qsdk-ipq-factory-mmc IMAGE/sysupgrade.bin/squashfs := append-rootfs | pad-to $$$$(BLOCKSIZE) | sysupgrade-tar rootfs=$$$$@ | append-metadata DEVICE_PACKAGES := ath10k-firmware-qca988x-ct e2fsprogs kmod-hwmon-lm75 \ - kmod-fs-ext4 kmod-fs-f2fs kmod-rtc-pcf8563 losetup mkf2fs + kmod-fs-f2fs kmod-rtc-pcf8563 losetup mkf2fs endef TARGET_DEVICES += ruijie_rg-mtfi-m520 diff --git a/target/linux/rockchip/Makefile b/target/linux/rockchip/Makefile index 711d1bc395..dd2349bff3 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 autocore-arm fdisk e2fsprogs ethtool luci-app-cpufreq + automount autocore-arm fdisk ethtool luci-app-cpufreq KERNELNAME:=Image dtbs diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index d1485754ca..16d42a85bd 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -17,13 +17,13 @@ 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-vendor kmod-igb-vendor kmod-igbvf kmod-igc kmod-ixgbe-vendor \ - kmod-ixgbevf-vendor kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-r8101 kmod-r8125 kmod-r8168 \ - kmod-8139cp kmod-8139too kmod-tg3 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 autocore-x86 automount +DEFAULT_PACKAGES += alsa-utils partx-utils mkf2fs fdisk kmod-button-hotplug kmod-usb-hid kmod-e1000e \ + kmod-i40e-vendor kmod-igb-vendor kmod-igbvf kmod-igc kmod-ixgbe-vendor kmod-ixgbevf-vendor \ + kmod-pcnet32 kmod-tulip kmod-vmxnet3 kmod-r8101 kmod-r8125 kmod-r8168 kmod-8139cp \ + kmod-8139too kmod-tg3 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 autocore-x86 automount $(eval $(call BuildTarget))