summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnas Nashif <anas.nashif@intel.com>2012-11-14 20:41:30 -0800
committerAnas Nashif <anas.nashif@intel.com>2012-11-14 20:41:30 -0800
commita7d57c8020ec5f7ea2fa9aed5cbcf3c76ab1d54a (patch)
treeabf3c93dad45297c6161a6efee1a4a1364ec8add
parentb40ffe6aebc9a75c77d94ad086963cb653759498 (diff)
downloadmeta-common-a7d57c8020ec5f7ea2fa9aed5cbcf3c76ab1d54a.tar.gz
meta-common-a7d57c8020ec5f7ea2fa9aed5cbcf3c76ab1d54a.tar.bz2
meta-common-a7d57c8020ec5f7ea2fa9aed5cbcf3c76ab1d54a.zip
generate liveusb images nowsubmit/trunk/20121115.044237
-rw-r--r--image-configs/base.yaml23
-rw-r--r--image-configs/configs/enlightenment-test.yaml20
-rw-r--r--image-configs/configs/enlightenment.yaml1
3 files changed, 20 insertions, 24 deletions
diff --git a/image-configs/base.yaml b/image-configs/base.yaml
index 9b3df4d..954926a 100644
--- a/image-configs/base.yaml
+++ b/image-configs/base.yaml
@@ -16,14 +16,29 @@ Default:
BASE:
PartSize: 3200
Bootloader: True
- BootloaderAppend: "rootwait rootfstype=ext4"
- BootloaderTimeout: 0
+ BootloaderAppend: "rootwait rootfstype=ext4 quiet splash"
+ BootloaderTimeout: 5
SaveRepos: True
StartX: False
- Architecture: ia32
+ Architecture: x86_64
Desktop: None
- Mic2Options: -f raw --copy-kernel --compress-disk-image=bz2
+ Mic2Options: -f liveusb --copy-kernel
Groups:
- Base System
Repos:
- base
+PC:
+ PartSize: 3200
+ Bootloader: True
+ BootloaderAppend: "rootwait rootfstype=ext4 quiet splash"
+ BootloaderTimeout: 5
+ SaveRepos: True
+ StartX: False
+ Mic2Options: -f liveusb --copy-kernel
+ Architecture: x86_64
+ Desktop: None
+ Groups:
+ - Base System
+ Repos:
+ - base
+ - pc
diff --git a/image-configs/configs/enlightenment-test.yaml b/image-configs/configs/enlightenment-test.yaml
deleted file mode 100644
index eeca994..0000000
--- a/image-configs/configs/enlightenment-test.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-Name: Base Enlightenment Desktop
-Schedule: "*"
-Active: True
-Platform: BASE
-FileName: enlightenment-test
-Kernel: kernel-adaptation-pc
-Architecture: x86_64
-Mic2Options: -f liveusb --copy-kernel
-Desktop: None
-PostScripts:
- - workarounds
- - base-general
- - base-e17-default
-Groups:
- - Base System
- - X11
- - SLP Fonts
- - Enlightenment
- - Development
- - Applications
diff --git a/image-configs/configs/enlightenment.yaml b/image-configs/configs/enlightenment.yaml
index 7f5a965..97b0d76 100644
--- a/image-configs/configs/enlightenment.yaml
+++ b/image-configs/configs/enlightenment.yaml
@@ -5,6 +5,7 @@ Platform: BASE
FileName: enlightenment
Kernel: kernel-adaptation-pc
Architecture: x86_64
+Mic2Options: -f liveusb --copy-kernel
Desktop: None
PostScripts:
- base-general