From a2eb50e0e6de6cda58f21c18e6311565db594aa2 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Thu, 26 Apr 2018 22:59:36 +0200 Subject: [PATCH] x86: move common parts of x86-generic and x86-64 to include file --- targets/x86-64 | 15 +-------------- targets/x86-generic | 15 +-------------- targets/x86.inc | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 28 deletions(-) create mode 100644 targets/x86.inc diff --git a/targets/x86-64 b/targets/x86-64 index b19d87555..9d690285d 100644 --- a/targets/x86-64 +++ b/targets/x86-64 @@ -1,17 +1,4 @@ -config 'CONFIG_VDI_IMAGES=y' -config 'CONFIG_VMDK_IMAGES=y' - -ATH10K_PACKAGES='kmod-ath10k-ct ath10k-firmware-qca9887 ath10k-firmware-qca988x' -if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then - ATH10K_PACKAGES='kmod-ath10k-ct ath10k-firmware-qca9887-ct ath10k-firmware-qca988x-ct' -fi - -packages 'kmod-3c59x' 'kmod-8139cp' 'kmod-8139too' 'kmod-e100' 'kmod-e1000' 'kmod-e1000e' 'kmod-forcedeth' 'kmod-igb' 'kmod-natsemi' 'kmod-ne2k-pci' -packages 'kmod-pcnet32' 'kmod-r8169' 'kmod-sis900' 'kmod-sky2' 'kmod-tg3' 'kmod-tulip' 'kmod-via-rhine' 'kmod-via-velocity' -packages 'kmod-ath9k' -packages $ATH10K_PACKAGES -packages 'kmod-gpio-button-hotplug' 'kmod-gpio-nct5104d' 'kmod-hwmon-core' 'kmod-hwmon-k10temp' 'kmod-leds-gpio' 'kmod-leds-apu2' 'kmod-sp5100_tco' -packages 'kmod-usb-core' 'kmod-usb-ohci' 'kmod-usb2' 'kmod-usb3' 'kmod-usb-serial' +. targets/x86.inc factory_image x86-64 combined-ext4 .img.gz factory_image x86-64 combined-ext4 .vdi diff --git a/targets/x86-generic b/targets/x86-generic index 6935ac7bc..9158a8aa7 100644 --- a/targets/x86-generic +++ b/targets/x86-generic @@ -1,17 +1,4 @@ -config 'CONFIG_VDI_IMAGES=y' -config 'CONFIG_VMDK_IMAGES=y' - -ATH10K_PACKAGES='kmod-ath10k-ct ath10k-firmware-qca9887 ath10k-firmware-qca988x' -if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then - ATH10K_PACKAGES='kmod-ath10k-ct ath10k-firmware-qca9887-ct ath10k-firmware-qca988x-ct' -fi - -packages 'kmod-3c59x' 'kmod-8139cp' 'kmod-8139too' 'kmod-e100' 'kmod-e1000' 'kmod-e1000e' 'kmod-forcedeth' 'kmod-igb' 'kmod-natsemi' 'kmod-ne2k-pci' -packages 'kmod-pcnet32' 'kmod-r8169' 'kmod-sis900' 'kmod-sky2' 'kmod-tg3' 'kmod-tulip' 'kmod-via-rhine' 'kmod-via-velocity' -packages 'kmod-ath9k' -packages $ATH10K_PACKAGES -packages 'kmod-gpio-button-hotplug' 'kmod-gpio-nct5104d' 'kmod-hwmon-core' 'kmod-hwmon-k10temp' 'kmod-leds-gpio' 'kmod-leds-apu2' 'kmod-sp5100_tco' -packages 'kmod-usb-core' 'kmod-usb-ohci' 'kmod-usb2' 'kmod-usb3' 'kmod-usb-serial' +. targets/x86.inc factory_image x86-generic combined-ext4 .img.gz factory_image x86-generic combined-ext4 .vdi diff --git a/targets/x86.inc b/targets/x86.inc new file mode 100644 index 000000000..d1f211896 --- /dev/null +++ b/targets/x86.inc @@ -0,0 +1,14 @@ +config 'CONFIG_VDI_IMAGES=y' +config 'CONFIG_VMDK_IMAGES=y' + +ATH10K_PACKAGES='kmod-ath10k-ct ath10k-firmware-qca9887 ath10k-firmware-qca988x' +if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then + ATH10K_PACKAGES='kmod-ath10k-ct ath10k-firmware-qca9887-ct ath10k-firmware-qca988x-ct' +fi + +packages 'kmod-3c59x' 'kmod-8139cp' 'kmod-8139too' 'kmod-e100' 'kmod-e1000' 'kmod-e1000e' 'kmod-forcedeth' 'kmod-igb' 'kmod-natsemi' 'kmod-ne2k-pci' +packages 'kmod-pcnet32' 'kmod-r8169' 'kmod-sis900' 'kmod-sky2' 'kmod-tg3' 'kmod-tulip' 'kmod-via-rhine' 'kmod-via-velocity' +packages 'kmod-ath9k' +packages $ATH10K_PACKAGES +packages 'kmod-gpio-button-hotplug' 'kmod-gpio-nct5104d' 'kmod-hwmon-core' 'kmod-hwmon-k10temp' 'kmod-leds-gpio' 'kmod-leds-apu2' 'kmod-sp5100_tco' +packages 'kmod-usb-core' 'kmod-usb-ohci' 'kmod-usb2' 'kmod-usb3' 'kmod-usb-serial' -- GitLab