diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2021-07-31 17:47:03 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2021-07-31 17:47:03 +0800 |
commit | 0584f638797a816b29b909d4611d5a099df7bbc1 (patch) | |
tree | 1ec4bdacf824c304290b5086fd54bba9b84158e2 /recipes-support | |
parent | 7a5e47b6a594eb29dfe84e47f043a49974bc0402 (diff) | |
download | meta-intel-0584f638797a816b29b909d4611d5a099df7bbc1.tar.gz |
Convert to new override syntax
Use the convert-overrides.py to convert to new syntax and manually
fix some additional changes.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Diffstat (limited to 'recipes-support')
-rw-r--r-- | recipes-support/jhi/jhi_1.41.bb | 22 | ||||
-rw-r--r-- | recipes-support/libipt/libipt_2.0.4.bb | 4 | ||||
-rw-r--r-- | recipes-support/sbsigntool/sbsigntool-native_git.bb | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/recipes-support/jhi/jhi_1.41.bb b/recipes-support/jhi/jhi_1.41.bb index badb928f..d8b807c0 100644 --- a/recipes-support/jhi/jhi_1.41.bb +++ b/recipes-support/jhi/jhi_1.41.bb | |||
@@ -14,20 +14,20 @@ S = "${WORKDIR}/git" | |||
14 | 14 | ||
15 | DEPENDS += "util-linux libxml2" | 15 | DEPENDS += "util-linux libxml2" |
16 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | 16 | DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" |
17 | RDEPENDS_${PN} += "bash" | 17 | RDEPENDS:${PN} += "bash" |
18 | 18 | ||
19 | USERADD_PACKAGES = "${PN}" | 19 | USERADD_PACKAGES = "${PN}" |
20 | USERADD_PARAM_${PN} = "--system --no-create-home --shell /bin/false -g mei jhi" | 20 | USERADD_PARAM:${PN} = "--system --no-create-home --shell /bin/false -g mei jhi" |
21 | 21 | ||
22 | GROUPADD_PARAM_${PN} = "-g 880 mei" | 22 | GROUPADD_PARAM:${PN} = "-g 880 mei" |
23 | 23 | ||
24 | COMPATIBLE_HOST_libc-musl = 'null' | 24 | COMPATIBLE_HOST:libc-musl = 'null' |
25 | 25 | ||
26 | SYSTEMD_SERVICE_${PN} = "jhi.service" | 26 | SYSTEMD_SERVICE:${PN} = "jhi.service" |
27 | 27 | ||
28 | INITSCRIPT_PACKAGES = "${PN}" | 28 | INITSCRIPT_PACKAGES = "${PN}" |
29 | INITSCRIPT_NAME_${PN} = "${PN}" | 29 | INITSCRIPT_NAME:${PN} = "${PN}" |
30 | INITSCRIPT_PARAMS_${PN} = "defaults" | 30 | INITSCRIPT_PARAMS:${PN} = "defaults" |
31 | 31 | ||
32 | # systemd is the default so they are installed when sysvinit is not selected as INIT_SYSTEM | 32 | # systemd is the default so they are installed when sysvinit is not selected as INIT_SYSTEM |
33 | EXTRA_OECMAKE = "-DCMAKE_SKIP_RPATH=ON \ | 33 | EXTRA_OECMAKE = "-DCMAKE_SKIP_RPATH=ON \ |
@@ -36,7 +36,7 @@ EXTRA_OECMAKE = "-DCMAKE_SKIP_RPATH=ON \ | |||
36 | -DAPP_REPO_DIR=${localstatedir}/cache/dal/applet_repository \ | 36 | -DAPP_REPO_DIR=${localstatedir}/cache/dal/applet_repository \ |
37 | " | 37 | " |
38 | 38 | ||
39 | do_install_append () { | 39 | do_install:append () { |
40 | install -d ${D}${localstatedir}/cache/dal/applet_repository | 40 | install -d ${D}${localstatedir}/cache/dal/applet_repository |
41 | 41 | ||
42 | chown -R jhi ${D}${localstatedir}/cache/dal/applet_repository | 42 | chown -R jhi ${D}${localstatedir}/cache/dal/applet_repository |
@@ -52,9 +52,9 @@ do_install_append () { | |||
52 | 52 | ||
53 | PACKAGES += "${PN}-test" | 53 | PACKAGES += "${PN}-test" |
54 | 54 | ||
55 | FILES_${PN}-dev = "" | 55 | FILES:${PN}-dev = "" |
56 | 56 | ||
57 | FILES_${PN} = "\ | 57 | FILES:${PN} = "\ |
58 | ${sbindir} \ | 58 | ${sbindir} \ |
59 | ${sysconfdir} \ | 59 | ${sysconfdir} \ |
60 | ${libdir}/lib*${SOLIBSDEV} \ | 60 | ${libdir}/lib*${SOLIBSDEV} \ |
@@ -64,7 +64,7 @@ FILES_${PN} = "\ | |||
64 | ${localstatedir}/cache/dal/applet_repository \ | 64 | ${localstatedir}/cache/dal/applet_repository \ |
65 | " | 65 | " |
66 | 66 | ||
67 | FILES_${PN}-test = "\ | 67 | FILES:${PN}-test = "\ |
68 | ${bindir} \ | 68 | ${bindir} \ |
69 | ${libdir}/dal/applets \ | 69 | ${libdir}/dal/applets \ |
70 | " | 70 | " |
diff --git a/recipes-support/libipt/libipt_2.0.4.bb b/recipes-support/libipt/libipt_2.0.4.bb index a0554f44..6d59654b 100644 --- a/recipes-support/libipt/libipt_2.0.4.bb +++ b/recipes-support/libipt/libipt_2.0.4.bb | |||
@@ -21,7 +21,7 @@ EXTRA_OECMAKE += " \ | |||
21 | -DCMAKE_SKIP_RPATH=ON \ | 21 | -DCMAKE_SKIP_RPATH=ON \ |
22 | " | 22 | " |
23 | 23 | ||
24 | do_install_append() { | 24 | do_install:append() { |
25 | install -d ${D}${bindir}/libipt | 25 | install -d ${D}${bindir}/libipt |
26 | install -d ${D}${bindir}/libipt/tests | 26 | install -d ${D}${bindir}/libipt/tests |
27 | 27 | ||
@@ -29,5 +29,5 @@ do_install_append() { | |||
29 | cp -r ${WORKDIR}/git/test/src/* ${D}${bindir}/libipt/tests | 29 | cp -r ${WORKDIR}/git/test/src/* ${D}${bindir}/libipt/tests |
30 | } | 30 | } |
31 | 31 | ||
32 | FILES_${PN}-test = "${bindir}" | 32 | FILES:${PN}-test = "${bindir}" |
33 | PACKAGES =+ "${PN}-test" | 33 | PACKAGES =+ "${PN}-test" |
diff --git a/recipes-support/sbsigntool/sbsigntool-native_git.bb b/recipes-support/sbsigntool/sbsigntool-native_git.bb index f6094a5c..1db77561 100644 --- a/recipes-support/sbsigntool/sbsigntool-native_git.bb +++ b/recipes-support/sbsigntool/sbsigntool-native_git.bb | |||
@@ -37,7 +37,7 @@ S = "${WORKDIR}/git" | |||
37 | inherit autotools pkgconfig | 37 | inherit autotools pkgconfig |
38 | inherit native | 38 | inherit native |
39 | 39 | ||
40 | do_configure_prepend() { | 40 | do_configure:prepend() { |
41 | cd ${S} | 41 | cd ${S} |
42 | 42 | ||
43 | sed -i s#RECIPE_SYSROOT#${RECIPE_SYSROOT_NATIVE}#g configure.ac | 43 | sed -i s#RECIPE_SYSROOT#${RECIPE_SYSROOT_NATIVE}#g configure.ac |