From 175b9e63e90bd1e4f2993e7b5f505045fd3d8281 Mon Sep 17 00:00:00 2001 From: "Graydon, Tracy" Date: Mon, 3 Jun 2013 17:36:38 -0700 Subject: [PATCH] Change image-configurations to use new format and require meta-ivi --- Makefile | 46 ------------ README | 0 README.kickstarter | 0 configurations.yaml | 51 -------------- custom/part/custom | 2 - custom/part/tizen-ivi | 3 - custom/scripts/buildname.nochroot | 3 - custom/scripts/console-switching.post | 4 -- custom/scripts/copy-initd.post | 6 -- custom/scripts/ims-service.post | 10 --- custom/scripts/invisi-cursor.post | 8 --- custom/scripts/keygen.post | 4 -- custom/scripts/links-n-tweaks.post | 35 ---------- custom/scripts/menu-screen.post | 7 -- custom/scripts/misc-hacks.post | 18 ----- custom/scripts/platform-fix.post | 4 -- custom/scripts/rpm.post | 5 -- custom/scripts/usb-networking.post | 14 ---- custom/scripts/user-bin-press.post | 14 ---- ivi/ivi-devel.yaml | 50 ------------- packaging/image-configurations.changes | 29 +------- packaging/image-configurations.spec | 18 +++-- repos.yaml | 13 ---- scripts/create-daily.sh | 104 --------------------------- scripts/create.sh | 91 ------------------------ scripts/gitlog2changelog.py | 124 --------------------------------- scripts/merge-request.sh | 20 ------ 27 files changed, 13 insertions(+), 670 deletions(-) delete mode 100755 Makefile mode change 100755 => 100644 README mode change 100755 => 100644 README.kickstarter delete mode 100755 configurations.yaml delete mode 100755 custom/part/custom delete mode 100755 custom/part/tizen-ivi delete mode 100644 custom/scripts/buildname.nochroot delete mode 100644 custom/scripts/console-switching.post delete mode 100644 custom/scripts/copy-initd.post delete mode 100644 custom/scripts/ims-service.post delete mode 100644 custom/scripts/invisi-cursor.post delete mode 100644 custom/scripts/keygen.post delete mode 100644 custom/scripts/links-n-tweaks.post delete mode 100644 custom/scripts/menu-screen.post delete mode 100644 custom/scripts/misc-hacks.post delete mode 100644 custom/scripts/platform-fix.post delete mode 100644 custom/scripts/rpm.post delete mode 100644 custom/scripts/usb-networking.post delete mode 100644 custom/scripts/user-bin-press.post delete mode 100755 ivi/ivi-devel.yaml mode change 100755 => 100644 packaging/image-configurations.changes mode change 100755 => 100644 packaging/image-configurations.spec delete mode 100755 repos.yaml delete mode 100755 scripts/create-daily.sh delete mode 100755 scripts/create.sh delete mode 100755 scripts/gitlog2changelog.py delete mode 100755 scripts/merge-request.sh diff --git a/Makefile b/Makefile deleted file mode 100755 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/README b/README old mode 100755 new mode 100644 diff --git a/README.kickstarter b/README.kickstarter old mode 100755 new mode 100644 diff --git a/configurations.yaml b/configurations.yaml deleted file mode 100755 index bb9d8a9..0000000 --- a/configurations.yaml +++ /dev/null @@ -1,51 +0,0 @@ -ExternalConfigs: - - 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: "" - - -IVI: - PartSize: 3000 - Bootloader: True - BootloaderAppend: "rootwait rootfstype=ext4 quiet" - BootloaderTimeout: 0 - BootloaderOptions: "--ptable=gpt" - SaveRepos: False - StartX: False - Architecture: ia32 - Desktop: None - Mic2Options: -f raw --copy-kernel --compress-disk-image=bz2 --generate-bmap - Repos: - - Tizen-base - - Tizen-ivi - NoChrootScripts: - - buildname - -IVI-DEVEL: - PartSize: 3000 - Bootloader: True - BootloaderAppend: "rootwait rootfstype=ext4" - BootloaderTimeout: 0 - BootloaderOptions: "--ptable=gpt" - SaveRepos: False - StartX: False - Architecture: ia32 - Desktop: None - Mic2Options: -f raw --copy-kernel --compress-disk-image=bz2 --generate-bmap - Repos: - - Tizen-base - - Tizen-ivi - NoChrootScripts: - - buildname diff --git a/custom/part/custom b/custom/part/custom deleted file mode 100755 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/tizen-ivi b/custom/part/tizen-ivi deleted file mode 100755 index 6b83ee9..0000000 --- a/custom/part/tizen-ivi +++ /dev/null @@ -1,3 +0,0 @@ -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/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/console-switching.post b/custom/scripts/console-switching.post deleted file mode 100644 index 14033cc..0000000 --- a/custom/scripts/console-switching.post +++ /dev/null @@ -1,4 +0,0 @@ -# console-switching.post -# inittab hack to fix console - UI switching -sed -ri 's/--noclear tty1/tty3/' /etc/inittab -sed -ri 's/tty2/tty4/' /etc/inittab diff --git a/custom/scripts/copy-initd.post b/custom/scripts/copy-initd.post deleted file mode 100644 index 092ce66..0000000 --- a/custom/scripts/copy-initd.post +++ /dev/null @@ -1,6 +0,0 @@ -# copy-initd.post -if [ -d /etc/init.d ]; then - cp /etc/init.d/* /etc/rc.d/init.d/ -rdf -fi -rm -rf /etc/init.d* -ln -sf /etc/rc.d/init.d /etc/init.d diff --git a/custom/scripts/ims-service.post b/custom/scripts/ims-service.post deleted file mode 100644 index bea5313..0000000 --- a/custom/scripts/ims-service.post +++ /dev/null @@ -1,10 +0,0 @@ -# ims-service.post -# ims-service domain setting -RESULT=`grep "192.168.0.163 config.45001.rcse" /etc/hosts` -if [ -z "$RESULT" ]; then - echo "Set domain for auto configuration" - echo "192.168.0.163 config.45001.rcse" >> /etc/hosts -else - echo "Already setted domain for test auto configuration" -fi - diff --git a/custom/scripts/invisi-cursor.post b/custom/scripts/invisi-cursor.post deleted file mode 100644 index 5b814dd..0000000 --- a/custom/scripts/invisi-cursor.post +++ /dev/null @@ -1,8 +0,0 @@ -# invisi-cursor.post -# Config workaround for TIVI-515: Invisible cursor. -cd /opt/home/app/.e/e/config/samsung/ -eet -d e.cfg config > a.config -sed -ie s/'value "cursor_size" int: 1'/'value "cursor_size" int: 24'/ a.config -eet -e e.cfg config a.config 1 -chown app.app e.cfg -rm a.config diff --git a/custom/scripts/keygen.post b/custom/scripts/keygen.post deleted file mode 100644 index 7dea1c0..0000000 --- a/custom/scripts/keygen.post +++ /dev/null @@ -1,4 +0,0 @@ -# keygen.post -ssh-keygen -t rsa1 -f /etc/ssh/ssh_host_key -N "" -ssh-keygen -t dsa -f /etc/ssh/ssh_host_dsa_key -N "" -ssh-keygen -t rsa -f /etc/ssh/ssh_host_rsa_key -N "" diff --git a/custom/scripts/links-n-tweaks.post b/custom/scripts/links-n-tweaks.post deleted file mode 100644 index 107195b..0000000 --- a/custom/scripts/links-n-tweaks.post +++ /dev/null @@ -1,35 +0,0 @@ -# links-n-tweaks.post -echo "UDEV_PERSISTENT_STORAGE=no" >> /etc/sysconfig/udev - -# to make udev happy -ln -sf /bin/busybox /sbin/blkid - -# modprobe fuse for sqlfs-mount -/bin/sed -i "3i /sbin/modprobe fuse || :" /etc/rc.d/init.d/sqlfs-mount - -# kill some docs and man pages -rm -rf /usr/share/man -rm -rf /usr/share/doc - -ldconfig - -mkdir -p /opt/var/lib/dbus -if [ -e /usr/bin/build-backup-data.sh ]; then - /usr/bin/build-backup-data.sh -fi - -# set some opt/ links -rm -rf /etc/localtime -ln -sf /opt/etc/localtime /etc/localtime - -ln -s /opt/etc/X11/xkb /usr/share/X11 - -ln -sf /etc/info.ini /opt/etc/info.ini -ln -sf /etc/info.ini /usr/etc/info.ini - - -mkdir /opt/home/root -ln -sf /opt/home/root /root - -# Optimize indicator sleep time a little. Fixes TIVI-614. -sed -ie 's/sleep [0-9]/sleep 2/' /etc/init.d/indicator diff --git a/custom/scripts/menu-screen.post b/custom/scripts/menu-screen.post deleted file mode 100644 index 4a0c635..0000000 --- a/custom/scripts/menu-screen.post +++ /dev/null @@ -1,7 +0,0 @@ -# menu-screen.post -pkg_initdb - -INITDB=1 ail_initdb -/opt/apps/com.samsung.menu-screen/bin/menuscreen_initdb - -sed -i s/ENGINE=gl/ENGINE=fb/ /etc/profile.d/menu-screen.sh diff --git a/custom/scripts/misc-hacks.post b/custom/scripts/misc-hacks.post deleted file mode 100644 index 7eeb656..0000000 --- a/custom/scripts/misc-hacks.post +++ /dev/null @@ -1,18 +0,0 @@ -# misc-hacks.post -# hacks to get usbnet, udev, ssh, and other stuff -cat > /etc/rc.d/rc3.d/S01debug << EOF - -# udev -/sbin/udevd --daemon -/sbin/udevadm trigger - -EOF - -chmod +x /etc/rc.d/rc3.d/S01debug - - -pkg_initdb - -INITDB=1 ail_initdb - - diff --git a/custom/scripts/platform-fix.post b/custom/scripts/platform-fix.post deleted file mode 100644 index eec90c5..0000000 --- a/custom/scripts/platform-fix.post +++ /dev/null @@ -1,4 +0,0 @@ -# Without this line the rpm doesn't get the architecture right. -# echo -n 'armv7l-tizen-linux' > /etc/rpm/platform -> /etc/rpm/platform - diff --git a/custom/scripts/rpm.post b/custom/scripts/rpm.post deleted file mode 100644 index b67d1f3..0000000 --- a/custom/scripts/rpm.post +++ /dev/null @@ -1,5 +0,0 @@ -# rpm.post -rm -f /var/lib/rpm/__db* -mv -f /var/lib/rpm /opt/var/lib/ -ln -sf /opt/var/lib/rpm /var/lib/rpm -rpmdb --rebuilddb diff --git a/custom/scripts/usb-networking.post b/custom/scripts/usb-networking.post deleted file mode 100644 index 3099099..0000000 --- a/custom/scripts/usb-networking.post +++ /dev/null @@ -1,14 +0,0 @@ -# usb-networking.post -# enable USB networking with IP address 192.168.1.1 by default - -cat >/etc/rc.d/rc3.d/S01usbnet.sh < /sys/class/android_usb/android0/enable -echo adb,rndis > /sys/class/android_usb/android0/functions -echo 1 > /sys/class/android_usb/android0/enable -ifconfig rndis0 192.168.100.1 -END -chmod 755 /etc/rc.d/rc3.d/S01usbnet.sh - -ln -sf /etc/rc.d/init.d/ssh /etc/rc.d/rc3.d/S90ssh - diff --git a/custom/scripts/user-bin-press.post b/custom/scripts/user-bin-press.post deleted file mode 100644 index fc44124..0000000 --- a/custom/scripts/user-bin-press.post +++ /dev/null @@ -1,14 +0,0 @@ -# user-bin-press.post -cat > /usr/bin/press << EOF -!/bin/sh - -JUNK="SLP" - -[ "\$1" ] && TIMEOUT="\$1" || TIMEOUT="1" - -echo "Press return key to stop scripts" -read -t \$TIMEOUT JUNK -exit \$? -EOF - -chmod +x /usr/bin/press diff --git a/ivi/ivi-devel.yaml b/ivi/ivi-devel.yaml deleted file mode 100755 index 8108994..0000000 --- a/ivi/ivi-devel.yaml +++ /dev/null @@ -1,50 +0,0 @@ -Name: Tizen IVI 2.0 Devel -Schedule: "*" -Active: True -Platform: IVI -Part: tizen-ivi -Kernel: kernel-x86-ivi -FileName: ivi-devel -Groups: - - common - - appscommon - - appstargetsdk - - osp - - trats - - adaptation-automotive-intel -ExtraPackages: - - ivi-repos -RemovePackages: - - opengl-es -PrePackages: - - eglibc - - systemd - - busybox - - libacl - - libcap - - dbus-libs - - libgcc - - libudev - - libattr - - openssl - - libprivilege-control - - libprivilege-control-conf - - security-server - - libdlog - - libsecurity-server-client - - sqlite - - tzdata-slp - - vconf - - tizen-coreutils -PostScripts: - - console-switching - - copy-initd - - platform-fix - - keygen - - ims-service - - user-bin-press - - rpm - - usb-networking - - misc-hacks - - links-n-tweaks - - invisi-cursor diff --git a/packaging/image-configurations.changes b/packaging/image-configurations.changes old mode 100755 new mode 100644 index b7b03ec..97e198f --- a/packaging/image-configurations.changes +++ b/packaging/image-configurations.changes @@ -1,28 +1,3 @@ -* Tue Apr 23 22:43:01 UTC 2013 - tracy.graydon@intel.com -- Drop 2.0 from file names. Redundant +* Tue Dec 11 2012 Anas Nashif 18@7427300 +- make this base project specific -* Tue Apr 23 21:52:28 UTC 2013 - tracy.graydon@intel.com -- Add a release image for milestone releases - -* Tue Apr 9 17:46:05 UTC 2013 - tracy.graydon@intel.com -- TIVI-614: optimize indicator to reduce boot time --Add ks for preview release - -* Wed Feb 13 23:34:00 UTC 2013 - dbowen@jf.intel.com -- TIVI-503 Used gpt partition. - -* Wed Jan 9 21:45:03 UTC 2013 - tracy.graydon@intel.com -- TIVI-461 & TIVI-462: add --active and --align 1024 to partition schema -- Remove the extraneous VERSION file. No longer used for packaging - -* Fri Dec 21 19:57:08 UTC 2012 - tracy.graydon@intel.com -- Turn off preview image - -* Tue Oct 16 18:18:18 UTC 2012 - tracy.graydon@intel.com -- Turn pinetrail image into ivi-2.0 image. Support just one image for now - -* Wed Oct 3 18:52:12 UTC 2012 - tracy.graydon@intel.com -- Add an image, ivi-common, that builds against common base/main. - -* Tue Oct 2 19:46:17 UTC 2012 - tracy.graydon@intel.com -- Import for 2.0 images diff --git a/packaging/image-configurations.spec b/packaging/image-configurations.spec old mode 100755 new mode 100644 index d80cbac..209bf54 --- a/packaging/image-configurations.spec +++ b/packaging/image-configurations.spec @@ -1,15 +1,17 @@ -%define baseline tizen-0.0 -Summary: Create kickstart files for IVI Tizen 2.0 images +%define baseline tizen-3.0 +Summary: Create kickstart files for Tizen images Name: image-configurations -Version: 4 -Release: 2 +Version: 101 +Release: 1 License: GPLv2 Group: System/Base URL: http://www.tizen.org Source: image-configurations-%{version}.tar.bz2 BuildArch: noarch -BuildRequires: kickstarter >= 0.8 +BuildRequires: kickstarter >= 0.15 +BuildRequires: meta-ivi +BuildRequires: meta-common %description Create Configuration files to build Tizen images @@ -19,7 +21,9 @@ 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 \ + -e /usr/share/image-configurations/base/configs \ + -r /usr/share/image-configurations/base/base-repos.yaml -i image-configs.xml %install @@ -28,6 +32,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 100755 index f95f239..0000000 --- a/repos.yaml +++ /dev/null @@ -1,13 +0,0 @@ -Repositories: - - Name: Tizen-base - Url: https://download.tizen.org/snapshots/2.0/ivi-devel/@BUILD_ID@/repos/base/@ARCH@/packages/ - Options: --ssl_verify=no - - Name: Tizen-base-debug - Url: https://download.tizen.org/snapshots/2.0/ivi-devel/@BUILD_ID@/repos/base/@ARCH@/debug/ - Options: --ssl_verify=no - - Name: Tizen-ivi - Url: https://download.tizen.org/snapshots/2.0/ivi-devel/@BUILD_ID@/repos/ivi-devel/@ARCH@/packages/ - Options: --ssl_verify=no - - Name: Tizen-ivi-debug - Url: https://download.tizen.org/snapshots/2.0/ivi-devel/@BUILD_ID@/repos/ivi-devel/@ARCH@/debug - Options: --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 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 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 100755 index ce69b68..0000000 --- a/scripts/gitlog2changelog.py +++ /dev/null @@ -1,124 +0,0 @@ -#!/usr/bin/python -# Copyright 2008 Marcus D. Hanwell -# 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 -- 2.7.4