From cda95605226bb814b058c843d38cc06d3a13dde7 Mon Sep 17 00:00:00 2001
From: Anas Nashif <anas.nashif@intel.com>
Date: Wed, 3 Jul 2013 10:17:25 -0400
Subject: [PATCH] Make it boot into enlightenment

- Fixed systemd target
- Add build ID to os-release
- Do not use uuid in fstab
- Do not create /opt partition
---
 base.yaml                     | 8 +++++---
 ks/enlightenment.yaml         | 2 +-
 packaging/meta-base.changes   | 7 +++++++
 partitions/base               | 1 -
 scripts/base-e17-default.post | 1 +
 scripts/buildname.nochroot    | 5 +++++
 6 files changed, 19 insertions(+), 5 deletions(-)
 create mode 100644 scripts/buildname.nochroot

diff --git a/base.yaml b/base.yaml
index 349d5ff..2764f5e 100644
--- a/base.yaml
+++ b/base.yaml
@@ -8,20 +8,22 @@ Default:
     RootPass: tizen
     DefaultUser: tizen
     DefaultUserPass: tizen
-    BootloaderOptions: '--menus="install:Wipe and Install:systemd.unit=pc-installer.service:test"'
+    BootloaderOptions: ' --menus="install:Wipe and Install:systemd.unit=pc-installer.service:test"'
 
 
 
 BASE:
     Bootloader: True
-    BootloaderAppend: "vga=current quiet splash"
+    BootloaderAppend: "vga=current quiet splash rootwait rootfstype=ext4"
     BootloaderTimeout: 1
     SaveRepos: True
     StartX: False
     Architecture: x86_64
     Desktop: None
-    Mic2Options: -f liveusb --copy-kernel --runtime=native
+    Mic2Options: -f raw --copy-kernel --runtime=native
     Part: base
+    NoChrootScripts:
+        - buildname
     Groups:
         - Base System
     Repos:
diff --git a/ks/enlightenment.yaml b/ks/enlightenment.yaml
index 9b2a2d3..8c4f2e9 100644
--- a/ks/enlightenment.yaml
+++ b/ks/enlightenment.yaml
@@ -5,7 +5,7 @@ Platform: BASE
 FileName: enlightenment
 Kernel: kernel-adaptation-pc
 Architecture: x86_64
-Mic2Options: -f raw --copy-kernel --runtime=native --compress-disk-image=bz2 --generate-bmap
+Mic2Options: -f raw --copy-kernel --runtime=native --compress-disk-image=bz2 --generate-bmap --fstab-name
 Desktop: None
 PostScripts:
     - base-general
diff --git a/packaging/meta-base.changes b/packaging/meta-base.changes
index d75e28e..16cc45b 100644
--- a/packaging/meta-base.changes
+++ b/packaging/meta-base.changes
@@ -1,3 +1,10 @@
+* Wed Jul 03 2013 Anas Nashif <anas.nashif@intel.com> submit/tizen/20130703.125236@454e022
+- Make it boot into enlightenment
+ - Fixed systemd target
+ - Add build ID to os-release
+ - Do not use uuid in fstab
+ - Do not create /opt partition
+
 * Wed Jul 03 2013 Anas Nashif <anas.nashif@intel.com> accepted/tizen/20130628.165825@51ecff2
 - generate bmap
 
diff --git a/partitions/base b/partitions/base
index 6b83ee9..cf96d13 100644
--- a/partitions/base
+++ b/partitions/base
@@ -1,3 +1,2 @@
 part /boot --size 64 --ondisk sdb --fstype=ext4 --label boot --active --align 1024
-part /opt --size 676 --ondisk sdb --fstype=ext4 --label opt --align 1024
 part / --size 3072 --ondisk sdb --fstype=ext4 --label platform --align 1024
diff --git a/scripts/base-e17-default.post b/scripts/base-e17-default.post
index af41feb..0d81388 100644
--- a/scripts/base-e17-default.post
+++ b/scripts/base-e17-default.post
@@ -1,2 +1,3 @@
+mkdir -p /usr/lib/systemd/system/graphical.target.wants
 ln -sf ../user-session@.service /usr/lib/systemd/system/graphical.target.wants/user-session@1000.service
 ln -sf e17.target  /usr/lib/systemd/user/default.target
diff --git a/scripts/buildname.nochroot b/scripts/buildname.nochroot
new file mode 100644
index 0000000..36ae504
--- /dev/null
+++ b/scripts/buildname.nochroot
@@ -0,0 +1,5 @@
+# buildname.nochroot 
+if [ -n "$IMG_NAME" ]; then
+    echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/tizen-release
+    echo "BUILD_ID=$IMG_NAME" >> $INSTALL_ROOT/etc/os-release
+fi
-- 
2.7.4