[OpenWrt-Devel] [PATCH v2 4/4] x86: move packages selection to profiles

Tomasz Maciej Nowak tomek_n at o2.pl
Mon Apr 20 14:12:28 EDT 2020


This can be rather confusing for contributors, since there are three
layers in which packages can be added. As for now there are none profiles
other than generic (exception: geos) let's move packages to these profiles.
Being here this commit also removes packages in geode profiles already
enabled in kernel config.

Signed-off-by: Tomasz Maciej Nowak <tomek_n at o2.pl>
---

v1 -> v2
Really remove those packages.

 target/linux/x86/64/target.mk    |  2 --
 target/linux/x86/geode/target.mk | 10 ----------
 target/linux/x86/image/64.mk     |  2 ++
 target/linux/x86/image/geode.mk  |  7 +++----
 4 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/target/linux/x86/64/target.mk b/target/linux/x86/64/target.mk
index 02b6c8debfe1..ece3d1bc9a16 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 04ac926cfd95..a64d2baaeec2 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 bde76ceba5dd..61e6d408d7ce 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
diff --git a/target/linux/x86/image/geode.mk b/target/linux/x86/image/geode.mk
index 0b463e36ed39..4ebb14888a8c 100644
--- a/target/linux/x86/image/geode.mk
+++ b/target/linux/x86/image/geode.mk
@@ -1,7 +1,7 @@
 define Device/generic
   DEVICE_TITLE := Generic x86/Geode
   DEVICE_PACKAGES += kmod-crypto-cbc kmod-crypto-hw-geode kmod-ledtrig-gpio \
-	kmod-ledtrig-heartbeat kmod-ledtrig-netdev kmod-via-rhine
+	kmod-ledtrig-heartbeat kmod-ledtrig-netdev
   GRUB2_VARIANT := legacy
 endef
 TARGET_DEVICES += generic
@@ -9,8 +9,7 @@ TARGET_DEVICES += generic
 define Device/geos
   $(call Device/generic)
   DEVICE_TITLE := Traverse Technologies Geos
-  DEVICE_PACKAGES += br2684ctl flashrom kmod-8139cp kmod-hwmon-lm90 kmod-mppe \
-	kmod-pppoa kmod-usb-ohci-pci linux-atm ppp-mod-pppoa pppdump pppstats \
-	soloscli tc
+  DEVICE_PACKAGES += br2684ctl flashrom kmod-hwmon-lm90 kmod-mppe kmod-pppoa \
+	kmod-usb-ohci-pci linux-atm ppp-mod-pppoa pppdump pppstats soloscli tc
 endef
 TARGET_DEVICES += geos
-- 
2.26.1


_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list