Skip to content

Commit

Permalink
[pre-commit.ci] auto fixes from pre-commit.com hooks
Browse files Browse the repository at this point in the history
for more information, see https://pre-commit.ci
  • Loading branch information
pre-commit-ci[bot] committed Nov 25, 2024
1 parent 20b602a commit cf06a6c
Show file tree
Hide file tree
Showing 33 changed files with 159 additions and 159 deletions.
2 changes: 1 addition & 1 deletion meta-dts-distro/recipes-bsp/coreboot-utils/cbfstool_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ TARGET_CC_ARCH += "${LDFLAGS}"

EXTRA_OEMAKE = " \
DESTDIR="${D}" \
PREFIX="${prefix}" \
PREFIX="${prefix}"\
"

INSANE_SKIP:${PN} = "textrel"
Expand Down
6 changes: 3 additions & 3 deletions meta-dts-distro/recipes-bsp/coreboot-utils/cbmem_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ SUMMARY = "CBMEM parser to read e.g. timestamps and console log"
DEPENDS += "pciutils zlib"

EXTRA_OEMAKE = ' \
DESTDIR="${D}" \
PREFIX="${prefix}" \
'
DESTDIR="${D}" \
PREFIX="${prefix}" \
'

do_compile () {
oe_runmake -C util/cbmem
Expand Down
4 changes: 2 additions & 2 deletions meta-dts-distro/recipes-bsp/coreboot-utils/coreboot-utils.inc
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ LICENSE = "LGPL-2.1-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"

SRC_URI = " \
git://github.com/Dasharo/coreboot.git;protocol=https;branch=dasharo-4.21\
"
git://github.com/Dasharo/coreboot.git;protocol=https;branch=dasharo-4.21\
"

SRCREV = "d08d5eaa98b1204b5e665d3ae4f63fb6f84a0d77"

Expand Down
6 changes: 3 additions & 3 deletions meta-dts-distro/recipes-bsp/coreboot-utils/ectool_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ require coreboot-utils.inc
SUMMARY = "Dumps the RAM of a laptop's Embedded/Environmental Controller (EC)."

EXTRA_OEMAKE = ' \
DESTDIR="${D}" \
PREFIX="${prefix}" \
'
DESTDIR="${D}" \
PREFIX="${prefix}" \
'

do_compile () {
oe_runmake -C util/ectool
Expand Down
16 changes: 8 additions & 8 deletions meta-dts-distro/recipes-bsp/coreboot-utils/futil_git.bb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SUMMARY = "\
Firmware utility tool, used to create, sign, and validate Chrome \
OS images."
Firmware utility tool, used to create, sign, and validate Chrome \
OS images."

HOMEPAGE = "https://github.com/Dasharo/vboot"

Expand All @@ -9,13 +9,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=562c740877935f40b262db8af30bca36"

DEPENDS += " \
openssl \
flashrom \
flashrom\
"

SRC_URI = " \
git://github.com/Dasharo/vboot.git;protocol=https;branch=dasharo \
file://0001-Makefile-disable-deprecated-warnigs-as-errors.patch \
"
git://github.com/Dasharo/vboot.git;protocol=https;branch=dasharo \
file://0001-Makefile-disable-deprecated-warnigs-as-errors.patch \
"
SRCREV = "dc68f9f1b56d92f76026dca490e79493599ff4cf"

S = "${WORKDIR}/git"
Expand All @@ -25,12 +25,12 @@ inherit pkgconfig
TARGET_CC_ARCH += "${LDFLAGS}"

RDEPENDS:${PN} += " \
bash \
bash\
"

EXTRA_OEMAKE = " \
DESTDIR="${D}" \
PREFIX="${prefix}" \
PREFIX="${prefix}"\
"

INSANE_SKIP:${PN} = "textrel"
Expand Down
6 changes: 3 additions & 3 deletions meta-dts-distro/recipes-bsp/coreboot-utils/ifdtool_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ SUMMARY = "Extract and dump Intel Firmware Descriptor information"
TARGET_CC_ARCH += "${LDFLAGS}"

EXTRA_OEMAKE = ' \
DESTDIR="${D}" \
PREFIX="${prefix}" \
'
DESTDIR="${D}" \
PREFIX="${prefix}" \
'

do_compile () {
oe_runmake -C util/ifdtool
Expand Down
6 changes: 3 additions & 3 deletions meta-dts-distro/recipes-bsp/coreboot-utils/intelmetool_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ SUMMARY = "Dump interesting things about Management Engine even if hidden"
DEPENDS += "pciutils zlib"

EXTRA_OEMAKE = ' \
DESTDIR="${D}" \
PREFIX="${prefix}" \
'
DESTDIR="${D}" \
PREFIX="${prefix}" \
'

TARGET_CFLAGS += "-I../../src/commonlib/bsd/include"

Expand Down
10 changes: 5 additions & 5 deletions meta-dts-distro/recipes-bsp/coreboot-utils/intelp2m_git.bb
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
require coreboot-utils.inc

SUMMARY = "\
Converts the configuration DW0/1 registers value from an inteltool \
dump to coreboot macros.\
"
Converts the configuration DW0/1 registers value from an inteltool \
dump to coreboot macros.\
"

LIC_FILES_CHKSUM = "file://../../COPYING;md5=751419260aa954499f7abaabaa882bbe"

Expand All @@ -12,8 +12,8 @@ GO_IMPORT = "github.com/dasharo/coreboot/"
# we need to override SRC_URI from coreboot-utils.inc so it's unpacked in the
# directory as expected by the go bbclass
SRC_URI = " \
git://github.com/dasharo/coreboot.git;protocol=https;branch=dasharo-4.21;destsuffix=${GO_IMPORT} \
"
git://github.com/dasharo/coreboot.git;protocol=https;branch=dasharo-4.21;destsuffix=${GO_IMPORT} \
"

S = "${WORKDIR}/${GO_IMPORT}/util/intelp2m"

Expand Down
12 changes: 6 additions & 6 deletions meta-dts-distro/recipes-bsp/coreboot-utils/inteltool_git.bb
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
require coreboot-utils.inc

SUMMARY = "\
Provides information about the Intel CPU/chipset hardware \
configuration (register contents, MSRs, etc).\
"
Provides information about the Intel CPU/chipset hardware \
configuration (register contents, MSRs, etc).\
"

DEPENDS += "pciutils zlib"

EXTRA_OEMAKE = ' \
DESTDIR="${D}" \
PREFIX="${prefix}" \
'
DESTDIR="${D}" \
PREFIX="${prefix}" \
'

do_compile () {
oe_runmake -C util/inteltool
Expand Down
6 changes: 3 additions & 3 deletions meta-dts-distro/recipes-bsp/coreboot-utils/nvramtool_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ require coreboot-utils.inc
SUMMARY = "Reads and writes coreboot parameters and displaying information from the coreboot table in CMOS/NVRAM. "

EXTRA_OEMAKE = ' \
DESTDIR="${D}" \
PREFIX="${prefix}" \
'
DESTDIR="${D}" \
PREFIX="${prefix}" \
'

do_compile () {
oe_runmake -C util/nvramtool
Expand Down
6 changes: 3 additions & 3 deletions meta-dts-distro/recipes-bsp/coreboot-utils/superiotool_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ SUMMARY = "A user-space utility to detect Super I/O of a mainboard and provide d
DEPENDS += "pciutils zlib"

EXTRA_OEMAKE = ' \
DESTDIR="${D}" \
PREFIX="${prefix}" \
'
DESTDIR="${D}" \
PREFIX="${prefix}" \
'

do_compile () {
oe_runmake -C util/superiotool
Expand Down
22 changes: 11 additions & 11 deletions meta-dts-distro/recipes-bsp/fwupd/fwupd-efi_1.2.bb
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
DEPENDS = "gnu-efi"

SRC_URI = "\
git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \
file://cc.patch"
git://github.com/fwupd/fwupd-efi;protocol=https;branch=main \
file://cc.patch"
SRCREV = "8de5918507dcc797e612aac688d6b60b90053f54"
S = "${WORKDIR}/git"

Expand All @@ -22,15 +22,15 @@ SBAT_DISTRO_URL ?= ""

EXTRA_OEMESON += "\
-Defi-cc=${@meson_array('CC', d)}\
-Defi-ld='${HOST_PREFIX}ld' \
-Defi-includedir=${STAGING_INCDIR}/efi \
-Defi-libdir=${STAGING_LIBDIR} \
-Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \
-Defi_sbat_distro_summary='${SBAT_DISTRO_SUMMARY}' \
-Defi_sbat_distro_url='${SBAT_DISTRO_URL}' \
-Defi_sbat_distro_pkgname='${PN}' \
-Defi_sbat_distro_version='${PV}'\
"
-Defi-ld='${HOST_PREFIX}ld' \
-Defi-includedir=${STAGING_INCDIR}/efi \
-Defi-libdir=${STAGING_LIBDIR} \
-Defi_sbat_distro_id='${SBAT_DISTRO_ID}' \
-Defi_sbat_distro_summary='${SBAT_DISTRO_SUMMARY}' \
-Defi_sbat_distro_url='${SBAT_DISTRO_URL}' \
-Defi_sbat_distro_pkgname='${PN}' \
-Defi_sbat_distro_version='${PV}'\
"

# The compile assumes GCC at present
TOOLCHAIN = "gcc"
10 changes: 5 additions & 5 deletions meta-dts-distro/recipes-bsp/fwupd/fwupd_%.bbappend
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PACKAGECONFIG = " \
curl gnutls gudev gusb \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \
plugin_flashrom \
sqlite \
"
curl gnutls gudev gusb \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \
plugin_flashrom \
sqlite \
"
74 changes: 37 additions & 37 deletions meta-dts-distro/recipes-bsp/fwupd/fwupd_2.0.1.bb
Original file line number Diff line number Diff line change
Expand Up @@ -22,36 +22,36 @@ GIDOCGEN_MESON_DISABLE_FLAG = 'none'
# ../git/meson.build:1:0: ERROR: Unknown options: "plugin_gpio, plugin_scsi"

PACKAGECONFIG ??= "\
curl gnutls gudev gusb \
curl gnutls gudev gusb \
${@bb.utils.filter('DISTRO_FEATURES', 'bluetooth polkit', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd offline', '', d)} \
${@bb.utils.contains('MACHINE_FEATURES', 'efi', 'plugin_uefi_capsule plugin_uefi_pk', '', d)} \
${@bb.utils.contains('PTEST_ENABLED', '1', 'tests plugin_dummy', '', d)} \
hsi \
plugin_acpi_phat \
plugin_amt \
plugin_bcm57xx \
plugin_emmc \
plugin_ep963x \
plugin_fastboot \
plugin_flashrom \
plugin_intel_spi \
plugin_logitech_bulkcontroller \
plugin_modem_manager \
plugin_msr \
plugin_nitrokey \
plugin_nvme \
plugin_parade_lspcon \
plugin_pixart_rf \
plugin_platform_integrity \
plugin_realtek_mst \
plugin_redfish \
plugin_synaptics_mst \
plugin_synaptics_rmi \
plugin_thunderbolt \
plugin_uf2 \
plugin_upower \
sqlite"
hsi \
plugin_acpi_phat \
plugin_amt \
plugin_bcm57xx \
plugin_emmc \
plugin_ep963x \
plugin_fastboot \
plugin_flashrom \
plugin_intel_spi \
plugin_logitech_bulkcontroller \
plugin_modem_manager \
plugin_msr \
plugin_nitrokey \
plugin_nvme \
plugin_parade_lspcon \
plugin_pixart_rf \
plugin_platform_integrity \
plugin_realtek_mst \
plugin_redfish \
plugin_synaptics_mst \
plugin_synaptics_rmi \
plugin_thunderbolt \
plugin_uf2 \
plugin_upower \
sqlite"

PACKAGECONFIG[bluetooth] = "-Dbluez=true,-Dbluez=false"
PACKAGECONFIG[compat-cli] = "-Dcompat_cli=true,-Dcompat_cli=false"
Expand Down Expand Up @@ -115,17 +115,17 @@ PACKAGECONFIG:remove = "${DISABLE_NON_X86}"
PACKAGE_ARCH = "${MACHINE_ARCH}"

FILES:${PN} += "\
${libdir}/fwupd-plugins-* \
${systemd_unitdir} \
${datadir}/fish \
${datadir}/metainfo \
${datadir}/icons \
${datadir}/dbus-1 \
${datadir}/polkit-1 \
${nonarch_libdir}/modules-load.d"
${libdir}/fwupd-plugins-* \
${systemd_unitdir} \
${datadir}/fish \
${datadir}/metainfo \
${datadir}/icons \
${datadir}/dbus-1 \
${datadir}/polkit-1 \
${nonarch_libdir}/modules-load.d"

FILES:${PN}-ptest += "\
${libexecdir}/installed-tests/ \
${datadir}/installed-tests/ \
"
${libexecdir}/installed-tests/ \
${datadir}/installed-tests/ \
"
RDEPENDS:${PN}-ptest += "gnome-desktop-testing"
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ LICENSE = "MIT"
inherit packagegroup

PACKAGES = " \
packagegroup-coreboot-utils \
packagegroup-coreboot-utils\
"

RDEPENDS:${PN} = " \
Expand All @@ -20,5 +20,5 @@ RDEPENDS:${PN} = " \
intelmetool \
msrtool \
nvramtool \
superiotool \
superiotool\
"
12 changes: 6 additions & 6 deletions meta-dts-distro/recipes-bsp/txe-secure-boot/smmstoretool_git.bb
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ HOMEPAGE = "https://github.com/coreboot/coreboot"

LICENSE = "GPL-2.0-or-later"
LIC_FILES_CHKSUM = " \
file://${WORKDIR}/git/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6 \
file://${WORKDIR}/git/LICENSES/GPL-2.0-or-later.txt;md5=261bea1168c0bdfa73232ee90df11eb6\
"

SRC_URI = " \
git://github.com/coreboot/coreboot.git;branch=main;protocol=https \
file://a5df001.diff;patchdir=${WORKDIR}/git \
file://a5df001.diff;patchdir=${WORKDIR}/git\
"

SRCREV = "602653abed391ae1b1445ad86d0f05b8b5b678cb"
Expand All @@ -18,14 +18,14 @@ inherit pkgconfig
S = "${WORKDIR}/git/util/smmstoretool"

EXTRA_OEMAKE = ' \
DESTDIR="${D}" \
PREFIX="${prefix}" \
'
DESTDIR="${D}" \
PREFIX="${prefix}" \
'

do_install() {
oe_runmake install
}

FILES:${PN} += " \
${bindir}/smmstoretool \
${bindir}/smmstoretool\
"
Loading

0 comments on commit cf06a6c

Please sign in to comment.