summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTracy Graydon <tracy.graydon@intel.com>2012-02-24 16:59:56 -0800
committerTracy Graydon <tracy.graydon@intel.com>2012-02-24 17:25:30 -0800
commitee422a1406631a1ce3ad02148e521c69ba52031e (patch)
treef14bedee1a8663608a17b4817084c4992304f39e
downloadimage-configurations-ee422a1406631a1ce3ad02148e521c69ba52031e.tar.gz
image-configurations-ee422a1406631a1ce3ad02148e521c69ba52031e.tar.bz2
image-configurations-ee422a1406631a1ce3ad02148e521c69ba52031e.zip
IVI repo changes.
Initial git project commit
-rw-r--r--Changelog161
-rw-r--r--Makefile46
-rw-r--r--README29
-rw-r--r--README.kickstarter58
-rw-r--r--VERSION1
-rw-r--r--configurations.yaml54
-rw-r--r--custom/part/custom2
-rw-r--r--custom/part/n900-2G8
-rw-r--r--custom/part/n900-4G8
-rw-r--r--custom/part/tizen-arm4
-rw-r--r--custom/part/tizen-handset3
-rw-r--r--custom/part/tizen-ivi3
-rw-r--r--custom/scripts/arch-armv7hl.post6
-rw-r--r--custom/scripts/boot-graphical-ivi.post3
-rw-r--r--custom/scripts/boot-multiuser-ivi.post3
-rw-r--r--custom/scripts/buildname.nochroot3
-rw-r--r--custom/scripts/cleanup.post2
-rw-r--r--custom/scripts/cogl.post7
-rw-r--r--custom/scripts/inittab.post3
-rw-r--r--custom/scripts/prelink.post4
-rw-r--r--custom/scripts/rpm.post2
-rw-r--r--custom/scripts/udev.post1
-rw-r--r--custom/scripts/update.post1
-rw-r--r--custom/scripts/usb-networking.post8
-rw-r--r--custom/scripts/users.post5
-rw-r--r--custom/scripts/uxlaunch-symlink-ivi.post2
-rw-r--r--custom/scripts/uxlaunch-symlink-nb.post2
-rw-r--r--handset/handset-blackbay.yaml15
-rw-r--r--handset/handset-pinetrail.yaml13
-rw-r--r--index.xml34
-rw-r--r--ivi/ivi-main-min-auto.yaml16
-rw-r--r--ivi/ivi-main-min-pc.yaml18
-rw-r--r--ivi/ivi-main-wayland-auto.yaml18
-rw-r--r--ivi/ivi-main-wayland-pc.yaml20
-rw-r--r--ivi/ivi-main-x-auto.yaml19
-rw-r--r--ivi/ivi-main-x-pc.yaml18
-rw-r--r--packaging/image-configurations.spec33
-rw-r--r--repos.yaml31
-rwxr-xr-xscripts/create-daily.sh104
-rwxr-xr-xscripts/create.sh91
-rw-r--r--scripts/gitlog2changelog.py124
-rwxr-xr-xscripts/merge-request.sh20
42 files changed, 1003 insertions, 0 deletions
diff --git a/Changelog b/Changelog
new file mode 100644
index 0000000..053d75b
--- /dev/null
+++ b/Changelog
@@ -0,0 +1,161 @@
+Sat Feb 25 00:53:40 UTC 2012 - tracy.graydon@intel.com
+- Removed the now extraneous live repos for IVI from repos.yaml, etc.
+
+Fri Feb 24 08:40:41 UTC 2012 - tracy.graydon@intel.com
+- Yamlfy IVI kickstarts.
+
+* Thu Feb 23 2012 Rolla Selbak <rolla.n.selbak@intel.com> - 2.06
+- Renamed PR3 to Handset (pinetrail, blackbay)
+
+* Thu Feb 23 2012 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 2.05
+- Adding gzip disk compression for PR3 Intel image
+
+* Thu Feb 23 2012 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 2.03
+- Renaming --save-kernel parameter for PR3 Medfield Intel image to --copy-kernel new name
+
+* Thu Feb 23 2012 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 2.02
+- Renamed Tizen Base to Base System for one of the IVI images
+
+* Wed Feb 22 2012 Rolla Selbak <rolla.n.selbak@intel.com> - 2.01
+- Proper translation for pr3-* yaml files. Cleaned up PR3 base config.
+
+* Mon Feb 20 2012 Jian-feng Ding <jian-feng.ding@intel.com> - 0.75
+- Update repos configurations using snapshots
+
+* Fri Feb 17 2012 Li Yi <yi.a.li@intel.com> - 0.74git
+- Adding image for PR3
+
+* Wed Feb 08 2012 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 0.74
+- Disabling IVI images for Tizen Trunk (Netbook)
+
+* Fri Feb 03 2012 Tracy Graydon <tracy.graydon@intel.com> - 0.73
+- Git Tag: 20120203.1
+ 928eebd: IVI changes to fix certs issue, and add devel stuff
+
+* Fri Feb 03 2012 Tracy Graydon <tracy.graydon@intel.com> - 0.71
+- Git Tag: 20120203.0
+ f038f56: Image configs fix
+
+* Fri Jan 20 2012 Ulf Hofemeier <ulf.hofemeier@intel.com> - 0.64
+- Git Tag: 20120120.0
+ 4b4d3d4: Disable SaveRepo --save parameter for Tizen Netbook image generation.
+
+* Wed Jan 18 2012 Ulf Hofemeier <ulf.hofemeier@intel.com> - 0.63
+- Git Tag: 20120118.0
+ 8d3e6fe: Adding Tizen Webapi Apps group to Pinetrail and Cedartrail image configuration
+
+* Thu Jan 12 2012 Tracy Graydon <tracy.graydon@intel.com> - 0.62
+- Git Tag: 20120112.0
+ cbc8a7f: turn on saverepos for IVI images
+
+* Mon Jan 09 2012 Ulf Hofemeier <ulf.hofemeier@intel.com> - 0.60
+- Git Tag: 20120109.1
+ a4ec493: Added update.post script appending the DMZ chain cert to ca-bundle.crt to make zypper updates work properly.
+
+* Mon Jan 09 2012 Ulf Hofemeier <ulf.hofemeier@intel.com> - 0.59
+- Git Tag: 20120109.0
+ e061adc: Added update.post script appending the DMZ chain cert to ca-bundle.crt to make zypper updates work properly.
+
+* Wed Jan 04 2012 Tracy Graydon <tracy.graydon@intel.com> - 0.57
+- Git Tag: 20120104.1
+ a54d423: Bug# PVIVI-10: don't save repos for IVI images
+
+* Wed Jan 04 2012 Tracy Graydon <tracy.graydon@intel.com> - 0.57
+- Git Tag: 20120104.0
+ a54d423: Bug# PVIVI-10: don't save repos for IVI images
+
+* Mon Dec 19 2011 Prajwal Mohan <prajwal.karur.mohan@intel.com> - 0.56
+- Git Tag: 20111219.0
+ 9d751d4: Adding TV images back. Updating to version 0.56
+
+* Thu Dec 15 2011 Tracy Graydon <tracy.graydon@intel.com> - 0.55
+- Git Tag: 20111215.1
+ 855fa85: spec
+
+* Thu Dec 15 2011 Tracy Graydon <tracy.graydon@intel.com> - 0.53
+- Git Tag: 20111215.0
+ e962186: IVI changes
+
+* Wed Dec 14 2011 Tracy Graydon <tracy.graydon@intel.com> - 0.47
+- Git Tag: 20111214.2
+ 98468cc: removed cetv stuff to get package to build.
+
+* Wed Dec 14 2011 Tracy Graydon <tracy.graydon@intel.com> - 0.43
+- Git Tag: 20111214.1
+ 21fcda2: revert an IVI change
+
+* Wed Dec 14 2011 Tracy Graydon <tracy.graydon@intel.com> - 0.42
+- Git Tag: 20111214.0
+ e90d4e7: IVI changes
+
+* Thu Dec 8 2011 Prajwal Mohan <prajwal.karur.mohan@intel.com> - 0.41
+- Adding image for TV
+
+* Thu Dec 01 2011 Tracy Graydon <tracy.graydon@intel.com> - 0.40
+- Fix X pattern name in ivi yaml.
+
+* Tue Nov 29 2011 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 0.38
+- Renamed MeeGo in Tizen
+
+* Mon Nov 28 2011 Tracy Graydon <tracy.graydon@intel.com> - 0.37
+- IVI changes. Drop language packages from IVI. Drop base dev from IVI in configurationis.yaml
+
+* Tue Nov 22 2011 Tracy Graydon <tracy.graydon@intel.com> - 0.35
+- Update IVI groups to use new Tizen naming. i.e. Tizen IVI, etc.
+- Remove extra net-tool package for IVI yaml that is now in a pattern.
+
+* Mon Nov 21 2011 Tracy Graydon <tracy.graydon@intel.com> - 0.35
+- IVI Updates
+
+* Fri Nov 18 2011 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 0.34
+- Renamed MeeGo Basea Development to Tizen Base Development
+
+* Mon Nov 14 2011 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 0.32
+- Updating repos.yaml to final URL
+
+* Fri Nov 04 2011 Prajwal Mohan <prajwal.karur.mohan@linux.intel.com> - 0.30
+- Makign a new configuration for cedartrail. reverting changes to pinetrail
+
+* Fri Nov 04 2011 Prajwal Mohan <prajwal.karur.mohan@linux.intel.com> - 0.26
+- Adding non-oss repo to netbook ks file
+
+* Tue Nov 01 2011 Prajwal Mohan <prajwal.karur.mohan@linux.intel.com> - 0.25
+- Enabling uxlaunch-symplink-nb.post for netbook images
+
+* Fri Oct 28 2011 Prajwal Mohan <prajwal.karur.mohan@linux.intel.com> - 0.24
+- switching from kernel to kernel-adaptation-pc
+
+* Fri Oct 28 2011 Prajwal Mohan <prajwal.karur.mohan@linux.intel.com> - 0.23
+- disabling printing group for netbook images
+
+* Fri Oct 28 2011 Prajwal Mohan <prajwal.karur.mohan@linux.intel.com> - 0.22
+- Removing meego-ivi group from ivi images
+- Removing chromium from ks file temporarily
+
+* Tue Oct 25 2011 Prajwal Mohan <prajwal.karur.mohan@linux.intel.com> - 0.19
+- Removing IVI Desktop and IVI Applications group from images
+
+* Tue Oct 25 2011 Prajwal Mohan <prajwal.karur.mohan@linux.intel.com> - 0.18
+- Removing meego compliance from IVI group
+
+* Tue Oct 25 2011 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 0.15
+- Disabling adobe flash for right now
+
+* Mon Oct 24 2011 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 0.14
+- Replaced kernel-adaptation-pinetrail with kernel 2.6.37 from 1.2.0 release
+
+* Mon Oct 24 2011 Ulf Hofemeier <ulf.hofemeier@linux.intel.com> - 0.11
+- Re-enabling Adobe repo to add flash to Tizen image.
+
+* Thu Oct 13 2011 Jian-feng Ding <jian-feng.ding@intel.com> - 0.4
+- 0.4: sync with meego 1.2
+
+* Thu Oct 13 2011 Jian-feng Ding <jian-feng.ding@intel.com> - 0.3
+- 0.3 release: remove non-oss repos
+
+* Thu Oct 13 2011 Jian-feng Ding <jian-feng.ding@intel.com> - 0.2
+- 0.2 release: netbook and ivi images added
+
+* Tue Sep 27 2011 Jian-feng Ding <jian-feng.ding@intel.com> - 0.1
+- Initial Release
+
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..19421a2
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,46 @@
+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 Trunk:Testing $(NAME)
+ rm home\:*\:branches\:Trunk:Testing/$(NAME)/*tar.bz2
+ cp $(NAME)-$(VERSION).tar.bz2 home\:*\:branches\:Trunk:Testing/$(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/README b/README
new file mode 100644
index 0000000..41cd459
--- /dev/null
+++ b/README
@@ -0,0 +1,29 @@
+Any global changes to configurations need to be done in the
+configurations.yaml file. Local changes need to be done in the individual yaml
+files which are organised per vertical.
+
+Do not make any changes directly to the ks files. If it gets complicated and a
+certain scenario can't be done using kickstarter, please report a bug.
+
+Updates to the git repositories have no effect unless they are packaged and
+submitted to the build system.
+
+- Edit yaml files and make the desired changes
+- Verfiy integrity of the changes by running kickstarter as follows:
+
+# kickstarter -c configurations.yaml -r repos.yaml -i index.xml
+
+
+To update the package:
+- change the yaml files
+- Verify your changes
+- Bump the version in the VERSION file
+- commit and push
+- Do not change the ChangeLog file, this is generated using a script
+ run 'python scripts/gitlog2changelog.py'
+- commit and push
+- run 'make tag'
+- run 'make dist'
+- Submit the newly generated tar
+
+
diff --git a/README.kickstarter b/README.kickstarter
new file mode 100644
index 0000000..ef9a2d2
--- /dev/null
+++ b/README.kickstarter
@@ -0,0 +1,58 @@
+This configurations.yaml file has a generic definition of configurations.
+The Configurations inherit from platforms first then from the DEFAULT section.
+The image configurations override all other settings
+(in DEFAULT and platform sections).
+
+Basically all common options should go to the DEFAULT section. If an options is
+related to a specific platform, then that option should be added to the platform
+section. Try to keep platforms clean and very generic, if needed, create a new
+platform section and use it when many options for a new platfrom are common.
+
+Example
+
+
+# description of the configuration file
+Name: MeeGo Netbook/Nettop
+# When should this image be generated:
+# *: always
+# 0: Monday
+# 1: Tuesday
+# ...
+# If no schedule keyword is present, then image will not be created
+
+Schedule: "*"
+
+# if this image is active
+Active: True
+
+# Inherit from platform
+Platform: NETBOOK
+
+# MIC2 options to be used when creating this image
+Mic2Options: "-f livecd"
+
+# Desktop type
+Desktop: None
+
+# Timezone
+Timezone: America/New_York
+
+# The name of the configuration file
+FileName: netbook-ia32
+
+# package groups
+Groups:
+ - MeeGo Netbook Desktop
+ - MeeGo Core
+ - Printing
+ - Games
+
+# Additional packages that are not part of any group
+ExtraPackages:
+ - chromium
+ - adobe-release
+ - flash-plugin
+
+# Repos to use in addition to default repos, those are define in the repos.yaml file
+Repos:
+ - adobe
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+5
diff --git a/configurations.yaml b/configurations.yaml
new file mode 100644
index 0000000..34cb82d
--- /dev/null
+++ b/configurations.yaml
@@ -0,0 +1,54 @@
+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: "quiet"
+ BootloaderTimeout: 0
+ SaveRepos: True
+ StartX: False
+ Architecture: ia32
+ Desktop: None
+ Mic2Options: -f raw
+ Groups:
+ - Base System
+ Repos:
+ - Tizen-base
+ - Tizen-main
+ - Tizen-ivi
diff --git a/custom/part/custom b/custom/part/custom
new file mode 100644
index 0000000..d6c8b6b
--- /dev/null
+++ b/custom/part/custom
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000..fce8a34
--- /dev/null
+++ b/custom/part/n900-2G
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000..be10ccf
--- /dev/null
+++ b/custom/part/n900-4G
@@ -0,0 +1,8 @@
+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
new file mode 100644
index 0000000..1756909
--- /dev/null
+++ b/custom/part/tizen-arm
@@ -0,0 +1,4 @@
+# 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
new file mode 100644
index 0000000..12df959
--- /dev/null
+++ b/custom/part/tizen-handset
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..dc08af1
--- /dev/null
+++ b/custom/part/tizen-ivi
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..955f819
--- /dev/null
+++ b/custom/scripts/arch-armv7hl.post
@@ -0,0 +1,6 @@
+# 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
new file mode 100644
index 0000000..495d1af
--- /dev/null
+++ b/custom/scripts/boot-graphical-ivi.post
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 0000000..4a99772
--- /dev/null
+++ b/custom/scripts/boot-multiuser-ivi.post
@@ -0,0 +1,3 @@
+# 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
new file mode 100644
index 0000000..544a400
--- /dev/null
+++ b/custom/scripts/buildname.nochroot
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..d7c0ecd
--- /dev/null
+++ b/custom/scripts/cleanup.post
@@ -0,0 +1,2 @@
+# save a little bit of space at least...
+rm -f /boot/initrd*
diff --git a/custom/scripts/cogl.post b/custom/scripts/cogl.post
new file mode 100644
index 0000000..107bd06
--- /dev/null
+++ b/custom/scripts/cogl.post
@@ -0,0 +1,7 @@
+# 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
new file mode 100644
index 0000000..73bb7e5
--- /dev/null
+++ b/custom/scripts/inittab.post
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000..527548c
--- /dev/null
+++ b/custom/scripts/prelink.post
@@ -0,0 +1,4 @@
+# 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
new file mode 100644
index 0000000..62707bd
--- /dev/null
+++ b/custom/scripts/rpm.post
@@ -0,0 +1,2 @@
+rm -f /var/lib/rpm/__db*
+rpm --rebuilddb
diff --git a/custom/scripts/udev.post b/custom/scripts/udev.post
new file mode 100644
index 0000000..9ac3936
--- /dev/null
+++ b/custom/scripts/udev.post
@@ -0,0 +1 @@
+echo "UDEV_PERSISTENT_STORAGE=no" >> /etc/sysconfig/udev
diff --git a/custom/scripts/update.post b/custom/scripts/update.post
new file mode 100644
index 0000000..f8cb35d
--- /dev/null
+++ b/custom/scripts/update.post
@@ -0,0 +1 @@
+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
new file mode 100644
index 0000000..5f5f4b1
--- /dev/null
+++ b/custom/scripts/usb-networking.post
@@ -0,0 +1,8 @@
+# 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
new file mode 100644
index 0000000..2c07f8b
--- /dev/null
+++ b/custom/scripts/users.post
@@ -0,0 +1,5 @@
+mkdir -p /opt/home/inhouse
+chown inhouse: /opt/home/inhouse
+mkdir -p /home
+ln -s /opt/home/inhouse /home/inhouse
+ln -sf /opt/home/root /root
diff --git a/custom/scripts/uxlaunch-symlink-ivi.post b/custom/scripts/uxlaunch-symlink-ivi.post
new file mode 100644
index 0000000..1c9bd92
--- /dev/null
+++ b/custom/scripts/uxlaunch-symlink-ivi.post
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000..cfa310a
--- /dev/null
+++ b/custom/scripts/uxlaunch-symlink-nb.post
@@ -0,0 +1,2 @@
+# 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
new file mode 100644
index 0000000..98b1d62
--- /dev/null
+++ b/handset/handset-blackbay.yaml
@@ -0,0 +1,15 @@
+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-pr3
diff --git a/handset/handset-pinetrail.yaml b/handset/handset-pinetrail.yaml
new file mode 100644
index 0000000..e7f0b0f
--- /dev/null
+++ b/handset/handset-pinetrail.yaml
@@ -0,0 +1,13 @@
+Name: Tizen Handset Pinetrail
+Schedule: "*"
+Active: True
+Platform: Handset
+FileName: handset-pinetrail
+Part: tizen-handset
+Mic2Options: -f raw --copy-kernel
+Groups:
+ - Pinetrail Support
+PostScripts:
+ - users
+ - xorg
+ - rpm
diff --git a/index.xml b/index.xml
new file mode 100644
index 0000000..a4a2f8a
--- /dev/null
+++ b/index.xml
@@ -0,0 +1,34 @@
+<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
new file mode 100644
index 0000000..f264e27
--- /dev/null
+++ b/ivi/ivi-main-min-auto.yaml
@@ -0,0 +1,16 @@
+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
+RemovePackages:
+ - initscripts
+PostScripts:
+ - users
+ - rpm
diff --git a/ivi/ivi-main-min-pc.yaml b/ivi/ivi-main-min-pc.yaml
new file mode 100644
index 0000000..a620011
--- /dev/null
+++ b/ivi/ivi-main-min-pc.yaml
@@ -0,0 +1,18 @@
+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
+ExtraPackages:
+ - udev-rules-netbook
+RemovePackages:
+ - initscripts
+PostScripts:
+ - users
+ - rpm
diff --git a/ivi/ivi-main-wayland-auto.yaml b/ivi/ivi-main-wayland-auto.yaml
new file mode 100644
index 0000000..dded3cb
--- /dev/null
+++ b/ivi/ivi-main-wayland-auto.yaml
@@ -0,0 +1,18 @@
+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
+ - IVI Wayland
+ - IVI Applications
+RemovePackages:
+ - initscripts
+PostScripts:
+ - users
+ - rpm
diff --git a/ivi/ivi-main-wayland-pc.yaml b/ivi/ivi-main-wayland-pc.yaml
new file mode 100644
index 0000000..edb3d72
--- /dev/null
+++ b/ivi/ivi-main-wayland-pc.yaml
@@ -0,0 +1,20 @@
+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
+ - IVI Wayland for Pinetrail
+ - IVI Applications
+ExtraPackages:
+ - udev-rules-netbook
+RemovePackages:
+ - initscripts
+PostScripts:
+ - users
+ - rpm
diff --git a/ivi/ivi-main-x-auto.yaml b/ivi/ivi-main-x-auto.yaml
new file mode 100644
index 0000000..5b18c9a
--- /dev/null
+++ b/ivi/ivi-main-x-auto.yaml
@@ -0,0 +1,19 @@
+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
+ - Base X
+ - IVI X
+ - IVI Applications
+RemovePackages:
+ - initscripts
+PostScripts:
+ - users
+ - rpm
diff --git a/ivi/ivi-main-x-pc.yaml b/ivi/ivi-main-x-pc.yaml
new file mode 100644
index 0000000..ff58ad5
--- /dev/null
+++ b/ivi/ivi-main-x-pc.yaml
@@ -0,0 +1,18 @@
+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
+ - Base X Server
+ - IVI X for Pinetrail
+ - IVI Applications
+ExtraPackages:
+ - udev-rules-netbook
+RemovePackages:
+ - initscripts
diff --git a/packaging/image-configurations.spec b/packaging/image-configurations.spec
new file mode 100644
index 0000000..2c30612
--- /dev/null
+++ b/packaging/image-configurations.spec
@@ -0,0 +1,33 @@
+%define baseline tizen-0.0
+Summary: Create kickstart files for Tizen images
+Name: image-configurations
+Version: 5
+Release: 1
+License: GPLv2
+Group: System/Base
+URL: http://www.tizen.org
+Source: image-configurations-%{version}.tar.bz2
+
+BuildArch: noarch
+BuildRequires: kickstarter >= 0.8
+
+%description
+Create Configuration files to build Tizen images
+
+%prep
+%setup -q
+
+
+%build
+kickstarter -c configurations.yaml -r repos.yaml -i image-configs.xml
+
+%install
+
+mkdir -p %{buildroot}/usr/share/image-configurations
+cp %{baseline}/*.ks %{buildroot}/usr/share/image-configurations
+cp image-configs.xml %{buildroot}/usr/share/image-configurations
+
+%files
+%dir %_datadir/image-configurations
+%_datadir/image-configurations/*.ks
+%_datadir/image-configurations/image-configs.xml
diff --git a/repos.yaml b/repos.yaml
new file mode 100644
index 0000000..37eff47
--- /dev/null
+++ b/repos.yaml
@@ -0,0 +1,31 @@
+Repositories:
+ - Name: Tizen-base
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/tzbase/@ARCH@/packages/
+ Options: --save --ssl_verify=no
+ - Name: Tizen-base-debug
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/tzbase/@ARCH@/debug/
+ Options: --save --ssl_verify=no
+ - Name: Tizen-main
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/tzmain/@ARCH@/packages/
+ Options: --save --ssl_verify=no
+ - Name: Tizen-main-debug
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/tzmain/@ARCH@/debug
+ Options: --save --ssl_verify=no
+ - Name: Tizen-main-public
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/tzmain-pub/@ARCH@/packages/
+ Options: --save
+ - Name: Tizen-main-rs
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/tzmain-rs/@ARCH@/packages/
+ Options: --save
+ - Name: Tizen-non-oss
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/non-oss/standard/ --save
+ Options: --save --ssl_verify=no
+ - Name: Tizen-pr3
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/tzpr3/@ARCH@/packages/
+ Options: --save --ssl_verify=no
+ - Name: Tizen-pr3-debug
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/tzpr3/@ARCH@/debug
+ Options: --save --ssl_verify=no
+ - Name: Tizen-ivi
+ Url: https://download.tz.otcshare.org/snapshots/@BUILD_ID@/repos/tzivi/@ARCH@/packages/
+ Options: --save --ssl_verify=no
diff --git a/scripts/create-daily.sh b/scripts/create-daily.sh
new file mode 100755
index 0000000..11e309a
--- /dev/null
+++ b/scripts/create-daily.sh
@@ -0,0 +1,104 @@
+#!/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
new file mode 100755
index 0000000..afba827
--- /dev/null
+++ b/scripts/create.sh
@@ -0,0 +1,91 @@
+#!/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
new file mode 100644
index 0000000..ce69b68
--- /dev/null
+++ b/scripts/gitlog2changelog.py
@@ -0,0 +1,124 @@
+#!/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
new file mode 100755
index 0000000..222d883
--- /dev/null
+++ b/scripts/merge-request.sh
@@ -0,0 +1,20 @@
+#!/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