[kirkstone][PATCH] podman: Rename podman-rootless.conf sysctl file to aid overrides


Andrei Gherzan
 

From: Andrei Gherzan <andrei.gherzan@...>

Files are sorted in lexicographic order. Moving podman-rootless.conf to
something greater then '00' would help with systems providing default
values in other configuration files that can be overridden by
podman-rootless.conf.

Signed-off-by: Andrei Gherzan <andrei.gherzan@...>
---
.../{00-podman-rootless.conf => 50-podman-rootless.conf} | 0
recipes-containers/podman/podman_git.bb | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename recipes-containers/podman/podman/{00-podman-rootless.conf => 50-podman-rootless.conf} (100%)

diff --git a/recipes-containers/podman/podman/00-podman-rootless.conf b/recipes-containers/podman/podman/50-podman-rootless.conf
similarity index 100%
rename from recipes-containers/podman/podman/00-podman-rootless.conf
rename to recipes-containers/podman/podman/50-podman-rootless.conf
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index e155c7b..aedb988 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -22,7 +22,7 @@ SRC_URI = " \
git://github.com/containers/libpod.git;branch=v4.0;protocol=https \
file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \
file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \
- ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://00-podman-rootless.conf', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \
"

LICENSE = "Apache-2.0"
@@ -105,7 +105,7 @@ do_install() {

if ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'true', 'false', d)}; then
install -d "${D}${sysconfdir}/sysctl.d"
- install -m 0644 "${WORKDIR}/00-podman-rootless.conf" "${D}${sysconfdir}/sysctl.d"
+ install -m 0644 "${WORKDIR}/50-podman-rootless.conf" "${D}${sysconfdir}/sysctl.d"
fi
}

--
2.25.1


Bruce Ashfield
 

merged to kirkstone.

Bruce


In message: [meta-virtualization][kirkstone][PATCH] podman: Rename podman-rootless.conf sysctl file to aid overrides
on 25/08/2022 Andrei Gherzan wrote:

From: Andrei Gherzan <andrei.gherzan@...>

Files are sorted in lexicographic order. Moving podman-rootless.conf to
something greater then '00' would help with systems providing default
values in other configuration files that can be overridden by
podman-rootless.conf.

Signed-off-by: Andrei Gherzan <andrei.gherzan@...>
---
.../{00-podman-rootless.conf => 50-podman-rootless.conf} | 0
recipes-containers/podman/podman_git.bb | 4 ++--
2 files changed, 2 insertions(+), 2 deletions(-)
rename recipes-containers/podman/podman/{00-podman-rootless.conf => 50-podman-rootless.conf} (100%)

diff --git a/recipes-containers/podman/podman/00-podman-rootless.conf b/recipes-containers/podman/podman/50-podman-rootless.conf
similarity index 100%
rename from recipes-containers/podman/podman/00-podman-rootless.conf
rename to recipes-containers/podman/podman/50-podman-rootless.conf
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index e155c7b..aedb988 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -22,7 +22,7 @@ SRC_URI = " \
git://github.com/containers/libpod.git;branch=v4.0;protocol=https \
file://0001-Rename-BUILDFLAGS-to-GOBUILDFLAGS.patch;patchdir=src/import \
file://0002-Define-ActKillThread-equal-to-ActKill.patch;patchdir=src/import/vendor/github.com/seccomp/libseccomp-golang \
- ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://00-podman-rootless.conf', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'file://50-podman-rootless.conf', '', d)} \
"

LICENSE = "Apache-2.0"
@@ -105,7 +105,7 @@ do_install() {

if ${@bb.utils.contains('PACKAGECONFIG', 'rootless', 'true', 'false', d)}; then
install -d "${D}${sysconfdir}/sysctl.d"
- install -m 0644 "${WORKDIR}/00-podman-rootless.conf" "${D}${sysconfdir}/sysctl.d"
+ install -m 0644 "${WORKDIR}/50-podman-rootless.conf" "${D}${sysconfdir}/sysctl.d"
fi
}

--
2.25.1