mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +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:
@@ -11,7 +11,7 @@ SRC_URI = "svn://www.streamboard.tv/svn/oscam;module=trunk;protocol=http \
|
||||
SRCREV = "11718"
|
||||
PV = "1.10+"
|
||||
|
||||
S = "${WORKDIR}/trunk"
|
||||
S = "${UNPACKDIR}/trunk"
|
||||
|
||||
inherit cmake
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ do_install() {
|
||||
chmod a+rx ${D}/${libdir}/*.so*
|
||||
cp -R --no-dereference --preserve=mode,links ${S}/util/szap/channels-conf* ${D}/${docdir}/dvb-apps/szap/
|
||||
cp -R --no-dereference --preserve=mode,links ${S}/util/szap/README ${D}/${docdir}/dvb-apps/szap/
|
||||
cp -R --no-dereference --preserve=mode,links ${WORKDIR}/dvb-scan-table/* ${D}/usr/share/dvb
|
||||
cp -R --no-dereference --preserve=mode,links ${UNPACKDIR}/dvb-scan-table/* ${D}/usr/share/dvb
|
||||
}
|
||||
|
||||
PACKAGES =+ "dvb-evtest dvb-evtest-dbg \
|
||||
|
||||
@@ -15,5 +15,5 @@ inherit autotools lib_package pkgconfig
|
||||
|
||||
do_install:append() {
|
||||
install -D -m 0644 ${S}/src/dvbcsa/dvbcsa.h ${D}${includedir}/dvbcsa/dvbcsa.h
|
||||
install -D -m 0644 ${WORKDIR}/libdvbcsa.pc ${D}${libdir}/pkgconfig/libdvbcsa.pc
|
||||
install -D -m 0644 ${UNPACKDIR}/libdvbcsa.pc ${D}${libdir}/pkgconfig/libdvbcsa.pc
|
||||
}
|
||||
|
||||
@@ -28,11 +28,11 @@ do_install:append(){
|
||||
|
||||
# Systemd script
|
||||
install -d ${D}${nonarch_base_libdir}/systemd/system
|
||||
install -m 0755 ${WORKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system
|
||||
install -m 0755 ${UNPACKDIR}/minidlna.service ${D}${nonarch_base_libdir}/systemd/system
|
||||
|
||||
# Sysvinit script
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
install -m 0755 ${WORKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna
|
||||
install -m 0755 ${UNPACKDIR}/minidlna-daemon.init.d ${D}${sysconfdir}/init.d/minidlna
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -76,7 +76,7 @@ do_install:append() {
|
||||
${D}/${localstatedir}/lib/mpd/music
|
||||
|
||||
install -d ${D}/${sysconfdir}
|
||||
install -m 644 ${WORKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf
|
||||
install -m 644 ${UNPACKDIR}/mpd.conf.in ${D}/${sysconfdir}/mpd.conf
|
||||
sed -i \
|
||||
-e 's|%music_directory%|${localstatedir}/lib/mpd/music|' \
|
||||
-e 's|%playlist_directory%|${localstatedir}/lib/mpd/playlists|' \
|
||||
|
||||
@@ -33,17 +33,17 @@ do_install() {
|
||||
rm -r ${D}${libdir}/mycroft/.git
|
||||
|
||||
# Install the dev opts so it doesn't ask us on initial setup.
|
||||
install -m 644 ${WORKDIR}/dev_opts.json ${D}${libdir}/mycroft/.dev_opts.json
|
||||
install -m 644 ${UNPACKDIR}/dev_opts.json ${D}${libdir}/mycroft/.dev_opts.json
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
install -m 644 ${WORKDIR}/mycroft-setup.service ${D}${systemd_unitdir}/system
|
||||
install -m 644 ${UNPACKDIR}/mycroft-setup.service ${D}${systemd_unitdir}/system
|
||||
sed -i -e 's,@LIBDIR@,${libdir},g' ${D}${systemd_unitdir}/system/mycroft-setup.service
|
||||
fi
|
||||
|
||||
if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
|
||||
install -d ${D}${systemd_unitdir}/system
|
||||
install -m 644 ${WORKDIR}/mycroft.service ${D}${systemd_unitdir}/system
|
||||
install -m 644 ${UNPACKDIR}/mycroft.service ${D}${systemd_unitdir}/system
|
||||
sed -i -e 's,@LIBDIR@,${libdir},g' ${D}${systemd_unitdir}/system/mycroft.service
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ inherit allarch
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${datadir}/movies
|
||||
install -m 0644 ${WORKDIR}/big_buck_bunny_1080p_surround.avi ${D}${datadir}/movies/
|
||||
install -m 0644 ${UNPACKDIR}/big_buck_bunny_1080p_surround.avi ${D}${datadir}/movies/
|
||||
}
|
||||
|
||||
FILES:${PN} += "${datadir}/movies"
|
||||
|
||||
@@ -11,7 +11,7 @@ inherit allarch
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${datadir}/movies
|
||||
install -m 0644 ${WORKDIR}/big_buck_bunny_480p_surround-fix.avi ${D}${datadir}/movies/
|
||||
install -m 0644 ${UNPACKDIR}/big_buck_bunny_480p_surround-fix.avi ${D}${datadir}/movies/
|
||||
}
|
||||
|
||||
FILES:${PN} += "${datadir}/movies"
|
||||
|
||||
@@ -11,7 +11,7 @@ inherit allarch
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${datadir}/movies
|
||||
install -m 0644 ${WORKDIR}/big_buck_bunny_720p_surround.avi ${D}${datadir}/movies/
|
||||
install -m 0644 ${UNPACKDIR}/big_buck_bunny_720p_surround.avi ${D}${datadir}/movies/
|
||||
}
|
||||
|
||||
FILES:${PN} += "${datadir}/movies"
|
||||
|
||||
@@ -10,7 +10,7 @@ inherit allarch
|
||||
|
||||
do_install() {
|
||||
install -d ${D}${datadir}/movies
|
||||
install -m 0644 ${WORKDIR}/ToS-4k-1920.mov ${D}${datadir}/movies/
|
||||
install -m 0644 ${UNPACKDIR}/ToS-4k-1920.mov ${D}${datadir}/movies/
|
||||
}
|
||||
|
||||
FILES:${PN} += "${datadir}/movies"
|
||||
|
||||
@@ -54,7 +54,7 @@ WP_MODULE_SUBDIR = "wireplumber-0.5"
|
||||
|
||||
do_install:append() {
|
||||
if ${@bb.utils.contains('PACKAGECONFIG', 'dbus', 'false', 'true', d)}; then
|
||||
install -m 0644 ${WORKDIR}/90-OE-disable-session-dbus-dependent-features.lua ${D}${datadir}/wireplumber/main.lua.d
|
||||
install -m 0644 ${UNPACKDIR}/90-OE-disable-session-dbus-dependent-features.lua ${D}${datadir}/wireplumber/main.lua.d
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user