diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2021-09-28 20:46:50 +0300 |
commit | d73e39703a0260c8911cb439b579e1c2bada4b20 (patch) | |
tree | 4fa9f965ae954c587ab773ecaced6b8f8e18d359 /meta-openembedded/meta-oe/recipes-bsp | |
parent | 6f106a0a4ce15fe0678d4ffefd572e6978c72597 (diff) | |
parent | 6d8c5d2c6204714ca6b7a43f04348162b683cdbc (diff) | |
download | openbmc-d73e39703a0260c8911cb439b579e1c2bada4b20.tar.xz |
Merge tag '0.75' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-bsp')
10 files changed, 73 insertions, 73 deletions
diff --git a/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb index 88fcc0200..d61a871cd 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb @@ -14,7 +14,7 @@ SRC_URI = "git://github.com/emagii/cpufrequtils.git \ file://0001-dont-unset-cflags.patch \ " -EXTRA_OEMAKE_append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " +EXTRA_OEMAKE:append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " PR = "r5" diff --git a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb index b89fe6771..914718c00 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/edac-utils/edac-utils_git.bb @@ -19,19 +19,19 @@ SRC_URI = "git://github.com/grondo/edac-utils \ inherit autotools-brokensep systemd -do_configure_prepend () { +do_configure:prepend () { touch ${S}/ChangeLog ${S}/bootstrap } -RDEPENDS_${PN}_x86 = "dmidecode" -RDEPENDS_${PN}_x86-64 = "dmidecode" -RDEPENDS_${PN}_arm = "dmidecode" -RDEPENDS_${PN}_aarch64 = "dmidecode" -RDEPENDS_${PN}_powerpc = "dmidecode" -RDEPENDS_${PN}_powerpc64 = "dmidecode" -RDEPENDS_${PN}_powerpc64le = "dmidecode" -RDEPENDS_${PN}_append = " \ +RDEPENDS:${PN}:x86 = "dmidecode" +RDEPENDS:${PN}:x86-64 = "dmidecode" +RDEPENDS:${PN}:arm = "dmidecode" +RDEPENDS:${PN}:aarch64 = "dmidecode" +RDEPENDS:${PN}:powerpc = "dmidecode" +RDEPENDS:${PN}:powerpc64 = "dmidecode" +RDEPENDS:${PN}:powerpc64le = "dmidecode" +RDEPENDS:${PN}:append = " \ perl \ perl-module-file-basename \ perl-module-file-find \ @@ -42,11 +42,11 @@ RDEPENDS_${PN}_append = " \ perl-module-file-glob \ " -do_install_append() { +do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 644 ${WORKDIR}/edac.service ${D}/${systemd_unitdir}/system sed -i -e 's,@SBINDIR@,${sbindir},g' ${D}/${systemd_unitdir}/system/edac.service } -SYSTEMD_SERVICE_${PN} = "edac.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "edac.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" diff --git a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb index 43fc59815..186bc1930 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb @@ -21,13 +21,13 @@ inherit pkgconfig autotools systemd features_check REQUIRED_DISTRO_FEATURES = "systemd" -SYSTEMD_SERVICE_${PN} = "firmwared.service" +SYSTEMD_SERVICE:${PN} = "firmwared.service" -do_configure_prepend() { +do_configure:prepend() { ${S}/autogen.sh } -do_install_append() { +do_install:append() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/firmwared.service ${D}${systemd_system_unitdir} sed -i -e 's,@BINDIR@,${bindir},g' ${D}${systemd_system_unitdir}/firmwared.service diff --git a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb index caffcb696..ebd034ac1 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/irda-utils/irda-utils_0.9.18.bb @@ -21,7 +21,7 @@ SRC_URI[sha256sum] = "61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67 inherit update-rc.d -RRECOMMENDS_${PN} = "\ +RRECOMMENDS:${PN} = "\ kernel-module-pxaficp-ir \ kernel-module-irda \ kernel-module-ircomm \ diff --git a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb index f9ae9aad9..66da1826f 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/ledmon/ledmon_git.bb @@ -13,7 +13,7 @@ DEPENDS = "sg3-utils udev" inherit autotools systemd -SYSTEMD_SERVICE_${PN} = "ledmon.service" +SYSTEMD_SERVICE:${PN} = "ledmon.service" # 0.93 SRC_URI = "git://github.com/intel/ledmon;branch=master \ @@ -24,7 +24,7 @@ SRC_URI = "git://github.com/intel/ledmon;branch=master \ SRCREV = "1d72f9cb5c9163b2ecdf19709935720e65f5b90e" COMPATIBLE_HOST = "(i.86|x86_64).*-linux" -COMPATIBLE_HOST_libc-musl = "null" +COMPATIBLE_HOST:libc-musl = "null" S = "${WORKDIR}/git" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'" @@ -33,7 +33,7 @@ EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}' CFLAGS='${CFLAGS}'" # We need to add this include path in CFLAGS. CFLAGS += "-I${S}/config" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then install -d ${D}${systemd_unitdir}/system install -m 0755 ${S}/systemd/ledmon.service ${D}${systemd_unitdir}/system diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb index b55bd5161..038f0c674 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors-config_1.0.bb @@ -17,7 +17,7 @@ S = "${WORKDIR}" PACKAGECONFIG ??= "sensord" PACKAGECONFIG[sensord] = ",," -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" do_install() { # Install fancontrol configuration file @@ -51,18 +51,18 @@ PACKAGES =+ "${PN}-fancontrol" # sensord web cgi support PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-cgi', '', d)}" -RRECOMMENDS_${PN}-cgi = "lighttpd lighttpd-module-cgi" -RDEPENDS_${PN}-cgi = "${PN}-sensord rrdtool" -FILES_${PN}-cgi = "/www/*" +RRECOMMENDS:${PN}-cgi = "lighttpd lighttpd-module-cgi" +RDEPENDS:${PN}-cgi = "${PN}-sensord rrdtool" +FILES:${PN}-cgi = "/www/*" # libsensors configuration file -FILES_${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf" +FILES:${PN}-libsensors = "${sysconfdir}/sensors.d/sensors.conf" # sensord logging daemon configuration files -FILES_${PN}-sensord = "\ +FILES:${PN}-sensord = "\ ${sysconfdir}/sensord.conf \ ${sysconfdir}/sysconfig/sensord \ " # fancontrol script configuration file -FILES_${PN}-fancontrol = "${sysconfdir}/fancontrol" +FILES:${PN}-fancontrol = "${sysconfdir}/fancontrol" diff --git a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb index 4ee96df98..b6ae3cddc 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/lm_sensors/lmsensors_3.6.0.bb @@ -19,7 +19,7 @@ SRCREV = "1667b850a1ce38151dae17156276f981be6fb557" inherit update-rc.d systemd -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" PACKAGECONFIG ??= "sensord" PACKAGECONFIG[sensord] = "sensord,,rrdtool" @@ -28,19 +28,19 @@ INITSCRIPT_PACKAGES = "\ ${PN}-fancontrol \ ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ " -INITSCRIPT_NAME_${PN}-fancontrol = "fancontrol" -INITSCRIPT_NAME_${PN}-sensord = "sensord" -INITSCRIPT_PARAMS_${PN}-fancontrol = "defaults 66" -INITSCRIPT_PARAMS_${PN}-sensord = "defaults 67" +INITSCRIPT_NAME:${PN}-fancontrol = "fancontrol" +INITSCRIPT_NAME:${PN}-sensord = "sensord" +INITSCRIPT_PARAMS:${PN}-fancontrol = "defaults 66" +INITSCRIPT_PARAMS:${PN}-sensord = "defaults 67" SYSTEMD_PACKAGES = "\ ${PN} \ ${PN}-fancontrol \ ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ " -SYSTEMD_SERVICE_${PN} = "lm_sensors.service" -SYSTEMD_SERVICE_${PN}-fancontrol = "fancontrol.service" -SYSTEMD_SERVICE_${PN}-sensord = "sensord.service" +SYSTEMD_SERVICE:${PN} = "lm_sensors.service" +SYSTEMD_SERVICE:${PN}-fancontrol = "fancontrol.service" +SYSTEMD_SERVICE:${PN}-sensord = "sensord.service" SYSTEMD_AUTO_ENABLE = "disable" S = "${WORKDIR}/git" @@ -85,10 +85,10 @@ do_install() { fi } -RPROVIDES_${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" +RPROVIDES:${PN}-dbg += "${PN}-libsensors-dbg ${PN}-sensors-dbg ${PN}-sensord-dbg ${PN}-isatools-dbg" -ALLOW_EMPTY_${PN} = "1" -RDEPENDS_${PN} += " \ +ALLOW_EMPTY:${PN} = "1" +RDEPENDS:${PN} += " \ ${PN}-libsensors \ ${PN}-sensors \ ${@bb.utils.contains('PACKAGECONFIG', 'sensord', '${PN}-sensord', '', d)} \ @@ -125,44 +125,44 @@ PACKAGES =+ "${PN}-isatools ${PN}-isatools-doc" # libsensors files -FILES_${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d" -FILES_${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}" -FILES_${PN}-libsensors-staticdev = "${libdir}/libsensors.a" -FILES_${PN}-libsensors-doc = "${mandir}/man3" -RRECOMMENDS_${PN}-libsensors = "lmsensors-config-libsensors" +FILES:${PN}-libsensors = "${libdir}/libsensors.so.* ${sysconfdir}/sensors3.conf ${sysconfdir}/sensors.d" +FILES:${PN}-libsensors-dev = "${libdir}/libsensors.so ${includedir}" +FILES:${PN}-libsensors-staticdev = "${libdir}/libsensors.a" +FILES:${PN}-libsensors-doc = "${mandir}/man3" +RRECOMMENDS:${PN}-libsensors = "lmsensors-config-libsensors" # sensors command files -FILES_${PN}-sensors = "${bindir}/sensors" -FILES_${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5" -RDEPENDS_${PN}-sensors = "${PN}-libsensors" +FILES:${PN}-sensors = "${bindir}/sensors" +FILES:${PN}-sensors-doc = "${mandir}/man1 ${mandir}/man5" +RDEPENDS:${PN}-sensors = "${PN}-libsensors" # sensord logging daemon -FILES_${PN}-sensord = "${sbindir}/sensord ${INIT_D_DIR}/sensord ${systemd_system_unitdir}/sensord.service" -FILES_${PN}-sensord-doc = "${mandir}/man8/sensord.8" -RDEPENDS_${PN}-sensord = "${PN}-sensors rrdtool" -RRECOMMENDS_${PN}-sensord = "lmsensors-config-sensord" +FILES:${PN}-sensord = "${sbindir}/sensord ${INIT_D_DIR}/sensord ${systemd_system_unitdir}/sensord.service" +FILES:${PN}-sensord-doc = "${mandir}/man8/sensord.8" +RDEPENDS:${PN}-sensord = "${PN}-sensors rrdtool" +RRECOMMENDS:${PN}-sensord = "lmsensors-config-sensord" # fancontrol script files -FILES_${PN}-fancontrol = "${sbindir}/fancontrol ${INIT_D_DIR}/fancontrol" -FILES_${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8" -RDEPENDS_${PN}-fancontrol = "bash" -RRECOMMENDS_${PN}-fancontrol = "lmsensors-config-fancontrol" +FILES:${PN}-fancontrol = "${sbindir}/fancontrol ${INIT_D_DIR}/fancontrol" +FILES:${PN}-fancontrol-doc = "${mandir}/man8/fancontrol.8" +RDEPENDS:${PN}-fancontrol = "bash" +RRECOMMENDS:${PN}-fancontrol = "lmsensors-config-fancontrol" # sensors-detect script files -FILES_${PN}-sensorsdetect = "${sbindir}/sensors-detect" -FILES_${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8" -RDEPENDS_${PN}-sensorsdetect = "${PN}-sensors perl perl-modules" +FILES:${PN}-sensorsdetect = "${sbindir}/sensors-detect" +FILES:${PN}-sensorsdetect-doc = "${mandir}/man8/sensors-detect.8" +RDEPENDS:${PN}-sensorsdetect = "${PN}-sensors perl perl-modules" # sensors-conf-convert script files -FILES_${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" -FILES_${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8" -RDEPENDS_${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" +FILES:${PN}-sensorsconfconvert = "${bindir}/sensors-conf-convert" +FILES:${PN}-sensorsconfconvert-doc = "${mandir}/man8/sensors-conf-convert.8" +RDEPENDS:${PN}-sensorsconfconvert = "${PN}-sensors perl perl-modules" # pwmconfig script files -FILES_${PN}-pwmconfig = "${sbindir}/pwmconfig" -FILES_${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" -RDEPENDS_${PN}-pwmconfig = "${PN}-fancontrol bash" +FILES:${PN}-pwmconfig = "${sbindir}/pwmconfig" +FILES:${PN}-pwmconfig-doc = "${mandir}/man8/pwmconfig.8" +RDEPENDS:${PN}-pwmconfig = "${PN}-fancontrol bash" # isadump and isaset helper program files -FILES_${PN}-isatools = "${sbindir}/isa*" -FILES_${PN}-isatools-doc = "${mandir}/man8/isa*" +FILES:${PN}-isatools = "${sbindir}/isa*" +FILES:${PN}-isatools-doc = "${mandir}/man8/isa*" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb index 2f5e25c29..e1a98db4e 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_1.13.bb @@ -19,15 +19,15 @@ do_install() { UDEVDIR=${nonarch_base_libdir}/udev SYSTEMDDIR=${systemd_unitdir} } -pkg_postinst_ontarget_${PN}() { +pkg_postinst_ontarget:${PN}() { ${sbindir}/nvme gen-hostnqn > ${sysconfdir}/nvme/hostnqn ${bindir}/uuidgen > ${sysconfdir}/nvme/hostid } PACKAGES =+ "${PN}-dracut ${PN}-zsh-completion" -FILES_${PN} += "${systemd_system_unitdir}" -FILES_${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" -FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions" +FILES:${PN} += "${systemd_system_unitdir}" +FILES:${PN}-dracut = "${nonarch_libdir}/dracut/dracut.conf.d" +FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions" -RDEPENDS_${PN} = "util-linux-uuidgen" +RDEPENDS:${PN} = "util-linux-uuidgen" diff --git a/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb index fc064550f..3ffbf6f59 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/pcmciautils/pcmciautils_018.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "udev sysfsutils flex-native bison-native" -RDEPENDS_${PN} = "udev module-init-tools" +RDEPENDS:${PN} = "udev module-init-tools" PR = "r1" @@ -38,4 +38,4 @@ do_install () { oe_runmake 'DESTDIR=${D}' install } -CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" +CONFFILES:${PN} += "${sysconfdir}/pcmcia/config.opts" diff --git a/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb index fcfd0386d..d3e797332 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/pointercal/pointercal_0.0.bb @@ -17,6 +17,6 @@ do_install() { fi } -ALLOW_EMPTY_${PN} = "1" +ALLOW_EMPTY:${PN} = "1" PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_DEFAULT_DEPS = "1" |