From fe4aa44788a8b870c34282ac08714b4b8fc9938c Mon Sep 17 00:00:00 2001 From: Maciej Wereski Date: Mon, 18 Sep 2017 10:13:39 +0200 Subject: [PATCH] [TRE-1621] Remove x86 images Change-Id: I1b9f60215154adecaf254e3cf63af32b8056c0dc Signed-off-by: Maciej Wereski --- common-targets.yaml | 7 ------ common.yaml | 36 ---------------------------- ks/common-installer-efi-x86_64.yaml | 21 ---------------- ks/common-installer-mbr-i586.yaml | 21 ---------------- ks/common-minimal-mbr-x86_64.yaml | 19 --------------- ks/common-wayland-efi-i586.yaml | 24 ------------------- ks/common-wayland-efi-x86_64.yaml | 25 ------------------- ks/common-wayland-mbr-i586.yaml | 24 ------------------- ks/common-wayland-mbr-x86_64.yaml | 25 ------------------- partitions/common-efi | 2 -- patterns/common-adaptation-intel-x86_64.yaml | 6 ----- patterns/common-adaptation-intel.yaml | 13 ---------- 12 files changed, 223 deletions(-) delete mode 100644 ks/common-installer-efi-x86_64.yaml delete mode 100644 ks/common-installer-mbr-i586.yaml delete mode 100644 ks/common-minimal-mbr-x86_64.yaml delete mode 100644 ks/common-wayland-efi-i586.yaml delete mode 100644 ks/common-wayland-efi-x86_64.yaml delete mode 100644 ks/common-wayland-mbr-i586.yaml delete mode 100644 ks/common-wayland-mbr-x86_64.yaml delete mode 100644 partitions/common-efi delete mode 100644 patterns/common-adaptation-intel-x86_64.yaml delete mode 100644 patterns/common-adaptation-intel.yaml diff --git a/common-targets.yaml b/common-targets.yaml index ec639b5..7e5d554 100644 --- a/common-targets.yaml +++ b/common-targets.yaml @@ -2,13 +2,6 @@ Targets: - Name: standard Images: - - common-installer-mbr-i586.yaml - - common-wayland-mbr-i586.yaml - - common-wayland-efi-i586.yaml - - common-installer-efi-x86_64.yaml - - common-wayland-mbr-x86_64.yaml - - common-wayland-efi-x86_64.yaml - - common-minimal-mbr-x86_64.yaml - common-boot-armv7l-odroidu3.yaml - common-boot-armv7l-odroidxu3.yaml - iot-boot-armv7l-artik520.yaml diff --git a/common.yaml b/common.yaml index bcaae8b..fbe5bc2 100644 --- a/common.yaml +++ b/common.yaml @@ -18,29 +18,6 @@ Default: SaveRepos: False UserGroups: "audio,video" -Minimal: - Part: common-mbr - Groups: - - Generic Adaptation - - Common Adaptation - - Generic Base - - Common Base - - Generic Console Tools - - Common Console Tools - - Generic Packaging - - Common Packaging - PostScripts: - - generic-adaptation - - common-adaptation - - generic-base - - common-base - - generic-console-tools - - generic-packaging - - common-packaging - Repos: [] - NoChrootScripts: - - buildname - Artik: Part: common-mbr-3parts Groups: @@ -67,19 +44,6 @@ Artik: NoChrootScripts: - buildname -Installer: - Part: common-mbr - Groups: - - Generic Adaptation - - Common Adaptation - PostScripts: - - generic-adaptation - - common-adaptation - BootloaderAppend: "rw vga=current quiet splash rootwait rootfstype=ext4" - Repos: [] - NoChrootScripts: - - buildname - Boot-Odroidu3: Part: common-mbr-boot Desktop: None diff --git a/ks/common-installer-efi-x86_64.yaml b/ks/common-installer-efi-x86_64.yaml deleted file mode 100644 index e1692b7..0000000 --- a/ks/common-installer-efi-x86_64.yaml +++ /dev/null @@ -1,21 +0,0 @@ -Name: common-installer-efi-x86_64 -Architecture: x86_64 -Schedule: "*" -Active: True -Platform: Installer -InstallerFrameworkPlugins: - - bootloader - - fstab -Part: common-efi -Mic2Options: -A x86_64 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap -FileName: common-installer-efi-x86_64 -Kernel: kernel-profile-common -Repos: - - unified-standard - - base-standard -Groups: - - Generic Setup Boot -PostScripts: - - generic-setup-boot -ExtraPackages: - - system-installer diff --git a/ks/common-installer-mbr-i586.yaml b/ks/common-installer-mbr-i586.yaml deleted file mode 100644 index 47c0e57..0000000 --- a/ks/common-installer-mbr-i586.yaml +++ /dev/null @@ -1,21 +0,0 @@ -Name: common-installer-mbr-i586 -Architecture: ia32 -Schedule: "*" -Active: True -Platform: Installer -InstallerFrameworkPlugins: - - bootloader - - fstab -Part: common-mbr -Mic2Options: -A i686 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap -FileName: common-installer-mbr-i586 -Kernel: kernel-profile-common -Repos: - - unified-standard - - base-standard -ExtraPackages: - - system-installer -Groups: - - Generic Setup Boot Bios -PostScripts: - - generic-setup-boot-bios diff --git a/ks/common-minimal-mbr-x86_64.yaml b/ks/common-minimal-mbr-x86_64.yaml deleted file mode 100644 index b184902..0000000 --- a/ks/common-minimal-mbr-x86_64.yaml +++ /dev/null @@ -1,19 +0,0 @@ -Name: common-minimal-mbr-x86_64 -Architecture: x86_64 -Schedule: "*" -Active: True -Platform: Minimal -InstallerFrameworkPlugins: - - bootloader - - fstab -Part: common-mbr -Mic2Options: -A x86_64 -f loop --pack-to=@NAME@.tar.gz --copy-kernel -FileName: common-minimal-mbr-x86_64 -Kernel: kernel-profile-common -Repos: - - unified-standard - - base-standard -Groups: - - Generic Setup Boot Bios -PostScripts: - - generic-setup-boot-bios diff --git a/ks/common-wayland-efi-i586.yaml b/ks/common-wayland-efi-i586.yaml deleted file mode 100644 index 4241867..0000000 --- a/ks/common-wayland-efi-i586.yaml +++ /dev/null @@ -1,24 +0,0 @@ -Name: common-wayland-efi-i586 -Architecture: ia32 -Schedule: "*" -Active: True -Platform: Wayland -InstallerFrameworkPlugins: - - bootloader - - fstab -Part: common-efi -Mic2Options: -A i686 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap -FileName: common-wayland-efi-i586 -Kernel: kernel-profile-common -Repos: - - unified-standard - - base-standard -Groups: - - Common Adaptation Intel - - Generic Multimedia Intel - - Generic Setup Boot -PostScripts: - - generic-multimedia-intel - - generic-setup-boot -ExtraPackages: - - mesa diff --git a/ks/common-wayland-efi-x86_64.yaml b/ks/common-wayland-efi-x86_64.yaml deleted file mode 100644 index 3c95c39..0000000 --- a/ks/common-wayland-efi-x86_64.yaml +++ /dev/null @@ -1,25 +0,0 @@ -Name: common-wayland-efi-x86_64 -Architecture: x86_64 -Schedule: "*" -Active: True -Platform: Wayland -InstallerFrameworkPlugins: - - bootloader - - fstab -Part: common-efi -Mic2Options: -A x86_64 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap -FileName: common-wayland-efi-x86_64 -Kernel: kernel-profile-common -Repos: - - unified-standard - - base-standard -Groups: - - Common Adaptation Intel - - Common Adaptation Intel x86_64 - - Generic Multimedia Intel - - Generic Setup Boot -PostScripts: - - generic-multimedia-intel - - generic-setup-boot -ExtraPackages: - - mesa diff --git a/ks/common-wayland-mbr-i586.yaml b/ks/common-wayland-mbr-i586.yaml deleted file mode 100644 index aad1fd6..0000000 --- a/ks/common-wayland-mbr-i586.yaml +++ /dev/null @@ -1,24 +0,0 @@ -Name: common-wayland-mbr-i586 -Architecture: ia32 -Schedule: "*" -Active: True -Platform: Wayland -InstallerFrameworkPlugins: - - bootloader - - fstab -Part: common-mbr -Mic2Options: -A i686 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap -FileName: common-wayland-mbr-i586 -Kernel: kernel-profile-common -Repos: - - unified-standard - - base-standard -Groups: - - Common Adaptation Intel - - Generic Multimedia Intel - - Generic Setup Boot Bios -PostScripts: - - generic-multimedia-intel - - generic-setup-boot-bios -ExtraPackages: - - mesa diff --git a/ks/common-wayland-mbr-x86_64.yaml b/ks/common-wayland-mbr-x86_64.yaml deleted file mode 100644 index 0ea4c7e..0000000 --- a/ks/common-wayland-mbr-x86_64.yaml +++ /dev/null @@ -1,25 +0,0 @@ -Name: common-wayland-mbr-x86_64 -Architecture: x86_64 -Schedule: "*" -Active: True -Platform: Wayland -InstallerFrameworkPlugins: - - bootloader - - fstab -Part: common-mbr -Mic2Options: -A x86_64 -f raw --fstab=uuid --copy-kernel --compress-disk-image=bz2 --generate-bmap -FileName: common-wayland-mbr-x86_64 -Kernel: kernel-profile-common -Repos: - - unified-standard - - base-standard -Groups: - - Common Adaptation Intel - - Common Adaptation Intel x86_64 - - Generic Multimedia Intel - - Generic Setup Boot Bios -PostScripts: - - generic-multimedia-intel - - generic-setup-boot-bios -ExtraPackages: - - mesa diff --git a/partitions/common-efi b/partitions/common-efi deleted file mode 100644 index ebf3b65..0000000 --- a/partitions/common-efi +++ /dev/null @@ -1,2 +0,0 @@ -part /boot --size 64 --ondisk sda --fstype=vfat --label TZBOOT --active --align 1024 --part-type C12A7328-F81F-11D2-BA4B-00A0C93EC93B -part / --fstype="ext4" --size=3520 --ondisk=sda --label tizen-common --fsoptions=defaults,noatime diff --git a/patterns/common-adaptation-intel-x86_64.yaml b/patterns/common-adaptation-intel-x86_64.yaml deleted file mode 100644 index 4ccd650..0000000 --- a/patterns/common-adaptation-intel-x86_64.yaml +++ /dev/null @@ -1,6 +0,0 @@ -Summary: Common Adaptation Intel x86_64 -Description: Common Adaptation Intel x86_64 -Name: common-adaptation-intel-x86_64 -Packages: -#From TRE-1473 -- csapi-tizenfx-common diff --git a/patterns/common-adaptation-intel.yaml b/patterns/common-adaptation-intel.yaml deleted file mode 100644 index 83f6336..0000000 --- a/patterns/common-adaptation-intel.yaml +++ /dev/null @@ -1,13 +0,0 @@ -Summary: Common Adaptation Intel -Description: Common Adaptation Intel -Name: common-adaptation-intel -Packages: -- libtdm-drm -- libtbm-dumb -- model-config-generic -#From TRE-826 -- boot-animation-sound-file-profile_common -#From TRE-1473 -- csapi-tizenfx-common -#From TRE-1488 -- dotnet-launcher -- 2.7.4