diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-07-28 23:28:15 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-02 15:44:10 +0100 |
| commit | bb6ddc3691ab04162ec5fd69a2d5e7876713fd15 (patch) | |
| tree | 76e376b01253c3aace1a98a5021bcaad3c92e861 /meta/recipes-devtools/dnf | |
| parent | fcc456ee4b8f619134abb4649db53c638074082c (diff) | |
| download | poky-bb6ddc3691ab04162ec5fd69a2d5e7876713fd15.tar.gz | |
Convert to new override syntax
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dnf')
| -rw-r--r-- | meta/recipes-devtools/dnf/dnf_4.8.0.bb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/recipes-devtools/dnf/dnf_4.8.0.bb b/meta/recipes-devtools/dnf/dnf_4.8.0.bb index 44c4405939..f51d74797d 100644 --- a/meta/recipes-devtools/dnf/dnf_4.8.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.8.0.bb | |||
| @@ -32,7 +32,7 @@ EXTRA_OECMAKE = " -DWITH_MAN=0 -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} - | |||
| 32 | 32 | ||
| 33 | BBCLASSEXTEND = "native nativesdk" | 33 | BBCLASSEXTEND = "native nativesdk" |
| 34 | 34 | ||
| 35 | RDEPENDS_${PN} += " \ | 35 | RDEPENDS:${PN} += " \ |
| 36 | python3-core \ | 36 | python3-core \ |
| 37 | python3-codecs \ | 37 | python3-codecs \ |
| 38 | python3-netclient \ | 38 | python3-netclient \ |
| @@ -55,32 +55,32 @@ RDEPENDS_${PN} += " \ | |||
| 55 | python3-gpg \ | 55 | python3-gpg \ |
| 56 | " | 56 | " |
| 57 | 57 | ||
| 58 | RDEPENDS_${PN}_class-native = "" | 58 | RDEPENDS:${PN}:class-native = "" |
| 59 | 59 | ||
| 60 | RRECOMMENDS_${PN}_class-target += "gnupg" | 60 | RRECOMMENDS:${PN}:class-target += "gnupg" |
| 61 | 61 | ||
| 62 | # Create a symlink called 'dnf' as 'make install' does not do it, but | 62 | # Create a symlink called 'dnf' as 'make install' does not do it, but |
| 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 | lnr ${D}/${bindir}/dnf-3 ${D}/${bindir}/dnf |
| 67 | lnr ${D}/${bindir}/dnf-automatic-3 ${D}/${bindir}/dnf-automatic | 67 | lnr ${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 |
| 71 | do_install_append_class-native() { | 71 | do_install:append:class-native() { |
| 72 | create_wrapper ${D}/${bindir}/dnf \ | 72 | create_wrapper ${D}/${bindir}/dnf \ |
| 73 | RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ | 73 | RPM_CONFIGDIR=${STAGING_LIBDIR_NATIVE}/rpm \ |
| 74 | RPM_NO_CHROOT_FOR_SCRIPTS=1 | 74 | RPM_NO_CHROOT_FOR_SCRIPTS=1 |
| 75 | } | 75 | } |
| 76 | 76 | ||
| 77 | do_install_append_class-nativesdk() { | 77 | do_install:append:class-nativesdk() { |
| 78 | create_wrapper ${D}/${bindir}/dnf \ | 78 | create_wrapper ${D}/${bindir}/dnf \ |
| 79 | RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ | 79 | RPM_CONFIGDIR=${SDKPATHNATIVE}${libdir_nativesdk}/rpm \ |
| 80 | RPM_NO_CHROOT_FOR_SCRIPTS=1 | 80 | RPM_NO_CHROOT_FOR_SCRIPTS=1 |
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ | 83 | SYSTEMD_SERVICE:${PN} = "dnf-makecache.service dnf-makecache.timer \ |
| 84 | dnf-automatic.service dnf-automatic.timer \ | 84 | dnf-automatic.service dnf-automatic.timer \ |
| 85 | dnf-automatic-download.service dnf-automatic-download.timer \ | 85 | dnf-automatic-download.service dnf-automatic-download.timer \ |
| 86 | dnf-automatic-install.service dnf-automatic-install.timer \ | 86 | dnf-automatic-install.service dnf-automatic-install.timer \ |
