[meta-virtualization] [meta-cloud-services] [PATCH] nss-pam-ldapd: Start WORKDIR -> UNPACKDIR transition

[meta-virtualization] [meta-cloud-services] [PATCH] nss-pam-ldapd: Start WORKDIR -> UNPACKDIR transition

[wangmy]

From: Wang Mingyu <wangmy@fujitsu.com>

Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb
index 7f3b9e38..582f7592 100644
--- a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb
+++ b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb
@@ -43,14 +43,14 @@ FILES:${PN}-dbg += "${base_libdir}/security/.debug"
 LDAP_DN ?= "dc=my-domain,dc=com"
 
 do_install:append() {
-	install -D -m 0755 ${WORKDIR}/nslcd.init ${D}${sysconfdir}/init.d/nslcd
+	install -D -m 0755 ${UNPACKDIR}/nslcd.init ${D}${sysconfdir}/init.d/nslcd
 
 	sed -i -e 's/^uid nslcd/# uid nslcd/;' ${D}${sysconfdir}/nslcd.conf
 	sed -i -e 's/^gid nslcd/# gid nslcd/;' ${D}${sysconfdir}/nslcd.conf
 	sed -i -e 's/^base dc=example,dc=com/base ${LDAP_DN}/;' ${D}${sysconfdir}/nslcd.conf
 
 	install -d ${D}${systemd_unitdir}/system
-	install -m 0644 ${WORKDIR}/nslcd.service ${D}${systemd_unitdir}/system
+	install -m 0644 ${UNPACKDIR}/nslcd.service ${D}${systemd_unitdir}/system
 }
 
 inherit update-rc.d systemd
-- 
2.34.1

[meta-virtualization] [PATCH 1/2] lxc: Start WORKDIR -> UNPACKDIR transition

[wangmy]

From: Wang Mingyu <wangmy@fujitsu.com>

Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 recipes-containers/lxc/lxc_git.bb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
index ee0e442f..550f910e 100644
--- a/recipes-containers/lxc/lxc_git.bb
+++ b/recipes-containers/lxc/lxc_git.bb
@@ -161,12 +161,12 @@ do_install:append() {
 	# /etc/default/lxc sources lxc-net, this allows lxc bridge when lxc-networking
 	# is not installed this results in no lxcbr0, but when lxc-networking is installed
 	# lxcbr0 will be fully configured.
-	install -m 644 ${WORKDIR}/lxc-net ${D}${sysconfdir}/default/
+	install -m 644 ${UNPACKDIR}/lxc-net ${D}${sysconfdir}/default/
 
 	# Force the main dnsmasq instance to bind only to specified interfaces and
 	# to not bind to virbr0. Libvirt will run its own instance on this interface.
 	install -d ${D}/${sysconfdir}/dnsmasq.d
-	install -m 644 ${WORKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/lxc
+	install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/lxc
 }
 
 EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests"
-- 
2.34.1

Re: [meta-virtualization] [PATCH 1/2] lxc: Start WORKDIR -> UNPACKDIR transition

[Bruce Ashfield]

Double check your tree.

These conversions have been done some time ago.

Bruce

On Mon, Jun 17, 2024 at 4:13 AM wangmy via lists.yoctoproject.org
<wangmy=fujitsu.com@lists.yoctoproject.org> wrote:
>
> From: Wang Mingyu <wangmy@fujitsu.com>
>
> Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR.
>
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  recipes-containers/lxc/lxc_git.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes-containers/lxc/lxc_git.bb b/recipes-containers/lxc/lxc_git.bb
> index ee0e442f..550f910e 100644
> --- a/recipes-containers/lxc/lxc_git.bb
> +++ b/recipes-containers/lxc/lxc_git.bb
> @@ -161,12 +161,12 @@ do_install:append() {
>         # /etc/default/lxc sources lxc-net, this allows lxc bridge when lxc-networking
>         # is not installed this results in no lxcbr0, but when lxc-networking is installed
>         # lxcbr0 will be fully configured.
> -       install -m 644 ${WORKDIR}/lxc-net ${D}${sysconfdir}/default/
> +       install -m 644 ${UNPACKDIR}/lxc-net ${D}${sysconfdir}/default/
>
>         # Force the main dnsmasq instance to bind only to specified interfaces and
>         # to not bind to virbr0. Libvirt will run its own instance on this interface.
>         install -d ${D}/${sysconfdir}/dnsmasq.d
> -       install -m 644 ${WORKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/lxc
> +       install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}/${sysconfdir}/dnsmasq.d/lxc
>  }
>
>  EXTRA_OEMAKE += "TEST_DIR=${D}${PTEST_PATH}/src/tests"
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8799): https://lists.yoctoproject.org/g/meta-virtualization/message/8799
> Mute This Topic: https://lists.yoctoproject.org/mt/106717040/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>


-- 
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II

[meta-virtualization] [PATCH 2/2] openvswitch: Start WORKDIR -> UNPACKDIR transition

[wangmy]

From: Wang Mingyu <wangmy@fujitsu.com>

Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR.

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
 recipes-networking/openvswitch/openvswitch.inc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes-networking/openvswitch/openvswitch.inc b/recipes-networking/openvswitch/openvswitch.inc
index 767a41e6..a792a903 100644
--- a/recipes-networking/openvswitch/openvswitch.inc
+++ b/recipes-networking/openvswitch/openvswitch.inc
@@ -104,13 +104,13 @@ do_install:prepend() {
 
 do_install:append() {
 	install -d ${D}/${sysconfdir}/default/
-	install -m 660 ${WORKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch
+	install -m 660 ${UNPACKDIR}/openvswitch-switch-setup ${D}/${sysconfdir}/default/openvswitch-switch
 	install -d ${D}/${sysconfdir}/openvswitch-testcontroller
-	install -m 660 ${WORKDIR}/openvswitch-testcontroller-setup ${D}/${sysconfdir}/default/openvswitch-testcontroller
+	install -m 660 ${UNPACKDIR}/openvswitch-testcontroller-setup ${D}/${sysconfdir}/default/openvswitch-testcontroller
 
 	install -d ${D}/${sysconfdir}/init.d/
-	install -m 755 ${WORKDIR}/openvswitch-testcontroller ${D}/${sysconfdir}/init.d/openvswitch-testcontroller
-	install -m 755 ${WORKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch
+	install -m 755 ${UNPACKDIR}/openvswitch-testcontroller ${D}/${sysconfdir}/init.d/openvswitch-testcontroller
+	install -m 755 ${UNPACKDIR}/openvswitch-switch ${D}/${sysconfdir}/init.d/openvswitch-switch
 	true || rm -fr ${D}/${datadir}/${PN}/pki
 
 	install -d ${D}/${sysconfdir}/sysconfig
-- 
2.34.1

Re: [meta-virtualization] [meta-cloud-services] [PATCH] nss-pam-ldapd: Start WORKDIR -> UNPACKDIR transition

[Bruce Ashfield]

merged!

Bruce

In message: [meta-virtualization] [meta-cloud-services] [PATCH] nss-pam-ldapd: Start WORKDIR -> UNPACKDIR transition
on 17/06/2024 wangmy via lists.yoctoproject.org wrote:

> From: Wang Mingyu <wangmy@fujitsu.com>
> 
> Replace references of WORKDIR with UNPACKDIR where it makes sense to do so in preparation for changing the default value of UNPACKDIR.
> 
> Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
> ---
>  recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb
> index 7f3b9e38..582f7592 100644
> --- a/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb
> +++ b/recipes-support/nss-pam-ldapd/nss-pam-ldapd_0.9.12.bb
> @@ -43,14 +43,14 @@ FILES:${PN}-dbg += "${base_libdir}/security/.debug"
>  LDAP_DN ?= "dc=my-domain,dc=com"
>  
>  do_install:append() {
> -	install -D -m 0755 ${WORKDIR}/nslcd.init ${D}${sysconfdir}/init.d/nslcd
> +	install -D -m 0755 ${UNPACKDIR}/nslcd.init ${D}${sysconfdir}/init.d/nslcd
>  
>  	sed -i -e 's/^uid nslcd/# uid nslcd/;' ${D}${sysconfdir}/nslcd.conf
>  	sed -i -e 's/^gid nslcd/# gid nslcd/;' ${D}${sysconfdir}/nslcd.conf
>  	sed -i -e 's/^base dc=example,dc=com/base ${LDAP_DN}/;' ${D}${sysconfdir}/nslcd.conf
>  
>  	install -d ${D}${systemd_unitdir}/system
> -	install -m 0644 ${WORKDIR}/nslcd.service ${D}${systemd_unitdir}/system
> +	install -m 0644 ${UNPACKDIR}/nslcd.service ${D}${systemd_unitdir}/system
>  }
>  
>  inherit update-rc.d systemd
> -- 
> 2.34.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#8798): https://lists.yoctoproject.org/g/meta-virtualization/message/8798
> Mute This Topic: https://lists.yoctoproject.org/mt/106717039/1050810
> Group Owner: meta-virtualization+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [bruce.ashfield@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>