mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-17 04:37:19 +00:00
recipes: Start WORKDIR -> UNPACKDIR transition
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: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
@@ -193,7 +193,7 @@ do_install:append() {
|
||||
chmod 4750 ${D}${libexecdir}/cockpit-session
|
||||
|
||||
install -d "${D}${sysconfdir}/pam.d"
|
||||
install -p -m 0644 ${WORKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit
|
||||
install -p -m 0644 ${UNPACKDIR}/cockpit.pam ${D}${sysconfdir}/pam.d/cockpit
|
||||
|
||||
# provided by firewalld
|
||||
rm -rf ${D}${libdir}/firewalld
|
||||
|
||||
@@ -55,13 +55,13 @@ do_install:append() {
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
|
||||
# Install systemd unit files
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${WORKDIR}/netdata.service ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${UNPACKDIR}/netdata.service ${D}${systemd_unitdir}/system
|
||||
sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service
|
||||
fi
|
||||
|
||||
# Install default netdata.conf
|
||||
install -d ${D}${sysconfdir}/netdata
|
||||
install -m 0644 ${WORKDIR}/netdata.conf ${D}${sysconfdir}/netdata/
|
||||
install -m 0644 ${UNPACKDIR}/netdata.conf ${D}${sysconfdir}/netdata/
|
||||
sed -i -e 's,@@sysconfdir,${sysconfdir},g' ${D}${sysconfdir}/netdata/netdata.conf
|
||||
sed -i -e 's,@@libdir,${libexecdir},g' ${D}${sysconfdir}/netdata/netdata.conf
|
||||
sed -i -e 's,@@datadir,${datadir},g' ${D}${sysconfdir}/netdata/netdata.conf
|
||||
|
||||
@@ -82,7 +82,7 @@ do_install() {
|
||||
install -m 0755 webmin-init ${D}${sysconfdir}/init.d/webmin
|
||||
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${WORKDIR}/webmin.service ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${UNPACKDIR}/webmin.service ${D}${systemd_unitdir}/system
|
||||
sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \
|
||||
${D}${systemd_unitdir}/system/webmin.service
|
||||
|
||||
@@ -117,7 +117,7 @@ do_install() {
|
||||
export atboot=1
|
||||
export no_pam=1
|
||||
mkdir -p $tempdir
|
||||
${S}/../setup.sh
|
||||
${UNPACKDIR}/setup.sh
|
||||
|
||||
# Ensure correct PERLLIB path
|
||||
sed -i -e 's#${D}##g' ${D}${sysconfdir}/webmin/start
|
||||
|
||||
Reference in New Issue
Block a user