From 8a89f464cbceeb1c87292cdd3f3381da2c01608d Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Thu, 13 Oct 2022 23:16:06 +0800 Subject: [PATCH] x86: fix sysupgrade failure --- target/linux/x86/Makefile | 9 ++++----- target/linux/x86/image/64.mk | 5 +++-- target/linux/x86/image/Makefile | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index e1e7d4147..f18c6e1e4 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -18,11 +18,10 @@ KERNELNAME:=bzImage include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += partx-utils mkf2fs e2fsprogs kmod-button-hotplug kmod-usb-hid kmod-mmc kmod-sdhci kmod-fs-f2fs cfdisk usbutils pciutils \ -kmod-alx kmod-e1000e kmod-igb kmod-igc kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-via-velocity kmod-vmxnet3 kmod-i40e kmod-i40evf kmod-r8125 kmod-8139cp kmod-8139too kmod-tg3 \ -htop lm-sensors iperf3 autocore-x86 automount autosamba luci-app-adbyby-plus luci-app-ipsec-vpnd luci-proto-bonding luci-app-diskman \ -luci-app-unblockmusic luci-app-zerotier luci-app-xlnetacc ddns-scripts_aliyun ddns-scripts_dnspod ca-bundle luci-app-wireguard luci-app-ttyd \ -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-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-rtl8152-vendor kmod-usb-net-aqc111 kmod-mlx4-core kmod-mlx5-core kmod-drm-i915 kmod-drm-amdgpu +kmod-alx kmod-e1000e kmod-igb kmod-igc kmod-igbvf kmod-iavf kmod-bnx2x kmod-pcnet32 kmod-tulip kmod-via-velocity kmod-vmxnet3 kmod-i40e kmod-i40evf \ +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-net kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8150 kmod-usb-net-aqc111 kmod-mlx4-core kmod-mlx5-core kmod-drm-i915 kmod-drm-amdgpu kmod-usb-audio \ +kmod-usb-net-rtl8152-vendor kmod-r8125 kmod-r8168 kmod-8139cp kmod-8139too kmod-tg3 htop lm-sensors iperf3-ssl autocore-x86 automount autosamba ca-bundle $(eval $(call BuildTarget)) diff --git a/target/linux/x86/image/64.mk b/target/linux/x86/image/64.mk index 75969666f..25090ea15 100644 --- a/target/linux/x86/image/64.mk +++ b/target/linux/x86/image/64.mk @@ -1,8 +1,9 @@ define Device/generic DEVICE_VENDOR := Generic DEVICE_MODEL := x86/64 - DEVICE_PACKAGES += kmod-amazon-ena kmod-bnx2 kmod-e1000e kmod-e1000 \ - kmod-forcedeth kmod-ixgbe kmod-amd-xgbe kmod-r8168 kmod-fs-vfat + DEVICE_PACKAGES += kmod-amazon-ena kmod-amd-xgbe kmod-bnx2 \ + kmod-e1000e kmod-e1000 kmod-forcedeth kmod-fs-vfat \ + kmod-igb kmod-igc kmod-ixgbe kmod-r8168 kmod-tg3 GRUB2_VARIANT := generic endef TARGET_DEVICES += generic diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index 30a903515..677b758e0 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -53,7 +53,7 @@ define Build/combined $@ \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \ $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \ - 1024 + 256 endef define Build/grub-config