Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initial kirkstone support changes #70

Merged
merged 12 commits into from
Oct 25, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conf/layer.conf
Original file line number Diff line number Diff line change
@@ -10,4 +10,4 @@ BBFILE_PATTERN_raspberrypi4 = "^${LAYERDIR}/"
BBFILE_PRIORITY_raspberrypi4 = "6"

LAYERDEPENDS_raspberrypi4 = "core"
LAYERSERIES_COMPAT_raspberrypi4 = "dunfell"
LAYERSERIES_COMPAT_raspberrypi4 = "kirkstone"
1 change: 1 addition & 0 deletions conf/machine/include/preferred_provider.inc
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@ PREFERRED_PROVIDER_virtual/vendor-pwrmgr-hal = "pwrmgr-hal-raspberrypi4"
PREFERRED_PROVIDER_virtual/vendor-deepsleepmgr-hal = "deepsleepmgr-hal-raspberrypi4"
PREFERRED_PROVIDER_virtual/mfrlib = "mfrlibs-hal-raspberrypi4"
PREFERRED_PROVIDER_virtual/vendor-hdmicec-hal = "hdmicec-hal-raspberrypi4"
PREFERRED_PROVIDER_virtual/vendor-tvsettings-hal = "tvsettings-hal-noop"

#Temp add media-utils as provider for vendor-media-utils, to be re-worked if hal changes are required.
PREFERRED_PROVIDER_virtual/vendor-media-utils = "media-utils"
25 changes: 14 additions & 11 deletions conf/machine/include/product.inc
Original file line number Diff line number Diff line change
@@ -14,37 +14,40 @@ TCLIBCAPPEND = ""
#MACHINEOVERRIDES .= ":arm"

# This override is needed for systemd 2.30 patches to get applied. Refer RDKCentral jira RDKE-12
MACHINEOVERRIDES .= ":dunfell"
DISTRO_FEATURES_append = " dunfell"
MACHINEOVERRIDES .= ":kirkstone"
DISTRO_FEATURES:append = " kirkstone"

require conf/multilib.conf
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "armv7athf-neon-vfpv4"
DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon-vfpv4"

# Enable Syslog-ng
DISTRO_FEATURES_append = " syslog-ng"
DISTRO_FEATURES:append = " syslog-ng"

# Enabling this to solve syslog-ng packaging issue. Refer RDKCentral jira RDKE-14
DISTRO_FEATURES_append = " systemd"
DISTRO_FEATURES:append = " systemd"
DISTRO_FEATURES_BACKFILL_CONSIDERED += "sysvinit"
VIRTUAL-RUNTIME_init_manager = "systemd"
VIRTUAL-RUNTIME_initscripts = "systemd-compat-units"
# This distro is used in westeros recipes
DISTRO_FEATURES_append = " rdkshell"
DISTRO_FEATURES:append = " rdkshell"

# Middleware layer requirements.
DOBBY_DEVICESETTINGS_FILE = "dobby.generic.json"

# Upstream meta-raspberrypi kirkstone branch has "vc4-kms-v3d". Ref RDKVREFPLT-1977
VC4DTBO = "vc4-fkms-v3d"

# Platform does not have SVP support
DISTRO_FEATURES_remove = " rdk_svp"
DISTRO_FEATURES:remove = " rdk_svp"

## Move to common middleware configuration when its ready. Refer Comcast Jira: RDK-50625
# To remove SecAPI dependency.
DISTRO_FEATURES_append = " enable_icrypto_openssl open-middleware"
DISTRO_FEATURES:append = " enable_icrypto_openssl open-middleware"

# To remove rdkfwupgrade package dependency
DISTRO_FEATURES_remove = "enable_maintenance_manager ctrlm"
DISTRO_FEATURES:remove = "enable_maintenance_manager ctrlm"

# RDK-52444: Temporarily remove the SECUIRTY_CFLAGS -fstackprotector and fortify source
SECURITY_CFLAGS_remove = " -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wno-error=format-security -Wno-error=unused-result"
SECURITY_LDFLAGS_remove = " -fstack-protector"
SECURITY_CFLAGS:remove = " -fstack-protector -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Wno-error=format-security -Wno-error=unused-result"
SECURITY_LDFLAGS:remove = " -fstack-protector"