Don't hardcode path

meta-skeleton/recipes-skeleton/service/service_0.1.bb

@@ -15,10 +15,10 @@ do_compile () {
 do_install () {
 	install -d ${D}${sysconfdir}/init.d
 	cat ${WORKDIR}/skeleton | \
-	  sed -e 's,/etc,${sysconfdir},g' \
-	      -e 's,/usr/sbin,${sbindir},g' \
+	  sed -e 's,${sysconfdir},${sysconfdir},g' \
+	      -e 's,${sbindir},${sbindir},g' \
 	      -e 's,/var,${localstatedir},g' \
-	      -e 's,/usr/bin,${bindir},g' \
+	      -e 's,${bindir},${bindir},g' \
 	      -e 's,/usr,${prefix},g' > ${D}${sysconfdir}/init.d/skeleton
 	chmod a+x ${D}${sysconfdir}/init.d/skeleton
 

meta/recipes-bsp/acpid/acpid.inc

@@ -20,7 +20,7 @@ SYSTEMD_SERVICE_${PN} = "acpid.service"
 
 do_install_append () {
 	install -d ${D}${sysconfdir}/init.d
-	sed -e 's,/usr/sbin,${sbindir},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/acpid
+	sed -e 's,${sbindir},${sbindir},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/acpid
 	chmod 755 ${D}${sysconfdir}/init.d/acpid
 
 	install -d ${D}${sysconfdir}/acpi

meta/recipes-bsp/apmd/apmd_3.2.2-15.bb

@@ -70,7 +70,7 @@ do_install() {
 	oe_libinstall -so libapm ${D}${libdir}
 	install -m 0644 apm.h ${D}${includedir}
 
-	sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/apmd
+	sed -e 's,${sbindir},${sbindir},g; s,${sysconfdir},${sysconfdir},g;' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/apmd
 	chmod 755 ${D}${sysconfdir}/init.d/apmd
 
 	install -d ${D}${systemd_unitdir}/system

meta/recipes-connectivity/bind/bind_9.11.5-P4.bb

@@ -81,7 +81,7 @@ do_install_append() {
 	install -m 644 ${S}/conf/* "${D}${sysconfdir}/bind/"
 	install -m 755 "${S}/init.d" "${D}${sysconfdir}/init.d/bind"
         if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then
-		sed -i -e '1s,#!.*python3,#! /usr/bin/python3,' \
+		sed -i -e '1s,#!.*python3,#! ${bindir}/python3,' \
 		${D}${sbindir}/dnssec-coverage \
 		${D}${sbindir}/dnssec-checkds \
 		${D}${sbindir}/dnssec-keymgr

meta/recipes-connectivity/connman/connman-gnome_0.7.bb

@@ -26,5 +26,5 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
 RDEPENDS_${PN} = "connman"
 
 do_install_append() {
-    install -m 0644 ${WORKDIR}/images/* ${D}/usr/share/icons/hicolor/22x22/apps/
+    install -m 0644 ${WORKDIR}/images/* ${D}${datadir}/icons/hicolor/22x22/apps/
 }

meta/recipes-connectivity/openssl/openssl_1.1.1c.bb

@@ -131,7 +131,7 @@ do_install () {
 	oe_multilib_header openssl/opensslconf.h
 
 	# Create SSL structure for packages such as ca-certificates which
-	# contain hard-coded paths to /etc/ssl. Debian does the same.
+	# contain hard-coded paths to ${sysconfdir}/ssl. Debian does the same.
 	install -d ${D}${sysconfdir}/ssl
 	mv ${D}${libdir}/ssl-1.1/certs \
 	   ${D}${libdir}/ssl-1.1/private \
@@ -156,7 +156,7 @@ do_install_append_class-native () {
 do_install_append_class-nativesdk () {
 	mkdir -p ${D}${SDKPATHNATIVE}/environment-setup.d
 	install -m 644 ${WORKDIR}/environment.d-openssl.sh ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
-	sed 's|/usr/lib/ssl/|/usr/lib/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
+	sed 's|${libdir}/ssl/|${libdir}/ssl-1.1/|g' -i ${D}${SDKPATHNATIVE}/environment-setup.d/openssl.sh
 }
 
 PTEST_BUILD_HOST_FILES += "configdata.pm"

meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb

@@ -96,8 +96,8 @@ do_install () {
 		install -m 644 ${S}/wpa_supplicant/systemd/*.service ${D}/${systemd_unitdir}/system
 	fi
 
-	install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}/etc/default/volatiles
+	install -d ${D}${sysconfdir}/default/volatiles
+	install -m 0644 ${WORKDIR}/99_wpa_supplicant ${D}${sysconfdir}/default/volatiles
 }
 
 pkg_postinst_wpa-supplicant () {

meta/recipes-core/base-files/base-files_3.0.14.bb

@@ -61,7 +61,7 @@ conffiles = "${sysconfdir}/debian_version ${sysconfdir}/host.conf \
              ${sysconfdir}/default"
 
 # By default the hostname is the machine name. If the hostname is unset then a
-# /etc/hostname file isn't written, suitable for environments with dynamic
+# ${sysconfdir}/hostname file isn't written, suitable for environments with dynamic
 # hostnames.
 #
 # The hostname can be changed outside of this recipe by using

meta/recipes-core/base-passwd/base-passwd_3.5.29.bb

@@ -1,5 +1,5 @@
 SUMMARY = "Base system master password/group files"
-DESCRIPTION = "The master copies of the user database files (/etc/passwd and /etc/group).  The update-passwd tool is also provided to keep the system databases synchronized with these master files."
+DESCRIPTION = "The master copies of the user database files (${sysconfdir}/passwd and ${sysconfdir}/group).  The update-passwd tool is also provided to keep the system databases synchronized with these master files."
 SECTION = "base"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a"

meta/recipes-core/busybox/busybox.inc

@@ -209,8 +209,8 @@ do_compile() {
 do_install () {
 	sed -i "s:^/bin/:BASE_BINDIR/:" busybox.links*
 	sed -i "s:^/sbin/:BASE_SBINDIR/:" busybox.links*
-	sed -i "s:^/usr/bin/:BINDIR/:" busybox.links*
-	sed -i "s:^/usr/sbin/:SBINDIR/:" busybox.links*
+	sed -i "s:^${bindir}/:BINDIR/:" busybox.links*
+	sed -i "s:^${sbindir}/:SBINDIR/:" busybox.links*
 
 	# Move arch/link to BINDIR to match coreutils
 	sed -i "s:^BASE_BINDIR/arch:BINDIR/arch:" busybox.links*
@@ -303,7 +303,7 @@ do_install () {
 	fi
 	if grep -q "CONFIG_INETD=y" ${B}/.config; then
 		install -m 0755 ${WORKDIR}/inetd ${D}${sysconfdir}/init.d/inetd.${BPN}
-		sed -i "s:/usr/sbin/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN}
+		sed -i "s:${sbindir}/:${sbindir}/:" ${D}${sysconfdir}/init.d/inetd.${BPN}
 		install -m 0644 ${WORKDIR}/inetd.conf ${D}${sysconfdir}/
 	fi
 	if grep -q "CONFIG_MDEV=y" ${B}/.config; then
@@ -360,7 +360,7 @@ inherit update-alternatives
 ALTERNATIVE_PRIORITY = "50"
 
 python do_package_prepend () {
-    # We need to load the full set of busybox provides from the /etc/busybox.links
+    # We need to load the full set of busybox provides from the ${sysconfdir}/busybox.links
     # Use this to see the update-alternatives with the right information
 
     dvar = d.getVar('D')
@@ -385,7 +385,7 @@ python do_package_prepend () {
         f.close()
         return
 
-    if os.path.exists('%s/etc/busybox.links' % (dvar)):
+    if os.path.exists('%s${sysconfdir}/busybox.links' % (dvar)):
         set_alternative_vars("${sysconfdir}/busybox.links", "${base_bindir}/busybox")
     else:
         set_alternative_vars("${sysconfdir}/busybox.links.nosuid", "${base_bindir}/busybox.nosuid")

meta/recipes-core/dbus/dbus_1.12.16.bb

@@ -87,8 +87,8 @@ pkg_postinst_dbus() {
 		systemctl $OPTS mask dbus-1.service
 	fi
 
-	if [ -z "$D" ] && [ -e /etc/init.d/populate-volatile.sh ] ; then
-		/etc/init.d/populate-volatile.sh update
+	if [ -z "$D" ] && [ -e ${sysconfdir}/init.d/populate-volatile.sh ] ; then
+		${sysconfdir}/init.d/populate-volatile.sh update
 	fi
 }
 

meta/recipes-core/dropbear/dropbear.inc

@@ -76,10 +76,10 @@ do_install() {
 	do
 		ln -s ./dropbearmulti ${D}${sbindir}/$i
 	done
-	sed -e 's,/etc,${sysconfdir},g' \
-		-e 's,/usr/sbin,${sbindir},g' \
+	sed -e 's,${sysconfdir},${sysconfdir},g' \
+		-e 's,${sbindir},${sbindir},g' \
 		-e 's,/var,${localstatedir},g' \
-		-e 's,/usr/bin,${bindir},g' \
+		-e 's,${bindir},${bindir},g' \
 		-e 's,/usr,${prefix},g' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/dropbear
 	chmod 755 ${D}${sysconfdir}/init.d/dropbear
 	if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then

meta/recipes-core/glib-2.0/glib.inc

@@ -99,7 +99,7 @@ EXEEXT_mingw32 = ".exe"
 
 do_install_append () {
 	if [ -f ${D}${bindir}/gtester-report ]; then
-		sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|'
+		sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!${bindir}/env python3|'
 	fi
 
 	# Remove some unpackaged files

meta/recipes-core/glibc/glibc-locale.inc

@@ -6,7 +6,7 @@ BPN = "glibc"
 LOCALEBASEPN = "${MLPREFIX}glibc"
 
 # glibc-collateral.inc inhibits all default deps, but do_package needs objcopy
-# ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so')
+# ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'glibc-locale/2.17-r0/package${libdir}/gconv/IBM1166.so' 'glibc-locale/2.17-r0/package${libdir}/gconv/.debug/IBM1166.so')
 # ERROR: Function failed: split_and_strip_files
 BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
 BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"

meta/recipes-core/glibc/glibc-package.inc

@@ -18,7 +18,7 @@ libc_baselibs = "${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir
 ARCH_DYNAMIC_LOADER = ""
 # The aarch64 ABI says the dynamic linker -must- be
 # /lib/ld-linux-aarch64{,_be}.so.1. With usrmerge, that may mean that
-# we need to install it in /usr/lib.
+# we need to install it in ${libdir}.
 ARCH_DYNAMIC_LOADER_aarch64 = "ld-linux-${TARGET_ARCH}.so.1"
 libc_baselibs_append = " ${@oe.utils.conditional('ARCH_DYNAMIC_LOADER', '', '', '${root_prefix}/lib/${ARCH_DYNAMIC_LOADER}', d)}"
 INSANE_SKIP_${PN}_append_aarch64 = " libdir"

meta/recipes-core/glibc/glibc-testing.inc

@@ -1,6 +1,6 @@
 do_compile_append () {
 	# now generate script to drive testing
-	echo "#!/usr/bin/env sh" >${B}/${HOST_PREFIX}testglibc
+	echo "#!${bindir}/env sh" >${B}/${HOST_PREFIX}testglibc
 	set >> ${B}/${HOST_PREFIX}testglibc
 	# prune out the unneeded vars
 	sed -i -e "/^BASH/d" ${B}/${HOST_PREFIX}testglibc
@@ -55,7 +55,7 @@ then
 	echo "   The tree should be accessible at same location on build host and target"
 	echo "   You can add nfs-client to IMAGE_FEATURES to get the nfs client on target"
 	echo "3. nfs server on build host is not running."
-	echo "   Please make sure that you have 'no_root_squash' added in /etc/exports if you want"
+	echo "   Please make sure that you have 'no_root_squash' added in ${sysconfdir}/exports if you want"
 	echo "   to test as root user on target (usually its recommended to create a non"
 	echo "   root user."
 	echo "   As a sanity check make sure that target can read/write to the glibc build tree"

meta/recipes-core/glibc/glibc_2.30.bb

@@ -13,7 +13,7 @@ NATIVESDKFIXES_class-nativesdk = "\
 "
 
 SRC_URI =  "${GLIBC_GIT_URI};branch=${SRCBRANCH};name=glibc \
-           file://etc/ld.so.conf \
+           file:/${sysconfdir}/ld.so.conf \
            file://generate-supported.mk \
            file://makedbs.sh \
            \

meta/recipes-core/ifupdown/ifupdown_0.8.22.bb

@@ -2,7 +2,7 @@ SUMMARY = "ifupdown: basic ifup and ifdown used by initscripts"
 DESCRIPTION = "High level tools to configure network interfaces \
 This package provides the tools ifup and ifdown which may be used to \
 configure (or, respectively, deconfigure) network interfaces, based on \
-the file /etc/network/interfaces."
+the file ${sysconfdir}/network/interfaces."
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
@@ -30,8 +30,8 @@ do_install () {
 		  ${D}${base_sbindir}
 
 	# If volatiles are used, then we'll also need /run/network there too.
-	install -d ${D}/etc/default/volatiles
-	install -m 0644 ${WORKDIR}/99_network ${D}/etc/default/volatiles
+	install -d ${D}${sysconfdir}/default/volatiles
+	install -m 0644 ${WORKDIR}/99_network ${D}${sysconfdir}/default/volatiles
 
 	install -m 0755 ifup ${D}${base_sbindir}/
 	ln ${D}${base_sbindir}/ifup ${D}${base_sbindir}/ifdown

meta/recipes-core/images/build-appliance-image_15.0.0.bb

@@ -87,16 +87,16 @@ fakeroot do_populate_poky_src () {
 	mkdir -p ${IMAGE_ROOTFS}/media/cdrom
 
 	# Allow builder to use sudo
-	echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}/etc/sudoers
+	echo "builder ALL=(ALL) NOPASSWD: ALL" >> ${IMAGE_ROOTFS}${sysconfdir}/sudoers
 
 	# Load tap/tun at startup
 	rm -f ${IMAGE_ROOTFS}/sbin/iptables
-	lnr ${IMAGE_ROOTFS}/usr/sbin/iptables ${IMAGE_ROOTFS}/sbin/iptables
-	echo "tun" >> ${IMAGE_ROOTFS}/etc/modules
+	lnr ${IMAGE_ROOTFS}${sbindir}/iptables ${IMAGE_ROOTFS}/sbin/iptables
+	echo "tun" >> ${IMAGE_ROOTFS}${sysconfdir}/modules
 
 	# Use Clearlooks GTK+ theme
-	mkdir -p ${IMAGE_ROOTFS}/etc/gtk-2.0
-	echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}/etc/gtk-2.0/gtkrc
+	mkdir -p ${IMAGE_ROOTFS}${sysconfdir}/gtk-2.0
+	echo 'gtk-theme-name = "Clearlooks"' > ${IMAGE_ROOTFS}${sysconfdir}/gtk-2.0/gtkrc
 
 	# Install modules needed for toaster
 	export STAGING_LIBDIR=${STAGING_LIBDIR_NATIVE}

meta/recipes-core/initscripts/initscripts_1.0.bb

@@ -95,7 +95,7 @@ do_install () {
 	install -m 0755    ${WORKDIR}/single		${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/umountnfs.sh	${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/urandom		${D}${sysconfdir}/init.d
-	sed -i ${D}${sysconfdir}/init.d/urandom -e 's,/var/,${localstatedir}/,g;s,/etc/,${sysconfdir}/,g'
+	sed -i ${D}${sysconfdir}/init.d/urandom -e 's,/var/,${localstatedir}/,g;s,${sysconfdir}/,${sysconfdir}/,g'
 	install -m 0755    ${WORKDIR}/devpts.sh	${D}${sysconfdir}/init.d
 	install -m 0755    ${WORKDIR}/devpts		${D}${sysconfdir}/default
 	install -m 0755    ${WORKDIR}/sysfs.sh		${D}${sysconfdir}/init.d
@@ -179,7 +179,7 @@ pkg_postinst_${PN} () {
 
     # Delete any old volatile cache script, as directories may have moved
     if [ -z "$D" ]; then
-        rm -f "/etc/volatile.cache"
+        rm -f "${sysconfdir}/volatile.cache"
     fi
 }
 

meta/recipes-core/libxml/libxml2_2.9.9.bb

@@ -86,8 +86,8 @@ do_install_ptest () {
 	if [ "${@bb.utils.filter('PACKAGECONFIG', 'python', d)}" ]; then
 		sed -i -e 's|^\(PYTHON = \).*|\1${USRBINPATH}/${PYTHON_PN}|' \
 		    ${D}${PTEST_PATH}/python/tests/Makefile
-		grep -lrZ '#!/usr/bin/python' ${D}${PTEST_PATH}/python |
-			xargs -0 sed -i -e 's|/usr/bin/python|${USRBINPATH}/${PYTHON_PN}|'
+		grep -lrZ '#!${bindir}/python' ${D}${PTEST_PATH}/python |
+			xargs -0 sed -i -e 's|${bindir}/python|${USRBINPATH}/${PYTHON_PN}|'
 	fi
 	#Remove build host references from various Makefiles
 	find "${D}${PTEST_PATH}" -name Makefile -type f -exec \

meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb

@@ -21,7 +21,7 @@ DUMMYPROVIDES = "\
     nativesdk-perl-module-posix \
     nativesdk-perl-module-thread-queue \
     nativesdk-perl-module-threads \
-    /usr/bin/perl \
+    ${bindir}/perl \
     "
 
 PR = "r2"

meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb

@@ -3,7 +3,7 @@ DUMMYARCH = "sdk-provides-dummy-${SDKPKGSUFFIX}"
 # Add /bin/sh?
 DUMMYPROVIDES = "\
     /bin/bash \
-    /usr/bin/env \
+    ${bindir}/env \
     pkgconfig \
     libGL.so()(64bit) \
     libGL.so \

meta/recipes-core/meta/target-sdk-provides-dummy.bb

@@ -51,8 +51,8 @@ DUMMYPROVIDES = "\
     ${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])} \
     /bin/sh \
     /bin/bash \
-    /usr/bin/env \
-    /usr/bin/perl \
+    ${bindir}/env \
+    ${bindir}/perl \
     libperl.so.5 \
     libperl.so.5()(64bit) \
 "

meta/recipes-core/meta/uninative-tarball.bb

@@ -64,7 +64,7 @@ fakeroot archive_sdk() {
 	DEST="./${SDK_ARCH}-${SDK_OS}"
 	mv sysroots/${SDK_SYS} $DEST
 	rm sysroots -rf
-	patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST/usr/bin/patchelf
-	mv $DEST/usr/bin/patchelf $DEST/usr/bin/patchelf-uninative
+	patchelf --set-interpreter ${@''.join('a' for n in range(1024))} $DEST${bindir}/patchelf
+	mv $DEST${bindir}/patchelf $DEST${bindir}/patchelf-uninative
 	${SDK_ARCHIVE_CMD}
 }

meta/recipes-core/ncurses/ncurses.inc

@@ -54,11 +54,11 @@ PACKAGES_DYNAMIC = "^${PN}-lib.*"
 # because the sstate had a hard coded search path.  Until this is fixed
 # another way this is deemed good enough.
 EX_TERMCAP = ""
-EX_TERMCAP_class-native = ":/etc/termcap:/usr/share/misc/termcap"
-EX_TERMCAP_class-nativesdk = ":/etc/termcap:/usr/share/misc/termcap"
+EX_TERMCAP_class-native = ":${sysconfdir}/termcap:${datadir}/misc/termcap"
+EX_TERMCAP_class-nativesdk = ":${sysconfdir}/termcap:${datadir}/misc/termcap"
 EX_TERMINFO = ""
-EX_TERMINFO_class-native = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
-EX_TERMINFO_class-nativesdk = ":/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo"
+EX_TERMINFO_class-native = ":${sysconfdir}/terminfo:${datadir}/terminfo:${datadir}/misc/terminfo:/lib/terminfo"
+EX_TERMINFO_class-nativesdk = ":${sysconfdir}/terminfo:${datadir}/terminfo:${datadir}/misc/terminfo:/lib/terminfo"
 EX_TERMLIB ?= "tinfo"
 
 # Helper function for do_configure to allow multiple configurations
@@ -193,7 +193,7 @@ do_install() {
                 then
                         install -d ${D}${sysconfdir}/terminfo/${basedir}
                         mv ${termfile} ${D}${sysconfdir}/terminfo/${basedir}/
-                        ln -s /etc/terminfo/${basedir}/${x} \
+                        ln -s ${sysconfdir}/terminfo/${basedir}/${x} \
                                 ${D}${datadir}/terminfo/${basedir}/${x}
                 fi
         done
@@ -203,8 +203,8 @@ do_install() {
                 ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm
         fi
 
-        # When changing ${libdir} to e.g. /usr/lib/myawesomelib/ ncurses 
-        # still installs '/usr/lib/terminfo', so try to rm both 
+        # When changing ${libdir} to e.g. ${libdir}/myawesomelib/ ncurses 
+        # still installs '${libdir}/terminfo', so try to rm both 
         # the proper path and a slightly hardcoded one
         rm -f ${D}${libdir}/terminfo ${D}${prefix}/lib/terminfo
 

meta/recipes-core/os-release/os-release.bb

@@ -1,7 +1,7 @@
 inherit allarch
 
 SUMMARY = "Operating system identification"
-DESCRIPTION = "The /usr/lib/os-release file contains operating system identification data."
+DESCRIPTION = "The ${libdir}/os-release file contains operating system identification data."
 LICENSE = "MIT"
 INHIBIT_DEFAULT_DEPS = "1"
 

meta/recipes-core/ovmf/ovmf_git.bb

@@ -62,8 +62,8 @@ do_patch[postfuncs] += "fix_iasl"
 fix_iasl() {
 }
 fix_iasl_class-native() {
-    # iasl is not installed under /usr/bin when building with OE.
-    sed -i -e 's#/usr/bin/iasl#${STAGING_BINDIR_NATIVE}/iasl#' ${S}/BaseTools/Conf/tools_def.template
+    # iasl is not installed under ${bindir} when building with OE.
+    sed -i -e 's#${bindir}/iasl#${STAGING_BINDIR_NATIVE}/iasl#' ${S}/BaseTools/Conf/tools_def.template
 }
 
 # Inject CC and friends into the build. LINKER already is in GNUmakefile.

meta/recipes-core/systemd/systemd_242.bb

@@ -267,12 +267,12 @@ do_install() {
 		${@bb.utils.contains('PACKAGECONFIG', 'networkd', ':', 'sed -i -e "\$ad /run/systemd/netif/links 0755 root root -" ${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf', d)}
 	fi
 	if ! ${@bb.utils.contains('PACKAGECONFIG', 'resolved', 'true', 'false', d)}; then
-		echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
+		echo 'L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf' >>${D}${exec_prefix}/lib/tmpfiles.d${sysconfdir}.conf
 		echo 'd /run/systemd/resolve 0755 root root -' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
 		echo 'f /run/systemd/resolve/resolv.conf 0644 root root' >>${D}${exec_prefix}/lib/tmpfiles.d/systemd.conf
 		ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd
 	else
-		sed -i -e "s%^L! /etc/resolv.conf.*$%L! /etc/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d/etc.conf
+		sed -i -e "s%^L! ${sysconfdir}/resolv.conf.*$%L! ${sysconfdir}/resolv.conf - - - - ../run/systemd/resolve/resolv.conf%g" ${D}${exec_prefix}/lib/tmpfiles.d${sysconfdir}.conf
 		ln -s ../run/systemd/resolve/resolv.conf ${D}${sysconfdir}/resolv-conf.systemd
 	fi
 	install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install