diff options
Diffstat (limited to 'recipes-devtools')
| -rw-r--r-- | recipes-devtools/devregs/devregs_git.bb | 6 | ||||
| -rw-r--r-- | recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb | 4 | ||||
| -rw-r--r-- | recipes-devtools/qemu/qemu-qoriq/0001-linux-user-remove-host-stime-syscall.patch | 67 | ||||
| -rw-r--r-- | recipes-devtools/qemu/qemu-qoriq_4.2.bb (renamed from recipes-devtools/qemu/qemu-qoriq_4.1.0.bb) | 25 | ||||
| -rw-r--r-- | recipes-devtools/qemu/qemu.inc | 24 | ||||
| -rw-r--r-- | recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch (renamed from recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch) | 0 | ||||
| -rw-r--r-- | recipes-devtools/qoriq-cst/qoriq-cst_git.bb (renamed from recipes-devtools/cst/cst_git.bb) | 15 | ||||
| -rw-r--r-- | recipes-devtools/utp-com/utp-com_git.bb | 4 | ||||
| -rw-r--r-- | recipes-devtools/uuu/uuu-bin_1.5.165.bb | 33 | ||||
| -rw-r--r-- | recipes-devtools/uuu/uuu_git.bb | 18 |
10 files changed, 90 insertions, 106 deletions
diff --git a/recipes-devtools/devregs/devregs_git.bb b/recipes-devtools/devregs/devregs_git.bb index 7f158fd8..f24cb0f6 100644 --- a/recipes-devtools/devregs/devregs_git.bb +++ b/recipes-devtools/devregs/devregs_git.bb @@ -1,10 +1,10 @@ DESCRIPTION = "i.MX Register tool" SECTION = "devel" -LICENSE = "GPL-1" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=5003fa041d799dd5dd5f646b74e36924" -SRCREV = "d5f6223027f4d6ae71bd5d432f5611486e0e6074" -SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=http" +SRCREV = "dcc3e3f26d3d867d5297a104dc32bd99f5e6fa71" +SRC_URI = "git://github.com/boundarydevices/devregs.git;protocol=https;branch=master" PV = "1.0+${SRCPV}" diff --git a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb index c5f51983..deffd853 100644 --- a/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb +++ b/recipes-devtools/imx-usb-loader/imx-usb-loader_git.bb @@ -1,12 +1,12 @@ DESCRIPTION = "i.MX/Vybrid recovery utility" SECTION = "devel" -LICENSE = "LGPLv2.1" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libusb1" SRCREV = "f009770d841468204ab104bf7d3b0c5bc8425dbb" -SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=http" +SRC_URI = "git://github.com/boundarydevices/imx_usb_loader.git;protocol=https;branch=master" PV = "1.0+${SRCPV}" diff --git a/recipes-devtools/qemu/qemu-qoriq/0001-linux-user-remove-host-stime-syscall.patch b/recipes-devtools/qemu/qemu-qoriq/0001-linux-user-remove-host-stime-syscall.patch deleted file mode 100644 index 2d3bd7e0..00000000 --- a/recipes-devtools/qemu/qemu-qoriq/0001-linux-user-remove-host-stime-syscall.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 0f1f2d4596aee037d3ccbcf10592466daa54107f Mon Sep 17 00:00:00 2001 -From: Laurent Vivier <laurent@vivier.eu> -Date: Tue, 12 Nov 2019 15:25:56 +0100 -Subject: [PATCH] linux-user: remove host stime() syscall - -stime() has been withdrawn from glibc -(12cbde1dae6f "Use clock_settime to implement stime; withdraw stime.") - -Implement the target stime() syscall using host -clock_settime(CLOCK_REALTIME, ...) as it is done internally in glibc. - -Tested qemu-ppc/x86_64 with: - - #include <time.h> - #include <stdio.h> - - int main(void) - { - time_t t; - int ret; - - /* date -u -d"2019-11-12T15:11:00" "+%s" */ - t = 1573571460; - ret = stime(&t); - printf("ret %d\n", ret); - return 0; - } - - # date; ./stime; date - Tue Nov 12 14:18:32 UTC 2019 - ret 0 - Tue Nov 12 15:11:00 UTC 2019 - -Upstream-Status: Backport - -Buglink: https://bugs.launchpad.net/qemu/+bug/1852115 -Reported-by: Cole Robinson <crobinso@redhat.com> -Signed-off-by: Laurent Vivier <laurent@vivier.eu> -Reviewed-by: Peter Maydell <peter.maydell@linaro.org> -Message-Id: <20191112142556.6335-1-laurent@vivier.eu> ---- - linux-user/syscall.c | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 4e97bcf1e5..ce399a55f0 100644 ---- a/linux-user/syscall.c -+++ b/linux-user/syscall.c -@@ -7764,10 +7764,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1, - #ifdef TARGET_NR_stime /* not on alpha */ - case TARGET_NR_stime: - { -- time_t host_time; -- if (get_user_sal(host_time, arg1)) -+ struct timespec ts; -+ ts.tv_nsec = 0; -+ if (get_user_sal(ts.tv_sec, arg1)) { - return -TARGET_EFAULT; -- return get_errno(stime(&host_time)); -+ } -+ return get_errno(clock_settime(CLOCK_REALTIME, &ts)); - } - #endif - #ifdef TARGET_NR_alarm /* not on alpha */ --- -2.24.0 - diff --git a/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb b/recipes-devtools/qemu/qemu-qoriq_4.2.bb index dfd7fdcf..5ac774ed 100644 --- a/recipes-devtools/qemu/qemu-qoriq_4.1.0.bb +++ b/recipes-devtools/qemu/qemu-qoriq_4.2.bb @@ -9,14 +9,13 @@ DEPENDS = "glib-2.0 zlib pixman bison-native" LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \ file://COPYING.LIB;endline=24;md5=8c5efda6cf1e1b03dcfd0e6c0d271c7f" -SRC_URI = "gitsm://source.codeaurora.org/external/qoriq/qoriq-components/qemu;nobranch=1 \ +SRC_URI = "gitsm://github.com/nxp-qoriq/qemu;protocol=https;nobranch=1 \ file://powerpc_rom.bin \ file://run-ptest \ file://0002-Add-subpackage-ptest-which-runs-all-unit-test-cases-.patch \ - file://0001-linux-user-remove-host-stime-syscall.patch \ " -SRCREV = "0b88a503e43ca629d6e8165638ac6b312e5c66bd" +SRCREV = "14fda5a42df6c72e890d6a97ff88c5852172604b" S = "${WORKDIR}/git" @@ -25,18 +24,18 @@ python() { pkgs = d.getVar('PACKAGES').split() for p in pkgs: if '-qoriq' in p: - d.appendVar('RPROVIDES_' + p, ' ' + p.replace('-qoriq', '')) - d.appendVar('RCONFLICTS_' + p, ' ' + p.replace('-qoriq', '')) - d.appendVar('RREPLACES_' + p, ' ' + p.replace('-qoriq', '')) + d.appendVar('RPROVIDES:' + p, ' ' + p.replace('-qoriq', '')) + d.appendVar('RCONFLICTS:' + p, ' ' + p.replace('-qoriq', '')) + d.appendVar('RREPLACES:' + p, ' ' + p.replace('-qoriq', '')) } -RDEPENDS_${PN}_class-target += "bash" +RDEPENDS:${PN}:class-target += "bash" -EXTRA_OECONF_append_class-target = " --target-list=${@get_qemu_target_list(d)}" -EXTRA_OECONF_append_class-target_mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" -EXTRA_OECONF_append_class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" +EXTRA_OECONF:append:class-target = " --target-list=${@get_qemu_target_list(d)}" +EXTRA_OECONF:append:class-target:mipsarcho32 = "${@bb.utils.contains('BBEXTENDCURR', 'multilib', ' --disable-capstone', '', d)}" +EXTRA_OECONF:append:class-nativesdk = " --target-list=${@get_qemu_target_list(d)}" -do_install_append_class-nativesdk() { +do_install:append:class-nativesdk() { ${@bb.utils.contains('PACKAGECONFIG', 'gtk+', 'make_qemu_wrapper', '', d)} } @@ -53,10 +52,10 @@ do_install_ptest() { } PACKAGECONFIG ??= " \ - fdt sdl kvm aio libusb vhost \ + fdt sdl kvm aio libusb vhost numa \ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa xen', d)} \ " -PACKAGECONFIG_class-nativesdk ??= "fdt sdl kvm" +PACKAGECONFIG:class-nativesdk ??= "fdt sdl kvm" PACKAGECONFIG[xkbcommon] = ",," PACKAGECONFIG[libudev] = ",," diff --git a/recipes-devtools/qemu/qemu.inc b/recipes-devtools/qemu/qemu.inc index bf05da9a..b8b5f318 100644 --- a/recipes-devtools/qemu/qemu.inc +++ b/recipes-devtools/qemu/qemu.inc @@ -4,9 +4,9 @@ machine's processor through dynamic binary translation and provides a set \ of different hardware and device models for the machine, enabling it to run \ a variety of guest operating systems" HOMEPAGE = "http://qemu.org" -LICENSE = "GPLv2 & LGPLv2.1" +LICENSE = "GPL-2.0-only & LGPL-2.1-only" -RDEPENDS_${PN}-ptest = "bash make" +RDEPENDS:${PN}-ptest = "bash make" require qemu-targets.inc inherit pkgconfig ptest @@ -45,14 +45,14 @@ UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" SRC_URI[sha256sum] = "c9174eb5933d9eb5e61f541cd6d1184cd3118dfe4c5c4955bc1bdc4d390fa4e5" -COMPATIBLE_HOST_mipsarchn32 = "null" -COMPATIBLE_HOST_mipsarchn64 = "null" +COMPATIBLE_HOST:mipsarchn32 = "null" +COMPATIBLE_HOST:mipsarchn64 = "null" # Per https://lists.nongnu.org/archive/html/qemu-devel/2020-09/msg03873.html # upstream states qemu doesn't work without optimization DEBUG_BUILD = "0" -do_install_append() { +do_install:append() { # Prevent QA warnings about installed ${localstatedir}/run if [ -d ${D}${localstatedir}/run ]; then rmdir ${D}${localstatedir}/run; fi } @@ -101,9 +101,9 @@ export LIBTOOL="${HOST_SYS}-libtool" B = "${WORKDIR}/build" -EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3" +EXTRA_OECONF:append = " --python=${HOSTTOOLS_DIR}/python3" -do_configure_prepend_class-native() { +do_configure:prepend:class-native() { # Append build host pkg-config paths for native target since the host may provide sdl BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then @@ -127,7 +127,7 @@ do_install () { # This will trigger a MMU access fault in the virtual CPU. With this change, # the qemu-mips works fine. # IMPORTANT: This piece needs to be removed once the root cause is fixed! -do_install_append() { +do_install:append() { if [ -e "${D}/${bindir}/qemu-mips" ]; then create_wrapper ${D}/${bindir}/qemu-mips \ QEMU_RESERVED_VA=0x0 @@ -147,8 +147,8 @@ make_qemu_wrapper() { } # Disable kvm/virgl/mesa on targets that do not support it -PACKAGECONFIG_remove_darwin = "kvm virglrenderer glx gtk+" -PACKAGECONFIG_remove_mingw32 = "kvm virglrenderer glx gtk+" +PACKAGECONFIG:remove:darwin = "kvm virglrenderer glx gtk+" +PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer glx gtk+" PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," @@ -193,6 +193,6 @@ PACKAGECONFIG[vhost] = "--enable-vhost-net,--disable-vhost-net,," PACKAGECONFIG[ust] = "--enable-trace-backend=ust,--enable-trace-backend=nop,lttng-ust," PACKAGECONFIG[pie] = "--enable-pie,--disable-pie,," -INSANE_SKIP_${PN} = "arch" +INSANE_SKIP:${PN} = "arch" -FILES_${PN} += "${datadir}/icons" +FILES:${PN} += "${datadir}/icons" diff --git a/recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch b/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch index d25675aa..d25675aa 100644 --- a/recipes-devtools/cst/cst/0001-tools-Mark-struct-input_field-file_field-extern.patch +++ b/recipes-devtools/qoriq-cst/qoriq-cst/0001-tools-Mark-struct-input_field-file_field-extern.patch diff --git a/recipes-devtools/cst/cst_git.bb b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb index 9091350b..8d345836 100644 --- a/recipes-devtools/cst/cst_git.bb +++ b/recipes-devtools/qoriq-cst/qoriq-cst_git.bb @@ -1,14 +1,14 @@ SUMMARY = "utility for security boot" SECTION = "cst" -LICENSE = "BSD" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e959d5d617e33779d0e90ce1d9043eff" -DEPENDS += "openssl cst-native" -RDEPENDS_${PN} = "bash" +DEPENDS += "openssl qoriq-cst-native" +RDEPENDS:${PN} = "bash" GENKEYS ?= "${STAGING_BINDIR_NATIVE}/cst/gen_keys" -GENKEYS_class-native = "./gen_keys" +GENKEYS:class-native = "./gen_keys" inherit kernel-arch @@ -16,14 +16,15 @@ inherit kernel-arch #SECURE_PRI_KEY = "/path/srk.pri" #SECURE_PUB_KEY = "/path/srk.pub" -SRC_URI = "git://source.codeaurora.org/external/qoriq/qoriq-components/cst;nobranch=1 \ +SRC_URI = "git://github.com/nxp-qoriq/cst;protocol=https;nobranch=1 \ file://0001-tools-Mark-struct-input_field-file_field-extern.patch \ " -SRCREV = "dfe30d3f05cfe281896482839e57ed49c52f2088" +SRCREV = "af56e6c5c66dd2bc86a83b0bee8cb61b88d2120c" S = "${WORKDIR}/git" EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}"' +CFLAGS:append = ' -Wno-deprecated-declarations' PARALLEL_MAKE = "" @@ -38,5 +39,5 @@ do_install () { fi } -FILES_${PN}-dbg += "${bindir}/cst/.debug" +FILES:${PN}-dbg += "${bindir}/cst/.debug" BBCLASSEXTEND = "native nativesdk" diff --git a/recipes-devtools/utp-com/utp-com_git.bb b/recipes-devtools/utp-com/utp-com_git.bb index db2d7f08..85c80acb 100644 --- a/recipes-devtools/utp-com/utp-com_git.bb +++ b/recipes-devtools/utp-com/utp-com_git.bb @@ -1,12 +1,12 @@ DESCRIPTION = "Tool used to send commands to hardware via NXP's UTP protocol" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022" DEPENDS = "sg3-utils" SRCREV = "dee512ced1e9367d223d22f10797fbf9aeacfab6" SRC_URI = " \ - git://github.com/Freescale/utp_com;protocol=https \ + git://github.com/Freescale/utp_com;protocol=https;branch=master \ " PV = "1.0+git${SRCPV}" diff --git a/recipes-devtools/uuu/uuu-bin_1.5.165.bb b/recipes-devtools/uuu/uuu-bin_1.5.165.bb new file mode 100644 index 00000000..61c3927c --- /dev/null +++ b/recipes-devtools/uuu/uuu-bin_1.5.165.bb @@ -0,0 +1,33 @@ +# Copyright (C) 2022-2023 O.S. Systems Software LTDA. +# Released under the MIT License (see COPYING.MIT for the terms) + +SUMMARY = "Universal Update Utility - Binaries" +DESCRIPTION = "Image deploy tool for i.MX chips" +HOMEPAGE = "https://github.com/nxp-imx/mfgtools" + +LICENSE = "BSD-3-Clause & LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9 \ + file://${COMMON_LICENSE_DIR}/LGPL-2.1-or-later;md5=2a4f4fd2128ea2f65047ee63fbca9f68" + +SRC_URI = " \ + https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu;downloadfilename=uuu-${PV};name=Linux \ + https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu_mac;downloadfilename=uuu-${PV}_mac;name=Mac \ + https://github.com/nxp-imx/mfgtools/releases/download/uuu_${PV}/uuu.exe;downloadfilename=uuu-${PV}.exe;name=Windows \ +" + +SRC_URI[Linux.sha256sum] = "f863bba022202361d19e5026be0af408d307f78d2dbf2c139fb7eaaabd220442" +SRC_URI[Mac.sha256sum] = "62da0bd7e333931fba100823aa50133621c7e6047be0546bc12e29c0ea78a4d8" +SRC_URI[Windows.sha256sum] = "013ed8bb45e21b971b6b3a5802c5f154733913714bece0b020cb770a809cd206" + +inherit allarch + +do_install() { + install -D -m 0755 ${UNPACKDIR}/uuu-${PV} ${D}${libdir}/uuu/uuu + install -D -m 0755 ${UNPACKDIR}/uuu-${PV}_mac ${D}${libdir}/uuu/uuu_mac + install -D -m 0644 ${UNPACKDIR}/uuu-${PV}.exe ${D}${libdir}/uuu/uuu.exe +} + +# HACK! We are not aiming to run those binaries during the build but copy then for MFGTOOL bundle. +INSANE_SKIP:${PN} += "arch file-rdeps" +FILES:${PN} = "${libdir}/uuu" +SYSROOT_DIRS = "${libdir}/uuu" diff --git a/recipes-devtools/uuu/uuu_git.bb b/recipes-devtools/uuu/uuu_git.bb new file mode 100644 index 00000000..e48698a8 --- /dev/null +++ b/recipes-devtools/uuu/uuu_git.bb @@ -0,0 +1,18 @@ +SUMMARY = "Universal Update Utility" +DESCRIPTION = "Image deploy tool for i.MX chips" +HOMEPAGE = "https://github.com/nxp-imx/mfgtools" + +SRC_URI = "git://github.com/nxp-imx/mfgtools.git;protocol=https;branch=master" +SRCREV = "7347a80c7a943dd7e9081d9d2bab9e6ca8e0ba07" +PV = "1.5.165" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=38ec0c18112e9a92cffc4951661e85a5" + +inherit cmake pkgconfig + +S = "${WORKDIR}/git" + +DEPENDS = "libusb zlib bzip2 openssl zstd libtinyxml2" + +BBCLASSEXTEND = "native nativesdk" |