From c7c374bc98fc150f0132aaf5fb28a72f272190b5 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Mon, 29 Aug 2022 06:07:44 +0000
Subject: [PATCH] podman: Drop upstreamed changed
Patch has been merged upstream:
* 6063ad1 : podman: Rename podman-rootless.conf sysctl file to aid
overrides - Andrei Gherzan
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
.../recipes-containers/podman/podman_%.bbappend | 16 ----------------
1 file changed, 16 deletions(-)
delete mode 100644 meta-oniro-core/recipes-containers/podman/podman_%.bbappend
diff --git a/meta-oniro-core/recipes-containers/podman/podman_%.bbappend b/meta-oniro-core/recipes-containers/podman/podman_%.bbappend
deleted file mode 100644
index 351bdb96..00000000
--- a/meta-oniro-core/recipes-containers/podman/podman_%.bbappend
+++ /dev/null
@@ -1,16 +0,0 @@
-# SPDX-FileCopyrightText: Huawei Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-
-inherit writables
-
-WRITABLES = "rootuser-netconfig"
-WRITABLE_PATH[rootuser-netconfig] = "/etc/cni/net.d"
-
-do_install:append() {
- if ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'true', 'false', d)}; then
- # Make sure that the Oniro defaults gets overridden by this.
- mv "${D}${sysconfdir}/sysctl.d/00-podman-rootless.conf" \
- "${D}${sysconfdir}/sysctl.d/50-podman-rootless.conf"
- fi
-}
--
GitLab