From 2acc7f1baeb9b4974dec8ca68e1264cdc0ed86be Mon Sep 17 00:00:00 2001
From: David Bauer <mail@david-bauer.net>
Date: Mon, 6 Apr 2020 12:36:17 +0200
Subject: [PATCH] x86: update profile names
---
targets/x86-64 | 11 +++++++----
targets/x86-generic | 11 +++++++----
targets/x86-geode | 8 ++++++--
targets/x86-legacy | 9 +--------
targets/x86.inc | 10 +++++++---
5 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/targets/x86-64 b/targets/x86-64
index 3ef125158..28de8543f 100644
--- a/targets/x86-64
+++ b/targets/x86-64
@@ -1,6 +1,9 @@
include 'x86.inc'
-factory_image('x86-64', 'combined-squashfs', '.img.gz')
-factory_image('x86-64', 'combined-squashfs', '.vdi')
-factory_image('x86-64', 'combined-squashfs', '.vmdk')
-sysupgrade_image('x86-64', 'combined-squashfs', '.img.gz')
+packages {
+ 'kmod-gpio-nct5104d',
+ 'kmod-leds-gpio',
+ 'kmod-leds-apu2',
+}
+
+device('x86-64', 'generic')
diff --git a/targets/x86-generic b/targets/x86-generic
index 57b55f4a0..3bbe72ec9 100644
--- a/targets/x86-generic
+++ b/targets/x86-generic
@@ -1,9 +1,12 @@
include 'x86.inc'
-factory_image('x86-generic', 'combined-squashfs', '.img.gz')
-factory_image('x86-generic', 'combined-squashfs', '.vdi')
-factory_image('x86-generic', 'combined-squashfs', '.vmdk')
-sysupgrade_image('x86-generic', 'combined-squashfs', '.img.gz', {
+packages {
+ 'kmod-gpio-nct5104d',
+ 'kmod-leds-gpio',
+ 'kmod-leds-apu2',
+}
+
+device('x86-generic', 'generic', {
manifest_aliases = {
'x86-kvm',
'x86-xen_domu',
diff --git a/targets/x86-geode b/targets/x86-geode
index 57519eb1b..146cfce9f 100644
--- a/targets/x86-geode
+++ b/targets/x86-geode
@@ -18,5 +18,9 @@ packages {
'kmod-via-velocity',
}
-factory_image('x86-geode', 'combined-squashfs', '.img.gz')
-sysupgrade_image('x86-geode', 'combined-squashfs', '.img.gz')
+device('x86-geode', 'generic', {
+ factory = '-squashfs-combined',
+ factory_ext = '.img.gz',
+ sysupgrade = '-squashfs-combined',
+ sysupgrade_ext = '.img.gz',
+})
diff --git a/targets/x86-legacy b/targets/x86-legacy
index 79667dad2..402d7e219 100644
--- a/targets/x86-legacy
+++ b/targets/x86-legacy
@@ -1,10 +1,3 @@
include 'x86.inc'
-packages {
- '-kmod-gpio-nct5104d',
- '-kmod-leds-gpio',
- '-kmod-leds-apu2',
-}
-
-factory_image('x86-legacy', 'combined-squashfs', '.img.gz')
-sysupgrade_image('x86-legacy', 'combined-squashfs', '.img.gz')
+device('x86-legacy', 'generic')
diff --git a/targets/x86.inc b/targets/x86.inc
index c6037c688..286d2a077 100644
--- a/targets/x86.inc
+++ b/targets/x86.inc
@@ -22,10 +22,7 @@ packages {
'kmod-via-velocity',
'kmod-ath9k',
'kmod-gpio-button-hotplug',
- 'kmod-gpio-nct5104d',
'kmod-hwmon-core',
- 'kmod-leds-gpio',
- 'kmod-leds-apu2',
'kmod-sp5100_tco',
'kmod-usb-core',
'kmod-usb-ohci',
@@ -42,3 +39,10 @@ packages {
'kmod-mt7603',
'kmod-mt7615e',
}
+
+defaults {
+ factory = '-squashfs-combined',
+ factory_ext = {'.img.gz', '.vmdk', '.vdi'},
+ sysupgrade = '-squashfs-combined',
+ sysupgrade_ext = '.img.gz',
+}
--
GitLab