From 9c23ecee577962c3836b6b1b2cdc222c59a257ad Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Mon, 20 Apr 2020 19:46:34 +0200 Subject: [PATCH] x86: move packages selection to profiles This can be rather confusing for contributors, since there are three layers in which they can be added. As for now there are none profiles other than generic (exception: geos) let's move them to these profiles. Being here this commit also removes packages in geode profiles already enabled in kernel config. Signed-off-by: Tomasz Maciej Nowak --- target/linux/x86/64/target.mk | 2 -- target/linux/x86/geode/target.mk | 10 ---------- target/linux/x86/image/64.mk | 2 ++ 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/target/linux/x86/64/target.mk b/target/linux/x86/64/target.mk index 02b6c8debf..ece3d1bc9a 100644 --- a/target/linux/x86/64/target.mk +++ b/target/linux/x86/64/target.mk @@ -1,7 +1,5 @@ ARCH:=x86_64 BOARDNAME:=x86_64 -DEFAULT_PACKAGES += kmod-e1000e kmod-e1000 kmod-r8169 kmod-igb kmod-bnx2 \ - kmod-forcedeth define Target/Description Build images for 64 bit systems including virtualized guests. diff --git a/target/linux/x86/geode/target.mk b/target/linux/x86/geode/target.mk index 04ac926cfd..a64d2baaee 100644 --- a/target/linux/x86/geode/target.mk +++ b/target/linux/x86/geode/target.mk @@ -1,15 +1,5 @@ BOARDNAME:=AMD Geode based systems FEATURES += pci usb gpio -DEFAULT_PACKAGES += \ - kmod-crypto-hw-geode kmod-crypto-cbc \ - kmod-ath5k kmod-ath9k \ - kmod-ledtrig-heartbeat kmod-ledtrig-gpio \ - kmod-ledtrig-netdev hwclock wpad-basic -# Geos -DEFAULT_PACKAGES += \ - soloscli linux-atm br2684ctl ppp-mod-pppoa pppdump pppstats \ - hwclock flashrom tc kmod-pppoa kmod-8139cp kmod-mppe \ - kmod-usb-ohci-pci kmod-hwmon-lm90 define Target/Description Build firmware images for AMD Geode GX/LX based systems (net5501, alix, geos) diff --git a/target/linux/x86/image/64.mk b/target/linux/x86/image/64.mk index bde76ceba5..61e6d408d7 100644 --- a/target/linux/x86/image/64.mk +++ b/target/linux/x86/image/64.mk @@ -1,5 +1,7 @@ define Device/generic DEVICE_TITLE := Generic x86/64 + DEVICE_PACKAGES += kmod-bnx2 kmod-e1000e kmod-e1000 kmod-forcedeth kmod-igb \ + kmod-r8169 GRUB2_VARIANT := generic endef TARGET_DEVICES += generic -- 2.25.1