diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-04-30 14:23:37 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-05-02 15:15:51 +0100 |
commit | 0ea63b6a439fe97f840c69d08cf381687baaae3f (patch) | |
tree | c632ba15d6b67617859f335fe9263930cbf1a0fa /meta/recipes-extended/shadow | |
parent | 3288587aeb009fb65652776242c0a526b90771e2 (diff) | |
download | poky-0ea63b6a439fe97f840c69d08cf381687baaae3f.tar.gz |
recipes: Update WORKDIR references to UNPACKDIR
Since we want to be able to stop unpacking to WORKDIR, correct the WORKDIR
references in recipe do_compile/do_install tasks to use UNPACKDIR in the
appropraite places instead.
(From OE-Core rev: d73595df69667fe9d12ecd407b77a0b8dae2109c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/shadow')
-rw-r--r-- | meta/recipes-extended/shadow/shadow.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-extended/shadow/shadow.inc b/meta/recipes-extended/shadow/shadow.inc index c15715fc77..25930b64c1 100644 --- a/meta/recipes-extended/shadow/shadow.inc +++ b/meta/recipes-extended/shadow/shadow.inc | |||
@@ -111,7 +111,7 @@ do_install() { | |||
111 | sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs | 111 | sed -i 's/^#ENCRYPT_METHOD.*$/ENCRYPT_METHOD SHA512/' ${D}${sysconfdir}/login.defs |
112 | 112 | ||
113 | install -d ${D}${sysconfdir}/default | 113 | install -d ${D}${sysconfdir}/default |
114 | install -m 0644 ${WORKDIR}/useradd ${D}${sysconfdir}/default | 114 | install -m 0644 ${UNPACKDIR}/useradd ${D}${sysconfdir}/default |
115 | } | 115 | } |
116 | 116 | ||
117 | do_install:append() { | 117 | do_install:append() { |
@@ -121,11 +121,11 @@ do_install:append() { | |||
121 | install -m 0775 -d ${D}${localstatedir}/spool/mail | 121 | install -m 0775 -d ${D}${localstatedir}/spool/mail |
122 | chown root:mail ${D}${localstatedir}/spool/mail | 122 | chown root:mail ${D}${localstatedir}/spool/mail |
123 | 123 | ||
124 | if [ -e ${WORKDIR}/pam.d ]; then | 124 | if [ -e ${UNPACKDIR}/pam.d ]; then |
125 | install -d ${D}${sysconfdir}/pam.d/ | 125 | install -d ${D}${sysconfdir}/pam.d/ |
126 | install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ | 126 | install -m 0644 ${UNPACKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ |
127 | # Remove defaults that are not used when supporting PAM. | 127 | # Remove defaults that are not used when supporting PAM. |
128 | sed -i -f ${WORKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs | 128 | sed -i -f ${UNPACKDIR}/login_defs_pam.sed ${D}${sysconfdir}/login.defs |
129 | fi | 129 | fi |
130 | 130 | ||
131 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} | 131 | install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir} |