From 33430eff038b232ed6ddb851ede1c800825b1605 Mon Sep 17 00:00:00 2001
From: Marta Rybczynska <marta.rybczynska@huawei.com>
Date: Fri, 30 Sep 2022 10:30:10 +0200
Subject: [PATCH] oniro-linux.conf: remove uneeded workaround

Remove a workaround for openssh-dropbear conflict [1] included locally.
It has been added to kirkstone proper.

[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=14858

Signed-off-by: Marta Rybczynska <marta.rybczynska@huawei.com>
---
 meta-oniro-core/conf/distro/oniro-linux.conf | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/meta-oniro-core/conf/distro/oniro-linux.conf b/meta-oniro-core/conf/distro/oniro-linux.conf
index f67d6716..8e6c27bb 100644
--- a/meta-oniro-core/conf/distro/oniro-linux.conf
+++ b/meta-oniro-core/conf/distro/oniro-linux.conf
@@ -113,9 +113,6 @@ ROOTFS_RO_UNNEEDED:remove = "shadow"
 # Set default hostname to reflect the DISTRO
 hostname:pn-base-files = "${DISTRO}-${MACHINE}"
 
-# Workaround for https://bugzilla.yoctoproject.org/show_bug.cgi?id=14858
-PACKAGE_EXCLUDE_COMPLEMENTARY:append = " openssh"
-
 #
 # Add support for Raspberry Pi 4 (64) in the Raspberry Pi 4 (64) builds.
 #
-- 
GitLab