diff options
| author | Zhang Qiang <qiang.z.zhang@intel.com> | 2011-12-16 17:38:31 +0800 |
|---|---|---|
| committer | Zhang Qiang <qiang.z.zhang@intel.com> | 2011-12-16 17:38:31 +0800 |
| commit | 5dfb3f8c7caf06d39d8d0573624f6e9f32ec3c81 (patch) | |
| tree | 5878a27bbddb7ca6b658820897ba661dddb346cf /tests | |
| parent | ee47d0e421d0c74bca0695dcfa6b23dc181394c6 (diff) | |
| download | mic-5dfb3f8c7caf06d39d8d0573624f6e9f32ec3c81.tar.gz mic-5dfb3f8c7caf06d39d8d0573624f6e9f32ec3c81.tar.bz2 mic-5dfb3f8c7caf06d39d8d0573624f6e9f32ec3c81.zip | |
Add 47 system test case.
These 47 test cases can be used to test 'mic cr'.
'mic ch' and 'mic cv' test case have not been added.
Diffstat (limited to 'tests')
159 files changed, 1960 insertions, 404 deletions
diff --git a/tests/mic_cases/base/customer.conf b/tests/mic_cases/base/customer.conf new file mode 100644 index 0000000..fc20dfb --- /dev/null +++ b/tests/mic_cases/base/customer.conf @@ -0,0 +1,19 @@ +[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 + diff --git a/tests/mic_cases/base/test.conf b/tests/mic_cases/base/test.conf index 64b4dec..fc20dfb 100644 --- a/tests/mic_cases/base/test.conf +++ b/tests/mic_cases/base/test.conf @@ -3,15 +3,13 @@ [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 diff --git a/tests/mic_cases/base/test.ks b/tests/mic_cases/base/test.ks index 6297591..6cb91bb 100644 --- a/tests/mic_cases/base/test.ks +++ b/tests/mic_cases/base/test.ks @@ -1,60 +1,61 @@ -# -# 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-*-
+
+#
+# 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://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
+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
+repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+%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
+
+%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
diff --git a/tests/mic_cases/test-armck/conf.p b/tests/mic_cases/test-armck/conf.p deleted file mode 100644 index 8cc0d39..0000000 --- a/tests/mic_cases/test-armck/conf.p +++ /dev/null @@ -1,11 +0,0 @@ ---- ./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 diff --git a/tests/mic_cases/test-armck/ks.p b/tests/mic_cases/test-armck/ks.p deleted file mode 100644 index 1ff7f7f..0000000 --- a/tests/mic_cases/test-armck/ks.p +++ /dev/null @@ -1,133 +0,0 @@ ---- ./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 diff --git a/tests/mic_cases/test-armck/options b/tests/mic_cases/test-armck/options deleted file mode 100644 index 17fa685..0000000 --- a/tests/mic_cases/test-armck/options +++ /dev/null @@ -1 +0,0 @@ -mic cr raw diff --git a/tests/mic_cases/test-genimg/conf.p b/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/conf.p index e69de29..e69de29 100644 --- a/tests/mic_cases/test-genimg/conf.p +++ b/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/conf.p diff --git a/tests/mic_cases/test-armv7hlck/ks.p b/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/ks.p index 5ce6a7f..119d429 100644 --- a/tests/mic_cases/test-armv7hlck/ks.p +++ b/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/ks.p @@ -1,104 +1,130 @@ ---- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/options b/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/options new file mode 100644 index 0000000..ea40147 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_config_outdir_release_log_zypp/options @@ -0,0 +1 @@ +mic cr fs --arch=armv7hl --config=customer.conf --pkgmgr=zypp --outdir=outdir10 --release=XXX --logfile=logfile9 --local-pkgs-path=package_armv7hl --record-pkgs=name diff --git a/tests/mic_cases/test-ksck/conf.p b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/conf.p index e69de29..e69de29 100644 --- a/tests/mic_cases/test-ksck/conf.p +++ b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/conf.p diff --git a/tests/mic_cases/test-genimg/ks.p b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/customer.conf index e69de29..e69de29 100644 --- a/tests/mic_cases/test-genimg/ks.p +++ b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/customer.conf diff --git a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/ks.p b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options new file mode 100644 index 0000000..99671db --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_include_log_pkg_yum/options @@ -0,0 +1 @@ +mic cr fs --arch=armv7hl --pkgmgr=yum --include-src --logfile=logfile1 --local-pkgs-path=package_armv7hl diff --git a/tests/mic_cases/test-rootck/conf.p b/tests/mic_cases/test-armv7hl_fs_o_release_yum/conf.p index e69de29..e69de29 100644 --- a/tests/mic_cases/test-rootck/conf.p +++ b/tests/mic_cases/test-armv7hl_fs_o_release_yum/conf.p diff --git a/tests/mic_cases/test-rootck/ks.p b/tests/mic_cases/test-armv7hl_fs_o_release_yum/customer.conf index e69de29..e69de29 100644 --- a/tests/mic_cases/test-rootck/ks.p +++ b/tests/mic_cases/test-armv7hl_fs_o_release_yum/customer.conf diff --git a/tests/mic_cases/test-armv7hl_fs_o_release_yum/ks.p b/tests/mic_cases/test-armv7hl_fs_o_release_yum/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_o_release_yum/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_fs_o_release_yum/options b/tests/mic_cases/test-armv7hl_fs_o_release_yum/options new file mode 100644 index 0000000..b2585a3 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_o_release_yum/options @@ -0,0 +1 @@ +mic cr fs --arch=armv7hl --pkgmgr=yum -o outdir13 --release=XXX diff --git a/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/conf.p b/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/conf.p diff --git a/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/ks.p b/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/options b/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/options new file mode 100644 index 0000000..70a1144 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_outdir_release_pkg_zypp/options @@ -0,0 +1 @@ +mic cr fs --arch=armv7hl --outdir=outdir11 --release=XXX --pkgmgr=zypp diff --git a/tests/mic_cases/test-armv7hl_fs_yum/conf.p b/tests/mic_cases/test-armv7hl_fs_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_yum/conf.p diff --git a/tests/mic_cases/test-armv7hl_fs_yum/ks.p b/tests/mic_cases/test-armv7hl_fs_yum/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_yum/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_fs_yum/options b/tests/mic_cases/test-armv7hl_fs_yum/options new file mode 100644 index 0000000..b6bba66 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_yum/options @@ -0,0 +1 @@ +mic cr fs --arch=armv7hl --pkgmgr=yum diff --git a/tests/mic_cases/test-armv7hl_fs_zypp/conf.p b/tests/mic_cases/test-armv7hl_fs_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_zypp/conf.p diff --git a/tests/mic_cases/test-armv7hl_fs_zypp/ks.p b/tests/mic_cases/test-armv7hl_fs_zypp/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_zypp/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_fs_zypp/options b/tests/mic_cases/test-armv7hl_fs_zypp/options new file mode 100644 index 0000000..2c7e47b --- /dev/null +++ b/tests/mic_cases/test-armv7hl_fs_zypp/options @@ -0,0 +1 @@ +mic cr fs --arch=armv7hl --pkgmgr=zypp diff --git a/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/conf.p b/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/conf.p diff --git a/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/ks.p b/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/options b/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/options new file mode 100644 index 0000000..11143ae --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_outdir_record_yum/options @@ -0,0 +1 @@ +mic cr loop --arch=armv7hl --pkgmgr=yum -o outdir12 --record-pkgs=name,license,content diff --git a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/conf.p b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/conf.p diff --git a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/ks.p b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options new file mode 100644 index 0000000..02f2331 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_tar_pkg_zypp/options @@ -0,0 +1 @@ +mic cr loop --taring-to=XXX --local-pkgs-path=package_mixed --pkgmgr=zypp diff --git a/tests/mic_cases/test-armv7hl_loop_yum/conf.p b/tests/mic_cases/test-armv7hl_loop_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_yum/conf.p diff --git a/tests/mic_cases/test-armv7hl_loop_yum/ks.p b/tests/mic_cases/test-armv7hl_loop_yum/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_yum/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_loop_yum/options b/tests/mic_cases/test-armv7hl_loop_yum/options new file mode 100644 index 0000000..1a9d71a --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_yum/options @@ -0,0 +1 @@ +mic cr loop --arch=armv7hl --pkgmgr=yum diff --git a/tests/mic_cases/test-armv7hl_loop_zypp/conf.p b/tests/mic_cases/test-armv7hl_loop_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_zypp/conf.p diff --git a/tests/mic_cases/test-armv7hl_loop_zypp/ks.p b/tests/mic_cases/test-armv7hl_loop_zypp/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_zypp/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_loop_zypp/options b/tests/mic_cases/test-armv7hl_loop_zypp/options new file mode 100644 index 0000000..36b0d65 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_loop_zypp/options @@ -0,0 +1 @@ +mic cr loop --arch=armv7hl --pkgmgr=zypp diff --git a/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/conf.p b/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/conf.p diff --git a/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/ks.p b/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/options b/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/options new file mode 100644 index 0000000..e43ded7 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_C_release_log_zypp/options @@ -0,0 +1 @@ +mic cr raw --arch=armv7hl --pkgmgr=zypp -c customer.conf --release=XXX --logfile=logfile10 diff --git a/tests/mic_cases/test-armv7hl_raw_pkg_yum/conf.p b/tests/mic_cases/test-armv7hl_raw_pkg_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_pkg_yum/conf.p diff --git a/tests/mic_cases/test-armv7hl_raw_pkg_yum/customer.conf b/tests/mic_cases/test-armv7hl_raw_pkg_yum/customer.conf new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_pkg_yum/customer.conf diff --git a/tests/mic_cases/test-armv7hl_raw_pkg_yum/ks.p b/tests/mic_cases/test-armv7hl_raw_pkg_yum/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_pkg_yum/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_raw_pkg_yum/options b/tests/mic_cases/test-armv7hl_raw_pkg_yum/options new file mode 100644 index 0000000..d7ec036 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_pkg_yum/options @@ -0,0 +1 @@ +mic cr raw --arch=armv7hl --pkgmgr=yum --arch=armv7hl --local-pkgs-path=package_mixed diff --git a/tests/mic_cases/test-armv7hl_raw_yum/conf.p b/tests/mic_cases/test-armv7hl_raw_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_yum/conf.p diff --git a/tests/mic_cases/test-armv7hl_raw_yum/ks.p b/tests/mic_cases/test-armv7hl_raw_yum/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_yum/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_raw_yum/options b/tests/mic_cases/test-armv7hl_raw_yum/options new file mode 100644 index 0000000..a05e7a6 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_yum/options @@ -0,0 +1 @@ +mic cr raw --arch=armv7hl --pkgmgr=yum diff --git a/tests/mic_cases/test-armv7hl_raw_zypp/conf.p b/tests/mic_cases/test-armv7hl_raw_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_zypp/conf.p diff --git a/tests/mic_cases/test-armv7hl_raw_zypp/ks.p b/tests/mic_cases/test-armv7hl_raw_zypp/ks.p new file mode 100644 index 0000000..119d429 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_zypp/ks.p @@ -0,0 +1,130 @@ +--- ./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-*-
++# -*-mic2-options-*- -f raw --save-kernel --arch=armv7hl -*-mic2-options-*-
+
+ #
+ # Do not Edit! Generated by:
+@@ -8,32 +8,30 @@ + 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://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
+-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
++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
++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
+ repo --name=1.2-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/oss/source/ --save --source
+ repo --name=1.2-non-oss-source --baseurl=http://repo.meego.com/MeeGo/releases/1.2.0/repos/non-oss/source --save --source
+
+-%packages
++%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
++kernel-adaptation-n900
+
+ %end
+
+@@ -41,14 +39,39 @@ kernel-adaptation-pinetrail
+ # 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
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
+nf
++
+
+ %end
+
diff --git a/tests/mic_cases/test-armv7hl_raw_zypp/options b/tests/mic_cases/test-armv7hl_raw_zypp/options new file mode 100644 index 0000000..62cd345 --- /dev/null +++ b/tests/mic_cases/test-armv7hl_raw_zypp/options @@ -0,0 +1 @@ +mic cr raw --arch=armv7hl --pkgmgr=zypp diff --git a/tests/mic_cases/test-armv7hlck/conf.p b/tests/mic_cases/test-armv7hlck/conf.p deleted file mode 100644 index dec0056..0000000 --- a/tests/mic_cases/test-armv7hlck/conf.p +++ /dev/null @@ -1,13 +0,0 @@ ---- ./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 diff --git a/tests/mic_cases/test-armv7hlck/options b/tests/mic_cases/test-armv7hlck/options deleted file mode 100644 index 17fa685..0000000 --- a/tests/mic_cases/test-armv7hlck/options +++ /dev/null @@ -1 +0,0 @@ -mic cr raw diff --git a/tests/mic_cases/test-genimg/options b/tests/mic_cases/test-genimg/options deleted file mode 100644 index 9d493ad..0000000 --- a/tests/mic_cases/test-genimg/options +++ /dev/null @@ -1 +0,0 @@ -sudo mic cr livecd diff --git a/tests/mic_cases/test-ia32_fs_include_yum/conf.p b/tests/mic_cases/test-ia32_fs_include_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_include_yum/conf.p diff --git a/tests/mic_cases/test-ia32_fs_include_yum/ks.p b/tests/mic_cases/test-ia32_fs_include_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_include_yum/ks.p diff --git a/tests/mic_cases/test-ia32_fs_include_yum/options b/tests/mic_cases/test-ia32_fs_include_yum/options new file mode 100644 index 0000000..b0bc557 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_include_yum/options @@ -0,0 +1 @@ +mic create fs --pkgmgr=yum --include-src diff --git a/tests/mic_cases/test-ia32_fs_include_zypp/conf.p b/tests/mic_cases/test-ia32_fs_include_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_include_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_fs_include_zypp/ks.p b/tests/mic_cases/test-ia32_fs_include_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_include_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_fs_include_zypp/options b/tests/mic_cases/test-ia32_fs_include_zypp/options new file mode 100644 index 0000000..1f84f61 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_include_zypp/options @@ -0,0 +1 @@ +mic create fs --pkgmgr=zypp --include-src diff --git a/tests/mic_cases/test-ia32_fs_outdir_release_yum/conf.p b/tests/mic_cases/test-ia32_fs_outdir_release_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_outdir_release_yum/conf.p diff --git a/tests/mic_cases/test-ia32_fs_outdir_release_yum/ks.p b/tests/mic_cases/test-ia32_fs_outdir_release_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_outdir_release_yum/ks.p diff --git a/tests/mic_cases/test-ia32_fs_outdir_release_yum/options b/tests/mic_cases/test-ia32_fs_outdir_release_yum/options new file mode 100644 index 0000000..dd41633 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_outdir_release_yum/options @@ -0,0 +1 @@ +mic create fs --pkgmgr=yum --outdir=outdir3 --release=XXX diff --git a/tests/mic_cases/test-ia32_fs_outdir_zypp/conf.p b/tests/mic_cases/test-ia32_fs_outdir_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_outdir_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_fs_outdir_zypp/ks.p b/tests/mic_cases/test-ia32_fs_outdir_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_outdir_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_fs_outdir_zypp/options b/tests/mic_cases/test-ia32_fs_outdir_zypp/options new file mode 100644 index 0000000..b38ad75 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_outdir_zypp/options @@ -0,0 +1 @@ +mic create fs --pkgmgr=zypp -o outdir1 diff --git a/tests/mic_cases/test-ia32_fs_record_yum/conf.p b/tests/mic_cases/test-ia32_fs_record_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_record_yum/conf.p diff --git a/tests/mic_cases/test-ia32_fs_record_yum/ks.p b/tests/mic_cases/test-ia32_fs_record_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_record_yum/ks.p diff --git a/tests/mic_cases/test-ia32_fs_record_yum/options b/tests/mic_cases/test-ia32_fs_record_yum/options new file mode 100644 index 0000000..e1f90c1 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_record_yum/options @@ -0,0 +1 @@ +mic cr fs --pkgmgr=yum --record-pkgs=name,license diff --git a/tests/mic_cases/test-ia32_fs_yum/conf.p b/tests/mic_cases/test-ia32_fs_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_yum/conf.p diff --git a/tests/mic_cases/test-ia32_fs_yum/ks.p b/tests/mic_cases/test-ia32_fs_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_yum/ks.p diff --git a/tests/mic_cases/test-ia32_fs_yum/options b/tests/mic_cases/test-ia32_fs_yum/options new file mode 100644 index 0000000..53eb1fe --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_yum/options @@ -0,0 +1 @@ +mic cr fs --pkgmgr=yum diff --git a/tests/mic_cases/test-ia32_fs_zypp/conf.p b/tests/mic_cases/test-ia32_fs_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_fs_zypp/ks.p b/tests/mic_cases/test-ia32_fs_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_fs_zypp/options b/tests/mic_cases/test-ia32_fs_zypp/options new file mode 100644 index 0000000..d9cce8c --- /dev/null +++ b/tests/mic_cases/test-ia32_fs_zypp/options @@ -0,0 +1 @@ +mic cr fs --pkgmgr=zypp diff --git a/tests/mic_cases/test-ia32_livecd_log_zypp/conf.p b/tests/mic_cases/test-ia32_livecd_log_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_log_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_livecd_log_zypp/ks.p b/tests/mic_cases/test-ia32_livecd_log_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_log_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_livecd_log_zypp/options b/tests/mic_cases/test-ia32_livecd_log_zypp/options new file mode 100644 index 0000000..cbb522f --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_log_zypp/options @@ -0,0 +1 @@ +mic create livecd --pkgmgr=zypp --logfile=logfile1 diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_yum/conf.p b/tests/mic_cases/test-ia32_livecd_pkgs_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_pkgs_yum/conf.p diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_yum/ks.p b/tests/mic_cases/test-ia32_livecd_pkgs_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_pkgs_yum/ks.p diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_yum/options b/tests/mic_cases/test-ia32_livecd_pkgs_yum/options new file mode 100644 index 0000000..eff0b9f --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_pkgs_yum/options @@ -0,0 +1 @@ +mic create livecd --pkgmgr=yum --local-pkgs-path=package_ia32 diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/conf.p b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/ks.p b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options new file mode 100644 index 0000000..258f120 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_pkgs_zypp/options @@ -0,0 +1 @@ +mic create livecd --pkgmgr=zypp --local-pkgs-path=package_mixed diff --git a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/conf.p b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/conf.p diff --git a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/ks.p b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/ks.p diff --git a/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options new file mode 100644 index 0000000..8ce4874 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_release_pkg_yum/options @@ -0,0 +1 @@ +mic cr livecd --pkgmgr=yum --release=XXX --local-pkgs-path=package_ia32 diff --git a/tests/mic_cases/test-ia32_livecd_yum/conf.p b/tests/mic_cases/test-ia32_livecd_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_yum/conf.p diff --git a/tests/mic_cases/test-ia32_livecd_yum/ks.p b/tests/mic_cases/test-ia32_livecd_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_yum/ks.p diff --git a/tests/mic_cases/test-ia32_livecd_yum/options b/tests/mic_cases/test-ia32_livecd_yum/options new file mode 100644 index 0000000..8898d69 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_yum/options @@ -0,0 +1 @@ +mic cr livecd --pkgmgr=yum diff --git a/tests/mic_cases/test-ia32_livecd_zypp/conf.p b/tests/mic_cases/test-ia32_livecd_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_livecd_zypp/ks.p b/tests/mic_cases/test-ia32_livecd_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_livecd_zypp/options b/tests/mic_cases/test-ia32_livecd_zypp/options new file mode 100644 index 0000000..5740466 --- /dev/null +++ b/tests/mic_cases/test-ia32_livecd_zypp/options @@ -0,0 +1 @@ +mic cr livecd --pkgmgr=zypp diff --git a/tests/mic_cases/test-ia32_liveusb_log_record_yum/conf.p b/tests/mic_cases/test-ia32_liveusb_log_record_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_log_record_yum/conf.p diff --git a/tests/mic_cases/test-ia32_liveusb_log_record_yum/ks.p b/tests/mic_cases/test-ia32_liveusb_log_record_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_log_record_yum/ks.p diff --git a/tests/mic_cases/test-ia32_liveusb_log_record_yum/options b/tests/mic_cases/test-ia32_liveusb_log_record_yum/options new file mode 100644 index 0000000..6840984 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_log_record_yum/options @@ -0,0 +1 @@ +mic cr liveusb --pkgmgr=yum --logfile=logfile4 --record-pkgs=name,license diff --git a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/conf.p b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/conf.p diff --git a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/ks.p b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/ks.p diff --git a/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options new file mode 100644 index 0000000..f7cc1fb --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_o_pkgs_yum/options @@ -0,0 +1 @@ +mic cr liveusb --pkgmgr=yum --local-pkgs-path=package_mixed -o outdir5 diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a/conf.p b/tests/mic_cases/test-ia32_liveusb_pkgs_a/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_pkgs_a/conf.p diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a/ks.p b/tests/mic_cases/test-ia32_liveusb_pkgs_a/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_pkgs_a/ks.p diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a/options b/tests/mic_cases/test-ia32_liveusb_pkgs_a/options new file mode 100644 index 0000000..b36a349 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_pkgs_a/options @@ -0,0 +1 @@ +mic create liveusb --pkgmgr=zypp -A i686 diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/conf.p b/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/ks.p b/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/options b/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/options new file mode 100644 index 0000000..b36a349 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_pkgs_a_zypp/options @@ -0,0 +1 @@ +mic create liveusb --pkgmgr=zypp -A i686 diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/conf.p b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/ks.p b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options new file mode 100644 index 0000000..d82f9e0 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_pkgs_zypp/options @@ -0,0 +1 @@ +mic create liveusb --pkgmgr=zypp --local-pkgs-path=package_ia32 diff --git a/tests/mic_cases/test-ia32_liveusb_record_zypp/conf.p b/tests/mic_cases/test-ia32_liveusb_record_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_record_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_liveusb_record_zypp/ks.p b/tests/mic_cases/test-ia32_liveusb_record_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_record_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_liveusb_record_zypp/options b/tests/mic_cases/test-ia32_liveusb_record_zypp/options new file mode 100644 index 0000000..71d0c5e --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_record_zypp/options @@ -0,0 +1 @@ +mic create liveusb --pkgmgr=zypp -A i686 diff --git a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/conf.p b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/conf.p diff --git a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/ks.p b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/ks.p diff --git a/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options new file mode 100644 index 0000000..8ce4874 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_release_pkg_yum/options @@ -0,0 +1 @@ +mic cr livecd --pkgmgr=yum --release=XXX --local-pkgs-path=package_ia32 diff --git a/tests/mic_cases/test-ia32_liveusb_yum/conf.p b/tests/mic_cases/test-ia32_liveusb_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_yum/conf.p diff --git a/tests/mic_cases/test-ia32_liveusb_yum/ks.p b/tests/mic_cases/test-ia32_liveusb_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_yum/ks.p diff --git a/tests/mic_cases/test-ia32_liveusb_yum/options b/tests/mic_cases/test-ia32_liveusb_yum/options new file mode 100644 index 0000000..def4228 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_yum/options @@ -0,0 +1 @@ +mic cr livecd --pkgmgr=yum diff --git a/tests/mic_cases/test-ia32_liveusb_zypp/conf.p b/tests/mic_cases/test-ia32_liveusb_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_liveusb_zypp/ks.p b/tests/mic_cases/test-ia32_liveusb_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_liveusb_zypp/options b/tests/mic_cases/test-ia32_liveusb_zypp/options new file mode 100644 index 0000000..b87abb1 --- /dev/null +++ b/tests/mic_cases/test-ia32_liveusb_zypp/options @@ -0,0 +1 @@ +mic cr livecd --pkgmgr=zypp diff --git a/tests/mic_cases/test-ia32_loop_o_log_yum/conf.p b/tests/mic_cases/test-ia32_loop_o_log_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_o_log_yum/conf.p diff --git a/tests/mic_cases/test-ia32_loop_o_log_yum/ks.p b/tests/mic_cases/test-ia32_loop_o_log_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_o_log_yum/ks.p diff --git a/tests/mic_cases/test-ia32_loop_o_log_yum/options b/tests/mic_cases/test-ia32_loop_o_log_yum/options new file mode 100644 index 0000000..61f11ad --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_o_log_yum/options @@ -0,0 +1 @@ +mic cr loop --pkgmgr=yum --release=XXX --logfile=logfile3 diff --git a/tests/mic_cases/test-ia32_loop_release_zypp/conf.p b/tests/mic_cases/test-ia32_loop_release_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_release_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_loop_release_zypp/ks.p b/tests/mic_cases/test-ia32_loop_release_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_release_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_loop_release_zypp/options b/tests/mic_cases/test-ia32_loop_release_zypp/options new file mode 100644 index 0000000..31c2419 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_release_zypp/options @@ -0,0 +1 @@ +mic create loop --pkgmgr=zypp --release=XXX diff --git a/tests/mic_cases/test-ia32_loop_taring_yum/conf.p b/tests/mic_cases/test-ia32_loop_taring_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_taring_yum/conf.p diff --git a/tests/mic_cases/test-ia32_loop_taring_yum/ks.p b/tests/mic_cases/test-ia32_loop_taring_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_taring_yum/ks.p diff --git a/tests/mic_cases/test-ia32_loop_taring_yum/options b/tests/mic_cases/test-ia32_loop_taring_yum/options new file mode 100644 index 0000000..5023a63 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_taring_yum/options @@ -0,0 +1 @@ +mic cr loop --pkgmgr=yum --taring-to=XXX diff --git a/tests/mic_cases/test-ia32_loop_taring_zypp/conf.p b/tests/mic_cases/test-ia32_loop_taring_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_taring_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_loop_taring_zypp/ks.p b/tests/mic_cases/test-ia32_loop_taring_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_taring_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_loop_taring_zypp/options b/tests/mic_cases/test-ia32_loop_taring_zypp/options new file mode 100644 index 0000000..8f0429e --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_taring_zypp/options @@ -0,0 +1 @@ +mic create loop --pkgmgr=zypp --taring-to=XXX diff --git a/tests/mic_cases/test-ia32_loop_yum/conf.p b/tests/mic_cases/test-ia32_loop_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_yum/conf.p diff --git a/tests/mic_cases/test-ia32_loop_yum/ks.p b/tests/mic_cases/test-ia32_loop_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_yum/ks.p diff --git a/tests/mic_cases/test-ia32_loop_yum/options b/tests/mic_cases/test-ia32_loop_yum/options new file mode 100644 index 0000000..7af979a --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_yum/options @@ -0,0 +1 @@ +mic cr loop --pkgmgr=yum diff --git a/tests/mic_cases/test-ia32_loop_zypp/conf.p b/tests/mic_cases/test-ia32_loop_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_loop_zypp/ks.p b/tests/mic_cases/test-ia32_loop_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_loop_zypp/options b/tests/mic_cases/test-ia32_loop_zypp/options new file mode 100644 index 0000000..2b2e942 --- /dev/null +++ b/tests/mic_cases/test-ia32_loop_zypp/options @@ -0,0 +1 @@ +mic cr loop --pkgmgr=zypp diff --git a/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/conf.p b/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/conf.p diff --git a/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/ks.p b/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/ks.p diff --git a/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/options b/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/options new file mode 100644 index 0000000..b98e13f --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_pkg_outdir_release_pkg_record_yum/options @@ -0,0 +1 @@ +mic cr raw --pkgmgr=yum --outdir=outdir6 --release=XXX --logfile=logfile5 --local-pkgs-path=package_ia32 --record-pkgs=license diff --git a/tests/mic_cases/test-ia32_raw_record/conf.p b/tests/mic_cases/test-ia32_raw_record/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_record/conf.p diff --git a/tests/mic_cases/test-ia32_raw_record/ks.p b/tests/mic_cases/test-ia32_raw_record/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_record/ks.p diff --git a/tests/mic_cases/test-ia32_raw_record/options b/tests/mic_cases/test-ia32_raw_record/options new file mode 100644 index 0000000..1e478fd --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_record/options @@ -0,0 +1 @@ +mic create raw --pkgmgr=zypp --record-pkgs=name diff --git a/tests/mic_cases/test-ia32_raw_record_zypp/conf.p b/tests/mic_cases/test-ia32_raw_record_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_record_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_raw_record_zypp/ks.p b/tests/mic_cases/test-ia32_raw_record_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_record_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_raw_record_zypp/options b/tests/mic_cases/test-ia32_raw_record_zypp/options new file mode 100644 index 0000000..1e478fd --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_record_zypp/options @@ -0,0 +1 @@ +mic create raw --pkgmgr=zypp --record-pkgs=name diff --git a/tests/mic_cases/test-ia32_raw_yum/conf.p b/tests/mic_cases/test-ia32_raw_yum/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_yum/conf.p diff --git a/tests/mic_cases/test-ia32_raw_yum/ks.p b/tests/mic_cases/test-ia32_raw_yum/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_yum/ks.p diff --git a/tests/mic_cases/test-ia32_raw_yum/options b/tests/mic_cases/test-ia32_raw_yum/options new file mode 100644 index 0000000..4b8ad21 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_yum/options @@ -0,0 +1 @@ +mic cr raw --pkgmgr=yum diff --git a/tests/mic_cases/test-ia32_raw_zypp/conf.p b/tests/mic_cases/test-ia32_raw_zypp/conf.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_zypp/conf.p diff --git a/tests/mic_cases/test-ia32_raw_zypp/ks.p b/tests/mic_cases/test-ia32_raw_zypp/ks.p new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_zypp/ks.p diff --git a/tests/mic_cases/test-ia32_raw_zypp/options b/tests/mic_cases/test-ia32_raw_zypp/options new file mode 100644 index 0000000..ab537a3 --- /dev/null +++ b/tests/mic_cases/test-ia32_raw_zypp/options @@ -0,0 +1 @@ +mic cr raw --pkgmgr=zypp diff --git a/tests/mic_cases/test-ksck/expect b/tests/mic_cases/test-ksck/expect deleted file mode 100644 index ad44fc2..0000000 --- a/tests/mic_cases/test-ksck/expect +++ /dev/null @@ -1 +0,0 @@ -Unable to load kickstart file diff --git a/tests/mic_cases/test-ksck/ks.p b/tests/mic_cases/test-ksck/ks.p deleted file mode 100644 index 7837ff5..0000000 --- a/tests/mic_cases/test-ksck/ks.p +++ /dev/null @@ -1,63 +0,0 @@ ---- ./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 diff --git a/tests/mic_cases/test-ksck/options b/tests/mic_cases/test-ksck/options deleted file mode 100644 index 9d493ad..0000000 --- a/tests/mic_cases/test-ksck/options +++ /dev/null @@ -1 +0,0 @@ -sudo mic cr livecd diff --git a/tests/mic_cases/test-rootck/expect b/tests/mic_cases/test-rootck/expect deleted file mode 100644 index 16678c6..0000000 --- a/tests/mic_cases/test-rootck/expect +++ /dev/null @@ -1 +0,0 @@ -You must run as root diff --git a/tests/mic_cases/test-rootck/options b/tests/mic_cases/test-rootck/options deleted file mode 100644 index dafef75..0000000 --- a/tests/mic_cases/test-rootck/options +++ /dev/null @@ -1 +0,0 @@ -mic cr livecd diff --git a/tests/testbase.py b/tests/testbase.py index b5cbe87..77b21ef 100644 --- a/tests/testbase.py +++ b/tests/testbase.py @@ -1,5 +1,6 @@ #!/usr/bin/python import os +import sys import subprocess, re, shutil, glob import gettext @@ -27,11 +28,13 @@ def PrepEnv(cases_dir, case, work_env): 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): @@ -53,9 +56,8 @@ 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: |