From debb227a9eb9a5bc8480e2d52e73ea2a8b71768d Mon Sep 17 00:00:00 2001 From: Mikko Ylinen Date: Mon, 29 Sep 2014 14:40:33 +0300 Subject: [PATCH] Update image configs to use setup-scripts and the new kernel Change-Id: I24c5f3c835a4210ad43724b862236371984fe6f6 Signed-off-by: Mikko Ylinen --- ivi.yaml | 6 +++++- ks/ivi-efi-i586.yaml | 5 +---- ks/ivi-efi-x86_64.yaml | 5 +---- ks/ivi-mbr-i586-emul.yaml | 4 +--- ks/ivi-mbr-i586.yaml | 4 +--- scripts/ivi-adaptation.post | 3 --- 6 files changed, 9 insertions(+), 18 deletions(-) diff --git a/ivi.yaml b/ivi.yaml index b6f69cd..9f563d5 100644 --- a/ivi.yaml +++ b/ivi.yaml @@ -33,6 +33,7 @@ Wayland-i586: Part: ivi-mbr UserGroups: "audio,video,weston-launch" Groups: + - Generic Setup Boot - Generic Middleware - Generic Wayland - Generic Crosswalk @@ -46,6 +47,7 @@ Wayland-i586: - IVI Middleware Intel - IVI Applications PostScripts: + - generic-setup-boot - generic-middleware - generic-wayland - generic-multimedia @@ -63,6 +65,7 @@ Wayland-x86_64: Part: ivi-mbr UserGroups: "audio,video,weston-launch" Groups: + - Generic Setup Boot - Generic Middleware - Generic Wayland - Generic Crosswalk @@ -76,6 +79,7 @@ Wayland-x86_64: - IVI Middleware Intel - IVI Applications PostScripts: + - generic-setup-boot - generic-middleware - generic-wayland - generic-multimedia @@ -86,7 +90,7 @@ Wayland-x86_64: - ivi-ux-weston - ivi-applications Repos: - - ivi + - ivi64 Wayland-ARM: Part: ivi-mbr diff --git a/ks/ivi-efi-i586.yaml b/ks/ivi-efi-i586.yaml index 619e56f..c93f13a 100644 --- a/ks/ivi-efi-i586.yaml +++ b/ks/ivi-efi-i586.yaml @@ -7,12 +7,9 @@ InstallerFrameworkPlugins: - fstab Part: ivi-efi FileName: ivi-efi-i586 -Kernel: kernel-x86-ivi +Kernel: kernel-profile-ivi Repos: - ivi ExtraPackages: - ivi-repos - - gummiboot-splash - - setup-gummiboot - - setup-ivi-clone PostScripts: [] diff --git a/ks/ivi-efi-x86_64.yaml b/ks/ivi-efi-x86_64.yaml index 6878f97..0b27787 100644 --- a/ks/ivi-efi-x86_64.yaml +++ b/ks/ivi-efi-x86_64.yaml @@ -7,12 +7,9 @@ InstallerFrameworkPlugins: - fstab Part: ivi-efi FileName: ivi-efi-x86_64 -Kernel: kernel-x86-ivi +Kernel: kernel-profile-ivi Repos: - ivi64 ExtraPackages: - ivi-repos - - gummiboot-splash - - setup-gummiboot - - setup-ivi-clone PostScripts: [] diff --git a/ks/ivi-mbr-i586-emul.yaml b/ks/ivi-mbr-i586-emul.yaml index fa40e8e..d584dca 100644 --- a/ks/ivi-mbr-i586-emul.yaml +++ b/ks/ivi-mbr-i586-emul.yaml @@ -8,14 +8,12 @@ InstallerFrameworkPlugins: - fstab Part: ivi-emul FileName: ivi-mbr-i586-emul -Kernel: kernel-x86-ivi +Kernel: kernel-profile-ivi Repos: - emul ExtraPackages: - ivi-repos - system-plugin-emulator - - setup-extlinux - - setup-ivi-clone RemovePackages: - openssh PostScripts: [] diff --git a/ks/ivi-mbr-i586.yaml b/ks/ivi-mbr-i586.yaml index 3d943c5..638d387 100644 --- a/ks/ivi-mbr-i586.yaml +++ b/ks/ivi-mbr-i586.yaml @@ -7,11 +7,9 @@ InstallerFrameworkPlugins: - fstab Part: ivi-mbr FileName: ivi-mbr-i586 -Kernel: kernel-x86-ivi +Kernel: kernel-profile-ivi Repos: - ivi ExtraPackages: - ivi-repos - - setup-extlinux - - setup-ivi-clone PostScripts: [] diff --git a/scripts/ivi-adaptation.post b/scripts/ivi-adaptation.post index 7848ab5..b6da5a7 100644 --- a/scripts/ivi-adaptation.post +++ b/scripts/ivi-adaptation.post @@ -3,6 +3,3 @@ echo "#################### ivi-adaptations.post ####################" #replace "Tizen Next" with real release number. sed -i 's/(\(.*\))/(@BUILD_ID@)/' /etc/os-release - -# Install and configure the boot-loader, /etc/fstab, and so on -/usr/sbin/setup-ivi-boot -- 2.7.4