From 9ec54f9dfece33931c895f842c134c7fcf49a9eb Mon Sep 17 00:00:00 2001
From: Tobias Poganiuch <tobias.poganiuch@garz-fricke.com>
Date: Tue, 3 May 2022 12:55:18 +0200
Subject: [PATCH] branches: Added branches to SRC_URI
Bitbake throws a warning when no branch is defined for an git
repository. Added the default branch to the SRC_URI.
Also updated to the correct GPLv2 license file.
---
.../rtl8723ds-bt-uart-driver_git.bb | 27 ++++++++++---------
recipes-connectivity/rtl8723ds/rtl8723ds.bb | 17 +++++++-----
2 files changed, 24 insertions(+), 20 deletions(-)
diff --git a/recipes-connectivity/rtl8723ds-bt-uart-driver/rtl8723ds-bt-uart-driver_git.bb b/recipes-connectivity/rtl8723ds-bt-uart-driver/rtl8723ds-bt-uart-driver_git.bb
index fefc6336..aabe64eb 100644
--- a/recipes-connectivity/rtl8723ds-bt-uart-driver/rtl8723ds-bt-uart-driver_git.bb
+++ b/recipes-connectivity/rtl8723ds-bt-uart-driver/rtl8723ds-bt-uart-driver_git.bb
@@ -12,9 +12,10 @@
LICENSE = "CLOSED"
LIC_FILES_CHKSUM = ""
-SRC_URI = "git://github.com/Poco-Ye/rtl8723DS-BT-uart-driver.git;protocol=https \
- file://0001-rkt_hciattach-Fix-Makefile-for-the-Yocto-build.patch \
- "
+SRC_URI = " \
+ git://github.com/Poco-Ye/rtl8723DS-BT-uart-driver.git;protocol=https;branch=master \
+ file://0001-rkt_hciattach-Fix-Makefile-for-the-Yocto-build.patch \
+"
# Modify these as desired
PV = "1.0+git${SRCPV}"
@@ -28,23 +29,23 @@ S = "${WORKDIR}/git"
#EXTRA_OEMAKE += "KDIR=${STAGING_KERNEL_DIR}"
do_configure() {
- cd rtk_hciattach
- oe_runmake clean
+ cd rtk_hciattach
+ oe_runmake clean
}
do_compile:prepend() {
- cd rtk_hciattach
+ cd rtk_hciattach
}
do_install() {
- mkdir -p ${D}${bindir}
- install -m755 ${S}/rtk_hciattach/rtk_hciattach ${D}${bindir}/
- mkdir -p ${D}/lib/firmware/rtlbt/
- install -m755 ${S}/8723D/rtl8723d_config ${D}/lib/firmware/rtlbt/
- install -m755 ${S}/8723D/rtl8723d_fw ${D}/lib/firmware/rtlbt/
+ mkdir -p ${D}${bindir}
+ install -m755 ${S}/rtk_hciattach/rtk_hciattach ${D}${bindir}/
+ mkdir -p ${D}/lib/firmware/rtlbt/
+ install -m755 ${S}/8723D/rtl8723d_config ${D}/lib/firmware/rtlbt/
+ install -m755 ${S}/8723D/rtl8723d_fw ${D}/lib/firmware/rtlbt/
}
FILES:${PN} += " \
- /lib/firmware/rtlbt/rtl8723d_config \
- /lib/firmware/rtlbt/rtl8723d_fw \
+ /lib/firmware/rtlbt/rtl8723d_config \
+ /lib/firmware/rtlbt/rtl8723d_fw \
"
diff --git a/recipes-connectivity/rtl8723ds/rtl8723ds.bb b/recipes-connectivity/rtl8723ds/rtl8723ds.bb
index cbbe639d..816cab2c 100644
--- a/recipes-connectivity/rtl8723ds/rtl8723ds.bb
+++ b/recipes-connectivity/rtl8723ds/rtl8723ds.bb
@@ -1,15 +1,18 @@
SUMMARY = "Driver for Realtek 8188EU USB wireless devices"
HOMEPAGE = "http://www.realtek.com/"
+
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6"
inherit module
do_compile[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
-SRC_URI = "git://github.com/lwfinger/rtl8723ds.git \
- file://0001-Disable-DEBUG-and-__DATE__-__TIME__-usage.patch \
- file://0001-Enable-adaptivity-for-regulation-qualification.patch \
- "
+SRC_URI = " \
+ git://github.com/lwfinger/rtl8723ds.git;protocol=https;branch=master \
+ file://0001-Disable-DEBUG-and-__DATE__-__TIME__-usage.patch \
+ file://0001-Enable-adaptivity-for-regulation-qualification.patch \
+"
+
SRCREV = "76fb80685be9920a1d5ac7003102dcdfb76daa6b"
S = "${WORKDIR}/git"
@@ -17,8 +20,8 @@ S = "${WORKDIR}/git"
EXTRA_OEMAKE = "KSRC=${STAGING_KERNEL_DIR} KVER=${KERNEL_VERSION}"
do_install() {
- install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless
- install -m 0644 ${S}/8723ds.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless
+ install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless
+ install -m 0644 ${S}/8723ds.ko ${D}${base_libdir}/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless
}
# The inherit of module.bbclass will automatically name module packages with
--
GitLab