mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-21 05:57:05 +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:
@@ -70,13 +70,13 @@ do_install:append() {
|
||||
|
||||
install -m 0755 -d ${D}${sysconfdir}
|
||||
install -m 0755 -d ${D}${sysconfdir}/lirc
|
||||
install -m 0644 ${WORKDIR}/lircd.conf ${D}${sysconfdir}/lirc/
|
||||
install -m 0644 ${WORKDIR}/lirc_options.conf ${D}${sysconfdir}/lirc/
|
||||
install -m 0644 ${UNPACKDIR}/lircd.conf ${D}${sysconfdir}/lirc/
|
||||
install -m 0644 ${UNPACKDIR}/lirc_options.conf ${D}${sysconfdir}/lirc/
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
install -m 0755 -d ${D}${systemd_unitdir}/system ${D}${libdir}/tmpfiles.d
|
||||
install -m 0644 ${WORKDIR}/lircd.service ${D}${systemd_unitdir}/system/
|
||||
install -m 0755 ${WORKDIR}/lircexec.init ${D}${systemd_unitdir}/system/
|
||||
install -m 0644 ${WORKDIR}/lirc.tmpfiles ${D}${libdir}/tmpfiles.d/lirc.conf
|
||||
install -m 0644 ${UNPACKDIR}/lircd.service ${D}${systemd_unitdir}/system/
|
||||
install -m 0755 ${UNPACKDIR}/lircexec.init ${D}${systemd_unitdir}/system/
|
||||
install -m 0644 ${UNPACKDIR}/lirc.tmpfiles ${D}${libdir}/tmpfiles.d/lirc.conf
|
||||
else
|
||||
rm -rf ${D}/lib
|
||||
fi
|
||||
|
||||
+4
-4
@@ -55,13 +55,13 @@ do_install:append(){
|
||||
|
||||
install -d ${D}${sysconfdir}/thingsboard-gateway/config
|
||||
|
||||
for file in $(find ${WORKDIR} -maxdepth 1 -type f -name *.json); do
|
||||
for file in $(find ${UNPACKDIR} -maxdepth 1 -type f -name *.json); do
|
||||
install -m 0644 "$file" ${D}${sysconfdir}/thingsboard-gateway/config
|
||||
done
|
||||
|
||||
install -m 0644 ${WORKDIR}/tb_gateway.yaml ${D}${sysconfdir}/thingsboard-gateway/config
|
||||
install -m 0644 ${WORKDIR}/logs.conf ${D}${sysconfdir}/thingsboard-gateway/config
|
||||
install -m 0644 ${UNPACKDIR}/tb_gateway.yaml ${D}${sysconfdir}/thingsboard-gateway/config
|
||||
install -m 0644 ${UNPACKDIR}/logs.conf ${D}${sysconfdir}/thingsboard-gateway/config
|
||||
|
||||
install -d ${D}${systemd_unitdir}/system/
|
||||
install -m 0644 ${WORKDIR}/thingsboard-gateway.service ${D}${systemd_system_unitdir}/thingsboard-gateway.service
|
||||
install -m 0644 ${UNPACKDIR}/thingsboard-gateway.service ${D}${systemd_system_unitdir}/thingsboard-gateway.service
|
||||
}
|
||||
|
||||
@@ -34,9 +34,9 @@ LDFLAGS:append:libc-musl = " -largp"
|
||||
|
||||
do_install:append() {
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon
|
||||
install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${WORKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system
|
||||
install -m 0644 ${UNPACKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system
|
||||
}
|
||||
|
||||
FILES:${PN} += "${sbindir}/rasdaemon \
|
||||
|
||||
+6
-6
@@ -14,17 +14,17 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir}
|
||||
install -m 0755 ${WORKDIR}/android-gadget-start ${D}${bindir}
|
||||
install -m 0755 ${WORKDIR}/android-gadget-cleanup ${D}${bindir}
|
||||
install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
|
||||
install -m 0755 ${UNPACKDIR}/android-gadget-start ${D}${bindir}
|
||||
install -m 0755 ${UNPACKDIR}/android-gadget-cleanup ${D}${bindir}
|
||||
|
||||
if [ -r ${WORKDIR}/android-gadget-setup.machine ] ; then
|
||||
if [ -r ${UNPACKDIR}/android-gadget-setup.machine ] ; then
|
||||
install -d ${D}${sysconfdir}
|
||||
install -m 0644 ${WORKDIR}/android-gadget-setup.machine ${D}${sysconfdir}
|
||||
install -m 0644 ${UNPACKDIR}/android-gadget-setup.machine ${D}${sysconfdir}
|
||||
fi
|
||||
|
||||
install -d ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
|
||||
install -m 0644 ${WORKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
|
||||
install -m 0644 ${UNPACKDIR}/10-adbd-configfs.conf ${D}${systemd_unitdir}/system/android-tools-adbd.service.d
|
||||
}
|
||||
|
||||
FILES:${PN} += " \
|
||||
|
||||
+1
-1
@@ -7,7 +7,7 @@ SRC_URI = "file://android-gadget-setup"
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${bindir}
|
||||
install -m 0755 ${WORKDIR}/android-gadget-setup ${D}${bindir}
|
||||
install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir}
|
||||
}
|
||||
|
||||
python () {
|
||||
|
||||
+1
-1
@@ -153,7 +153,7 @@ do_install() {
|
||||
fi
|
||||
|
||||
# Outside the if statement to avoid errors during do_package
|
||||
install -D -p -m0644 ${WORKDIR}/android-tools-adbd.service \
|
||||
install -D -p -m0644 ${UNPACKDIR}/android-tools-adbd.service \
|
||||
${D}${systemd_unitdir}/system/android-tools-adbd.service
|
||||
|
||||
install -d ${D}${libdir}/android/
|
||||
|
||||
Reference in New Issue
Block a user