From 67ff9bdf02ce83fce298d6e0b43ade189bb24d79 Mon Sep 17 00:00:00 2001 From: "Graydon, Tracy" Date: Fri, 28 Jun 2013 14:23:16 -0700 Subject: [PATCH] A little reorganizing of ivi.yaml Change-Id: I837cfc538509142b12f436ae4dda3aabeeb35b0d --- ivi.yaml | 44 +++++++++++++++++++++++++++++--------------- ks/ivi-min-i586.yaml | 16 +--------------- ks/ivi-release-i586.yaml | 20 +------------------- ks/ivi-wayland-i586.yaml | 20 +------------------- ks/ivi-wayland-x86_64.yaml | 19 +------------------ scripts/rpm.post | 5 +++++ 6 files changed, 38 insertions(+), 86 deletions(-) create mode 100644 scripts/rpm.post diff --git a/ivi.yaml b/ivi.yaml index b31f4d1..68b1dd8 100644 --- a/ivi.yaml +++ b/ivi.yaml @@ -1,28 +1,42 @@ Default: Baseline: tizen-3.0 Active: True + Mic2Options: -f raw --fstab-entry=uuid --copy-kernel --runtime=native --compress-disk-image=bz2 --generate-bmap + Architecture: ia32 + Part: ivi Language: en_US.UTF-8 Keyboard: us - SaveRepos: False Timezone: America/Los_Angeles RootPass: tizen DefaultUser: tizen DefaultUserPass: tizen - BootloaderOptions: "" - -IVI: - Bootloader: True - BootloaderAppend: "vga=current quiet splash" - BootloaderTimeout: 1 - SaveRepos: False + BootLoader: True + BootloaderAppend: "rootwait rootfstype=ext4" + BootloaderTimeout: 0 + BootloaderOptions: "--ptable=gpt" StartX: False - Architecture: ia32 Desktop: None - Mic2Options: -f raw --fstab-entry=uuid --copy-kernel --runtime=native --compress-disk-image=bz2 --generate-bmap - Part: ivi - NoChrootScripts: - - buildname + Repos: + - ivi + SaveRepos: False + UserGroups: "audio,video" Groups: - Base System - Repos: - - ivi + - IVI Adaptation + - IVI Packaging + PostScripts: + - base-general + - base-ivi-minimal + - rpm + NoChrootScripts: + - buildname + +Wayland: + UserGroups: "audio,video,weston-launch,app,developer,testuser,db_menu,crash,db_alarm,db_browser,db_calendar,db_cc_list,db_contact,db_email_service,db_java_runtime,db_logs,db_memo,db_menu,db_msg_service,db_mtp,db_spkmgr,db_t9buffer,db_worldclock,db_sns,db_filemanager,db_daily_briefing,db_always,db_media_browser,db_music,db_drm,db_lbs_landmark,db_comm,db_quickpanel,db_wrt" + Groups: + - IVI Middleware + - Wayland + - Console Tools + - IVI Applications + PostScripts: + - base-weston-default diff --git a/ks/ivi-min-i586.yaml b/ks/ivi-min-i586.yaml index 1d446bd..1b8034c 100644 --- a/ks/ivi-min-i586.yaml +++ b/ks/ivi-min-i586.yaml @@ -1,20 +1,6 @@ Name: IVI Minimal i586 Schedule: "*" Active: True -Platform: IVI +Platform: Default FileName: ivi-min-i586 Kernel: kernel-x86-ivi -Architecture: ia32 -Mic2Options: -f raw --fstab-entry=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap --runtime=native -Bootloader: True -BootloaderAppend: "rootwait rootfstype=ext4" -BootloaderTimeout: 0 -BootloaderOptions: "--ptable=gpt" -Desktop: None -UserGroups: "audio,video" -PostScripts: - - base-general - - base-ivi-minimal -Groups: - - IVI Adaptation - - IVI Packaging diff --git a/ks/ivi-release-i586.yaml b/ks/ivi-release-i586.yaml index 62c4a0b..33b7e31 100644 --- a/ks/ivi-release-i586.yaml +++ b/ks/ivi-release-i586.yaml @@ -1,28 +1,10 @@ Name: IVI Release i586 Schedule: "*" Active: True -Platform: IVI +Platform: Wayland FileName: ivi-release-i586 Kernel: kernel-x86-ivi -Architecture: ia32 -Mic2Options: -f raw --fstab-entry=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap --runtime=native -Bootloader: True -BootloaderAppend: "rootwait rootfstype=ext4" -BootloaderTimeout: 0 -BootloaderOptions: "--ptable=gpt" -Desktop: None -UserGroups: "audio,video,weston-launch" ExtraPackages: - release-repos RemovePackages: - ivi-repos -PostScripts: - - base-general - - base-weston-default -Groups: - - IVI Middleware - - Wayland - - Console Tools - - IVI Adaptation - - IVI Applications - - IVI Packaging diff --git a/ks/ivi-wayland-i586.yaml b/ks/ivi-wayland-i586.yaml index 09362cf..daf655b 100644 --- a/ks/ivi-wayland-i586.yaml +++ b/ks/ivi-wayland-i586.yaml @@ -1,24 +1,6 @@ Name: IVI Wayland i586 Schedule: "*" Active: True -Platform: IVI +Platform: Wayland FileName: ivi-wayland-i586 Kernel: kernel-x86-ivi -Architecture: ia32 -Mic2Options: -f raw --fstab-entry=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap --runtime=native -Bootloader: True -BootloaderAppend: "rootwait rootfstype=ext4" -BootloaderTimeout: 0 -BootloaderOptions: "--ptable=gpt" -Desktop: None -UserGroups: "audio,video,weston-launch" -PostScripts: - - base-general - - base-weston-default -Groups: - - IVI Middleware - - Wayland - - Console Tools - - IVI Adaptation - - IVI Applications - - IVI Packaging diff --git a/ks/ivi-wayland-x86_64.yaml b/ks/ivi-wayland-x86_64.yaml index 9bda517..95563b9 100644 --- a/ks/ivi-wayland-x86_64.yaml +++ b/ks/ivi-wayland-x86_64.yaml @@ -1,24 +1,7 @@ Name: IVI Wayland x86_64 Schedule: "*" Active: True -Platform: IVI +Platform: Wayland FileName: ivi-wayland-x86_64 Kernel: kernel-adaptation-pc Architecture: x86_84 -Mic2Options: -f raw --fstab-entry=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap --runtime=native -Bootloader: True -BootloaderAppend: "rootwait rootfstype=ext4" -BootloaderTimeout: 0 -BootloaderOptions: "--ptable=gpt" -Desktop: None -UserGroups: "audio,video,weston-launch" -PostScripts: - - base-general - - base-weston-default -Groups: - - IVI Middleware - - Wayland - - Console Tools - - IVI Adaptation - - IVI Applications - - IVI Packaging diff --git a/scripts/rpm.post b/scripts/rpm.post new file mode 100644 index 0000000..b67d1f3 --- /dev/null +++ b/scripts/rpm.post @@ -0,0 +1,5 @@ +# rpm.post +rm -f /var/lib/rpm/__db* +mv -f /var/lib/rpm /opt/var/lib/ +ln -sf /opt/var/lib/rpm /var/lib/rpm +rpmdb --rebuilddb -- 2.7.4