From 402ccba804bb2491886a2086214b4c8a3275e25c Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Thu, 29 Apr 2021 12:12:47 +0200
Subject: [PATCH] systemd-conf: drop no longer needed bbappend for systemd-conf
This change has been upstreamed and backported. With our latest sync to
the dunfell branch we no longer need this.
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
.../recipes-core/systemd-conf/files/wired.network | 11 -----------
.../recipes-core/systemd-conf/systemd-conf_%.bbappend | 9 ---------
2 files changed, 20 deletions(-)
delete mode 100644 meta-ohos-core/recipes-core/systemd-conf/files/wired.network
delete mode 100644 meta-ohos-core/recipes-core/systemd-conf/systemd-conf_%.bbappend
diff --git a/meta-ohos-core/recipes-core/systemd-conf/files/wired.network b/meta-ohos-core/recipes-core/systemd-conf/files/wired.network
deleted file mode 100644
index 34c20fcb..00000000
--- a/meta-ohos-core/recipes-core/systemd-conf/files/wired.network
+++ /dev/null
@@ -1,11 +0,0 @@
-[Match]
-Name=en* eth*
-KernelCommandLine=!nfsroot
-KernelCommandLine=!ip
-
-[Network]
-DHCP=yes
-
-[DHCP]
-RouteMetric=10
-ClientIdentifier=mac
diff --git a/meta-ohos-core/recipes-core/systemd-conf/systemd-conf_%.bbappend b/meta-ohos-core/recipes-core/systemd-conf/systemd-conf_%.bbappend
deleted file mode 100644
index f11b8b19..00000000
--- a/meta-ohos-core/recipes-core/systemd-conf/systemd-conf_%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-do_install_append_qemuall() {
- install -D -m0644 ${WORKDIR}/wired.network ${D}${systemd_unitdir}/network/80-wired.network
-}
--
GitLab