diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:04:53 +0200 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2021-08-03 10:21:25 -0700 |
| commit | c61dc077bbd81260e4f167fa2251643ba0ba6974 (patch) | |
| tree | 66c3243f8f64ae60f66f70a16e8128c247254a65 /meta-oe/recipes-extended/ostree | |
| parent | c5f7cfb8db54cfa4257797db5bd87828dea43296 (diff) | |
| download | meta-openembedded-c61dc077bbd81260e4f167fa2251643ba0ba6974.tar.gz | |
Convert to new override syntax
This is the result of automated script (0.9.1) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-extended/ostree')
| -rw-r--r-- | meta-oe/recipes-extended/ostree/ostree_2021.3.bb | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/meta-oe/recipes-extended/ostree/ostree_2021.3.bb b/meta-oe/recipes-extended/ostree/ostree_2021.3.bb index c735f6d8b8..a0576b51e2 100644 --- a/meta-oe/recipes-extended/ostree/ostree_2021.3.bb +++ b/meta-oe/recipes-extended/ostree/ostree_2021.3.bb | |||
| @@ -45,7 +45,7 @@ PACKAGECONFIG ??= " \ | |||
| 45 | 45 | ||
| 46 | # We include soup because ostree can't (currently) be built without | 46 | # We include soup because ostree can't (currently) be built without |
| 47 | # soup or curl - https://github.com/ostreedev/ostree/issues/1897 | 47 | # soup or curl - https://github.com/ostreedev/ostree/issues/1897 |
| 48 | PACKAGECONFIG_class-native ??= " \ | 48 | PACKAGECONFIG:class-native ??= " \ |
| 49 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ | 49 | ${@bb.utils.filter('DISTRO_FEATURES', 'selinux smack', d)} \ |
| 50 | builtin-grub2-mkconfig \ | 50 | builtin-grub2-mkconfig \ |
| 51 | gpgme \ | 51 | gpgme \ |
| @@ -84,7 +84,7 @@ EXTRA_OEMAKE = " \ | |||
| 84 | INTROSPECTION_SCANNER_ENV= \ | 84 | INTROSPECTION_SCANNER_ENV= \ |
| 85 | " | 85 | " |
| 86 | 86 | ||
| 87 | EXTRA_OECONF_class-native = " \ | 87 | EXTRA_OECONF:class-native = " \ |
| 88 | --enable-wrpseudo-compat \ | 88 | --enable-wrpseudo-compat \ |
| 89 | --disable-otmpfile \ | 89 | --disable-otmpfile \ |
| 90 | " | 90 | " |
| @@ -92,17 +92,17 @@ EXTRA_OECONF_class-native = " \ | |||
| 92 | # Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the | 92 | # Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the |
| 93 | # do_configure stage so we do depend on it | 93 | # do_configure stage so we do depend on it |
| 94 | SYSROOT_DIR = "${STAGING_DIR_TARGET}" | 94 | SYSROOT_DIR = "${STAGING_DIR_TARGET}" |
| 95 | SYSROOT_DIR_class-native = "${STAGING_DIR_NATIVE}" | 95 | SYSROOT_DIR:class-native = "${STAGING_DIR_NATIVE}" |
| 96 | do_configure[vardeps] += "SYSROOT_DIR" | 96 | do_configure[vardeps] += "SYSROOT_DIR" |
| 97 | 97 | ||
| 98 | do_configure_prepend() { | 98 | do_configure:prepend() { |
| 99 | # this reflects what autogen.sh does, but the OE wrappers for autoreconf | 99 | # this reflects what autogen.sh does, but the OE wrappers for autoreconf |
| 100 | # allow it to work without the other gyrations which exist there | 100 | # allow it to work without the other gyrations which exist there |
| 101 | cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc | 101 | cp ${S}/libglnx/Makefile-libglnx.am ${S}/libglnx/Makefile-libglnx.am.inc |
| 102 | cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc | 102 | cp ${S}/bsdiff/Makefile-bsdiff.am ${S}/bsdiff/Makefile-bsdiff.am.inc |
| 103 | } | 103 | } |
| 104 | 104 | ||
| 105 | do_install_append_class-native() { | 105 | do_install:append:class-native() { |
| 106 | create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" | 106 | create_wrapper ${D}${bindir}/ostree OSTREE_GRUB2_EXEC="${STAGING_LIBDIR_NATIVE}/ostree/ostree-grub-generator" |
| 107 | } | 107 | } |
| 108 | 108 | ||
| @@ -114,38 +114,38 @@ PACKAGE_BEFORE_PN = " \ | |||
| 114 | ${PN}-trivial-httpd \ | 114 | ${PN}-trivial-httpd \ |
| 115 | " | 115 | " |
| 116 | 116 | ||
| 117 | FILES_${PN} += " \ | 117 | FILES:${PN} += " \ |
| 118 | ${nonarch_libdir}/${BPN} \ | 118 | ${nonarch_libdir}/${BPN} \ |
| 119 | ${nonarch_libdir}/tmpfiles.d \ | 119 | ${nonarch_libdir}/tmpfiles.d \ |
| 120 | ${systemd_unitdir}/system \ | 120 | ${systemd_unitdir}/system \ |
| 121 | ${systemd_unitdir}/system-generators \ | 121 | ${systemd_unitdir}/system-generators \ |
| 122 | " | 122 | " |
| 123 | FILES_${PN}-dracut = " \ | 123 | FILES:${PN}-dracut = " \ |
| 124 | ${sysconfdir}/dracut.conf.d \ | 124 | ${sysconfdir}/dracut.conf.d \ |
| 125 | ${libdir}/dracut \ | 125 | ${libdir}/dracut \ |
| 126 | " | 126 | " |
| 127 | FILES_${PN}-grub = " \ | 127 | FILES:${PN}-grub = " \ |
| 128 | ${sysconfdir}/grub.d \ | 128 | ${sysconfdir}/grub.d \ |
| 129 | ${libexecdir}/libostree/grub2-15_ostree \ | 129 | ${libexecdir}/libostree/grub2-15_ostree \ |
| 130 | " | 130 | " |
| 131 | FILES_${PN}-mkinitcpio = " \ | 131 | FILES:${PN}-mkinitcpio = " \ |
| 132 | ${sysconfdir}/ostree-mkinitcpio.conf \ | 132 | ${sysconfdir}/ostree-mkinitcpio.conf \ |
| 133 | ${libdir}/initcpio \ | 133 | ${libdir}/initcpio \ |
| 134 | " | 134 | " |
| 135 | FILES_${PN}-switchroot = " \ | 135 | FILES:${PN}-switchroot = " \ |
| 136 | ${nonarch_libdir}/${BPN}/ostree-prepare-root \ | 136 | ${nonarch_libdir}/${BPN}/ostree-prepare-root \ |
| 137 | ${systemd_unitdir}/system/ostree-prepare-root.service \ | 137 | ${systemd_unitdir}/system/ostree-prepare-root.service \ |
| 138 | " | 138 | " |
| 139 | FILES_${PN}-trivial-httpd = " \ | 139 | FILES:${PN}-trivial-httpd = " \ |
| 140 | ${libexecdir}/libostree/ostree-trivial-httpd \ | 140 | ${libexecdir}/libostree/ostree-trivial-httpd \ |
| 141 | " | 141 | " |
| 142 | 142 | ||
| 143 | RDEPENDS_${PN} = " \ | 143 | RDEPENDS:${PN} = " \ |
| 144 | ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \ | 144 | ${@bb.utils.contains('PACKAGECONFIG', 'trivial-httpd-cmdline', '${PN}-trivial-httpd', '', d)} \ |
| 145 | " | 145 | " |
| 146 | RDEPENDS_${PN}-dracut = "bash" | 146 | RDEPENDS:${PN}-dracut = "bash" |
| 147 | RDEPENDS_${PN}-mkinitcpio = "bash" | 147 | RDEPENDS:${PN}-mkinitcpio = "bash" |
| 148 | RDEPENDS_${PN}_class-target = " \ | 148 | RDEPENDS:${PN}:class-target = " \ |
| 149 | ${@bb.utils.contains('PACKAGECONFIG', 'gpgme', 'gnupg', '', d)} \ | 149 | ${@bb.utils.contains('PACKAGECONFIG', 'gpgme', 'gnupg', '', d)} \ |
| 150 | ${PN}-switchroot \ | 150 | ${PN}-switchroot \ |
| 151 | " | 151 | " |
| @@ -161,7 +161,7 @@ RDEPENDS_${PN}_class-target = " \ | |||
| 161 | # /var/tmp as a real filesystem (not a tmpfs) | 161 | # /var/tmp as a real filesystem (not a tmpfs) |
| 162 | # Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") | 162 | # Sufficient disk space (IMAGE_ROOTFS_SIZE = "524288") and RAM (QB_MEM = "-m 1024") |
| 163 | # | 163 | # |
| 164 | RDEPENDS_${PN}-ptest += " \ | 164 | RDEPENDS:${PN}-ptest += " \ |
| 165 | attr \ | 165 | attr \ |
| 166 | bash \ | 166 | bash \ |
| 167 | coreutils \ | 167 | coreutils \ |
| @@ -179,11 +179,11 @@ RDEPENDS_${PN}-ptest += " \ | |||
| 179 | python3-pyyaml \ | 179 | python3-pyyaml \ |
| 180 | ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ | 180 | ${@bb.utils.contains('PACKAGECONFIG', 'gjs', 'gjs', '', d)} \ |
| 181 | " | 181 | " |
| 182 | RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils glibc-localedata-en-us" | 182 | RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-utils glibc-localedata-en-us" |
| 183 | 183 | ||
| 184 | RRECOMMENDS_${PN} += "kernel-module-overlay" | 184 | RRECOMMENDS:${PN} += "kernel-module-overlay" |
| 185 | 185 | ||
| 186 | SYSTEMD_SERVICE_${PN} = "ostree-remount.service ostree-finalize-staged.path" | 186 | SYSTEMD_SERVICE:${PN} = "ostree-remount.service ostree-finalize-staged.path" |
| 187 | SYSTEMD_SERVICE_${PN}-switchroot = "ostree-prepare-root.service" | 187 | SYSTEMD_SERVICE:${PN}-switchroot = "ostree-prepare-root.service" |
| 188 | 188 | ||
| 189 | BBCLASSEXTEND = "native" | 189 | BBCLASSEXTEND = "native" |
