From d2bb7ec7d7c72d993e9f02f9d2a57d36834d7f9e 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 | 8 --------
1 file changed, 8 deletions(-)
diff --git a/meta-oniro-core/recipes-containers/podman/podman_%.bbappend b/meta-oniro-core/recipes-containers/podman/podman_%.bbappend
index 351bdb96..469490a9 100644
--- a/meta-oniro-core/recipes-containers/podman/podman_%.bbappend
+++ b/meta-oniro-core/recipes-containers/podman/podman_%.bbappend
@@ -6,11 +6,3 @@ 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