cachedir= /var/tmp/mic/cache
outdir= ./mic-output
pkgmgr = zypp
+distro_name = Tizen
; proxy = http://proxy.yourcompany.com:8080/
; no_proxy = localhost,127.0.0.0/8,.yourcompany.com
+# Prefix that is added in front of files that are produced.
+; name_prefix = output
; ssl_verify = no
[convert]
"logfile": None,
"record_pkgs": [],
"compress_disk_image": None,
+ "distro_name": "Default Distribution",
+ "name_prefix": None,
},
'chroot': {},
'convert': {},
self.create['ks'] = ks
self.create['name'] = os.path.splitext(os.path.basename(ksconf))[0]
+ if self.create['name_prefix']:
+ self.create['name'] = "%s-%s" % (self.create['name_prefix'], self.create['name'])
+
self._selinux_check (self.create['arch'], ks)
msger.info("Retrieving repo metadata:")
self._dep_checks = ["ls", "bash", "cp", "echo", "modprobe", "passwd"]
- #FIXME to be obsolete, make it configurable
- self.distro_name = "Tizen"
+ self.distro_name = createopts['distro_name']
# Output image file names
self.outimage = []
for repo in kickstart.get_repos(self.ks, repo_urls):
(name, baseurl, mirrorlist, inc, exc,
proxy, proxy_username, proxy_password, debuginfo,
- source, gpgkey, disable, ssl_verify) = repo
+ source, gpgkey, disable, ssl_verify, cost, priority) = repo
yr = pkg_manager.addRepository(name, baseurl, mirrorlist, proxy,
- proxy_username, proxy_password, inc, exc, ssl_verify)
+ proxy_username, proxy_password, inc, exc, ssl_verify,
+ cost, priority)
if kickstart.exclude_docs(self.ks):
rpm.addMacro("_excludedocs", "1")
ssl_verify = True
if hasattr(repo, "ssl_verify"):
ssl_verify = repo.ssl_verify == "yes"
+ cost = None
+ if hasattr(repo, "cost"):
+ cost = repo.cost
+ priority = None
+ if hasattr(repo, "priority"):
+ priority = repo.priority
repos[repo.name] = (repo.name, baseurl, mirrorlist, inc, exc,
proxy, proxy_username, proxy_password, debuginfo,
- source, gpgkey, disable, ssl_verify)
+ source, gpgkey, disable, ssl_verify, cost, priority)
return repos.values()
self.source = source
self.gpgkey = gpgkey
self.ssl_verify = ssl_verify.lower()
+ self.priority = priority
def _getArgsAsStr(self):
retval = F8_RepoData._getArgsAsStr(self)
retval += " --disable"
if self.ssl_verify:
retval += " --ssl_verify=%s" % self.ssl_verify
+ if self.priority:
+ retval += " --priority=%s" % self.priority
return retval
default=None, nargs=1)
op.add_option("--ssl_verify", type="string", action="store", dest="ssl_verify",
default="yes")
+ op.add_option("--priority", type="int", action="store", dest="priority",
+ default=None)
return op
repostr += ",debuginfo:"
if hasattr(repodata, "source") and repodata.source:
repostr += ",source:"
- if hasattr(repodata, "gpgkey") and repodata.gpgkey:
+ if hasattr(repodata, "gpgkey") and repodata.gpgkey:
repostr += ",gpgkey:" + repodata.gpgkey
if hasattr(repodata, "ssl_verify") and repodata.ssl_verify:
repostr += ",ssl_verify:" + repodata.ssl_verify
+ if hasattr(repodata, "priority") and repodata.priority:
+ repostr += ",priority:%d" % repodata.priority
kickstart_repos.append(repostr[1:])
return kickstart_repos
def addRepository(self, name, url = None, mirrorlist = None, proxy = None,
proxy_username = None, proxy_password = None,
- inc = None, exc = None, ssl_verify=True):
+ inc = None, exc = None, ssl_verify=True, cost = None,
+ priority=None):
+ # TODO: Handle priority attribute for repos
def _varSubstitute(option):
# takes a variable and substitutes like yum configs do
option = option.replace("$basearch", rpmUtils.arch.getBaseArch())
repo.enable()
repo.setup(0)
self.repos.add(repo)
+ if cost:
+ repo.cost = cost
msger.verbose('repo: %s was added' % name)
return repo
self.enabled = True
self.autorefresh = True
self.keeppackages = True
+ self.priority = None
class RepoError(CreatorError):
pass
def addRepository(self, name, url = None, mirrorlist = None, proxy = None,
proxy_username = None, proxy_password = None,
- inc = None, exc = None, ssl_verify = True):
+ inc = None, exc = None, ssl_verify = True, cost=None,
+ priority=None):
+ # TODO: Handle cost attribute for repos
if not self.repo_manager:
self.__initialize_repo_manager()
# Enable gpg check for verifying corrupt packages
repo.gpgcheck = 1
+ if priority:
+ repo.priority = priority
self.repos.append(repo)
try:
port = proxyinfo[1]
baseurl.setQueryParam ("proxyport", port)
repo_info.addBaseUrl(baseurl)
+ if repo.priority:
+ repo_info.setPriority(repo.priority)
self.repo_manager.addRepository(repo_info)
self.__build_repo_cache(name)
except RuntimeError, e:
recording_pkgs = []
if len(creatoropts['record_pkgs']) > 0:
recording_pkgs = creatoropts['record_pkgs']
+
if creatoropts['release'] is not None:
if 'name' not in recording_pkgs:
recording_pkgs.append('name')
ksconf = misc.save_ksconf_file(ksconf, creatoropts['release'])
- name = os.path.splitext(os.path.basename(ksconf))[0]
- creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], name)
+
configmgr._ksconf = ksconf
+
+ # Called After setting the configmgr._ksconf as the creatoropts['name'] is reset there.
+ if creatoropts['release'] is not None:
+ creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], creatoropts['name'])
# try to find the pkgmgr
pkgmgr = None
recording_pkgs = []
if len(creatoropts['record_pkgs']) > 0:
recording_pkgs = creatoropts['record_pkgs']
+
if creatoropts['release'] is not None:
if 'name' not in recording_pkgs:
recording_pkgs.append('name')
ksconf = misc.save_ksconf_file(ksconf, creatoropts['release'])
- name = os.path.splitext(os.path.basename(ksconf))[0]
- creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], name)
+
configmgr._ksconf = ksconf
+
+ # Called After setting the configmgr._ksconf as the creatoropts['name'] is reset there.
+ if creatoropts['release'] is not None:
+ creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], creatoropts['name'])
# try to find the pkgmgr
pkgmgr = None
recording_pkgs = []
if len(creatoropts['record_pkgs']) > 0:
recording_pkgs = creatoropts['record_pkgs']
+
if creatoropts['release'] is not None:
if 'name' not in recording_pkgs:
recording_pkgs.append('name')
ksconf = misc.save_ksconf_file(ksconf, creatoropts['release'])
- name = os.path.splitext(os.path.basename(ksconf))[0]
- creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], name)
+
configmgr._ksconf = ksconf
+
+ # Called After setting the configmgr._ksconf as the creatoropts['name'] is reset there.
+ if creatoropts['release'] is not None:
+ creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], creatoropts['name'])
# try to find the pkgmgr
pkgmgr = None
recording_pkgs = []
if len(creatoropts['record_pkgs']) > 0:
recording_pkgs = creatoropts['record_pkgs']
+
if creatoropts['release'] is not None:
if 'name' not in recording_pkgs:
recording_pkgs.append('name')
ksconf = misc.save_ksconf_file(ksconf, creatoropts['release'])
- name = os.path.splitext(os.path.basename(ksconf))[0]
- creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], name)
+
configmgr._ksconf = ksconf
+
+ # Called After setting the configmgr._ksconf as the creatoropts['name'] is reset there.
+ if creatoropts['release'] is not None:
+ creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], creatoropts['name'])
# try to find the pkgmgr
pkgmgr = None
recording_pkgs = []
if len(creatoropts['record_pkgs']) > 0:
recording_pkgs = creatoropts['record_pkgs']
+
if creatoropts['release'] is not None:
if 'name' not in recording_pkgs:
recording_pkgs.append('name')
ksconf = misc.save_ksconf_file(ksconf, creatoropts['release'])
- name = os.path.splitext(os.path.basename(ksconf))[0]
- creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], name)
+
configmgr._ksconf = ksconf
+
+ # Called After setting the configmgr._ksconf as the creatoropts['name'] is reset there.
+ if creatoropts['release'] is not None:
+ creatoropts['outdir'] = "%s/%s/images/%s/" % (creatoropts['outdir'], creatoropts['release'], creatoropts['name'])
# try to find the pkgmgr
pkgmgr = None
--- /dev/null
+[common]
+; general settings
+
+[create]
+; settings for create subcommand
+tmpdir= /var/tmp/mic
+cachedir= /var/tmp/mic/cache
+outdir= ./mic-output
+pkgmgr = zypp
+
+; proxy = http://proxy.yourcompany.com:8080/
+; no_proxy = localhost,127.0.0.0/8,.yourcompany.com
+
+[convert]
+; settings for convert subcommand
+
+[chroot]
+; settings for chroot subcommand
+
[create]
; settings for create subcommand
-tmpdir= /var/tmp
-cachedir= /var/tmp/cache
-outdir= .
+tmpdir= /var/tmp/mic
+cachedir= /var/tmp/mic/cache
+outdir= ./mic-output
pkgmgr = zypp
-arch = i586
; proxy = http://proxy.yourcompany.com:8080/
; no_proxy = localhost,127.0.0.0/8,.yourcompany.com
-; ssl_verify = no
[convert]
; settings for convert subcommand
-#
-# Do not Edit! Generated by:
-# kickstarter.py
-#
-
-lang en_US.UTF-8
-keyboard us
-timezone --utc America/Los_Angeles
-part / --size 3000 --ondisk sda --fstype=ext3
-rootpw meego
-xconfig --startxonboot
-bootloader --timeout=0 --append="quiet"
-desktop --autologinuser=meego
-user --name meego --groups audio,video --password meego
-
-repo --name=1.2-oss --baseurl=http://download.meego.com/snapshots/1.2.0.90.12.20110808.80/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-repo --name=1.2-non-oss --baseurl=http://download.meego.com/snapshots/1.2.0.90.12.20110808.80/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-
-%packages
-
-@MeeGo Base Development
-@Base Double Byte IME Support
-@MeeGo Compliance
-@MeeGo Core
-@MeeGo X Window System
-@X for Netbooks
-@MeeGo Netbook
-@MeeGo Netbook Desktop
-@Printing
-@Games
-
-kernel-adaptation-pinetrail
-
-chromium
--adobe-release
--flash-plugin
-%end
-
-%post
-# save a little bit of space at least...
-rm -f /boot/initrd*
-
-# Prelink can reduce boot time
-if [ -x /usr/sbin/prelink ]; then
- /usr/sbin/prelink -aRqm
-fi
-
-rm -f /var/lib/rpm/__db*
-rpm --rebuilddb
-
-
-%end
-
-%post --nochroot
-if [ -n "$IMG_NAME" ]; then
- echo "BUILD: $IMG_NAME" >> $INSTALL_ROOT/etc/meego-release
-fi
-
-
-%end
+# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
+\r
+# \r
+# Do not Edit! Generated by:\r
+# kickstarter.py\r
+# \r
+\r
+lang en_US.UTF-8\r
+keyboard us\r
+timezone --utc America/Los_Angeles\r
+part / --size 3000 --ondisk sda --fstype=ext3\r
+rootpw meego \r
+xconfig --startxonboot\r
+bootloader --timeout=0 --append="quiet"\r
+desktop --autologinuser=meego \r
+user --name meego --groups audio,video --password meego \r
+\r
+repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+\r
+%packages\r
+\r
+@MeeGo Base Development\r
+@Base Double Byte IME Support\r
+@MeeGo Compliance\r
+@MeeGo Core\r
+@MeeGo X Window System\r
+@X for Netbooks\r
+@MeeGo Netbook\r
+@MeeGo Netbook Desktop\r
+@Printing\r
+@Games\r
+\r
+kernel-adaptation-pinetrail\r
+\r
+%end\r
+\r
+%post\r
+# save a little bit of space at least...\r
+rm -f /boot/initrd*\r
+\r
+# Prelink can reduce boot time\r
+if [ -x /usr/sbin/prelink ]; then\r
+ /usr/sbin/prelink -aRqm\r
+fi\r
+\r
+rm -f /var/lib/rpm/__db*\r
+rpm --rebuilddb\r
+\r
+\r
+%end\r
+\r
+%post --nochroot\r
+if [ -n "$IMG_NAME" ]; then\r
+ echo "BUILD: $IMG_NAME" >> $INSTALL_ROOT/etc/meego-release\r
+fi\r
+\r
+\r
+%end\r
+++ /dev/null
---- ./mic_cases/base/test.conf 2011-08-23 10:55:02.062109222 +0800
-+++ conf_new 2011-08-23 11:01:52.204093784 +0800
-@@ -7,7 +7,7 @@ tmpdir= /var/tmp
- cachedir= /var/tmp/cache
- outdir= .
- pkgmgr = zypp
--arch = i586
-+arch = armv7l
-
- ; proxy = http://proxy.yourcompany.com:8080/
- ; no_proxy = localhost,127.0.0.0/8,.yourcompany.com
+++ /dev/null
---- ./mic_cases/base/test.ks 2011-08-23 09:44:14.192145003 +0800
-+++ meego-handset-armv7l-n900-1.1.ks 2011-08-23 10:31:43.047093908 +0800
-@@ -1,60 +1,93 @@
--#
--# Do not Edit! Generated by:
--# kickstarter.py
--#
--
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
--rootpw meego
-+#auth --useshadow --enablemd5
-+#part / --size=1600 --ondisk mmcblk0p --fstype=btrfs
-+part / --size=1750 --ondisk mmcblk0p --fstype=ext3
-+
-+# Add swap partition. It is a bit bad practise to have the swap on the same
-+# device as root partition, but currently we do not want to do changes to the
-+# N900 internal memories (emmc or nand).
-+part swap --size=256 --ondisk mmcblk0p --fstype=swap
-+
-+rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
--user --name meego --groups audio,video --password meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session=/usr/bin/mcompositor
-+user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://download.meego.com/snapshots/1.2.0.90.12.20110808.80/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://download.meego.com/snapshots/1.2.0.90.12.20110808.80/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=core --baseurl=http://linux-ftp.intel.com/pub/mirrors/MeeGo/releases/1.1/core/repos/armv7l/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego01
-+repo --name=handset --baseurl=http://linux-ftp.intel.com/pub/mirrors/MeeGo/releases/1.1/handset/repos/armv7l/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego01
-+repo --name=non-oss --baseurl=http://linux-ftp.intel.com/pub/mirrors/MeeGo/releases/1.1/non-oss/repos/armv7l/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego01
-
- %packages
--
--@MeeGo Base Development
--@Base Double Byte IME Support
--@MeeGo Compliance
- @MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
--
--kernel-adaptation-pinetrail
--
--chromium
---adobe-release
---flash-plugin
-+@MeeGo Base
-+@Minimal MeeGo X Window System
-+@MeeGo Compliance
-+@Nokia N900 Support
-+@MeeGo Handset Desktop
-+@MeeGo Handset Applications
-+@MeeGo Handset Applications Branding
-+@Nokia N900 Proprietary Support
-+@X for Handsets
-+@MeeGo Handset Base Support
-+
-+# Some development tools
-+openssh-server
-+wget
-+strace
-+bootchart
-+gdb
-+gdb-gdbserver
-+
-+# Some extra tools/libs
-+connman-test
-+xorg-x11-utils-xev
-+
-+# http://bugs.meego.com/show_bug.cgi?id=5651
-+-meegotouch-inputmethodbridges
-+-meegotouch-inputmethodframework
-+-meegotouch-inputmethodkeyboard
-+-meegotouch-inputmethodengine
- %end
-
- %post
--# save a little bit of space at least...
--rm -f /boot/initrd*
-+# Prelink not included because of following bug
-+# http://bugs.meego.com/show_bug.cgi?id=5217
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
-+# make sure there aren't core files lying around
-+rm -f /core*
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyS2 vt100" >> /etc/inittab
-
-+# work around for poor key import UI in PackageKit
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
--
-+# Set up sane defaults for mthemedaemon settings
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/theme/target N900
-+
-+# By default N900 has different value than Aava for showStatusBar
-+sed -i 's!showStatusBar=false!showStatusBar=true!g' /etc/meegotouch/devices.conf
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Temporary fix for BMC#8664 to get fennec startup time more reasonable.
-+mkdir -p /home/meego/.mozilla/
-+chown -R meego:meego /home/meego/.mozilla/
-+echo "tmpfs /home/meego/.mozilla tmpfs size=20m 0 0" >> /etc/fstab
- %end
-
- %post --nochroot
- if [ -n "$IMG_NAME" ]; then
- echo "BUILD: $IMG_NAME" >> $INSTALL_ROOT/etc/meego-release
- fi
--
--
- %end
+++ /dev/null
-mic cr raw
---- ./mic_cases/base/test.ks 2011-08-23 11:18:52.562082531 +0800
-+++ meego-handset-armv7hl-n900-1.2.0.90.12.20110808.1.ks 2011-08-23 11:20:29.543093697 +0800
-@@ -6,48 +6,77 @@
- lang en_US.UTF-8
- keyboard us
- timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
-+part / --size=1750 --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=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
-+
- rootpw meego
- xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
-+desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"
- user --name meego --groups audio,video --password meego
-
--repo --name=1.2-oss --baseurl=http://download.meego.com/snapshots/1.2.0.90.12.20110808.80/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://download.meego.com/snapshots/1.2.0.90.12.20110808.80/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-oss --baseurl=http://linux-ftp.intel.com/pub/mirrors/MeeGo/snapshots/stable/1.2.0.90/1.2.0.90.12.20110808.1/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-+repo --name=1.2-non-oss --baseurl=http://linux-ftp.intel.com/pub/mirrors/MeeGo/snapshots/stable/1.2.0.90/1.2.0.90.12.20110808.1/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
-
- %packages
-
--@MeeGo Base Development
--@Base Double Byte IME Support
- @MeeGo Compliance
- @MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
--
--kernel-adaptation-pinetrail
--
--chromium
---adobe-release
---flash-plugin
-+@X for Handsets
-+@MeeGo Handset Desktop
-+@MeeGo Handset Applications
-+@MeeGo Base Development
-+@Minimal MeeGo X Window System
-+@Nokia N900 Support
-+@Nokia N900 Proprietary Support
-+
-+kernel-adaptation-n900
-+
-+xorg-x11-utils-xev
- %end
-
- %post
- # save a little bit of space at least...
- rm -f /boot/initrd*
-
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
- rm -f /var/lib/rpm/__db*
- rpm --rebuilddb
-
-+# Remove cursor from showing during startup BMC#14991
-+echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch
-+
-+# open serial line console for embedded system
-+echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab
-+
-+# Set up proper target for libmeegotouch
-+Config_Src=`gconftool-2 --get-default-source`
-+gconftool-2 --direct --config-source $Config_Src \
-+ -s -t string /meegotouch/target/name N900
-+
-+# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.
-+cat > /sbin/bootchartd-long << EOF
-+#!/bin/sh
-+exec /sbin/bootchartd -n 4000
-+EOF
-+chmod +x /sbin/bootchartd-long
-+
-+# Use eMMC swap partition as MeeGo swap as well.
-+# Because of the 2nd partition is swap for the partition numbering
-+# we can just change the current fstab entry to match the eMMC partition.
-+sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab
-+
-+# Without this line the rpm don't get the architecture right.
-+echo -n 'armv7hl-meego-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
-+
-
- %end
-
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr fs --arch=armv7hl --config=customer.conf --pkgmgr=zypp --outdir=outdir10 --release=XXX --logfile=logfile9 --local-pkgs-path=package_armv7hl --record-pkgs=name
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr fs --arch=armv7hl --pkgmgr=yum --include-src --logfile=logfile1 --local-pkgs-path=package_armv7hl
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr fs --arch=armv7hl --pkgmgr=yum -o outdir13 --release=XXX
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr fs --arch=armv7hl --outdir=outdir11 --release=XXX --pkgmgr=zypp
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr fs --arch=armv7hl --pkgmgr=yum
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr fs --arch=armv7hl --pkgmgr=zypp
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr loop --arch=armv7hl --pkgmgr=yum -o outdir12 --record-pkgs=name,license,content
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr loop --taring-to=XXX --local-pkgs-path=package_mixed --pkgmgr=zypp
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr loop --arch=armv7hl --pkgmgr=yum
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr loop --arch=armv7hl --pkgmgr=zypp
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr raw --arch=armv7hl --pkgmgr=zypp -c customer.conf --release=XXX --logfile=logfile10
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr raw --arch=armv7hl --pkgmgr=yum --arch=armv7hl --local-pkgs-path=package_mixed
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr raw --arch=armv7hl --pkgmgr=yum
--- /dev/null
+--- ./mic_cases/base/test.ks 2011-12-07 15:44:06.683374769 +0800
++++ armv7hl.ks 2011-12-07 15:42:08.611374639 +0800
+@@ -1,4 +1,4 @@
+-# -*-mic2-options-*- -f livecd -*-mic2-options-*-\r
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-\r
+ \r
+ # \r
+ # Do not Edit! Generated by:\r
+@@ -8,32 +8,30 @@
+ lang en_US.UTF-8\r
+ keyboard us\r
+ timezone --utc America/Los_Angeles\r
+-part / --size 3000 --ondisk sda --fstype=ext3\r
++part / --size=1750 --ondisk mmcblk0p --fstype=ext3\r
++\r
++# This is not used currently. It is here because the /boot partition\r
++# needs to be the partition number 3 for the u-boot usage.\r
++part swap --size=8 --ondisk mmcblk0p --fstype=swap\r
++\r
++# This partition is made so that u-boot can find the kernel\r
++part /boot --size=32 --ondisk mmcblk0p --fstype=vfat\r
++\r
+ rootpw meego \r
+ xconfig --startxonboot\r
+-bootloader --timeout=0 --append="quiet"\r
+-desktop --autologinuser=meego \r
++desktop --autologinuser=meego --defaultdesktop=DUI --session="/usr/bin/mcompositor"\r
+ user --name meego --groups audio,video --password meego \r
+ \r
+-repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+-repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
++repo --name=1.2-non-oss --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/armv7hl/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego\r
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source\r
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source\r
+ \r
+-%packages\r
++%packages \r
+ \r
+-@MeeGo Base Development\r
+-@Base Double Byte IME Support\r
+ @MeeGo Compliance\r
+-@MeeGo Core\r
+-@MeeGo X Window System\r
+-@X for Netbooks\r
+-@MeeGo Netbook\r
+-@MeeGo Netbook Desktop\r
+-@Printing\r
+-@Games\r
+ \r
+-kernel-adaptation-pinetrail\r
++kernel-adaptation-n900\r
+ \r
+ %end\r
+ \r
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail\r
+ # save a little bit of space at least...\r
+ rm -f /boot/initrd*\r
+ \r
+-# Prelink can reduce boot time\r
+-if [ -x /usr/sbin/prelink ]; then\r
+- /usr/sbin/prelink -aRqm\r
+-fi\r
+-\r
+ rm -f /var/lib/rpm/__db*\r
+ rpm --rebuilddb\r
+ \r
++# Remove cursor from showing during startup BMC#14991\r
++echo "xopts=-nocursor" >> /etc/sysconfig/uxlaunch\r
++\r
++# open serial line console for embedded system\r
++echo "s0:235:respawn:/sbin/agetty -L 115200 ttyO2 vt100" >> /etc/inittab\r
++\r
++# Set up proper target for libmeegotouch\r
++Config_Src=`gconftool-2 --get-default-source`\r
++gconftool-2 --direct --config-source $Config_Src \\r
++ -s -t string /meegotouch/target/name N900\r
++\r
++# Normal bootchart is only 30 long so we use this to get longer bootchart during startup when needed.\r
++cat > /sbin/bootchartd-long << EOF\r
++#!/bin/sh\r
++exec /sbin/bootchartd -n 4000\r
++EOF\r
++chmod +x /sbin/bootchartd-long\r
++\r
++# Use eMMC swap partition as MeeGo swap as well.\r
++# Because of the 2nd partition is swap for the partition numbering\r
++# we can just change the current fstab entry to match the eMMC partition.\r
++sed -i 's/mmcblk0p2/mmcblk1p3/g' /etc/fstab\r
++\r
++# Without this line the rpm don't get the architecture right.\r
++echo -n 'armv7hl-meego-linux' > /etc/rpm/platform\r
++ \r
++# Also libzypp has problems in autodetecting the architecture so we force tha as well.\r
++# https://bugs.meego.com/show_bug.cgi?id=11484\r
++echo 'arch = armv7hl' >> /etc/zypp/zypp.conf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
+nf\r
++\r
+ \r
+ %end\r
+ \r
--- /dev/null
+mic cr raw --arch=armv7hl --pkgmgr=zypp
+++ /dev/null
---- ./mic_cases/base/test.conf 2011-08-23 11:18:52.562082531 +0800
-+++ conf_new 2011-08-23 11:21:00.616093561 +0800
-@@ -6,8 +6,8 @@
- tmpdir= /var/tmp
- cachedir= /var/tmp/cache
- outdir= .
--pkgmgr = zypp
--arch = i586
-+pkgmgr = yum
-+arch = armv7hl
-
- ; proxy = http://proxy.yourcompany.com:8080/
- ; no_proxy = localhost,127.0.0.0/8,.yourcompany.com
+++ /dev/null
-mic cr raw
+++ /dev/null
-sudo mic cr livecd
--- /dev/null
+mic create fs --pkgmgr=yum --include-src
--- /dev/null
+mic create fs --pkgmgr=zypp --include-src
--- /dev/null
+mic create fs --pkgmgr=yum --outdir=outdir3 --release=XXX
--- /dev/null
+mic create fs --pkgmgr=zypp -o outdir1
--- /dev/null
+mic cr fs --pkgmgr=yum --record-pkgs=name,license
--- /dev/null
+mic cr fs --pkgmgr=yum
--- /dev/null
+mic cr fs --pkgmgr=zypp
--- /dev/null
+mic create livecd --pkgmgr=zypp --logfile=logfile1
--- /dev/null
+mic create livecd --pkgmgr=yum --local-pkgs-path=package_ia32
--- /dev/null
+mic create livecd --pkgmgr=zypp --local-pkgs-path=package_mixed
--- /dev/null
+mic cr livecd --pkgmgr=yum --release=XXX --local-pkgs-path=package_ia32
--- /dev/null
+mic cr livecd --pkgmgr=yum
--- /dev/null
+mic cr livecd --pkgmgr=zypp
--- /dev/null
+mic cr liveusb --pkgmgr=yum --logfile=logfile4 --record-pkgs=name,license
--- /dev/null
+mic cr liveusb --pkgmgr=yum --local-pkgs-path=package_mixed -o outdir5
--- /dev/null
+mic create liveusb --pkgmgr=zypp -A i686
--- /dev/null
+mic create liveusb --pkgmgr=zypp -A i686
--- /dev/null
+mic create liveusb --pkgmgr=zypp --local-pkgs-path=package_ia32
--- /dev/null
+mic create liveusb --pkgmgr=zypp -A i686
--- /dev/null
+mic cr livecd --pkgmgr=yum --release=XXX --local-pkgs-path=package_ia32
--- /dev/null
+mic cr livecd --pkgmgr=yum
--- /dev/null
+mic cr livecd --pkgmgr=zypp
--- /dev/null
+mic cr loop --pkgmgr=yum --release=XXX --logfile=logfile3
--- /dev/null
+mic create loop --pkgmgr=zypp --release=XXX
--- /dev/null
+mic cr loop --pkgmgr=yum --taring-to=XXX
--- /dev/null
+mic create loop --pkgmgr=zypp --taring-to=XXX
--- /dev/null
+mic cr loop --pkgmgr=yum
--- /dev/null
+mic cr loop --pkgmgr=zypp
--- /dev/null
+mic cr raw --pkgmgr=yum --outdir=outdir6 --release=XXX --logfile=logfile5 --local-pkgs-path=package_ia32 --record-pkgs=license
--- /dev/null
+mic create raw --pkgmgr=zypp --record-pkgs=name
--- /dev/null
+mic create raw --pkgmgr=zypp --record-pkgs=name
--- /dev/null
+mic cr raw --pkgmgr=yum
--- /dev/null
+mic cr raw --pkgmgr=zypp
+++ /dev/null
-Unable to load kickstart file
+++ /dev/null
---- ./mic_cases/base/test.ks 2011-08-19 16:10:40.552093465 +0800
-+++ error.ks 1970-01-01 08:00:00.000000000 +0800
-@@ -1,60 +0,0 @@
--#
--# Do not Edit! Generated by:
--# kickstarter.py
--#
--
--lang en_US.UTF-8
--keyboard us
--timezone --utc America/Los_Angeles
--part / --size 3000 --ondisk sda --fstype=ext3
--rootpw meego
--xconfig --startxonboot
--bootloader --timeout=0 --append="quiet"
--desktop --autologinuser=meego
--user --name meego --groups audio,video --password meego
--
--repo --name=1.2-oss --baseurl=http://download.meego.com/snapshots/1.2.0.90.12.20110808.80/repos/oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--repo --name=1.2-non-oss --baseurl=http://download.meego.com/snapshots/1.2.0.90.12.20110808.80/repos/non-oss/ia32/packages/ --save --debuginfo --source --gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-meego
--
--%packages
--
--@MeeGo Base Development
--@Base Double Byte IME Support
--@MeeGo Compliance
--@MeeGo Core
--@MeeGo X Window System
--@X for Netbooks
--@MeeGo Netbook
--@MeeGo Netbook Desktop
--@Printing
--@Games
--
--kernel-adaptation-pinetrail
--
--chromium
---adobe-release
---flash-plugin
--%end
--
--%post
--# save a little bit of space at least...
--rm -f /boot/initrd*
--
--# Prelink can reduce boot time
--if [ -x /usr/sbin/prelink ]; then
-- /usr/sbin/prelink -aRqm
--fi
--
--rm -f /var/lib/rpm/__db*
--rpm --rebuilddb
--
--
--%end
--
--%post --nochroot
--if [ -n "$IMG_NAME" ]; then
-- echo "BUILD: $IMG_NAME" >> $INSTALL_ROOT/etc/meego-release
--fi
--
--
--%end
+++ /dev/null
-sudo mic cr livecd
+++ /dev/null
-You must run as root
+++ /dev/null
-mic cr livecd
#!/usr/bin/python
import os
+import sys
import subprocess, re, shutil, glob
import gettext
def ImgCheck(work_env):
"""check image generate"""
genImage = False
- for file in os.listdir(work_env):
- m = re.match(r'.*\.(img|raw|iso|usbimg)', file)
- if m:
- genImage = True
- break
+ for root, dirs, files in os.walk(work_env):
+ for name in files:
+ #add raw check support and XXX.tar file check support
+ m = re.match(r'.*\.(img|raw|iso|usbimg|tar)', name) or re.match(r'system-release',name)
+ if m:
+ genImage = True
+ break
return genImage
def RunandCheck(object, work_env):
opt_f = open('options','r')
args = opt_f.read().strip()+' test.ks'
- dev_null = os.open('/dev/null',os.O_WRONLY)
- proc = subprocess.Popen(args,stdout = dev_null,stderr=subprocess.PIPE,shell=True)
- os.close(dev_null)
+ print args
+ proc = subprocess.Popen(args,stdout = sys.stdout ,stderr=subprocess.PIPE,shell=True)
errorinfo = proc.communicate()[1]
#check
if expect:
projects / platform / upstream / mic.git / commitdiff