From 1112c48bb23dc3ceb67bc70b622a958579c4652c Mon Sep 17 00:00:00 2001 From: Sandeep Gundlupet Raju Date: Fri, 17 Feb 2023 15:10:39 -0700 Subject: linux-firmware-ti-bt: Fix git branch URL warnings Fix git branch URL warnings and indentation. WARNING: linux-firmware-ti-bt-1.0-r0 do_package_write_rpm_setscene: URL: git://git.ti.com/ti-bt/service-packs.git;protocol=https does not set any branch parameter. The future default branch used by tools and repositories is uncertain and we will therefore soon require this is set in all git urls. Signed-off-by: Sandeep Gundlupet Raju Signed-off-by: Mark Hatle --- .../linux-firmware/linux-firmware-ti-bt.bb | 50 ++++++++++++---------- 1 file changed, 28 insertions(+), 22 deletions(-) (limited to 'meta-xilinx-core/recipes-kernel/linux-firmware') diff --git a/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb b/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb index 6bb39051..97740671 100644 --- a/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb +++ b/meta-xilinx-core/recipes-kernel/linux-firmware/linux-firmware-ti-bt.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.ti-bt;md5=f39eac9f4573be5b012e8313831e72a9" # No common license for this, so be sure to include it NO_GENERIC_LICENSE[Firmware-ti-bt] = "LICENSE.ti-bt" -SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;protocol=https" +SRC_URI = "git://git.ti.com/ti-bt/service-packs.git;protocol=https;branch=master" SRCREV = "c290f8af9e388f37e509ecb111a1b64572b7c225" S = "${WORKDIR}/git" @@ -31,23 +31,23 @@ do_compile() { } do_install() { - oe_runmake 'DEST_DIR=${D}' 'BASE_LIB_DIR=${nonarch_base_libdir}' - - # Remove files we're not packaging... - rm -f ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_7.6.15.bts \ - ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_10.6.15.bts \ - ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_bt_spec_4.1.bts \ - ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_12.8.32.bts \ - ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_12.10.28.bts \ - ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_avpr_add-on.bts \ - ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_bt_spec_4.0.bts \ - ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_ble_add-on.bts - - for each in ${D}${nonarch_base_libdir}/firmware/ti-connectivity/* ; do - ln -s ti-connectivity/`basename $each` ${D}${nonarch_base_libdir}/firmware/`basename $each` - done - - cp LICENSE.ti-bt ${D}${nonarch_base_libdir}/firmware/License.ti-bt + oe_runmake 'DEST_DIR=${D}' 'BASE_LIB_DIR=${nonarch_base_libdir}' + + # Remove files we're not packaging... + rm -f ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_7.6.15.bts \ + ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_10.6.15.bts \ + ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_bt_spec_4.1.bts \ + ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_12.8.32.bts \ + ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_12.10.28.bts \ + ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_avpr_add-on.bts \ + ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_bt_spec_4.0.bts \ + ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_6.7.16_ble_add-on.bts + + for each in ${D}${nonarch_base_libdir}/firmware/ti-connectivity/* ; do + ln -s ti-connectivity/`basename $each` ${D}${nonarch_base_libdir}/firmware/`basename $each` + done + + cp LICENSE.ti-bt ${D}${nonarch_base_libdir}/firmware/License.ti-bt } # 11.8.32 = WL180x, WL183x, WL185x PG2.1 or PG2.2, 8.32 ROM Version @@ -57,12 +57,18 @@ PACKAGES =+ "${PN}-wl180x ${PN}-license" ALLOW_EMPTY:${PN} = "1" RDEPENDS:${PN} += "${PN}-wl180x" -FILES:${PN}-license = "${nonarch_base_libdir}/firmware/License.ti-bt" +FILES:${PN}-license = "\ + ${nonarch_base_libdir}/firmware/License.ti-bt \ + " -FILES:${PN}-wl180x = "${nonarch_base_libdir}/firmware/TIInit_11.8.32.bts \ - ${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_11.8.32.bts" +FILES:${PN}-wl180x = "\ + ${nonarch_base_libdir}/firmware/TIInit_11.8.32.bts \ + ${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_11.8.32.bts \ + " -RDEPENDS:${PN}-wl180x = "${PN}-license linux-firmware-wl18xx" +RDEPENDS:${PN}-wl180x = "\ + ${PN}-license linux-firmware-wl18xx \ + " LICENSE:${PN}-wl180x = "Firmware-ti-bt" -- cgit v1.2.3-54-g00ecf