meta-stx: set preempt-rt as the default kernel

- Set preempt-rt as the default kernel
- Add rt-tests into the image
- Remove extra boot menus since only the AIO controller with
  preempt-rt kernel will be built and supported.

Issue-ID: INF-121
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I3afaeb510607e5bbb5cf3adb97480f04abcd03d0

diff --git a/meta-stx/conf/distro/files/syslinux.cfg b/meta-stx/conf/distro/files/syslinux.cfg
index cc23c56..175e762 100644 (file)
--- a/meta-stx/conf/distro/files/syslinux.cfg
+++ b/meta-stx/conf/distro/files/syslinux.cfg
@@ -26,59 +26,14 @@ menu background   #ff555555
 # ----------------------------------------
 
 
-# Standard Controller menu
-menu begin
-  menu title Standard Controller Configuration
-
-  # Serial Console submenu
-  label 0
-    menu label Serial Console
-    menu disable
-    kernel /bzImage
-    append initrd=/initrd rootwait console=ttyS0,115200 inst.text serial inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/controller_ks.cfg
-  
-  # Graphical Console submenu
-  label 1
-    menu label Graphical Console
-    menu disable
-    kernel /bzImage
-    append initrd=/initrd rootwait console=tty0 inst.text inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/controller_ks.cfg
-menu end
-
-menu SEPARATOR
-
-# AIO Controller menu
-menu begin
-  menu title All-in-one Controller Configuration
-
-  # Serial Console submenu
-  label 2
-    menu label Serial Console
-    kernel /bzImage
-    append initrd=/initrd rootwait console=ttyS0,115200 inst.text serial inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/ks.cfg
-  
-  # Graphical Console submenu
-  label 3
-    menu label Graphical Console
-    kernel /bzImage
-    append initrd=/initrd rootwait console=tty0 inst.text inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/ks.cfg
-menu end
-
-menu SEPARATOR
-
-# AIO (Low Latency) Controller menu
-menu begin
-  menu title All-in-one (lowlatency) Controller Configuration
-
-  # Serial Console submenu
-  label 4
-    menu label Serial Console
-    kernel /bzImage
-    append nitrd=/initrd rootwait console=ttyS0,115200 inst.text serial inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/aio_lowlatency_ks.cfg
-
-  # Graphical Console submenu
-  label 5
-    menu label Graphical Console
-    kernel /bzImage
-    append initrd=/initrd rootwait console=tty0 inst.text inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/aio_lowlatency_ks.cfg
-menu end
+# AIO Controller - Serial Console menu
+label 2
+  menu label All-in-one Controller Configuration - Serial Console
+  kernel /bzImage
+  append initrd=/initrd rootwait console=ttyS0,115200 inst.text serial inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/ks.cfg
+
+# AIO Controller - Graphical Console menu
+label 3
+  menu label All-in-one Controller Configuration - Graphical Console
+  kernel /bzImage
+  append initrd=/initrd rootwait console=tty0 inst.text inst.stage2=hd:LABEL=oe_iso_boot boot_device=sda rootfs_device=sda biosdevname=0 usbcore.autosuspend=-1 inst.gpt security_profile=standard user_namespace.enable=1 ks=/installer-config/ks.cfg

diff --git a/meta-stx/recipes-core/images/stx-image-aio-installer.bb b/meta-stx/recipes-core/images/stx-image-aio-installer.bb
index 18e4dbb..bd76744 100644 (file)
--- a/meta-stx/recipes-core/images/stx-image-aio-installer.bb
+++ b/meta-stx/recipes-core/images/stx-image-aio-installer.bb
@@ -51,7 +51,7 @@ IMAGE_ROOTFS_EXTRA_SPACE =" + 102400"
 inherit core-image stx-anaconda-image
 
 KICKSTART_FILE ?= "${LAYER_PATH_meta-stx}/conf/distro/files/ks/poky_stx_aio_ks.cfg"
-REPO_INCLUDE_PKG ?= "${LAYER_PATH_meta-stx}/conf/distro/files/pkglist/poky-stx-aio-pkg-list.cfg"
+REPO_INCLUDE_PKG ?= "${LAYER_PATH_meta-stx}/conf/distro/files/pkglist/poky-stx-aio-rt-pkg-list.cfg"
 
 # Only the ones prefix with poky_stx_ are tested and working
 KICKSTART_FILE_EXTRA ?= " \

diff --git a/meta-stx/recipes-core/images/stx-image-aio.bb b/meta-stx/recipes-core/images/stx-image-aio.bb
index b83f354..aaef151 100644 (file)
--- a/meta-stx/recipes-core/images/stx-image-aio.bb
+++ b/meta-stx/recipes-core/images/stx-image-aio.bb
@@ -44,6 +44,7 @@ IMAGE_INSTALL_append = " \
        playbookconfig \
        distributedcloud-client-dcmanager \
        registry-token-server \
+       rt-tests \
        "
 
 IMAGE_FEATURES += " \

diff --git a/scripts/configs/local-anaconda.conf b/scripts/configs/local-anaconda.conf
index e3c5bf2..7142775 100644 (file)
--- a/scripts/configs/local-anaconda.conf
+++ b/scripts/configs/local-anaconda.conf
@@ -4,7 +4,7 @@
 
 DISTRO = "anaconda"
 MACHINE = "@BSP@"
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
 
 INSTALLER_TARGET_BUILD = "@TARGET_BUILD@"
 INSTALLER_TARGET_IMAGE = "stx-image-aio"

diff --git a/scripts/configs/local-stx.conf b/scripts/configs/local-stx.conf
index 44cb5aa..1c16fd1 100644 (file)
--- a/scripts/configs/local-stx.conf
+++ b/scripts/configs/local-stx.conf
@@ -4,7 +4,7 @@
 
 DISTRO = "poky-stx"
 MACHINE = "@BSP@"
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto"
+PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
 
 EXTRA_IMAGE_FEATURES = " \
     debug-tweaks \