Reorganize structure and add weston images

diff --git a/Makefile b/Makefile
index b3d3c42..acfa8a7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,11 +20,14 @@ install:
        install -d ${DESTDIR}/usr/share/image-configurations/base/custom/scripts
        install -d ${DESTDIR}/usr/share/image-configurations/base/custom/part
        install -m 644 patterns/*.yaml ${DESTDIR}/usr/share/package-groups/base
-       install -m 644 image-configs/base.yaml ${DESTDIR}/usr/share/image-configurations/base
-       install -m 644 image-configs/base-repos.yaml ${DESTDIR}/usr/share/image-configurations/base
-       install -m 644 image-configs/configs/*.yaml ${DESTDIR}/usr/share/image-configurations/base/configs
-       install -D image-configs/custom/part/* ${DESTDIR}/usr/share/image-configurations/base/custom/part
-       install -D image-configs/custom/scripts/* ${DESTDIR}/usr/share/image-configurations/base/custom/scripts
+       install -m 644 base.yaml ${DESTDIR}/usr/share/image-configurations/base
+       install -m 644 base-repos.yaml ${DESTDIR}/usr/share/image-configurations/base
+       install -m 644 ks/*.yaml ${DESTDIR}/usr/share/image-configurations/base/configs
+       install -D partitioning/* ${DESTDIR}/usr/share/image-configurations/base/partitioning
+       install -D scripts/* ${DESTDIR}/usr/share/image-configurations/base/scripts
+
+test:
+       kickstarter -c base.yaml -e ks -r base-repos.yaml
 
 tag:
        git tag -a $(VERSION) -m "$(VERSION)"

diff --git a/image-configs/base-repos.yaml b/base-repos.yaml
similarity index 100%
rename from image-configs/base-repos.yaml
rename to base-repos.yaml

diff --git a/image-configs/base.yaml b/base.yaml
similarity index 100%
rename from image-configs/base.yaml
rename to base.yaml

diff --git a/image-configs/custom/part/custom b/image-configs/custom/part/custom
deleted file mode 100644 (file)
index d6c8b6b..0000000
--- a/image-configs/custom/part/custom
+++ /dev/null
@@ -1,2 +0,0 @@
-part / --size 1300 --ondisk sda --grow --maxsize=1450 --fstype=ext3
-#part /home --size 1000  --grow --maxsize=1450 --ondisk sdb --fstype=ext3

diff --git a/image-configs/custom/part/n900-2G b/image-configs/custom/part/n900-2G
deleted file mode 100644 (file)
index fce8a34..0000000
--- a/image-configs/custom/part/n900-2G
+++ /dev/null
@@ -1,8 +0,0 @@
-part / --size=1750  --ondisk mmcblk0p --fstype=ext4
-
-# This is not used currently. It is here because the /boot partition
-# needs to be the partition number 3 for the u-boot usage.
-part swap --size=8 --ondisk mmcblk0p --fstype=swap
-
-# This partition is made so that u-boot can find the kernel
-part /boot --size=32 --ondisk mmcblk0p --fstype=vfat

diff --git a/image-configs/custom/part/n900-4G b/image-configs/custom/part/n900-4G
deleted file mode 100644 (file)
index be10ccf..0000000
--- a/image-configs/custom/part/n900-4G
+++ /dev/null
@@ -1,8 +0,0 @@
-part / --size=3400  --ondisk mmcblk0p --fstype=ext3
-
-# This is not used currently. It is here because the /boot partition
-# needs to be the partition number 3 for the u-boot usage.
-part swap --size=256 --ondisk mmcblk0p --fstype=swap
-
-# This partition is made so that u-boot can find the kernel
-part /boot --size=64 --ondisk mmcblk0p --fstype=vfat

diff --git a/image-configs/custom/part/tizen-arm b/image-configs/custom/part/tizen-arm
deleted file mode 100644 (file)
index 1756909..0000000
--- a/image-configs/custom/part/tizen-arm
+++ /dev/null
@@ -1,4 +0,0 @@
-# ROOT fs partition
-part / --size=800 --ondisk mmcblk0p --fstype=ext4 --label=platform
-# DATA partition
-part /opt/ --size=1800 --ondisk mmcblk0p --fstype=ext4 --label=data

diff --git a/image-configs/custom/part/tizen-handset b/image-configs/custom/part/tizen-handset
deleted file mode 100644 (file)
index 12df959..0000000
--- a/image-configs/custom/part/tizen-handset
+++ /dev/null
@@ -1,3 +0,0 @@
-part /boot --size 32 --ondisk sdb --fstype=ext2
-part /opt --size 300 --ondisk sdb --fstype=ext3
-part / --size 1024 --ondisk sdb --fstype=ext3

diff --git a/image-configs/custom/part/tizen-ivi b/image-configs/custom/part/tizen-ivi
deleted file mode 100644 (file)
index dc08af1..0000000
--- a/image-configs/custom/part/tizen-ivi
+++ /dev/null
@@ -1,3 +0,0 @@
-part /boot --size 32 --ondisk sdb --fstype=ext2
-part /opt --size 300 --ondisk sdb --fstype=ext4
-part / --size 1024 --ondisk sdb --fstype=ext4

diff --git a/image-configs/configs/enlightenment.yaml b/ks/enlightenment.yaml
similarity index 100%
rename from image-configs/configs/enlightenment.yaml
rename to ks/enlightenment.yaml

diff --git a/ks/weston.yaml b/ks/weston.yaml
new file mode 100644 (file)
index 0000000..0317300
--- /dev/null
+++ b/ks/weston.yaml
@@ -0,0 +1,18 @@
+Name: Weston
+Schedule: "*"
+Active: True
+Platform: BASE
+FileName: weston
+Kernel: kernel-adaptation-pc
+Architecture: x86_64
+Mic2Options: -f liveusb --copy-kernel
+Desktop: None
+UserGroups: "audio,video,weston-launch"
+PostScripts:
+    - base-general
+    - base-weston-default
+Groups:
+    - Base System
+    - SLP Fonts
+    - Wayland
+    - Development

diff --git a/partitioning/README.part b/partitioning/README.part
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/patterns/base.yaml b/patterns/base.yaml
index cd2d29d..c958d15 100644 (file)
--- a/patterns/base.yaml
+++ b/patterns/base.yaml
@@ -15,6 +15,7 @@ Packages:
 - setup
 - filesystem
 - systemd
+- user-session-units
 - bash
 - coreutils
 - rpm

diff --git a/patterns/enlightenment.yaml b/patterns/enlightenment.yaml
index ffcb152..cb6c218 100644 (file)
--- a/patterns/enlightenment.yaml
+++ b/patterns/enlightenment.yaml
@@ -4,5 +4,5 @@ Packages:
 - enlightenment
 - econnman
 - tizen-branding-default
-- user-session-units
+- user-session-units-enlightenment
 Summary: Enlightenment

diff --git a/patterns/wayland.yaml b/patterns/wayland.yaml
new file mode 100644 (file)
index 0000000..4716da4
--- /dev/null
+++ b/patterns/wayland.yaml
@@ -0,0 +1,7 @@
+Description: Wayland
+Name: wayland
+Packages:
+ - weston
+ - xkeyboard-config
+ - tizen-branding-default
+Summary: Wayland

diff --git a/image-configs/custom/scripts/base-e17-default.post b/scripts/base-e17-default.post
similarity index 100%
rename from image-configs/custom/scripts/base-e17-default.post
rename to scripts/base-e17-default.post

diff --git a/image-configs/custom/scripts/base-general.post b/scripts/base-general.post
similarity index 100%
rename from image-configs/custom/scripts/base-general.post
rename to scripts/base-general.post

diff --git a/scripts/base-weston-default.post b/scripts/base-weston-default.post
new file mode 100644 (file)
index 0000000..23dc009
--- /dev/null
+++ b/scripts/base-weston-default.post
@@ -0,0 +1,2 @@
+ln -sf ../user-session@.service /usr/lib/systemd/system/graphical.target.wants/user-session@1000.service
+ln -sf weston.target  /usr/lib/systemd/user/default.target

diff --git a/image-configs/custom/scripts/workarounds.post b/scripts/workarounds.post
similarity index 100%
rename from image-configs/custom/scripts/workarounds.post
rename to scripts/workarounds.post