diff options
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r-- | meta/recipes-devtools/dnf/dnf_4.10.0.bb | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/dnf/dnf_4.10.0.bb b/meta/recipes-devtools/dnf/dnf_4.10.0.bb index e4432c7f09..cef2c03e4e 100644 --- a/meta/recipes-devtools/dnf/dnf_4.10.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.10.0.bb | |||
@@ -63,8 +63,8 @@ RRECOMMENDS:${PN}:class-target += "gnupg" | |||
63 | # .spec file in dnf source tree does (and then Fedora and dnf documentation | 63 | # .spec file in dnf source tree does (and then Fedora and dnf documentation |
64 | # says that dnf binary is plain 'dnf'). | 64 | # says that dnf binary is plain 'dnf'). |
65 | do_install:append() { | 65 | do_install:append() { |
66 | lnr ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf | 66 | ln -rs ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf |
67 | lnr ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic | 67 | ln -rs ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic |
68 | } | 68 | } |
69 | 69 | ||
70 | # Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in | 70 | # Direct dnf-native to read rpm configuration from our sysroot, not the one it was compiled in |
diff --git a/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb b/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb index 29cf4a6a94..887e15e28c 100644 --- a/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb +++ b/meta/recipes-devtools/pkgconf/pkgconf_1.8.0.bb | |||
@@ -59,7 +59,7 @@ pkgconf_sstate_fixup_esdk () { | |||
59 | if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then | 59 | if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then |
60 | pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}" | 60 | pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}" |
61 | mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real | 61 | mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real |
62 | lnr $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config | 62 | ln -rs $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config |
63 | sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native | 63 | sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native |
64 | fi | 64 | fi |
65 | } | 65 | } |
diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb index 39b87ec829..c220bafd90 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb +++ b/meta/recipes-devtools/pkgconfig/pkgconfig_git.bb | |||
@@ -67,7 +67,7 @@ pkgconfig_sstate_fixup_esdk () { | |||
67 | if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then | 67 | if [ "${BB_CURRENTTASK}" = "populate_sysroot_setscene" -a "${WITHIN_EXT_SDK}" = "1" ] ; then |
68 | pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}" | 68 | pkgconfdir="${SSTATE_INSTDIR}/recipe-sysroot-native/${bindir_native}" |
69 | mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real | 69 | mv $pkgconfdir/pkg-config $pkgconfdir/pkg-config.real |
70 | lnr $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config | 70 | ln -rs $pkgconfdir/pkg-config-esdk $pkgconfdir/pkg-config |
71 | sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native | 71 | sed -i -e "s|^pkg-config|pkg-config.real|" $pkgconfdir/pkg-config-native |
72 | fi | 72 | fi |
73 | } | 73 | } |