cleanup

40 files changed, 5 insertions, 815 deletions

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index bd9d6b9..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,84 +0,0 @@
-2012-03-05  Tracy Graydon <tracy.graydon@intel.com>
-
-  * VERSION, configurations.yaml: Add copy-kernel option for IVI images
-
-2012-03-01  Tracy Graydon <tracy.graydon@intel.com>
-
-  * ChangeLog: Amend to trick gerrit
-
-  * ChangeLog: changelog update
-
-  * VERSION, ivi/ivi-main-min-auto.yaml, ivi/ivi-main-min-pc.yaml,
-  ivi/ivi-main-wayland-auto.yaml, ivi/ivi-main-wayland-pc.yaml,
-  ivi/ivi-main-x-auto.yaml, ivi/ivi-main-x-pc.yaml,
-  packaging/image-configurations.spec: IVI additions to adjust for
-  package-groups changes
-
-  * ChangeLog: Add IVI boot options
-
-  * ChangeLog: Changelog update
-
-  * VERSION: Version bump to 0.13
-
-  * configurations.yaml: Add bootloader options for IVI
-
-2012-02-29  Tracy Graydon <tracy.graydon@intel.com>
-
-  * ChangeLog: Compress IVI images
-
-  * ChangeLog: Changelog update
-
-  * VERSION: Version bump 0.12
-
-  * packaging/image-configurations.spec: spec
-
-  * configurations.yaml: Compress IVI images
-
-2012-02-28  Tracy Graydon <tracy.graydon@intel.com>
-
-  * VERSION, packaging/image-configurations.spec: omg
-
-  * ChangeLog: Amend to trick gerrit
-
-  * ChangeLog: Changelog
-
-  * VERSION, packaging/image-configurations.spec: Version, spec
-
-  * ChangeLog: Changelog update
-
-  * ChangeLog: Changelog update
-
-  * VERSION: Version bump
-
-  * ivi/ivi-main-wayland-auto.yaml, ivi/ivi-main-x-auto.yaml,
-  packaging/image-configurations.spec: ARRRRGGGHHHHHH
-
-  * ChangeLog: ChangeLog update
-
-  * VERSION: change ver to 0.8
-
-  * VERSION: Bump ver to 8
-
-  * ivi/ivi-main-wayland-auto.yaml, ivi/ivi-main-x-auto.yaml, repos.yaml:
-  Couple more IVI changes and fix repos.yaml non-oss URLwq
-
-  * ChangeLog: Changelog update
-
-  * ChangeLog: Changelog update
-
-  * VERSION, packaging/image-configurations.spec: IVI fixing
-
-  * ivi/ivi-main-wayland-auto.yaml, ivi/ivi-main-wayland-pc.yaml,
-  ivi/ivi-main-x-auto.yaml, ivi/ivi-main-x-pc.yaml: Drop IVI Apps until
-  hfdialer is fixed
-
-2012-02-27  Tracy Graydon <tracy.graydon@intel.com>
-
-  * ChangeLog: ChangeLog
-
-  * ChangeLog: ChangeLog
-
-  * ChangeLog, Changelog: Fix ChangeLog name
-
-  * Makefile, VERSION, configurations.yaml,
-  packaging/image-configurations.spec: Change IVI to use IVI Base pattern
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9c8caf7..0000000
--- a/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-VERSION = $(shell cat VERSION)
-NAME=image-configurations
-TAGVER = $(shell cat VERSION | sed -e "s/\([0-9\.]*\).*/\1/")
-
-ifeq ($(VERSION), $(TAGVER))
-	TAG = $(TAGVER)
-else
-	TAG = "HEAD"
-endif
-
-all: 
-
-tag:
-	git tag -a $(VERSION) -m " $(VERSION)"
-	git push --tags origin master
-
-dist-bz2:
-	git archive --format=tar --prefix=$(NAME)-$(TAGVER)/ $(TAG) | \
-		bzip2  > $(NAME)-$(TAGVER).tar.bz2
-
-dist-gz:
-	git archive --format=tar --prefix=$(NAME)-$(TAGVER)/ $(TAG) | \
-		gzip  > $(NAME)-$(TAGVER).tar.gz
-
-changelog:
-	python ./scripts/gitlog2changelog.py
-
-repackage: dist
-	osc branch -c Tizen:Base $(NAME)
-	rm home\:*\:branches\:Tizen:Base/$(NAME)/*tar.bz2
-	cp $(NAME)-$(VERSION).tar.bz2 home\:*\:branches\:Tizen:Base/$(NAME)
-
-dist: dist-bz2
-
-install: all install-data
-
-up:
-	@python scripts/gitlog2changelog.py
-	@echo 'Current versions:'
-	@git tag -l
-	@echo 'Please specify the new version:'
-	@read NEWVER; echo $$NEWVER > VERSION; \
-	git commit -a -m "bump version to $$NEWVER"; \
-	git tag -m $$NEWVER $$NEWVER
-
-clean:
diff --git a/VERSION b/VERSION
deleted file mode 100644
index 3c03207..0000000
--- a/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-18
diff --git a/configurations.yaml b/configurations.yaml
deleted file mode 100644
index a5422a5..0000000
--- a/configurations.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-ExternalConfigs:
-  - handset
-  - ivi
-
-Default:
-    Baseline: tizen-0.0
-    FileSystem: ext3
-    Active: True
-    Language: en_US.UTF-8
-    Keyboard: us
-    SaveRepos:  True
-    Timezone: America/Los_Angeles
-    RootPass: tizen
-    DefaultUser: tizen
-    DefaultUserPass: tizen
-    PartSize: 1900
-    BootloaderOptions: ""
-
-Handset:
-    PartSize: 1024
-    Bootloader: True
-    BootloaderAppend: "rootdelay=5"
-    BootloaderTimeout: 0
-    SaveRepos:  True
-    Architecture: ia32
-    Desktop: None
-    Groups:
-        - Base System
-        - Base X Server
-        - Tizen UI
-        - Tizen APIs
-        - Development Tools
-    Repos:
-        - Tizen-base
-        - Tizen-main
-        - Tizen-base-debug
-        - Tizen-main-debug
-
-IVI:
-    PartSize: 2200
-    Bootloader: True
-    BootloaderAppend: "rootwait rootfstype=ext4"
-    BootloaderTimeout: 0
-    SaveRepos: True
-    StartX: False
-    Architecture: ia32
-    Desktop: None
-    Mic2Options: -f raw --copy-kernel --compress-disk-image=bz2
-    Groups:
-        - IVI Base
-    Repos:
-        - Tizen-base
-        - Tizen-main
-        - Tizen-ivi
diff --git a/custom/part/custom b/custom/part/custom
deleted file mode 100644
index d6c8b6b..0000000
--- a/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/custom/part/n900-2G b/custom/part/n900-2G
deleted file mode 100644
index fce8a34..0000000
--- a/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/custom/part/n900-4G b/custom/part/n900-4G
deleted file mode 100644
index be10ccf..0000000
--- a/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/custom/part/tizen-arm b/custom/part/tizen-arm
deleted file mode 100644
index 1756909..0000000
--- a/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/custom/part/tizen-handset b/custom/part/tizen-handset
deleted file mode 100644
index 12df959..0000000
--- a/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/custom/part/tizen-ivi b/custom/part/tizen-ivi
deleted file mode 100644
index dc08af1..0000000
--- a/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/custom/scripts/arch-armv7hl.post b/custom/scripts/arch-armv7hl.post
deleted file mode 100644
index 955f819..0000000
--- a/custom/scripts/arch-armv7hl.post
+++ /dev/null
@@ -1,6 +0,0 @@
-# Without this line the rpm don't get the architecture right.
-echo -n 'armv7hl-tizen-linux' > /etc/rpm/platform
- 
-# Also libzypp has problems in autodetecting the architecture so we force tha as well.
-# https://bugs.meego.com/show_bug.cgi?id=11484
-echo 'arch = armv7hl' >> /etc/zypp/zypp.conf
diff --git a/custom/scripts/boot-graphical-ivi.post b/custom/scripts/boot-graphical-ivi.post
deleted file mode 100644
index 495d1af..0000000
--- a/custom/scripts/boot-graphical-ivi.post
+++ /dev/null
@@ -1,3 +0,0 @@
-# Boot with full UX. 
-ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target
-
diff --git a/custom/scripts/boot-multiuser-ivi.post b/custom/scripts/boot-multiuser-ivi.post
deleted file mode 100644
index 4a99772..0000000
--- a/custom/scripts/boot-multiuser-ivi.post
+++ /dev/null
@@ -1,3 +0,0 @@
-# Boot multi-user with no UX. (Sort of like init runlevel 3.) 
-ln -sf /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
-
diff --git a/custom/scripts/buildname.nochroot b/custom/scripts/buildname.nochroot
deleted file mode 100644
index 544a400..0000000
--- a/custom/scripts/buildname.nochroot
+++ /dev/null
@@ -1,3 +0,0 @@
-if [ -n "$IMG_NAME" ]; then
-    echo "BUILD: $IMG_NAME" >> $INSTALL_ROOT/etc/tizen-release
-fi
diff --git a/custom/scripts/cleanup.post b/custom/scripts/cleanup.post
deleted file mode 100644
index d7c0ecd..0000000
--- a/custom/scripts/cleanup.post
+++ /dev/null
@@ -1,2 +0,0 @@
-# save a little bit of space at least...
-rm -f /boot/initrd*
diff --git a/custom/scripts/cogl.post b/custom/scripts/cogl.post
deleted file mode 100644
index 107bd06..0000000
--- a/custom/scripts/cogl.post
+++ /dev/null
@@ -1,7 +0,0 @@
-# Create /etc/cogl.conf file to load proper GL libraries on Cedartrail
-mkdir /etc/xdg/cogl
-echo "[global]" >>/etc/xdg/cogl/cogl.conf
-echo "COGL_DRIVER=gles2" >>/etc/xdg/cogl/cogl.conf
-echo "COGL_RENDERER=EGL" >>/etc/xdg/cogl/cogl.conf
-echo "COGL_DEBUG=disable-atlas" >>/etc/xdg/cogl/cogl.conf
-
diff --git a/custom/scripts/inittab.post b/custom/scripts/inittab.post
deleted file mode 100644
index 73bb7e5..0000000
--- a/custom/scripts/inittab.post
+++ /dev/null
@@ -1,3 +0,0 @@
-sed -i s/ENGINE=gl/ENGINE=fb/ /etc/profile.d/menu-screen.sh
-
-echo "s1:12345:respawn:/sbin/agetty -L 115200 ttyMFD3 vt100" >> /etc/inittab
diff --git a/custom/scripts/prelink.post b/custom/scripts/prelink.post
deleted file mode 100644
index 527548c..0000000
--- a/custom/scripts/prelink.post
+++ /dev/null
@@ -1,4 +0,0 @@
-# Prelink can reduce boot time
-if [ -x /usr/sbin/prelink ]; then
-    /usr/sbin/prelink -aRqm
-fi
diff --git a/custom/scripts/rpm.post b/custom/scripts/rpm.post
deleted file mode 100644
index 62707bd..0000000
--- a/custom/scripts/rpm.post
+++ /dev/null
@@ -1,2 +0,0 @@
-rm -f /var/lib/rpm/__db*
-rpm --rebuilddb
diff --git a/custom/scripts/udev.post b/custom/scripts/udev.post
deleted file mode 100644
index 9ac3936..0000000
--- a/custom/scripts/udev.post
+++ /dev/null
@@ -1 +0,0 @@
-echo "UDEV_PERSISTENT_STORAGE=no" >> /etc/sysconfig/udev
diff --git a/custom/scripts/update.post b/custom/scripts/update.post
deleted file mode 100644
index f8cb35d..0000000
--- a/custom/scripts/update.post
+++ /dev/null
@@ -1 +0,0 @@
-cat /etc/pki/tls/certs/download.saobs.jf.intel.com >> /etc/pki/tls/certs/ca-bundle.crt
diff --git a/custom/scripts/usb-networking.post b/custom/scripts/usb-networking.post
deleted file mode 100644
index 5f5f4b1..0000000
--- a/custom/scripts/usb-networking.post
+++ /dev/null
@@ -1,8 +0,0 @@
-# enable USB networking with IP address 192.168.1.1 by default
-cat >/etc/rc.d/rc3.d/S99usbnet.sh <<END
-#!/bin/sh
-echo rndis > /sys/class/android_usb/android0/functions
-echo 1 > /sys/class/android_usb/android0/enable
-ifconfig rndis0 192.168.100.1
-END
-chmod 777 /etc/rc.d/rc3.d/S99usbnet.sh
diff --git a/custom/scripts/users.post b/custom/scripts/users.post
deleted file mode 100644
index f1b4c4e..0000000
--- a/custom/scripts/users.post
+++ /dev/null
@@ -1,5 +0,0 @@
-mkdir -p /opt/home/app
-chown inhouse: /opt/home/app
-mkdir -p /home
-ln -s /opt/home/app /home/app
-ln -sf /opt/home/root /root
diff --git a/custom/scripts/uxlaunch-symlink-ivi.post b/custom/scripts/uxlaunch-symlink-ivi.post
deleted file mode 100644
index 1c9bd92..0000000
--- a/custom/scripts/uxlaunch-symlink-ivi.post
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set symlink pointing to .desktop file 
-ln -sf x-meego-ivi.desktop /usr/share/xsessions/default.desktop
diff --git a/custom/scripts/uxlaunch-symlink-nb.post b/custom/scripts/uxlaunch-symlink-nb.post
deleted file mode 100644
index cfa310a..0000000
--- a/custom/scripts/uxlaunch-symlink-nb.post
+++ /dev/null
@@ -1,2 +0,0 @@
-# Set symlink pointing to .desktop file 
-ln -sf dawati.desktop /usr/share/xsessions/default.desktop
diff --git a/handset/handset-blackbay.yaml b/handset/handset-blackbay.yaml
deleted file mode 100644
index bb3ffb8..0000000
--- a/handset/handset-blackbay.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-Name: Tizen Handset Blackbay
-Schedule: "*"
-Active: True
-Platform: Handset
-FileName: handset-blackbay
-Mic2Options: -f loop --copy-kernel --compress-disk-image=gz
-Groups:
-    - Medfield Support
-PostScripts:
-    - users
-    - inittab
-    - usb-networking
-    - rpm
-Repos:
-    - Tizen-mobile
diff --git a/handset/handset-pinetrail.yaml b/handset/handset-pinetrail.yaml
deleted file mode 100644
index 638e79a..0000000
--- a/handset/handset-pinetrail.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-Name: Tizen Handset Pinetrail
-Schedule: "*"
-Active: True
-Platform: Handset
-FileName: handset-pinetrail
-Part: tizen-handset
-Mic2Options: -f raw --copy-kernel  --compress-disk-image=bz2
-Groups:
-    - Pinetrail Support
-PostScripts:
-    - users
-    - xorg
-    - rpm
diff --git a/index.xml b/index.xml
deleted file mode 100644
index a4a2f8a..0000000
--- a/index.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<image-configs>
-  <config>
-    <name>handset-blackbay.ks</name>
-    <path>image-configs/handset-blackbay.ks</path>
-    <description>Tizen Handset Blackbay</description>
-    <arch>ia32</arch>
-    <md5></md5>
-    <schedule>*</schedule>
-  </config>
-  <config>
-    <name>handset-pinetrail.ks</name>
-    <path>image-configs/handset-pinetrail.ks</path>
-    <description>Tizen Handset Pinetrail</description>
-    <arch>ia32</arch>
-    <md5></md5>
-    <schedule>*</schedule>
-  </config>
-  <config>
-    <name>pinetrail-ivi-public.ks</name>
-    <path>image-configs/pinetrail-ivi-public.ks</path>
-    <description>Tizen Pinetrail IVI Public</description>
-    <arch>ia32</arch>
-    <md5></md5>
-    <schedule>*</schedule>
-  </config>
-  <config>
-    <name>pinetrail-ivi-restricted.ks</name>
-    <path>image-configs/pinetrail-ivi-restricted.ks</path>
-    <description>Tizen Pinetrail IVI Restricted</description>
-    <arch>ia32</arch>
-    <md5></md5>
-    <schedule>*</schedule>
-  </config>
-</image-configs>
diff --git a/ivi/ivi-main-min-auto.yaml b/ivi/ivi-main-min-auto.yaml
deleted file mode 100644
index 668a94f..0000000
--- a/ivi/ivi-main-min-auto.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-Name: Tizen IVI Min Auto
-Schedule: "*"
-Active: True
-Platform: IVI
-FileName: ivi-main-min-auto
-Part: tizen-ivi
-Kernel: kernel-adaptation-intel-automotive
-Architecture: ia32
-Desktop: None
-Groups:
-    - IVI Support Auto
-RemovePackages:
-    - initscripts
-    - insserv
-PostScripts:
-    - users
-    - rpm
diff --git a/ivi/ivi-main-min-pc.yaml b/ivi/ivi-main-min-pc.yaml
deleted file mode 100644
index d72c8a9..0000000
--- a/ivi/ivi-main-min-pc.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-Name: Tizen IVI Min PC
-Schedule: "*"
-Active: True
-Platform: IVI
-FileName: ivi-main-min-pc
-Part: tizen-ivi
-Kernel: kernel-adaptation-pc
-Architecture: ia32
-Desktop: None
-Groups:
-    - IVI Support PC
-ExtraPackages:
-    - udev-rules-netbook
-RemovePackages:
-    - initscripts
-    - insserv
-PostScripts:
-    - users
-    - rpm
diff --git a/ivi/ivi-main-wayland-auto.yaml b/ivi/ivi-main-wayland-auto.yaml
deleted file mode 100644
index 64b38f2..0000000
--- a/ivi/ivi-main-wayland-auto.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-Name: Tizen IVI Wayland Auto
-Schedule: "*"
-Active: True
-Platform: IVI
-FileName: ivi-main-wayland-auto
-Part: tizen-ivi
-Kernel: kernel-adaptation-intel-automotive
-Architecture: ia32
-Desktop: None
-Groups:
-    - IVI Support Auto
-    - IVI Wayland Auto
-    - IVI Desktop Auto
-    - IVI Applications
-RemovePackages:
-    - initscripts
-    - insserv
-PostScripts:
-    - users
-    - rpm
-Repos:
-    - Tizen-non-oss
diff --git a/ivi/ivi-main-wayland-pc.yaml b/ivi/ivi-main-wayland-pc.yaml
deleted file mode 100644
index ed00ba8..0000000
--- a/ivi/ivi-main-wayland-pc.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-Name: Tizen IVI Wayland PC
-Schedule: "*"
-Active: True
-Platform: IVI
-FileName: ivi-main-wayland-pc
-Part: tizen-ivi
-Kernel: kernel-adaptation-pc
-Architecture: ia32
-Desktop: None
-Groups:
-    - IVI Support PC
-    - IVI Wayland PC
-    - IVI Desktop PC
-    - IVI Applications
-ExtraPackages:
-    - udev-rules-netbook
-RemovePackages:
-    - initscripts
-    - insserv
-PostScripts:
-    - users
-    - rpm
diff --git a/ivi/ivi-main-x-auto.yaml b/ivi/ivi-main-x-auto.yaml
deleted file mode 100644
index a5a852e..0000000
--- a/ivi/ivi-main-x-auto.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-Name: Tizen IVI X Auto
-Schedule: "*"
-Active: True
-Platform: IVI
-FileName: ivi-main-x-auto
-Part: tizen-ivi
-Kernel: kernel-adaptation-intel-automotive
-Architecture: ia32
-Desktop: None
-Groups:
-    - IVI Support Auto
-    - Base X Server
-    - IVI X Auto
-RemovePackages:
-    - initscripts
-    - insserv
-PostScripts:
-    - users
-    - rpm
-Repos: 
-    - Tizen-non-oss
diff --git a/ivi/ivi-main-x-pc.yaml b/ivi/ivi-main-x-pc.yaml
deleted file mode 100644
index bd645e3..0000000
--- a/ivi/ivi-main-x-pc.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-Name: Tizen IVI X PC
-Schedule: "*"
-Active: True
-Platform: IVI
-FileName: ivi-main-x-pc
-Part: tizen-ivi
-Kernel: kernel-adaptation-pc
-Architecture: ia32
-Desktop: None
-Groups:
-    - IVI Support PC
-    - Base X Server
-    - IVI X PC
-ExtraPackages:
-    - udev-rules-netbook
-RemovePackages:
-    - initscripts
-    - insserv
diff --git a/packaging/image-configurations.spec b/packaging/image-configurations.spec
index 0bd777f..f77c06b 100644
--- a/packaging/image-configurations.spec
+++ b/packaging/image-configurations.spec
@@ -1,7 +1,7 @@
-%define baseline tizen-0.0
+%define baseline tizen-3.0
 Summary:	Create kickstart files for Tizen images
 Name:		image-configurations
-Version:	0.14
+Version:	100
 Release:	1
 License:	GPLv2
 Group:		System/Base
@@ -9,7 +9,7 @@ URL:		http://www.tizen.org
 Source:		image-configurations-%{version}.tar.bz2
 
 BuildArch:	noarch
-BuildRequires:  kickstarter >= 0.8
+BuildRequires:  kickstarter >= 0.15
 
 %description
 Create Configuration files to build Tizen images 
@@ -19,7 +19,7 @@ Create Configuration files to build Tizen images
 
 
 %build
-kickstarter -c configurations.yaml -r repos.yaml -i image-configs.xml
+kickstarter -c /usr/share/image-configurations/base/base.yaml -r /usr/share/image-configurations/base/repos.yaml -i image-configs.xml
 
 %install
 
@@ -28,6 +28,6 @@ cp %{baseline}/*.ks %{buildroot}/usr/share/image-configurations
 cp image-configs.xml %{buildroot}/usr/share/image-configurations
 
 %files
-%dir %_datadir/image-configurations
+#%dir %_datadir/image-configurations
 %_datadir/image-configurations/*.ks
 %_datadir/image-configurations/image-configs.xml
diff --git a/repos.yaml b/repos.yaml
deleted file mode 100644
index 5d6cd74..0000000
--- a/repos.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-Repositories:
-    -   Name: Tizen-base
-        Url:  https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/base/@ARCH@/packages/
-        Options: --save  --ssl_verify=no
-    -   Name: Tizen-base-debug
-        Url:  https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/base/@ARCH@/debug/
-        Options: --save  --ssl_verify=no
-    -   Name: Tizen-main
-        Url:  https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/main/@ARCH@/packages/
-        Options: --save  --ssl_verify=no
-    -   Name: Tizen-main-debug
-        Url:  https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/main/@ARCH@/debug
-        Options: --save  --ssl_verify=no
-    -   Name: Tizen-non-oss
-        Url:  https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/non-oss/@ARCH@/packages/
-        Options: --save  --ssl_verify=no
-    -   Name: Tizen-mobile
-        Url:  https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/mobile/@ARCH@/packages/
-        Options: --save  --ssl_verify=no
-    -   Name: Tizen-mobile-debug
-        Url:  https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/mobile/@ARCH@/debug
-        Options: --save  --ssl_verify=no
-    -   Name: Tizen-ivi
-        Url:  https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/ivi/@ARCH@/packages/
-        Options: --save  --ssl_verify=no
diff --git a/scripts/create-daily.sh b/scripts/create-daily.sh
deleted file mode 100755
index 11e309a..0000000
--- a/scripts/create-daily.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-#
-#A simple script to batch generate all release-able images for MeeGo. 
-#
-#This script will check out all MeeGo Image Kickstart files and execute 
-#image generation based on repository type selected for all release-able images. 
-#
-# Written for MeeGo by Chris Ferron <chris.e.ferron@linux.intel.com> based on an initial
-# effort buy Anas Nashif.
-
-
-ID=$1
-REPOTYPE=$2
-RELEASE=$3
-
-# Preparation Section
-#export http_proxy=http://192.168.50.99:3128/
-
-rm -f *.log
-
-if [ "$RELEASE" = "MeeGo1.1" ]; then
-   git checkout -f MeeGo1.1 
-elif [ "$RELEASE" = "Trunk" ]; then 
-   git checkout -f master
-else
-   git checkout -f master
-   echo "No release type given, default to Trunk. Current support is for Trunk and MeeGo1.1"
-fi
-
-git pull
-
-
-if [ "$REPOTYPE" = "1" ]; then
-  str="s/\@BUILD_ID\@/$ID/"
-elif [ "$REPOTYPE" = "2" ]; then 
-  str="s/\@BUILD_ID\@/preview/"
-elif [ "$REPOTYPE" = "3" ]; then 
-  str="s/\@BUILD_ID\@/daily/" 
-elif [ "$REPOTYPE" = "4" ]; then 
-  # Replace .ks to use the trunk-daily repos
-  echo "Creating trunk-daily image-configurations"
-  str="s/repo.meego.com\/MeeGo/download.meego.com\/trunk-daily/"
-  find -name \*.ks -exec perl  -pi -e $str '{}' \;
-  str="s/\@BUILD_ID\@/$ID/"
-elif [ "$REPOTYPE" = "5" ]; then 
-  # Replace .ks to use the test-daily repos
-  echo "Creating testing-daily image-configurations"
-  str="s/repo.meego.com\/MeeGo/download.meego.com\/testing-daily/"
-  find -name \*.ks -exec perl  -pi -e $str '{}' \;
-  str="s/\@BUILD_ID\@/$ID/"
-else
- echo " Repository Type needs to be 1 for Weekly or 4 for trunk-daily or 5 for testing-daily" 
- exit 1 
-fi
-
-find -name \*.ks -exec perl  -pi -e $str '{}' \;
-
-# mk_image expects at minimal, one arg- the first arg must be the path to the ks file.
-# all further args are passed through to 'mic create'
-# finally, a --release argument is automatically prepended.
-mk_image() {
-   local ks="$1";
-   shift
-   local name="meego-$(basename "$ks")"
-   name="${name%.ks}"
-   local dirname="$(dirname "$ks")"
-   rm -rf "${ID}/${dirname}/images/${name}"
-   mic create -c "$ks" --release="${ID}" "$@" 2>&1 | tee "${name}-${ID}.log"
-   if [ ! -d "${ID}/${dirname}/images/${name}" ]; then
-      echo "error: no ${ID}/${dirname}/images/${name} directory created"
-      return 1
-   fi
-   md5sum "${name}-${ID}.log" >> "${ID}/${dirname}/images/${name}/MANIFEST"
-   cp "${name}-${ID}.log" "$ID/${dirname}/images/${name}/"
-}
-
-
-#Core Image Section
-#mk_image core/core-armv7l-n900.ks -f raw --save-kernel --arch armv7
-mk_image core/core-armv7l-madde-sysroot.ks --format=fs --compress-disk-image=none --package=tar.bz2 --arch=armv7l --save-kernel
-mk_image core/core-ia32-madde-sysroot.ks --format=fs --compress-disk-image=none --package=tar.bz2
-
-#Netbook Image Section
-mk_image netbook/netbook-ia32.ks -f livecd
-mk_image netbook/netbook-ia32-qemu.ks --format=raw --compress-disk-image=none --package=tar.bz2
-
-#IVI Image Section
-mk_image ivi/ivi-ia32.ks -f livecd
-
-#Handset Image Section
-#mk_image handset/handset-ia32-aava-mtf.ks -f nand
-mk_image handset/handset-ia32-mtf.ks -f nand
-#mk_image handset/handset-ia32-aava-mtf-devel.ks -f nand
-mk_image handset/handset-ia32-mtf-devel.ks -f nand
-mk_image handset/handset-armv7l-n900.ks -f raw --save-kernel --arch=armv7l
-mk_image handset/handset-armv7l-n900-devel.ks -f raw --save-kernel --arch=armv7l
-mk_image handset/handset-armv7hl-n900.ks -f raw --save-kernel --arch=armv7hl
-mk_image handset/handset-ia32-pinetrail-mtf.ks -f livecd
-mk_image handset/handset-armv7l-qemu.ks --format=raw --compress-disk-image=none --package=tar.bz2 --arch=armv7l --save-kernel
-mk_image handset/handset-ia32-qemu.ks --format=raw --compress-disk-image=none --package=tar.bz2
-mk_image handset/handset-armv7l-madde-sysroot.ks --format=fs --compress-disk-image=none --package=tar.bz2 --arch=armv7l --save-kernel
-mk_image handset/handset-ia32-madde-sysroot.ks --format=fs --compress-disk-image=none --package=tar.bz2
-
-exit 0
diff --git a/scripts/create.sh b/scripts/create.sh
deleted file mode 100755
index afba827..0000000
--- a/scripts/create.sh
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-#
-#A simple script to batch generate all release-able images for MeeGo. 
-#
-#This script will check out all MeeGo Image Kickstart files and execute 
-#image generation based on repository type selected for all release-able images. 
-#
-# Written for MeeGo by Chris Ferron <chris.e.ferron@linux.intel.com> based on an initial
-# effort buy Anas Nashif.
-
-
-ID=$1
-REPOTYPE=$2
-RELEASE=$3
-
-# Preparation Section
-#export http_proxy= http://XXX.XXX.XXX.XXX:XXXX/
-
-rm -f *.log
-
-if [ "$RELEASE" = "MeeGo1.1" ]; then
-   git checkout -f MeeGo1.1 
-elif [ "$RELEASE" = "Trunk" ]; then 
-   git checkout -f master
-else
-   git checkout -f master
-   echo "No release type given, default to Trunk. Current support is for Trunk and MeeGo1.1"
-fi
-
-git pull
-
-if [ "$REPOTYPE" = "1" ]; then
-  str="s/\@BUILD_ID\@/$ID/"
-elif [ "$REPOTYPE" = "2" ]; then 
-  str="s/\@BUILD_ID\@/preview/"
-elif [ "$REPOTYPE" = "3" ]; then 
-  str="s/\@BUILD_ID\@/daily/" 
-else
- echo " Repository Type needs to be 1 for Weekly or 2 for Preview or 3 for Daily" 
- exit 1 
-fi
-
-find -name \*.ks -exec perl  -pi -e $str '{}' \;
-
-# mk_image expects at minimal, one arg- the first arg must be the path to the ks file.
-# all further args are passed through to 'mic create'
-# finally, a --release argument is automatically prepended.
-mk_image() {
-   local ks="$1";
-   shift
-   local name="meego-$(basename "$ks")"
-   name="${name%.ks}"
-   local dirname="$(dirname "$ks")"
-   rm -rf "${ID}/${dirname}/images/${name}"
-   mic create -c "$ks" --release="${ID}" "$@" 2>&1 | tee "${name}-${ID}.log"
-   if [ ! -d "${ID}/${dirname}/images/${name}" ]; then
-      echo "error: no ${ID}/${dirname}/images/${name} directory created"
-      return 1
-   fi
-   md5sum "${name}-${ID}.log" >> "${ID}/${dirname}/images/${name}/MANIFEST"
-   cp "${name}-${ID}.log" "$ID/${dirname}/images/${name}/"
-}
-
-
-#Core Image Section
-mk_image core/core-armv7l-n900.ks -f raw --save-kernel --arch armv7
-mk_image core/core-armv7l-madde-sysroot.ks --format=fs --compress-disk-image=none --package=tar.bz2 --arch=armv7l --save-kernel
-mk_image core/core-ia32-madde-sysroot.ks --format=fs --compress-disk-image=none --package=tar.bz2
-
-#Netbook Image Section
-mk_image netbook/netbook-ia32.ks -f livecd
-mk_image netbook/netbook-ia32-qemu.ks --format=raw --compress-disk-image=none --package=tar.bz2
-
-#IVI Image Section
-mk_image ivi/ivi-ia32.ks -f livecd
-
-#Handset Image Section
-#mk_image handset/handset-ia32-aava-mtf.ks -f nand
-mk_image handset/handset-ia32-mtf.ks -f nand
-#mk_image handset/handset-ia32-aava-mtf-devel.ks -f nand
-mk_image handset/handset-ia32-mtf-devel.ks -f nand
-mk_image handset/handset-armv7l-n900.ks -f raw --save-kernel --arch=armv7l
-mk_image handset/handset-armv7l-n900-devel.ks -f raw --save-kernel --arch=armv7l
-mk_image handset/handset-armv7hl-n900.ks -f raw --save-kernel --arch=armv7hl
-mk_image handset/handset-ia32-pinetrail-mtf.ks -f livecd
-mk_image handset/handset-armv7l-qemu.ks --format=raw --compress-disk-image=none --package=tar.bz2 --arch=armv7l --save-kernel
-mk_image handset/handset-ia32-qemu.ks --format=raw --compress-disk-image=none --package=tar.bz2
-mk_image handset/handset-armv7l-madde-sysroot.ks --format=fs --compress-disk-image=none --package=tar.bz2 --arch=armv7l --save-kernel
-mk_image handset/handset-ia32-madde-sysroot.ks --format=fs --compress-disk-image=none --package=tar.bz2
-
-exit 0
diff --git a/scripts/gitlog2changelog.py b/scripts/gitlog2changelog.py
deleted file mode 100644
index ce69b68..0000000
--- a/scripts/gitlog2changelog.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/python
-# Copyright 2008 Marcus D. Hanwell <marcus@cryos.org>
-# Distributed under the terms of the GNU General Public License v2 or later
-
-import string, re, os
-
-# Execute git log with the desired command line options.
-fin = os.popen('git log --summary --stat --no-merges --date=short', 'r')
-# Create a ChangeLog file in the current directory.
-fout = open('ChangeLog', 'w')
-
-# Set up the loop variables in order to locate the blocks we want
-authorFound = False
-dateFound = False
-messageFound = False
-filesFound = False
-message = ""
-messageNL = False
-files = ""
-prevAuthorLine = ""
-
-# The main part of the loop
-for line in fin:
-    # The commit line marks the start of a new commit object.
-    if string.find(line, 'commit') >= 0:
-        # Start all over again...
-        authorFound = False
-        dateFound = False
-        messageFound = False
-        messageNL = False
-        message = ""
-        filesFound = False
-        files = ""
-        continue
-    # Match the author line and extract the part we want
-    elif re.match('Author:', line) >=0:
-        authorList = re.split(': ', line, 1)
-        author = authorList[1]
-        author = author[0:len(author)-1]
-        authorFound = True
-    # Match the date line
-    elif re.match('Date:', line) >= 0:
-        dateList = re.split(':   ', line, 1)
-        date = dateList[1]
-        date = date[0:len(date)-1]
-        dateFound = True
-    # The svn-id lines are ignored
-    elif re.match('    git-svn-id:', line) >= 0:
-        continue
-    # The sign off line is ignored too
-    elif re.search('Signed-off-by', line) >= 0:
-        continue
-    # Extract the actual commit message for this commit
-    elif authorFound & dateFound & messageFound == False:
-        # Find the commit message if we can
-        if len(line) == 1:
-            if messageNL:
-                messageFound = True
-            else:
-                messageNL = True
-        elif len(line) == 4:
-            messageFound = True
-        else:
-            if len(message) == 0:
-                message = message + line.strip()
-            else:
-                message = message + " " + line.strip()
-    # If this line is hit all of the files have been stored for this commit
-    elif re.search('files changed', line) >= 0:
-        filesFound = True
-        continue
-    # Collect the files for this commit. FIXME: Still need to add +/- to files
-    elif authorFound & dateFound & messageFound:
-        fileList = re.split(' \| ', line, 2)
-        if len(fileList) > 1:
-            if len(files) > 0:
-                files = files + ", " + fileList[0].strip()
-            else:
-                files = fileList[0].strip()
-    # All of the parts of the commit have been found - write out the entry
-    if authorFound & dateFound & messageFound & filesFound:
-        # First the author line, only outputted if it is the first for that
-        # author on this day
-        authorLine = date + "  " + author
-        if len(prevAuthorLine) == 0:
-            fout.write(authorLine + "\n")
-        elif authorLine == prevAuthorLine:
-            pass
-        else:
-            fout.write("\n" + authorLine + "\n")
-
-        # Assemble the actual commit message line(s) and limit the line length
-        # to 80 characters.
-        commitLine = "* " + files + ": " + message
-        i = 0
-        commit = ""
-        while i < len(commitLine):
-            if len(commitLine) < i + 78:
-                commit = commit + "\n  " + commitLine[i:len(commitLine)]
-                break
-            index = commitLine.rfind(' ', i, i+78)
-            if index > i:
-                commit = commit + "\n  " + commitLine[i:index]
-                i = index+1
-            else:
-                commit = commit + "\n  " + commitLine[i:78]
-                i = i+79
-
-        # Write out the commit line
-        fout.write(commit + "\n")
-
-        #Now reset all the variables ready for a new commit block.
-        authorFound = False
-        dateFound = False
-        messageFound = False
-        messageNL = False
-        message = ""
-        filesFound = False
-        files = ""
-        prevAuthorLine = authorLine
-
-# Close the input and output lines now that we are finished.
-fin.close()
-fout.close()
diff --git a/scripts/merge-request.sh b/scripts/merge-request.sh
deleted file mode 100755
index 222d883..0000000
--- a/scripts/merge-request.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-if [ -z "$1" ]; then
-	echo "Merge request number needed"
-	exit 1
-fi
-
-# Check out a new branch for integration
-git checkout -b merge-requests/$1
-
-# Fetch the merge request into this branch
-git pull git://gitorious.org:meego-os-base/image-configurations.git  refs/merge-requests/$1
-
-# Show the commits, assess they are okay
-git log --pretty=oneline --abbrev-commit master..merge-requests/$1
-
-# To apply the changes to your branch:
-git checkout master
-git merge merge-requests/$1
-git push origin master