Onboard: Add onboard virtual keyboard to scarthgap

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,20 @@
+### Summary of Changes
+
+TODO: Include a high-level description of the changes in this pull request.
+
+
+### Justification
+
+TODO: Justify why this contribution should be part of the project. Link to an AZDO work item with `AB#${AZDO ID}`.
+
+
+### Testing
+
+TODO: Detail what testing has been done to ensure this submission meets requirements.
+
+* [ ] I have built the core package feed with this PR in place. (`bitbake packagefeed-ni-core`)
+
+
+### Procedure
+
+* [ ] I certify that the contents of this pull request complies with the [Developer Certificate of Origin](https://github.com/ni/nilrt/blob/HEAD/docs/CONTRIBUTING.md#developer-certificate-of-origin-dco).

conf/distro/nilrt.conf

@@ -1,10 +1,10 @@
 DISTRO_NAME = "NI Linux Real-Time"
 
-DISTRO_VERSION = "10.1"
+DISTRO_VERSION = "11.0"
 
 DISTRO_CODENAME = "${LAYERSERIES_COMPAT_meta-nilrt}"
 
-NILRT_FEED_NAME ?= "2024Q1"
+NILRT_FEED_NAME ?= "2024Q4"
 
 DISTRO_FEATURES:append:x64 = "\
         x11 \

conf/layer.conf

@@ -9,4 +9,4 @@ BBFILE_COLLECTIONS += "meta-nilrt"
 BBFILE_PATTERN_meta-nilrt = "^${LAYERDIR}/"
 BBFILE_PRIORITY_meta-nilrt = "25"
 
-LAYERSERIES_COMPAT_meta-nilrt = "kirkstone"
+LAYERSERIES_COMPAT_meta-nilrt = "scarthgap"

files/group

@@ -6,6 +6,8 @@ ni:x:500:
 openvpn:x:499:
 niwscerts:x:498:
 # free space
+arpwatch:x:402:
+ptest:x:401:
 ossec:x:400:
 mysql:x:399:
 datetime:x:398:

files/passwd

@@ -6,6 +6,8 @@ webserv:x:501::::
 lvuser:x:500::::
 openvpn:x:499::::
 # free space
+arpwatch:x:402::::
+ptest:x:401::::
 ossec:x:400::::
 mysql:x:399::::
 polkitd:x:398::::

recipes-bsp/grub/grub/add-inbit-command-to-io-module.patch

@@ -1,16 +1,19 @@
-From 48de0b2faec205e874099e0afdc14ab70919e702 Mon Sep 17 00:00:00 2001
+From 8267085891ed1efd3a8f46aff8ae172f94caaab7 Mon Sep 17 00:00:00 2001
 From: Adrian Papp <[email protected]>
 Date: Thu, 20 Feb 2014 15:01:05 +0200
 Subject: [PATCH] add inbit command to io module
 
 * grub-core/commands/iorw.c: Add grub_cmd_read_bit and register inbit
 command
+
+Upstream-Status: Inappropriate [NI specific]
+
 ---
  grub-core/commands/iorw.c | 33 ++++++++++++++++++++++++++++++++-
  1 file changed, 32 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index 584baec8f..45a79ed7f 100644
+index 584baec..45a79ed 100644
 --- a/grub-core/commands/iorw.c
 +++ b/grub-core/commands/iorw.c
 @@ -27,6 +27,7 @@
@@ -81,6 +84,3 @@ index 584baec8f..45a79ed7f 100644
    grub_unregister_command (cmd_write_byte);
    grub_unregister_command (cmd_write_word);
    grub_unregister_command (cmd_write_dword);
--- 
-2.25.1
-

recipes-bsp/grub/grub/cmd-test-Add-bitwise-AND-document-the-feature.patch

@@ -1,4 +1,4 @@
-From 1dfdfdfa97910081e50e70df9b3e78162987130a Mon Sep 17 00:00:00 2001
+From 2fa7700d70f71fa96061b78dabefbda536e63d9d Mon Sep 17 00:00:00 2001
 From: Brad Mouring <[email protected]>
 Date: Thu, 8 Dec 2016 11:03:42 -0600
 Subject: [PATCH] cmd: test: Add bitwise AND, document the feature
@@ -11,17 +11,20 @@ Here, we add a more generic ability to test the bitwise AND of a
 value available to the grub scripting environment. This obviates the
 need for the inbit command.
 
+Upstream-Status: Inappropriate [NI specific]
+
 Signed-off-by: Brad Mouring <[email protected]>
+
 ---
  docs/grub.texi            |  2 ++
  grub-core/commands/test.c | 10 ++++++++++
  2 files changed, 12 insertions(+)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index f829684ec..37aef949b 100644
+index a225f9a..51ae3e0 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -5034,6 +5034,8 @@ the strings are not equal
+@@ -5817,6 +5817,8 @@ the strings are not equal
  @var{integer1} is less than @var{integer2}
  @item @var{integer1} @code{-ne} @var{integer2}
  @var{integer1} is not equal to @var{integer2}
@@ -31,7 +34,7 @@ index f829684ec..37aef949b 100644
  @var{integer1} is greater than @var{integer2} after stripping off common non-numeric @var{prefix}.
  @item @var{prefix}@var{integer1} @code{-plt} @var{prefix}@var{integer2}
 diff --git a/grub-core/commands/test.c b/grub-core/commands/test.c
-index 5f06642f6..af4fad728 100644
+index 62d3fb3..a34a8ed 100644
 --- a/grub-core/commands/test.c
 +++ b/grub-core/commands/test.c
 @@ -290,6 +290,16 @@ test_parse (char **args, int *argn, int argc)
@@ -51,6 +54,3 @@ index 5f06642f6..af4fad728 100644
  	  /* -nt and -ot tests. GRUB extension: when doing -?t<bias> bias
  	     will be added to the first mtime. */
  	  if (grub_memcmp (args[*argn + 1], "-nt", 3) == 0
--- 
-2.25.1
-

recipes-bsp/grub/grub/grub-advertise-NI-NILRT-over-GNU-GRUB.patch

@@ -1,4 +1,4 @@
-From 83f4667406917c3ea089f7cbb4da3f6e8a48c1fe Mon Sep 17 00:00:00 2001
+From 464ac648e9df45779754fadccbc0088042a3c441 Mon Sep 17 00:00:00 2001
 From: Ioan-Adrian Ratiu <[email protected]>
 Date: Thu, 15 Dec 2016 14:04:40 +0200
 Subject: [PATCH] grub: advertise NI NILRT over GNU GRUB
@@ -8,27 +8,30 @@ they can be entered anyway. Presumably advanced users already know about
 them and can use them without being told and this discourages behaviour
 like "uu what does this button do?" from unknowledgeable users.
 
+Upstream-Status: Inappropriate [NI specific]
+
 Signed-off-by: Ioan-Adrian Ratiu <[email protected]>
+
 ---
  grub-core/normal/main.c      | 2 +-
  grub-core/normal/menu_text.c | 8 ++------
  2 files changed, 3 insertions(+), 7 deletions(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 78a70a8bf..0a93eef30 100644
+index bd44310..d556012 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
-@@ -208,7 +208,7 @@ grub_normal_init_page (struct grub_term_output *term,
-  
+@@ -209,7 +209,7 @@ grub_normal_init_page (struct grub_term_output *term,
+
    grub_term_cls (term);
 
 -  msg_formatted = grub_xasprintf (_("GNU GRUB  version %s"), PACKAGE_VERSION);
 +  msg_formatted = grub_xasprintf (_("NI Linux Real-Time Boot Options"));
    if (!msg_formatted)
      return;
-  
+
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index e22bb91f6..d2411750b 100644
+index b1321eb..50a77b7 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -181,17 +181,13 @@ command-line or ESC to discard edits and return to the GRUB menu."),
@@ -49,8 +52,5 @@ index e22bb91f6..d2411750b 100644
 -	       "or `c' for a command-line."),
 +	    (_("Press enter to boot the selected OS. "),
  	     STANDARD_MARGIN, STANDARD_MARGIN, term, dry_run);
- 	}	
+ 	}
      }
--- 
-2.25.1
-

recipes-core/base-files/base-files/safemode-ps1.sh

@@ -1,3 +1,3 @@
-if [ -f /etc/natinst/safemode ] || /sbin/runlevel | egrep -q ' 4$' ; then
+if [ -f /etc/natinst/safemode ] || /sbin/runlevel | grep -Eq ' 4$' ; then
 	PS1="(safemode) $PS1"
 fi

recipes-core/busybox/busybox/0001-ifplugd.c-Increase-buffer-size-for-netlink-binding.patch

@@ -17,8 +17,9 @@ for x64-based systems.
 
 Signed-off-by: Charlie Johnston <[email protected]>
 
-Upstream-Status: Inappropriate [Large numbers of adapters
-are uncommon on embedded systems]
+Upstream-Status: Inappropriate [NI specific]
+
+Large numbers of adapters are uncommon on embedded systems
 ---
  networking/ifplugd.c | 11 ++++++++++-
  1 file changed, 10 insertions(+), 1 deletion(-)

recipes-core/busybox/busybox/zcip-allow-action-script-to-reject-chosen-IP.patch

@@ -13,6 +13,8 @@ delegate the complexity of this problem to the action script, by letting
 it reject the chosen IP by returning error 67 (ASCII 'C'). It is assumed
 that the action script has left the interface deconfigured.
 
+Upstream-Status: Inappropriate [NI specific]
+
 Signed-off-by: Richard Tollerton <[email protected]>
 ---
  networking/zcip.c | 11 ++++++++++-

recipes-core/busybox/files/ifplugd.action

@@ -10,9 +10,6 @@
 
 export INTERFACE=$1
 
-# If there are drivers that need priorities changed, do it
-update_driver_priorities
-
 case "$2" in
    up)
       # On link-up, we're not guaranteed to be on the same network as

recipes-core/glibc/glibc/cp936_support.patch → recipes-core/glibc/glibc/0001-glibc-add-cp936-support.patch

@@ -1,7 +1,11 @@
-From a78510f2e89476bd1405ff6ded58c45e65790db9 Mon Sep 17 00:00:00 2001
+From 04db7826a114d2a3f506155a22a781694549381c Mon Sep 17 00:00:00 2001
 From: Ben Shelton <[email protected]>
 Date: Fri, 19 Jun 2020 14:15:16 -0500
+Subject: [PATCH] glibc: add cp936 support
 
+Upstream-Status: Inappropriate [NI-specific]
+
+Signed-off-by: Alex Stewart <[email protected]>
 ---
  iconv/skeleton.c   |     4 +
  iconvdata/Makefile |     2 +-
@@ -10,10 +14,10 @@ Date: Fri, 19 Jun 2020 14:15:16 -0500
  create mode 100644 iconvdata/cp936.c
 
 diff --git a/iconv/skeleton.c b/iconv/skeleton.c
-index 1dc642e2fc..4c46b079db 100644
+index 9b74a3853c..003e997b3a 100644
 --- a/iconv/skeleton.c
 +++ b/iconv/skeleton.c
-@@ -168,6 +168,10 @@
+@@ -167,6 +167,10 @@
  # endif
  #endif
 
@@ -25,10 +29,10 @@ index 1dc642e2fc..4c46b079db 100644
  #ifndef MAX_NEEDED_FROM
  # define MAX_NEEDED_FROM	MIN_NEEDED_FROM
 diff --git a/iconvdata/Makefile b/iconvdata/Makefile
-index c83962f351..0015fde589 100644
+index ea019ce5c0..88602a05e5 100644
 --- a/iconvdata/Makefile
 +++ b/iconvdata/Makefile
-@@ -61,7 +61,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
+@@ -62,7 +62,7 @@ modules	:= ISO8859-1 ISO8859-2 ISO8859-3 ISO8859-4 ISO8859-5		 \
  	   IBM5347 IBM9030 IBM9066 IBM9448 IBM12712 IBM16804             \
  	   IBM1364 IBM1371 IBM1388 IBM1390 IBM1399 ISO_11548-1 MIK BRF	 \
  	   MAC-CENTRALEUROPE KOI8-RU ISO8859-9E				 \

recipes-core/glibc/glibc/cp936_charmap_support.patch → recipes-core/glibc/glibc/0002-glibc-add-CP936-charmap-and-zh_CN.CP936-locale.patch

@@ -1,29 +1,34 @@
-From 50acca0fba51a116e108b6549f4a88ce38d8ac80 Mon Sep 17 00:00:00 2001
+From 317d15193531d2beafaffcb7d8dff1f43951578f Mon Sep 17 00:00:00 2001
 From: Charlie Johnston <[email protected]>
 Date: Wed, 25 May 2022 10:37:37 -0500
-Subject: [PATCH] Adding CP936 charmap and zh_CN.CP936 locale. These are
- equivalent to the GBK charmap and zh_CN.GBK locale.
+Subject: [PATCH] glibc: add CP936 charmap and zh_CN.CP936 locale
+
+These are equivalent to the GBK charmap and zh_CN.GBK locale.
 
 Some NI Software expects that the charmap for Chinese language specifically
 be CP936. While this is equivalent to the GBK charmap, the naming appears
 to matter. This patch adds in a CP936 charmap and equivalent locale
 with the expected values.
 
 Upstream-Status: Inappropriate [NI-specific changes]
+
+Reapplied to glibc-2.39-22-g0244a37d2c.
+
+Signed-off-by: Alex Stewart <[email protected]>
 ---
  localedata/SUPPORTED      |     1 +
  localedata/charmaps/CP936 | 22037 ++++++++++++++++++++++++++++++++++++
  2 files changed, 22038 insertions(+)
  create mode 100644 localedata/charmaps/CP936
 
 diff --git a/localedata/SUPPORTED b/localedata/SUPPORTED
-index 1ee5b5e8c8..0bf665834d 100644
+index f3ea3267f3..c7efe08ae4 100644
 --- a/localedata/SUPPORTED
 +++ b/localedata/SUPPORTED
-@@ -475,6 +475,7 @@ yi_US/CP1255 \
- yo_NG/UTF-8 \
+@@ -485,6 +485,7 @@ yo_NG/UTF-8 \
  yue_HK/UTF-8 \
  yuw_PG/UTF-8 \
+ zgh_MA/UTF-8 \
 +zh_CN.CP936/CP936 \
  zh_CN.GB18030/GB18030 \
  zh_CN.GBK/GBK \
@@ -22071,6 +22076,3 @@ index 0000000000..a469702bee
 +WIDTH
 +<U4E02>...<UFA29> 2
 +END WIDTH
--- 
-2.30.2
-

recipes-core/glibc/glibc_2.%.bbappend

@@ -4,15 +4,15 @@ FILESEXTRAPATHS:prepend := "${THISDIR}:${THISDIR}/${PN}:"
 # Chinese support.
 #file://cp936-gconv-modules.patch
 SRC_URI =+ " \
-	file://cp936_support.patch \
 	file://gconv-modules-extra-remove-CP936-to-GBK-mapping.patch \
+	file://0001-glibc-add-cp936-support.patch \
 "
 
 # Add patches to build the ja_JP.WINDOWS-31J and zh_CN.CP936 locales for
 # LabVIEW Japanese and Chinese language support.
 SRC_URI =+ " \
 	file://windows-31j_support.patch \
-	file://cp936_charmap_support.patch \
+	file://0002-glibc-add-CP936-charmap-and-zh_CN.CP936-locale.patch \
 "
 
 # Add patch to alias custom LabVIEW locales to the equivalent

recipes-core/images/nilrt-base-system-image.bb

@@ -18,7 +18,7 @@ ROOTFS_IMAGE = "nilrt-runmode-rootfs"
 do_rootfs[depends] += "${ROOTFS_IMAGE}:do_image_complete"
 
 bootimg_fixup() {
-	install -m 0644 "${DEPLOY_DIR_IMAGE}/${ROOTFS_IMAGE}-${MACHINE}.tar.gz" "${IMAGE_ROOTFS}/data.tar.gz"
+	install -m 0644 "${DEPLOY_DIR_IMAGE}/${ROOTFS_IMAGE}-${MACHINE}.rootfs.tar.gz" "${IMAGE_ROOTFS}/data.tar.gz"
 	install -m 0755 "${THISDIR}/files/${BPN}.postinst" "${IMAGE_ROOTFS}/postinst"
 
 	# Remove everything that is not data.tar.gz nor the postinst

recipes-core/images/nilrt-recovery-media.bb

@@ -8,6 +8,8 @@ PACKAGE_INSTALL = "${ROOTFS_BOOTSTRAP_INSTALL} \
 
 IMAGE_FEATURES += "empty-root-password"
 
+IMAGE_INSTALL_NODEPS += "nirtcfg"
+
 DEPENDS += "init-restore-mode"
 
 INITRAMFS_MAXSIZE = "524288"
@@ -38,7 +40,7 @@ bootimg_fixup() {
 }
 
 symlink_iso () {
-	ln -sf ${PN}-${MACHINE}.wic ${DEPLOY_DIR_IMAGE}/${PN}-${MACHINE}.iso
+	ln -sf ${PN}-${MACHINE}.rootfs.wic ${DEPLOY_DIR_IMAGE}/${PN}-${MACHINE}.iso
 }
 
 ROOTFS_POSTPROCESS_COMMAND += "symlink_iso;"