From 892e6665bbf6ab6bc71c21a4a645fdf19749c5f3 Mon Sep 17 00:00:00 2001 From: Persian Prince Date: Mon, 26 Aug 2019 13:43:23 +0430 Subject: [PATCH] Don't hardcode path --- .../recipes-skeleton/service/service_0.1.bb | 6 ++--- meta/recipes-bsp/acpid/acpid.inc | 2 +- meta/recipes-bsp/apmd/apmd_3.2.2-15.bb | 2 +- .../bind/bind_9.11.5-P4.bb | 2 +- .../connman/connman-gnome_0.7.bb | 2 +- .../openssl/openssl_1.1.1c.bb | 4 ++-- .../wpa-supplicant/wpa-supplicant_2.9.bb | 4 ++-- .../base-files/base-files_3.0.14.bb | 2 +- .../base-passwd/base-passwd_3.5.29.bb | 2 +- meta/recipes-core/busybox/busybox.inc | 10 ++++---- meta/recipes-core/dbus/dbus_1.12.16.bb | 4 ++-- meta/recipes-core/dropbear/dropbear.inc | 6 ++--- meta/recipes-core/glib-2.0/glib.inc | 2 +- meta/recipes-core/glibc/glibc-locale.inc | 2 +- meta/recipes-core/glibc/glibc-package.inc | 2 +- meta/recipes-core/glibc/glibc-testing.inc | 4 ++-- meta/recipes-core/glibc/glibc_2.30.bb | 2 +- meta/recipes-core/ifupdown/ifupdown_0.8.22.bb | 6 ++--- .../images/build-appliance-image_15.0.0.bb | 10 ++++---- .../initscripts/initscripts_1.0.bb | 4 ++-- meta/recipes-core/libxml/libxml2_2.9.9.bb | 4 ++-- .../meta/nativesdk-buildtools-perl-dummy.bb | 2 +- .../meta/nativesdk-sdk-provides-dummy.bb | 2 +- .../meta/target-sdk-provides-dummy.bb | 4 ++-- meta/recipes-core/meta/uninative-tarball.bb | 4 ++-- meta/recipes-core/ncurses/ncurses.inc | 14 +++++------ meta/recipes-core/os-release/os-release.bb | 2 +- meta/recipes-core/ovmf/ovmf_git.bb | 4 ++-- meta/recipes-core/systemd/systemd_242.bb | 4 ++-- .../sysvinit/sysvinit-inittab_2.88dsf.bb | 4 ++-- .../update-rc.d/update-rc.d_0.8.bb | 4 ++-- .../volatile-binds/volatile-binds.bb | 2 +- meta/recipes-devtools/apt/apt-package.inc | 4 ++-- meta/recipes-devtools/apt/apt_1.2.31.bb | 2 +- meta/recipes-devtools/autoconf/autoconf.inc | 4 ++-- .../binutils/binutils-crosssdk_2.32.bb | 2 +- .../bootchart2/bootchart2_0.14.8.bb | 2 +- .../createrepo-c/createrepo-c_0.15.0.bb | 2 +- meta/recipes-devtools/dpkg/dpkg.inc | 4 ++-- meta/recipes-devtools/gcc/gcc-cross.inc | 2 +- meta/recipes-devtools/gcc/gcc-target.inc | 2 +- meta/recipes-devtools/gcc/libgcc-common.inc | 6 ++--- meta/recipes-devtools/git/git.inc | 2 +- meta/recipes-devtools/glide/glide_0.13.2.bb | 24 +++++++++---------- .../gnu-config/gnu-config_git.bb | 2 +- .../help2man/help2man-native_1.47.10.bb | 4 ++-- .../intltool/intltool_0.51.0.bb | 4 ++-- .../opkg-utils/opkg-utils_0.4.1.bb | 4 ++-- .../perl/libxml-parser-perl_2.44.bb | 8 +++---- meta/recipes-devtools/perl/perl_5.30.0.bb | 6 ++--- .../python/python-native_2.7.16.bb | 4 ++-- meta/recipes-devtools/python/python3_3.7.4.bb | 6 ++--- meta/recipes-devtools/python/python_2.7.16.bb | 2 +- meta/recipes-devtools/qemu/qemu.inc | 4 ++-- meta/recipes-devtools/quilt/quilt.inc | 2 +- meta/recipes-devtools/rpm/rpm_4.14.2.1.bb | 8 +++---- .../subversion/subversion_1.12.0.bb | 4 ++-- .../systemd-bootchart_233.bb | 2 +- .../valgrind/valgrind_3.15.0.bb | 2 +- .../asciidoc/asciidoc_8.6.9.bb | 2 +- meta/recipes-extended/bash/bash.inc | 2 +- .../chkconfig/chkconfig_1.3.58.bb | 10 ++++---- .../foomatic/foomatic-filters_4.0.17.bb | 2 +- meta/recipes-extended/groff/groff_1.22.4.bb | 10 ++++---- .../recipes-extended/man-db/man-db_2.8.6.1.bb | 4 ++-- meta/recipes-extended/mc/mc_4.8.23.bb | 2 +- meta/recipes-extended/msmtp/msmtp_1.8.5.bb | 4 ++-- meta/recipes-extended/newt/libnewt_0.52.21.bb | 2 +- meta/recipes-extended/pam/libpam_1.3.1.bb | 2 +- .../recipes-extended/rpcbind/rpcbind_1.2.5.bb | 2 +- .../shadow/shadow-sysroot_4.6.bb | 4 ++-- meta/recipes-extended/sysklogd/sysklogd.inc | 2 +- meta/recipes-extended/sysstat/sysstat.inc | 8 +++---- .../watchdog/watchdog_5.15.bb | 2 +- meta/recipes-extended/which/which_2.21.bb | 2 +- .../fontconfig/fontconfig_2.13.1.bb | 2 +- meta/recipes-graphics/xorg-app/xinit_1.4.1.bb | 2 +- .../xorg-font/xorg-font-common.inc | 4 ++-- .../xorg-xserver/xserver-xorg.inc | 4 ++-- meta/recipes-kernel/perf/perf.bb | 4 ++-- .../alsa/alsa-plugins_1.1.9.bb | 6 ++--- .../alsa/alsa-utils_1.1.9.bb | 2 +- .../pulseaudio-client-conf-sato_1.bb | 2 +- .../ca-certificates_20190110.bb | 4 ++-- .../p11-kit/p11-kit_0.23.16.1.bb | 2 +- meta/recipes-support/taglib/taglib_1.11.1.bb | 2 +- 86 files changed, 170 insertions(+), 170 deletions(-) diff --git a/meta-skeleton/recipes-skeleton/service/service_0.1.bb b/meta-skeleton/recipes-skeleton/service/service_0.1.bb index 6416618dcbd..1b586038134 100644 --- a/meta-skeleton/recipes-skeleton/service/service_0.1.bb +++ b/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 diff --git a/meta/recipes-bsp/acpid/acpid.inc b/meta/recipes-bsp/acpid/acpid.inc index 766ed4f89ed..c1c99d8d442 100644 --- a/meta/recipes-bsp/acpid/acpid.inc +++ b/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 diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb index 82c2649340e..7afdbad86a6 100644 --- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb +++ b/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 diff --git a/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb b/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb index 93c406f7787..fdf19431337 100644 --- a/meta/recipes-connectivity/bind/bind_9.11.5-P4.bb +++ b/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 diff --git a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb b/meta/recipes-connectivity/connman/connman-gnome_0.7.bb index a56bd3751f4..fec23ea5aee 100644 --- a/meta/recipes-connectivity/connman/connman-gnome_0.7.bb +++ b/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/ } diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb index 75159ac725c..8e0519b3092 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1c.bb +++ b/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" diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb index c16978cfe82..d23ca1edacf 100644 --- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_2.9.bb +++ b/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 () { diff --git a/meta/recipes-core/base-files/base-files_3.0.14.bb b/meta/recipes-core/base-files/base-files_3.0.14.bb index 4b4027f18d7..2345637513d 100644 --- a/meta/recipes-core/base-files/base-files_3.0.14.bb +++ b/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 diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index d1aab091811..6aee4291f2a 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/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" diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index 49165d7f51b..f373be832e1 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/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") diff --git a/meta/recipes-core/dbus/dbus_1.12.16.bb b/meta/recipes-core/dbus/dbus_1.12.16.bb index 05716608b0a..1d869ad39dc 100644 --- a/meta/recipes-core/dbus/dbus_1.12.16.bb +++ b/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 } diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc index dcbda741c3a..b24ce66e01a 100644 --- a/meta/recipes-core/dropbear/dropbear.inc +++ b/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 diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 3ae22f5e807..deefa3ffc1f 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/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 diff --git a/meta/recipes-core/glibc/glibc-locale.inc b/meta/recipes-core/glibc/glibc-locale.inc index ef06389ff94..10d360924b4 100644 --- a/meta/recipes-core/glibc/glibc-locale.inc +++ b/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" diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index f796876a877..ab5b2613743 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/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" diff --git a/meta/recipes-core/glibc/glibc-testing.inc b/meta/recipes-core/glibc/glibc-testing.inc index 0a42ae7f7ca..9cb869c9d50 100644 --- a/meta/recipes-core/glibc/glibc-testing.inc +++ b/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" diff --git a/meta/recipes-core/glibc/glibc_2.30.bb b/meta/recipes-core/glibc/glibc_2.30.bb index 03add3363ca..07fb8711c1a 100644 --- a/meta/recipes-core/glibc/glibc_2.30.bb +++ b/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 \ \ diff --git a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb b/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb index bd0989e8855..489af8515da 100644 --- a/meta/recipes-core/ifupdown/ifupdown_0.8.22.bb +++ b/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 diff --git a/meta/recipes-core/images/build-appliance-image_15.0.0.bb b/meta/recipes-core/images/build-appliance-image_15.0.0.bb index e9cac98c572..9ff0845542b 100644 --- a/meta/recipes-core/images/build-appliance-image_15.0.0.bb +++ b/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} diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb index 91eea4b8c24..02394086f96 100644 --- a/meta/recipes-core/initscripts/initscripts_1.0.bb +++ b/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 } diff --git a/meta/recipes-core/libxml/libxml2_2.9.9.bb b/meta/recipes-core/libxml/libxml2_2.9.9.bb index c38f883e44f..722f9ffa24a 100644 --- a/meta/recipes-core/libxml/libxml2_2.9.9.bb +++ b/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 \ diff --git a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb b/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb index 6a8748acdfe..45c8d5dcefb 100644 --- a/meta/recipes-core/meta/nativesdk-buildtools-perl-dummy.bb +++ b/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" diff --git a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb b/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb index b891efa5ef8..3e6b3202f24 100644 --- a/meta/recipes-core/meta/nativesdk-sdk-provides-dummy.bb +++ b/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 \ diff --git a/meta/recipes-core/meta/target-sdk-provides-dummy.bb b/meta/recipes-core/meta/target-sdk-provides-dummy.bb index 87b8bfab9c4..53509e62fa6 100644 --- a/meta/recipes-core/meta/target-sdk-provides-dummy.bb +++ b/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) \ " diff --git a/meta/recipes-core/meta/uninative-tarball.bb b/meta/recipes-core/meta/uninative-tarball.bb index 39638eb8c55..3233fbdcfcc 100644 --- a/meta/recipes-core/meta/uninative-tarball.bb +++ b/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} } diff --git a/meta/recipes-core/ncurses/ncurses.inc b/meta/recipes-core/ncurses/ncurses.inc index 5f2cc358233..e5b456006a5 100644 --- a/meta/recipes-core/ncurses/ncurses.inc +++ b/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 diff --git a/meta/recipes-core/os-release/os-release.bb b/meta/recipes-core/os-release/os-release.bb index d5793c6fed5..3da6bb3d1e1 100644 --- a/meta/recipes-core/os-release/os-release.bb +++ b/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" diff --git a/meta/recipes-core/ovmf/ovmf_git.bb b/meta/recipes-core/ovmf/ovmf_git.bb index b569b593fc2..4a23e1ad8eb 100644 --- a/meta/recipes-core/ovmf/ovmf_git.bb +++ b/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. diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb index b368ca8a2c4..9b0bed15948 100644 --- a/meta/recipes-core/systemd/systemd_242.bb +++ b/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 diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb index 8781492d472..fcbe6f15371 100644 --- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb +++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb @@ -20,7 +20,7 @@ do_install() { install -m 0644 ${WORKDIR}/inittab ${D}${sysconfdir}/inittab install -d ${D}${base_bindir} install -m 0755 ${WORKDIR}/start_getty ${D}${base_bindir}/start_getty - sed -e 's,/usr/bin,${bindir},g' -i ${D}${base_bindir}/start_getty + sed -e 's,${bindir},${bindir},g' -i ${D}${base_bindir}/start_getty set -x tmp="${SERIAL_CONSOLES}" @@ -70,7 +70,7 @@ if [ -e /proc/consoles ]; then k=`echo ${i} | sed s/^.*\://g` if [ -z "`grep ${j} /proc/consoles`" ]; then if [ -z "${k}" ] || [ -z "`grep ${k} /proc/consoles`" ] || [ ! -e /dev/${j} ]; then - sed -i -e /^.*${j}\ /d -e /^.*${j}$/d /etc/inittab + sed -i -e /^.*${j}\ /d -e /^.*${j}$/d ${sysconfdir}/inittab fi fi done diff --git a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb index 75632d94347..76cbaa4c025 100644 --- a/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb +++ b/meta/recipes-core/update-rc.d/update-rc.d_0.8.bb @@ -1,6 +1,6 @@ -SUMMARY = "manage symlinks in /etc/rcN.d" +SUMMARY = "manage symlinks in ${sysconfdir}/rcN.d" HOMEPAGE = "http://github.com/philb/update-rc.d/" -DESCRIPTION = "update-rc.d is a utility that allows the management of symlinks to the initscripts in the /etc/rcN.d directory structure." +DESCRIPTION = "update-rc.d is a utility that allows the management of symlinks to the initscripts in the ${sysconfdir}/rcN.d directory structure." SECTION = "base" LICENSE = "GPLv2+" diff --git a/meta/recipes-core/volatile-binds/volatile-binds.bb b/meta/recipes-core/volatile-binds/volatile-binds.bb index d861a71a6b8..6fe0a9124ec 100644 --- a/meta/recipes-core/volatile-binds/volatile-binds.bb +++ b/meta/recipes-core/volatile-binds/volatile-binds.bb @@ -74,7 +74,7 @@ do_install () { # Suppress attempts to process some tmpfiles that are not temporary. # install -d ${D}${sysconfdir}/tmpfiles.d ${D}/var/cache - ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/etc.conf + ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d${sysconfdir}.conf ln -s /dev/null ${D}${sysconfdir}/tmpfiles.d/home.conf } do_install[dirs] = "${WORKDIR}" diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc index 922f739d0d0..808831fce51 100644 --- a/meta/recipes-devtools/apt/apt-package.inc +++ b/meta/recipes-devtools/apt/apt-package.inc @@ -86,9 +86,9 @@ do_install () { install -d ${D}${systemd_unitdir}/system/ install -m 0755 ${S}/debian/apt.systemd.daily ${D}${libdir}/apt/ install -m 0644 ${S}/debian/apt-daily.service ${D}${systemd_unitdir}/system/ - sed -i 's#/usr/lib/apt/#${libdir}/apt/#g' ${D}${systemd_unitdir}/system/apt-daily.service + sed -i 's#${libdir}/apt/#${libdir}/apt/#g' ${D}${systemd_unitdir}/system/apt-daily.service install -m 0644 ${S}/debian/apt-daily.timer ${D}${systemd_unitdir}/system/ install -d ${D}${sysconfdir}/cron.daily/ install -m 0755 ${S}/debian/apt.apt-compat.cron.daily ${D}${sysconfdir}/cron.daily/ - sed -i 's#/usr/lib/apt/#${libdir}/apt/#g' ${D}${sysconfdir}/cron.daily/apt.apt-compat.cron.daily + sed -i 's#${libdir}/apt/#${libdir}/apt/#g' ${D}${sysconfdir}/cron.daily/apt.apt-compat.cron.daily } diff --git a/meta/recipes-devtools/apt/apt_1.2.31.bb b/meta/recipes-devtools/apt/apt_1.2.31.bb index ae0bce933dd..0bc3e0c2fd8 100644 --- a/meta/recipes-devtools/apt/apt_1.2.31.bb +++ b/meta/recipes-devtools/apt/apt_1.2.31.bb @@ -14,7 +14,7 @@ apt-manpages += "doc/apt-key.8" do_install_append() { #Write the correct apt-architecture to apt.conf - APT_CONF=${D}/etc/apt/apt.conf + APT_CONF=${D}${sysconfdir}/apt/apt.conf echo 'APT::Architecture "${DPKG_ARCH}";' > ${APT_CONF} oe_libinstall -so -C bin libapt-private ${D}${libdir}/ } diff --git a/meta/recipes-devtools/autoconf/autoconf.inc b/meta/recipes-devtools/autoconf/autoconf.inc index 2c87bf8296f..9fc7ed2463a 100644 --- a/meta/recipes-devtools/autoconf/autoconf.inc +++ b/meta/recipes-devtools/autoconf/autoconf.inc @@ -70,8 +70,8 @@ SRC_URI = "${GNU_MIRROR}/autoconf/autoconf-${PV}.tar.gz \ inherit autotools texinfo PERL = "${USRBINPATH}/perl" -PERL_class-native = "/usr/bin/env perl" -PERL_class-nativesdk = "/usr/bin/env perl" +PERL_class-native = "${bindir}/env perl" +PERL_class-nativesdk = "${bindir}/env perl" CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${PERL}'" diff --git a/meta/recipes-devtools/binutils/binutils-crosssdk_2.32.bb b/meta/recipes-devtools/binutils/binutils-crosssdk_2.32.bb index 37f4d6d2e92..6a5ce049be5 100644 --- a/meta/recipes-devtools/binutils/binutils-crosssdk_2.32.bb +++ b/meta/recipes-devtools/binutils/binutils-crosssdk_2.32.bb @@ -9,5 +9,5 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk" SRC_URI += "file://0001-binutils-crosssdk-Generate-relocatable-SDKs.patch" do_configure_prepend () { - sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt + sed -i 's#/usr/local/lib /lib ${libdir}#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}${libdir} /usr/local/lib /lib ${libdir}#' ${S}/ld/configure.tgt } diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb index 396d0ec0a10..ff388c5da7e 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.8.bb @@ -75,7 +75,7 @@ # either install it directly from some other source, or build bootchart2-native # and find pybootchartgui in the native sysroot: # bitbake bootchart2-native -# ./tmp/sysroots/x86_64-linux/usr/bin/pybootchartgui /path/to/bootchart.tgz +# ./tmp/sysroots/x86_64-linux${bindir}/pybootchartgui /path/to/bootchart.tgz # Note that, whether installed on your build system or on your image, the # pybootchartgui provided by this recipe does not support the -i option. You # will need to install pybootchartgui by other means in order to run it in diff --git a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb index ae0a35da847..812c0b5cd4d 100644 --- a/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb +++ b/meta/recipes-devtools/createrepo-c/createrepo-c_0.15.0.bb @@ -30,5 +30,5 @@ do_install_append_class-native() { do_install_append_class-nativesdk() { create_wrapper ${D}/${bindir}/createrepo_c \ RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm - rm -rf ${D}/etc + rm -rf ${D}${sysconfdir} } diff --git a/meta/recipes-devtools/dpkg/dpkg.inc b/meta/recipes-devtools/dpkg/dpkg.inc index 1c3c585d793..f5eb0fc621c 100644 --- a/meta/recipes-devtools/dpkg/dpkg.inc +++ b/meta/recipes-devtools/dpkg/dpkg.inc @@ -34,9 +34,9 @@ do_install_append () { if [ "${PN}" = "dpkg-native" ]; then # update-alternatives doesn't have an offline mode rm ${D}${bindir}/update-alternatives - sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!${bindir}/env nativeperl|' ${D}${bindir}/dpkg-* else - sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!/usr/bin/env perl|' ${D}${bindir}/dpkg-* + sed -i -e 's|^#!.*${bindir}/perl-native.*/perl|#!${bindir}/env perl|' ${D}${bindir}/dpkg-* fi } diff --git a/meta/recipes-devtools/gcc/gcc-cross.inc b/meta/recipes-devtools/gcc/gcc-cross.inc index 6222c2e8c91..1e6ba59f2c0 100644 --- a/meta/recipes-devtools/gcc/gcc-cross.inc +++ b/meta/recipes-devtools/gcc/gcc-cross.inc @@ -64,7 +64,7 @@ do_compile () { oe_runmake all-host configure-target-libgcc (cd ${B}/${TARGET_SYS}/libgcc; oe_runmake enable-execute-stack.c unwind.h md-unwind-support.h sfp-machine.h gthr-default.h) # now generate script to drive testing - echo "#!/usr/bin/env sh" >${B}/${TARGET_PREFIX}testgcc + echo "#!${bindir}/env sh" >${B}/${TARGET_PREFIX}testgcc set >> ${B}/${TARGET_PREFIX}testgcc # prune out the unneeded vars sed -i -e "/^BASH/d" ${B}/${TARGET_PREFIX}testgcc diff --git a/meta/recipes-devtools/gcc/gcc-target.inc b/meta/recipes-devtools/gcc/gcc-target.inc index bdc6ff658f9..ea4a891d0cb 100644 --- a/meta/recipes-devtools/gcc/gcc-target.inc +++ b/meta/recipes-devtools/gcc/gcc-target.inc @@ -232,7 +232,7 @@ do_install_append () { done } -# Installing /usr/lib/gcc/* means we'd have two copies, one from gcc-cross +# Installing ${libdir}/gcc/* means we'd have two copies, one from gcc-cross # and one from here. These can confuse gcc cross where includes use #include_next # and builds track file dependencies (e.g. perl and its makedepends code). # For determinism we don't install this ever and rely on the copy from gcc-cross. diff --git a/meta/recipes-devtools/gcc/libgcc-common.inc b/meta/recipes-devtools/gcc/libgcc-common.inc index d959566c3f0..1a6c2ff65a8 100644 --- a/meta/recipes-devtools/gcc/libgcc-common.inc +++ b/meta/recipes-devtools/gcc/libgcc-common.inc @@ -33,7 +33,7 @@ do_install () { mv ${D}${libdir}/libgcc* ${D}${base_libdir} || true fi - # install the runtime in /usr/lib/ not in /usr/lib/gcc on target + # install the runtime in ${libdir}/ not in ${libdir}/gcc on target # so that cross-gcc can find it in the sysroot mv ${D}${libdir}/gcc/* ${D}${libdir} @@ -60,9 +60,9 @@ BBCLASSEXTEND = "nativesdk" addtask multilib_install after do_install before do_package do_populate_sysroot # this makes multilib gcc files findable for target gcc # e.g. -# /usr/lib/i586-pokymllib32-linux/4.7/ +# ${libdir}/i586-pokymllib32-linux/4.7/ # by creating this symlink to it -# /usr/lib64/x86_64-poky-linux/4.7/32 +# ${libdir}64/x86_64-poky-linux/4.7/32 fakeroot python do_multilib_install() { import re diff --git a/meta/recipes-devtools/git/git.inc b/meta/recipes-devtools/git/git.inc index 6e137432f0a..bdda3108801 100644 --- a/meta/recipes-devtools/git/git.inc +++ b/meta/recipes-devtools/git/git.inc @@ -27,7 +27,7 @@ EXTRA_OECONF = "--with-perl=${STAGING_BINDIR_NATIVE}/perl-native/perl \ inherit autotools-brokensep perlnative bash-completion EXTRA_OEMAKE = "NO_PYTHON=1 CFLAGS='${CFLAGS}' LDFLAGS='${LDFLAGS}'" -EXTRA_OEMAKE += "'PERL_PATH=/usr/bin/env perl'" +EXTRA_OEMAKE += "'PERL_PATH=${bindir}/env perl'" EXTRA_OEMAKE_append_class-native = " NO_CROSS_DIRECTORY_HARDLINKS=1" do_compile_prepend () { diff --git a/meta/recipes-devtools/glide/glide_0.13.2.bb b/meta/recipes-devtools/glide/glide_0.13.2.bb index 7faaf4a3888..449358d248f 100644 --- a/meta/recipes-devtools/glide/glide_0.13.2.bb +++ b/meta/recipes-devtools/glide/glide_0.13.2.bb @@ -16,22 +16,22 @@ BBCLASSEXTEND = "native nativesdk" # for x86 ends with textrel in ${PN} # http://errors.yoctoproject.org/Errors/Details/185631/ -# ERROR: QA Issue: ELF binary '/work/i586-oe-linux/glide/0.13.1-r0/packages-split/glide/usr/bin/glide' has relocations in .text [textrel] +# ERROR: QA Issue: ELF binary '/work/i586-oe-linux/glide/0.13.1-r0/packages-split/glide${bindir}/glide' has relocations in .text [textrel] INSANE_SKIP_${PN} += "textrel" # for aarch64 ends with textrel in ${PN}-ptest # http://errors.yoctoproject.org/Errors/Details/185633/ -# ERROR: QA Issue: ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/glide.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/dependency/dependency.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/repo/repo.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/mirrors/mirrors.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/cfg/cfg.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/godep/strip/strip.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/path/path.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/tree/tree.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/util/util.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/action/action.test' has relocations in .text -# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest/usr/lib/glide/ptest/github.com/Masterminds/glide/cache/cache.test' has relocations in .text [textrel] +# ERROR: QA Issue: ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/glide.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/dependency/dependency.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/repo/repo.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/mirrors/mirrors.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/cfg/cfg.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/godep/strip/strip.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/path/path.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/tree/tree.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/util/util.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/action/action.test' has relocations in .text +# ELF binary '/work/aarch64-oe-linux/glide/0.13.1-r0/packages-split/glide-ptest${libdir}/glide/ptest/github.com/Masterminds/glide/cache/cache.test' has relocations in .text [textrel] INSANE_SKIP_${PN}-ptest += "textrel" # fails to run task compile_ptest_base on mips diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 1630c128235..9817399e6ec 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -28,7 +28,7 @@ do_install () { -e 's,@autom4te_perllibdir@,${datadir}/autoconf,g' > ${D}${bindir}/gnu-configize # In the native case we want the system perl as perl-native can't have built yet if [ "${PN}" != "gnu-config-native" -a "${PN}" != "nativesdk-gnu-config" ]; then - sed -i -e 's,/usr/bin/env,${bindir}/env,g' ${D}${bindir}/gnu-configize + sed -i -e 's,${bindir}/env,${bindir}/env,g' ${D}${bindir}/gnu-configize fi chmod 755 ${D}${bindir}/gnu-configize install -m 0644 config.guess config.sub ${D}${datadir}/gnu-config/ diff --git a/meta/recipes-devtools/help2man/help2man-native_1.47.10.bb b/meta/recipes-devtools/help2man/help2man-native_1.47.10.bb index 5feaeea1391..d54e3952980 100644 --- a/meta/recipes-devtools/help2man/help2man-native_1.47.10.bb +++ b/meta/recipes-devtools/help2man/help2man-native_1.47.10.bb @@ -19,6 +19,6 @@ do_configure() { } do_install_append () { - # Make sure we use /usr/bin/env perl - sed -i -e "1s:#!.*:#! /usr/bin/env perl:" ${D}${bindir}/help2man + # Make sure we use ${bindir}/env perl + sed -i -e "1s:#!.*:#! ${bindir}/env perl:" ${D}${bindir}/help2man } diff --git a/meta/recipes-devtools/intltool/intltool_0.51.0.bb b/meta/recipes-devtools/intltool/intltool_0.51.0.bb index ecff2faf253..bfe26b2f76d 100644 --- a/meta/recipes-devtools/intltool/intltool_0.51.0.bb +++ b/meta/recipes-devtools/intltool/intltool_0.51.0.bb @@ -21,8 +21,8 @@ DEPENDS_class-native = "libxml-parser-perl-native gettext-native" inherit autotools pkgconfig perlnative export PERL = "${bindir}/env perl" -PERL_class-native = "/usr/bin/env nativeperl" -PERL_class-nativesdk = "/usr/bin/env perl" +PERL_class-native = "${bindir}/env nativeperl" +PERL_class-nativesdk = "${bindir}/env perl" # gettext is assumed to exist on the host RDEPENDS_${PN}_class-native = "libxml-parser-perl-native" diff --git a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb index 4be7b16d8a2..44f7cccdae7 100644 --- a/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb +++ b/meta/recipes-devtools/opkg-utils/opkg-utils_0.4.1.bb @@ -33,13 +33,13 @@ do_install() { fi if ! ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - grep -lZ "/usr/bin/env.*python" ${D}${bindir}/* | xargs -0 rm + grep -lZ "${bindir}/env.*python" ${D}${bindir}/* | xargs -0 rm fi } do_install_append_class-target() { if [ -e "${D}${bindir}/update-alternatives" ]; then - sed -i ${D}${bindir}/update-alternatives -e 's,/usr/bin,${bindir},g; s,/usr/lib,${nonarch_libdir},g' + sed -i ${D}${bindir}/update-alternatives -e 's,${bindir},${bindir},g; s,${libdir},${nonarch_libdir},g' fi } diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb index 7c9b7696a7a..d02a3ef42ed 100644 --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb @@ -42,10 +42,10 @@ do_compile_class-native() { } do_install_ptest() { - sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlstats - sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlfilter - sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/xmlcomments - sed -i -e "s:/usr/local/bin/perl:/usr/bin/perl:g" ${B}/samples/canonical + sed -i -e "s:/usr/local/bin/perl:${bindir}/perl:g" ${B}/samples/xmlstats + sed -i -e "s:/usr/local/bin/perl:${bindir}/perl:g" ${B}/samples/xmlfilter + sed -i -e "s:/usr/local/bin/perl:${bindir}/perl:g" ${B}/samples/xmlcomments + sed -i -e "s:/usr/local/bin/perl:${bindir}/perl:g" ${B}/samples/canonical cp -r ${B}/samples ${D}${PTEST_PATH} chown -R root:root ${D}${PTEST_PATH}/samples } diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.0.bb index a221bce52bd..3661910b3fa 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.0.bb @@ -151,9 +151,9 @@ do_install_append_class-native () { # installed to a different location from the one it was built for. create_wrapper ${D}${bindir}/perl-native/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl5/site_perl/${PV}:${STAGING_LIBDIR}/perl5/vendor_perl/${PV}:${STAGING_LIBDIR}/perl5/${PV}' - # Use /usr/bin/env nativeperl for the perl script. + # Use ${bindir}/env nativeperl for the perl script. for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do - sed -i -e 's|${bindir}/perl|/usr/bin/env nativeperl|' $f + sed -i -e 's|${bindir}/perl|${bindir}/env nativeperl|' $f done } @@ -313,7 +313,7 @@ SYSROOT_PREPROCESS_FUNCS += "perl_sysroot_create_wrapper" perl_sysroot_create_wrapper () { mkdir -p ${SYSROOT_DESTDIR}${bindir} - # Create a wrapper that /usr/bin/env perl will use to get perl-native. + # Create a wrapper that ${bindir}/env perl will use to get perl-native. # This MUST live in the normal bindir. cat > ${SYSROOT_DESTDIR}${bindir}/nativeperl << EOF #!/bin/sh diff --git a/meta/recipes-devtools/python/python-native_2.7.16.bb b/meta/recipes-devtools/python/python-native_2.7.16.bb index b7442800d98..81dce6c41a1 100644 --- a/meta/recipes-devtools/python/python-native_2.7.16.bb +++ b/meta/recipes-devtools/python/python-native_2.7.16.bb @@ -47,9 +47,9 @@ do_install() { install -d ${D}${bindir}/${PN} install -m 0755 Parser/pgen ${D}${bindir}/${PN} - # Make sure we use /usr/bin/env python + # Make sure we use ${bindir}/env python for PYTHSCRIPT in `grep -rIl ${bindir}/${PN}/python ${D}${bindir}/${PN}`; do - sed -i -e '1s|^#!.*|#!/usr/bin/env python|' $PYTHSCRIPT + sed -i -e '1s|^#!.*|#!${bindir}/env python|' $PYTHSCRIPT done # Add a symlink to the native Python so that scripts can just invoke diff --git a/meta/recipes-devtools/python/python3_3.7.4.bb b/meta/recipes-devtools/python/python3_3.7.4.bb index 80c9b2919e6..fba6c22c87a 100644 --- a/meta/recipes-devtools/python/python3_3.7.4.bb +++ b/meta/recipes-devtools/python/python3_3.7.4.bb @@ -124,9 +124,9 @@ do_install_append_class-target() { } do_install_append_class-native() { - # Make sure we use /usr/bin/env python + # Make sure we use ${bindir}/env python for PYTHSCRIPT in `grep -rIl ${bindir}/${PN}/python ${D}${bindir}/${PN}`; do - sed -i -e '1s|^#!.*|#!/usr/bin/env python3|' $PYTHSCRIPT + sed -i -e '1s|^#!.*|#!${bindir}/env python3|' $PYTHSCRIPT done # Add a symlink to the native Python so that scripts can just invoke # "nativepython" and get the right one without needing absolute paths @@ -150,7 +150,7 @@ do_install_append() { } do_install_append_class-nativesdk () { - create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} OEPYTHON3HOME='${prefix}' TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1' + create_wrapper ${D}${bindir}/python${PYTHON_MAJMIN} OEPYTHON3HOME='${prefix}' TERMINFO_DIRS='${sysconfdir}/terminfo:${sysconfdir}/terminfo:${datadir}/terminfo:${datadir}/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1' } SSTATE_SCAN_FILES += "Makefile _sysconfigdata.py" diff --git a/meta/recipes-devtools/python/python_2.7.16.bb b/meta/recipes-devtools/python/python_2.7.16.bb index c093f84a35b..8fa52b124ff 100644 --- a/meta/recipes-devtools/python/python_2.7.16.bb +++ b/meta/recipes-devtools/python/python_2.7.16.bb @@ -133,7 +133,7 @@ do_install() { } do_install_append_class-nativesdk () { - create_wrapper ${D}${bindir}/python2.7 PYTHONHOME='${prefix}' TERMINFO_DIRS='${sysconfdir}/terminfo:/etc/terminfo:/usr/share/terminfo:/usr/share/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1' + create_wrapper ${D}${bindir}/python2.7 PYTHONHOME='${prefix}' TERMINFO_DIRS='${sysconfdir}/terminfo:${sysconfdir}/terminfo:${datadir}/terminfo:${datadir}/misc/terminfo:/lib/terminfo' PYTHONNOUSERSITE='1' } SSTATE_SCAN_FILES += "Makefile" diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index d2dd2bc9c1e..366ab95a729 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -79,7 +79,7 @@ EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" do_configure_prepend_class-native() { # Append build host pkg-config paths for native target since the host may provide sdl - BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") + BHOST_PKGCONFIG_PATH=$(PATH=${bindir}:/bin pkg-config --variable pc_path pkg-config || echo "") if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH fi @@ -114,7 +114,7 @@ make_qemu_wrapper() { for tool in `ls ${D}${bindir}/qemu-system-*`; do create_wrapper $tool \ GDK_PIXBUF_MODULE_FILE=$gdk_pixbuf_module_file \ - FONTCONFIG_PATH=/etc/fonts \ + FONTCONFIG_PATH=${sysconfdir}/fonts \ GTK_THEME=Adwaita done } diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 433e9b40b70..000abb532ef 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc @@ -30,7 +30,7 @@ EXTRA_AUTORECONF += "--exclude=aclocal" CACHED_CONFIGUREVARS += "ac_cv_path_BASH=/bin/bash" # Make sure we don't have "-w" in shebang lines: it breaks using -# "/usr/bin/env perl" as parser +# "${bindir}/env perl" as parser do_configure_prepend () { find ${S} -name "*.in" -exec sed -i -e "1s,^#\!.*@PERL@ -w$,#\! @PERL@\nuse warnings;," {} \; } diff --git a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb index 063f4269a57..129952a02a6 100644 --- a/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb +++ b/meta/recipes-devtools/rpm/rpm_4.14.2.1.bb @@ -60,14 +60,14 @@ EXTRA_AUTORECONF_append = " --exclude=gnu-configize" EXTRA_OECONF_append = " --without-lua --enable-python" EXTRA_OECONF_append_libc-musl = " --disable-nls" -# --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs +# --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot${sysconfdir}; we need to have it in rootfs # # --localstatedir prevents rpm from writing its database to native sysroot when building images # # Disable dbus for native, so that rpm doesn't attempt to inhibit shutdown via session dbus even when plugins support is enabled. # Also disable plugins by default for native. -EXTRA_OECONF_append_class-native = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" -EXTRA_OECONF_append_class-nativesdk = " --sysconfdir=/etc --localstatedir=/var --disable-plugins" +EXTRA_OECONF_append_class-native = " --sysconfdir=${sysconfdir} --localstatedir=/var --disable-plugins" +EXTRA_OECONF_append_class-nativesdk = " --sysconfdir=${sysconfdir} --localstatedir=/var --disable-plugins" BBCLASSEXTEND = "native nativesdk" @@ -123,7 +123,7 @@ do_install_append () { sed -i -e 's:${HOSTTOOLS_DIR}/::g' \ ${D}/${libdir}/rpm/macros - sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \ + sed -i -e 's|${bindir}/python|${USRBINPATH}/env ${PYTHON_PN}|' \ ${D}${libdir}/rpm/pythondistdeps.py \ ${D}${libdir}/rpm/python-macro-helper } diff --git a/meta/recipes-devtools/subversion/subversion_1.12.0.bb b/meta/recipes-devtools/subversion/subversion_1.12.0.bb index f1ac1dcfdc1..ab1e3fd3d00 100644 --- a/meta/recipes-devtools/subversion/subversion_1.12.0.bb +++ b/meta/recipes-devtools/subversion/subversion_1.12.0.bb @@ -50,9 +50,9 @@ do_configure_prepend () { sed -i -e 's:with_sasl="/usr/local":with_sasl="${STAGING_DIR}":' ${S}/build/ac-macros/sasl.m4 } -#| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_local/libsvn_ra_local-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| /usr/bin/ld: cannot find -lsvn_delta-1| collect2: ld returned 1 exit status| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_svn/libsvn_ra_svn-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_serf/libsvn_ra_serf-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib' +#| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_local/libsvn_ra_local-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux${libdir}'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux${libdir}'| ${bindir}/ld: cannot find -lsvn_delta-1| collect2: ld returned 1 exit status| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_svn/libsvn_ra_svn-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux${libdir}'| x86_64-linux-libtool: install: warning: `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/build/subversion/libsvn_ra_serf/libsvn_ra_serf-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux${libdir}' #| x86_64-linux-libtool: install: error: relink `libsvn_ra_serf-1.la' with the above command before installing it -#| x86_64-linux-libtool: install: warning: `../../subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux/usr/lib' +#| x86_64-linux-libtool: install: warning: `../../subversion/libsvn_repos/libsvn_repos-1.la' has not been installed in `/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/sysroots/x86_64-linux${libdir}' #| /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-logrotate/build/build/tmp/work/x86_64-linux/subversion-native/1.8.9-r0/subversion-1.8.9/build-outputs.mk:1090: recipe for target 'install-serf-lib' failed #| make: *** [install-serf-lib] Error 1 PARALLEL_MAKEINST = "" diff --git a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb index 1ae21b1fbc5..db05b45af8f 100644 --- a/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb +++ b/meta/recipes-devtools/systemd-bootchart/systemd-bootchart_233.bb @@ -27,7 +27,7 @@ REQUIRED_DISTRO_FEATURES = "systemd" SYSTEMD_SERVICE_${PN} = "systemd-bootchart.service" do_configure_prepend() { - # intltool.m4 is a soft link to /usr/share/aclocal/m4, delete it and use the one in our sysroot + # intltool.m4 is a soft link to ${datadir}/aclocal/m4, delete it and use the one in our sysroot rm -f ${S}/m4/intltool.m4 } diff --git a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb index 4e89c604d6f..0e19f750f9c 100644 --- a/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb +++ b/meta/recipes-devtools/valgrind/valgrind_3.15.0.bb @@ -71,7 +71,7 @@ EXTRA_OECONF_append_arm = " --host=armv7${HOST_VENDOR}-${HOST_OS}" EXTRA_OEMAKE = "-w" -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${bindir}/env perl'" # valgrind likes to control its own optimisation flags. It generally defaults # to -O2 but uses -O0 for some specific test apps etc. Passing our own flags diff --git a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb index 751bf0f19f7..5e69b856bcc 100644 --- a/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb +++ b/meta/recipes-extended/asciidoc/asciidoc_8.6.9.bb @@ -18,7 +18,7 @@ DEPENDS = "libxml2-native libxslt-native docbook-xml-dtd4-native docbook-xsl-sty S = "${WORKDIR}/git" # Tell xmllint where to find the DocBook XML catalogue, because right now it -# opens /etc/xml/catalog on the host. Depends on auto-catalogs.patch +# opens ${sysconfdir}/xml/catalog on the host. Depends on auto-catalogs.patch export SGML_CATALOG_FILES="file://${STAGING_ETCDIR_NATIVE}/xml/catalog" # Not using automake diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 039b8687a24..14cfbecb3e4 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -50,7 +50,7 @@ do_compile_ptest () { } do_install_append () { - # Move /usr/bin/bash to /bin/bash, if need + # Move ${bindir}/bash to /bin/bash, if need if [ "${base_bindir}" != "${bindir}" ]; then mkdir -p ${D}${base_bindir} mv ${D}${bindir}/bash ${D}${base_bindir} diff --git a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb index d21dd697042..a8086c8f7dc 100644 --- a/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb +++ b/meta/recipes-extended/chkconfig/chkconfig_1.3.58.bb @@ -1,7 +1,7 @@ -SUMMARY = "A system tool for maintaining the /etc/rc*.d hierarchy" +SUMMARY = "A system tool for maintaining the ${sysconfdir}/rc*.d hierarchy" DESCRIPTION = "Chkconfig is a basic system utility. It updates and queries runlevel \ information for system services. Chkconfig manipulates the numerous \ -symbolic links in /etc/rc.d, to relieve system administrators of some \ +symbolic links in ${sysconfdir}/rc.d, to relieve system administrators of some \ of the drudgery of manually editing the symbolic links." RECIPE_NO_UPDATE_REASON = "Version 1.5 requires selinux" @@ -44,10 +44,10 @@ EXTRA_OEMAKE = "\ do_unpack[postfuncs] += "obey_variables" do_unpack[vardeps] += "obey_variables" obey_variables () { - sed -i -e 's,/etc,${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h - sed -i -e 's,/etc/alternatives,${sysconfdir}/alternatives,' \ + sed -i -e 's,${sysconfdir},${sysconfdir},; s,/lib/systemd,${base_libdir}/systemd,' ${S}/leveldb.h + sed -i -e 's,${sysconfdir}/alternatives,${sysconfdir}/alternatives,' \ -e 's,/var/lib/alternatives,${localstatedir}/lib/alternatives,' \ - -e 's,/usr/share/locale,${datadir}/locale,' ${S}/alternatives.c + -e 's,${datadir}/locale,${datadir}/locale,' ${S}/alternatives.c } do_install() { diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb b/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb index 742c9a5cf2d..5d8025a964b 100644 --- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb +++ b/meta/recipes-extended/foomatic/foomatic-filters_4.0.17.bb @@ -33,7 +33,7 @@ EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops" do_configure_prepend() { export PERL="${bindir}/env perl" - export CUPS_SERVERBIN=${exec_prefix}/lib/cups # /usr/lib NOT libdir + export CUPS_SERVERBIN=${exec_prefix}/lib/cups # ${libdir} NOT libdir } do_install_append_linuxstdbase() { diff --git a/meta/recipes-extended/groff/groff_1.22.4.bb b/meta/recipes-extended/groff/groff_1.22.4.bb index 082597f6939..69b9761aeea 100644 --- a/meta/recipes-extended/groff/groff_1.22.4.bb +++ b/meta/recipes-extended/groff/groff_1.22.4.bb @@ -27,11 +27,11 @@ MULTILIB_SCRIPTS = "${PN}:${bindir}/gpinyin ${PN}:${bindir}/groffer ${PN}:${bind EXTRA_OECONF = "--without-x --without-doc" PARALLEL_MAKE = "" -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl' ac_cv_path_BASH_PROG='no'" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${bindir}/env perl' ac_cv_path_BASH_PROG='no'" do_install_append() { - # Some distros have both /bin/perl and /usr/bin/perl, but we set perl location - # for target as /usr/bin/perl, so fix it to /usr/bin/perl. + # Some distros have both /bin/perl and ${bindir}/perl, but we set perl location + # for target as ${bindir}/perl, so fix it to ${bindir}/perl. for i in afmtodit mmroff gropdf pdfmom grog; do if [ -f ${D}${bindir}/$i ]; then sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' ${D}${bindir}/$i @@ -41,13 +41,13 @@ do_install_append() { rm -rf ${D}${libdir}/charset.alias fi - # awk is located at /usr/bin/, not /bin/ + # awk is located at ${bindir}/, not /bin/ SPECIAL_AWK=`find ${D} -name special.awk` if [ -f ${SPECIAL_AWK} ]; then sed -i -e 's:#!.*awk:#! ${USRBINPATH}/awk:' ${SPECIAL_AWK} fi - # not ship /usr/bin/glilypond and its releated files in embedded target system + # not ship ${bindir}/glilypond and its releated files in embedded target system rm -rf ${D}${bindir}/glilypond rm -rf ${D}${libdir}/groff/glilypond rm -rf ${D}${mandir}/man1/glilypond* diff --git a/meta/recipes-extended/man-db/man-db_2.8.6.1.bb b/meta/recipes-extended/man-db/man-db_2.8.6.1.bb index ec9eb8385b2..eed092b79f4 100644 --- a/meta/recipes-extended/man-db/man-db_2.8.6.1.bb +++ b/meta/recipes-extended/man-db/man-db_2.8.6.1.bb @@ -25,8 +25,8 @@ do_install() { autotools_do_install if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_mandb ${D}/etc/default/volatiles + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_mandb ${D}${sysconfdir}/default/volatiles fi } diff --git a/meta/recipes-extended/mc/mc_4.8.23.bb b/meta/recipes-extended/mc/mc_4.8.23.bb index 83de8dbb2c6..3f5ad74ad84 100644 --- a/meta/recipes-extended/mc/mc_4.8.23.bb +++ b/meta/recipes-extended/mc/mc_4.8.23.bb @@ -23,7 +23,7 @@ PACKAGECONFIG[sftp] = "--enable-vfs-sftp,--disable-vfs-sftp,libssh2," EXTRA_OECONF = "--with-screen=ncurses --without-gpm-mouse --without-x" -CACHED_CONFIGUREVARS += "ac_cv_path_PERL='/usr/bin/env perl'" +CACHED_CONFIGUREVARS += "ac_cv_path_PERL='${bindir}/env perl'" do_install_append () { sed -i -e '1s,#!.*perl,#!${bindir}/env perl,' ${D}${libexecdir}/mc/extfs.d/* diff --git a/meta/recipes-extended/msmtp/msmtp_1.8.5.bb b/meta/recipes-extended/msmtp/msmtp_1.8.5.bb index 4f6b66f226d..c921dc681d4 100644 --- a/meta/recipes-extended/msmtp/msmtp_1.8.5.bb +++ b/meta/recipes-extended/msmtp/msmtp_1.8.5.bb @@ -19,10 +19,10 @@ inherit gettext autotools update-alternatives pkgconfig EXTRA_OECONF += "--without-libsecret --without-libgsasl --without-libidn" ALTERNATIVE_${PN} = "sendmail" -# /usr/lib/sendmial is required by LSB core test +# ${libdir}/sendmial is required by LSB core test ALTERNATIVE_${PN}_linuxstdbase = "sendmail usr-lib-sendmail" ALTERNATIVE_TARGET[sendmail] = "${bindir}/msmtp" ALTERNATIVE_LINK_NAME[sendmail] = "${sbindir}/sendmail" ALTERNATIVE_TARGET[usr-lib-sendmail] = "${bindir}/msmtp" -ALTERNATIVE_LINK_NAME[usr-lib-sendmail] = "/usr/lib/sendmail" +ALTERNATIVE_LINK_NAME[usr-lib-sendmail] = "${libdir}/sendmail" ALTERNATIVE_PRIORITY = "100" diff --git a/meta/recipes-extended/newt/libnewt_0.52.21.bb b/meta/recipes-extended/newt/libnewt_0.52.21.bb index 09b61be61df..4a8bd586c87 100644 --- a/meta/recipes-extended/newt/libnewt_0.52.21.bb +++ b/meta/recipes-extended/newt/libnewt_0.52.21.bb @@ -5,7 +5,7 @@ interfaces. Newt can be used to add stacked windows, entry widgets, \ checkboxes, radio buttons, labels, plain text fields, scrollbars, \ etc., to text mode user interfaces. This package also contains the \ shared library needed by programs built with newt, as well as a \ -/usr/bin/dialog replacement called whiptail. Newt is based on the \ +${bindir}/dialog replacement called whiptail. Newt is based on the \ slang library." HOMEPAGE = "https://releases.pagure.org/newt/" diff --git a/meta/recipes-extended/pam/libpam_1.3.1.bb b/meta/recipes-extended/pam/libpam_1.3.1.bb index 6b73f0a2fed..9f40639a95c 100644 --- a/meta/recipes-extended/pam/libpam_1.3.1.bb +++ b/meta/recipes-extended/pam/libpam_1.3.1.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://fedorahosted.org/linux-pam/" BUGTRACKER = "https://fedorahosted.org/linux-pam/newticket" SECTION = "base" # PAM is dual licensed under GPL and BSD. -# /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time +# ${sysconfdir}/pam.d comes from Debian libpam-runtime in 2009-11 (at that time # libpam-runtime-1.0.1 is GPLv2+), by openembedded LICENSE = "GPLv2+ | BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=7eb5c1bf854e8881005d673599ee74d3 \ diff --git a/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb b/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb index 7c96aca36b7..e8225d8cbd8 100644 --- a/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb +++ b/meta/recipes-extended/rpcbind/rpcbind_1.2.5.bb @@ -46,7 +46,7 @@ EXTRA_OECONF += " --enable-warmstarts --with-rpcuser=rpc" do_install_append () { install -d ${D}${sysconfdir}/init.d - sed -e 's,/etc/,${sysconfdir}/,g' \ + sed -e 's,${sysconfdir}/,${sysconfdir}/,g' \ -e 's,/sbin/,${sbindir}/,g' \ ${WORKDIR}/init.d > ${D}${sysconfdir}/init.d/rpcbind chmod 0755 ${D}${sysconfdir}/init.d/rpcbind diff --git a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb index ef014628f61..faa0ebe7949 100644 --- a/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb +++ b/meta/recipes-extended/shadow/shadow-sysroot_4.6.bb @@ -9,7 +9,7 @@ DEPENDS = "base-passwd" PR = "r3" -# The sole purpose of this recipe is to provide the /etc/login.defs +# The sole purpose of this recipe is to provide the ${sysconfdir}/login.defs # file for the target sysroot - needed so the shadow-native utilities # can add custom users/groups for recipes that use inherit useradd. SRC_URI = "file://login.defs_shadow-sysroot" @@ -28,5 +28,5 @@ SYSROOT_DIRS += "${sysconfdir}" # don't create any packages # otherwise: dbus-dev depends on shadow-sysroot-dev which depends on shadow-sysroot -# and this has another copy of /etc/login.defs already provided by shadow +# and this has another copy of ${sysconfdir}/login.defs already provided by shadow PACKAGES = "" diff --git a/meta/recipes-extended/sysklogd/sysklogd.inc b/meta/recipes-extended/sysklogd/sysklogd.inc index 749026f8533..28d5a016b66 100644 --- a/meta/recipes-extended/sysklogd/sysklogd.inc +++ b/meta/recipes-extended/sysklogd/sysklogd.inc @@ -67,7 +67,7 @@ ALTERNATIVE_LINK_NAME[syslogd.8] = "${mandir}/man8/syslogd.8" pkg_prerm_${PN} () { if test "x$D" = "x"; then if test "$1" = "upgrade" -o "$1" = "remove"; then - /etc/init.d/syslog stop || : + ${sysconfdir}/init.d/syslog stop || : fi fi } diff --git a/meta/recipes-extended/sysstat/sysstat.inc b/meta/recipes-extended/sysstat/sysstat.inc index 592cbf45743..6172ace6a66 100644 --- a/meta/recipes-extended/sysstat/sysstat.inc +++ b/meta/recipes-extended/sysstat/sysstat.inc @@ -38,8 +38,8 @@ do_install() { # don't install /var/log/sa when populating rootfs. Do it through volatile rm -rf ${D}/var if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_sysstat ${D}/etc/default/volatiles + install -d ${D}${sysconfdir}/default/volatiles + install -m 0644 ${WORKDIR}/99_sysstat ${D}${sysconfdir}/default/volatiles fi if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${sysconfdir}/tmpfiles.d @@ -56,8 +56,8 @@ do_install() { pkg_postinst_${PN} () { if [ ! -n "$D" ]; then - if [ -e /etc/init.d/populate-volatile.sh ]; then - /etc/init.d/populate-volatile.sh update + if [ -e ${sysconfdir}/init.d/populate-volatile.sh ]; then + ${sysconfdir}/init.d/populate-volatile.sh update fi fi } diff --git a/meta/recipes-extended/watchdog/watchdog_5.15.bb b/meta/recipes-extended/watchdog/watchdog_5.15.bb index 1acab2e9e7b..018efc11208 100644 --- a/meta/recipes-extended/watchdog/watchdog_5.15.bb +++ b/meta/recipes-extended/watchdog/watchdog_5.15.bb @@ -41,7 +41,7 @@ SYSTEMD_PACKAGES = "${PN} ${PN}-keepalive" SYSTEMD_SERVICE_${PN} = "watchdog.service" SYSTEMD_SERVICE_${PN}-keepalive = "wd_keepalive.service" # When using systemd, consider making use of internal watchdog support of systemd. -# See RuntimeWatchdogSec in /etc/systemd/system.conf. +# See RuntimeWatchdogSec in ${sysconfdir}/systemd/system.conf. SYSTEMD_AUTO_ENABLE = "disable" do_install_append() { diff --git a/meta/recipes-extended/which/which_2.21.bb b/meta/recipes-extended/which/which_2.21.bb index fac0fd3944b..d70c80ce9c3 100644 --- a/meta/recipes-extended/which/which_2.21.bb +++ b/meta/recipes-extended/which/which_2.21.bb @@ -25,7 +25,7 @@ SRC_URI[md5sum] = "097ff1a324ae02e0a3b0369f07a7544a" SRC_URI[sha256sum] = "f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad" do_configure_prepend() { - sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}/usr/share/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am + sed -i -e 's%@ACLOCAL_CWFLAGS@%-I ${STAGING_DIR_NATIVE}${datadir}/cwautomacros/m4%g' ${S}/Makefile.am ${S}/tilde/Makefile.am } ALTERNATIVE_${PN} = "which" diff --git a/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb b/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb index d0da419ce0e..e0085e4e046 100644 --- a/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb +++ b/meta/recipes-graphics/fontconfig/fontconfig_2.13.1.bb @@ -62,7 +62,7 @@ inherit autotools pkgconfig relative_symlinks gettext FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" # comma separated list of additional directories -# /usr/share/fonts is already included by default (you can change it with --with-default-fonts) +# ${datadir}/fonts is already included by default (you can change it with --with-default-fonts) FONTCONFIG_FONT_DIRS ?= "no" EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR} --with-add-fonts=${FONTCONFIG_FONT_DIRS}" diff --git a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb index 5626ebbd528..078b7bdb825 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb @@ -4,7 +4,7 @@ SUMMARY = "X Window System initializer" DESCRIPTION = "The xinit program is used to start the X Window System \ server and a first client program on systems that cannot start X \ -directly from /etc/init or in environments that use multiple window \ +directly from ${sysconfdir}/init or in environments that use multiple window \ systems. When this first client exits, xinit will kill the X server and \ then terminate." diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index cdbebcf788b..6e2d9d30fd6 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc @@ -32,11 +32,11 @@ FILES_${PN} += " ${libdir}/X11/fonts ${datadir}" PACKAGE_WRITE_DEPS += "mkfontdir-native mkfontscale-native" pkg_postinst_${PN} () { - for fontdir in `find $D/usr/lib/X11/fonts -type d`; do + for fontdir in `find $D${libdir}/X11/fonts -type d`; do mkfontdir $fontdir mkfontscale $fontdir done - for fontdir in `find $D/usr/share/fonts/X11 -type d`; do + for fontdir in `find $D${datadir}/fonts/X11 -type d`; do mkfontdir $fontdir mkfontscale $fontdir done diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 44315f59dc0..59d513c4f3f 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -77,7 +77,7 @@ RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}" RDEPENDS_${PN}-xvfb += "xkeyboard-config" RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" -FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" +FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11${sysconfdir} ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so ${sysconfdir}/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" FILES_${PN}-sdl = "${bindir}/Xsdl" @@ -114,7 +114,7 @@ EXTRA_OECONF += "--with-fop=no \ --enable-composite \ --without-dtrace \ --with-int10=x86emu \ - --sysconfdir=/etc/X11 \ + --sysconfdir=${sysconfdir}/X11 \ --localstatedir=/var \ --with-xkb-output=/var/lib/xkb \ " diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 4e603f1a32b..c37b115fd3b 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -231,9 +231,9 @@ do_configure_prepend () { sed -i 's,#include "perf_regs.h",#include "perf_regs.h"\n#include "util/debug.h",' ${S}/tools/perf/arch/arm/util/unwind-libunwind.c fi - # use /usr/bin/env instead of version specific python + # use ${bindir}/env instead of version specific python for s in `find ${S}/tools/perf/scripts/python/ -name '*.py'`; do - sed -i 's,/usr/bin/python2,/usr/bin/env python,' "${s}" + sed -i 's,${bindir}/python2,${bindir}/env python,' "${s}" done # unistd.h can be out of sync between libc-headers and the captured version in the perf source diff --git a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.9.bb b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.9.bb index b94fc5cee32..4c18e75d33d 100644 --- a/meta/recipes-multimedia/alsa/alsa-plugins_1.1.9.bb +++ b/meta/recipes-multimedia/alsa/alsa-plugins_1.1.9.bb @@ -56,8 +56,8 @@ do_install_append() { if [ "${@bb.utils.contains('PACKAGECONFIG', 'pulseaudio', 'yes', 'no', d)}" = "yes" ]; then # We use the example as is. Upstream installs the file under - # /etc, but we move it under /usr/share and add a symlink under - # /etc to be consistent with other installed configuration + # ${sysconfdir}, but we move it under ${datadir} and add a symlink under + # ${sysconfdir} to be consistent with other installed configuration # files. mv ${D}${sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf.example ${D}${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf ln -s ${datadir}/alsa/alsa.conf.d/99-pulseaudio-default.conf ${D}${sysconfdir}/alsa/conf.d/99-pulseaudio-default.conf @@ -70,7 +70,7 @@ python populate_packages_prepend() { d.setVar("RDEPENDS_alsa-plugins", packages) } -# Many plugins have a configuration file (plus a symlink in /etc) associated +# Many plugins have a configuration file (plus a symlink in ${sysconfdir}) associated # with them. We put the plugin and it's configuration usually in the same # package, but that's problematic when the configuration file is related to # multiple plugins, as is the case with the pulse, oss and maemo plugins. In diff --git a/meta/recipes-multimedia/alsa/alsa-utils_1.1.9.bb b/meta/recipes-multimedia/alsa/alsa-utils_1.1.9.bb index 03b5c8de30e..c3344742540 100644 --- a/meta/recipes-multimedia/alsa/alsa-utils_1.1.9.bb +++ b/meta/recipes-multimedia/alsa/alsa-utils_1.1.9.bb @@ -81,7 +81,7 @@ SUMMARY_alsa-utils-midi = "Miscellaneous MIDI utilities for ALSA" SUMMARY_alsa-utils-aconnect = "ALSA sequencer connection manager" SUMMARY_alsa-utils-aseqnet = "Network client/server for ALSA sequencer" SUMMARY_alsa-utils-iecset = "ALSA utility for setting/showing IEC958 (S/PDIF) status bits" -SUMMARY_alsa-utils-alsactl = "Saves/restores ALSA-settings in /etc/asound.state" +SUMMARY_alsa-utils-alsactl = "Saves/restores ALSA-settings in ${sysconfdir}/asound.state" SUMMARY_alsa-utils-aseqdump = "Shows the events received at an ALSA sequencer port" SUMMARY_alsa-utils-alsaloop = "ALSA PCM loopback utility" SUMMARY_alsa-utils-alsaucm = "ALSA Use Case Manager" diff --git a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb index e27339fb462..814b4a08fd0 100644 --- a/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb +++ b/meta/recipes-sato/pulseaudio-sato/pulseaudio-client-conf-sato_1.bb @@ -1,4 +1,4 @@ -SUMMARY = "/etc/pulse/client.conf tailored for Sato" +SUMMARY = "${sysconfdir}/pulse/client.conf tailored for Sato" SECTION = "multimedia" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb b/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb index efd9eaa71e4..e213d6a01e9 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20190110.bb @@ -58,8 +58,8 @@ do_install () { } do_install_append_class-target () { - sed -i -e 's,/etc/,${sysconfdir}/,' \ - -e 's,/usr/share/,${datadir}/,' \ + sed -i -e 's,${sysconfdir}/,${sysconfdir}/,' \ + -e 's,${datadir}/,${datadir}/,' \ -e 's,/usr/local,${prefix}/local,' \ ${D}${sbindir}/update-ca-certificates \ ${D}${mandir}/man8/update-ca-certificates.8 diff --git a/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb b/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb index 54455da1bb7..5f91518d019 100644 --- a/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb +++ b/meta/recipes-support/p11-kit/p11-kit_0.23.16.1.bb @@ -15,7 +15,7 @@ S = "${WORKDIR}/git" AUTOTOOLS_AUXDIR = "${S}/build/litter" PACKAGECONFIG ??= "" -PACKAGECONFIG[trust-paths] = "--with-trust-paths=/etc/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca-certificates" +PACKAGECONFIG[trust-paths] = "--with-trust-paths=${sysconfdir}/ssl/certs/ca-certificates.crt,--without-trust-paths,,ca-certificates" # This recipe does not use the standard gtk-doc m4 macros, and so the ./configure flags # that control gtk-doc build are non-standard diff --git a/meta/recipes-support/taglib/taglib_1.11.1.bb b/meta/recipes-support/taglib/taglib_1.11.1.bb index f4e288295de..0b72fb08650 100644 --- a/meta/recipes-support/taglib/taglib_1.11.1.bb +++ b/meta/recipes-support/taglib/taglib_1.11.1.bb @@ -40,5 +40,5 @@ do_configure_prepend () { } # without -fPIC depending packages failed with many error like: -# | <...>/ld: error: <...>/usr/lib/libtag.a(modfilebase.cpp.o): requires unsupported dynamic reloc R_ARM_THM_MOVW_ABS_NC; recompile with -fPIC +# | <...>/ld: error: <...>${libdir}/libtag.a(modfilebase.cpp.o): requires unsupported dynamic reloc R_ARM_THM_MOVW_ABS_NC; recompile with -fPIC CXXFLAGS += "-fPIC"