general: made layer kirkstone compatible

with the yocto update from dunfell to kirkstone (the new LTS
version) several things needed to be changed.

Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmueller 2022-07-20 08:42:25 +00:00 committed by Alexandre Bard
parent afeb746c8e
commit e454032d10
15 changed files with 46 additions and 46 deletions

View File

@ -13,4 +13,4 @@ BBFILE_PRIORITY_netmodule-wlan = "11"
# cause compatibility issues with other layers
LAYERVERSION_netmodule-wlan = "1"
LAYERSERIES_COMPAT_netmodule-wlan = "warrior dunfell"
LAYERSERIES_COMPAT_netmodule-wlan = "warrior dunfell kirkstone"

View File

@ -89,7 +89,7 @@ SRC_URI[md5sum] = "a68538fb62766f40f890125026c42c10"
SRC_URI[sha256sum] = "9d9f1c60afa5324ee17219bd3ec61c1a6fa4043b4187da9bb44e59025d3ed31d"
CVE_PRODUCT = "${TARGET_NAME}"
CONFFILES_${TARGET_NAME} += "${sysconfdir}/${TARGET_NAME}-full.config"
CONFFILES:${TARGET_NAME} += "${sysconfdir}/${TARGET_NAME}-full.config"
S = "${WORKDIR}/git"

View File

@ -4,10 +4,10 @@ TARGET_NAME = "hostapd"
include hostapd.inc
RRECOMMENDS_${PN}_${PV} = "hostapd-cli"
RRECOMMENDS:${PN}_${PV} = "hostapd-cli"
PACKAGES_prepend = "hostapd-cli"
FILES_hostpad-cli = "${sbindir}/hostapd_cli"
PACKAGES:prepend = "hostapd-cli"
FILES:hostpad-cli = "${sbindir}/hostapd_cli"
do_install () {
install -d ${D}${sbindir}

View File

@ -5,10 +5,10 @@ TARGET_NAME = "wpa_supplicant"
include hostapd.inc
#PACKAGES_prepend = "libwpa_client"
#PACKAGES:prepend = "libwpa_client"
FILES_${PN} += "${libdir}/*.so"
RPROVIDES_${PN} = "libwpa_client.so"
FILES:${PN} += "${libdir}/*.so"
RPROVIDES:${PN} = "libwpa_client.so"
PROVIDES = "libwpa_client.so"

View File

@ -3,13 +3,13 @@ SUMMARY = "Client for Wi-Fi Protected Access (WPA)"
TARGET_NAME = "wpa_supplicant"
include hostapd.inc
RRECOMMENDS_${PN}_${PV} = "wpa_supplicant-passphrase wpa_supplicant-cli"
RRECOMMENDS:${PN}_${PV} = "wpa_supplicant-passphrase wpa_supplicant-cli"
PACKAGES_prepend = "wpa_supplicant-passphrase wpa_supplicant-cli"
FILES_wpa_supplicant-passphrase = "${bindir}/wpa_passphrase"
FILES_wpa_supplicant-cli = "${sbindir}/wpa_cli"
FILES_${PN} += "${datadir}/dbus-1/system-services/*"
PACKAGES:prepend = "wpa_supplicant-passphrase wpa_supplicant-cli"
FILES:wpa_supplicant-passphrase = "${bindir}/wpa_passphrase"
FILES:wpa_supplicant-cli = "${sbindir}/wpa_cli"
FILES:${PN} += "${datadir}/dbus-1/system-services/*"
do_install () {
install -d ${D}${sbindir}
@ -17,7 +17,7 @@ do_install () {
install -m 755 wpa_supplicant/wpa_cli ${D}${sbindir}
}
pkg_postinst_wpa_supplicant () {
pkg_postinst:wpa_supplicant () {
# If we're offline, we don't need to do this.
if [ "x$D" = "x" ]; then
killall -q -HUP dbus-daemon || true

View File

@ -29,7 +29,7 @@ inherit pkgconfig
CFLAGS += "-I${STAGING_DIR_TARGET}/usr/include/libnl-tiny -lnl-tiny -DCONFIG_LIBNL20 -D_GNU_SOURCE"
LDFLAGS += " -Wl,--gc-sections"
CFLAGS_remove += "-lnl-genl"
CFLAGS:remove = "-lnl-genl"
EXTRA_OEMAKE = "\
-f '${S}/Makefile' \

View File

@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
DEPENDS = "openssl-native"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;protocol=http \
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;protocol=http;branch=master \
file://100-regdb-write-firmware-file-format-version-code-20.patch \
file://500-world-regd-5GHz.patch \
file://501-change-python-interpreter-to-version-3-to-be-compat.patch \
@ -32,11 +32,11 @@ do_install () {
# This requires Linux kernel >= v4.15.
# For kernel <= v4.14, inherit the kernel_wireless_regdb.bbclass in kernel's recipe.
PACKAGES =+ "${PN}-static"
RCONFLICTS_${PN} = "${PN}-static"
RCONFLICTS:${PN} = "${PN}-static"
FILES_${PN}-static = " \
FILES:${PN}-static = " \
${nonarch_base_libdir}/firmware/regulatory.db \
"
RSUGGESTS_${PN} = "crda"
RSUGGESTS:${PN} = "crda"
BBCLASSEXTEND = "native"

View File

@ -1,6 +1,6 @@
DESCRIPTION = "Tools for the Linux Standard Wireless Extension Subsystem"
HOMEPAGE = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html"
LICENSE = "GPLv2 & (LGPLv2.1 | MPL-1.1 | BSD)"
LICENSE = "GPL-2.0-only & (LGPL-2.1-only | MPL-1.1 | BSD)"
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://iwconfig.c;beginline=1;endline=12;md5=cf710eb1795c376eb10ea4ff04649caf \
file://iwevent.c;beginline=59;endline=72;md5=d66a10026d4394f0a5b1c5587bce4537 \
@ -46,12 +46,12 @@ do_install() {
PACKAGES = "libiw-dbg ifrename-dbg ${PN}-dbg \
libiw libiw-dev libiw-doc ifrename-doc ifrename ${PN} ${PN}-doc"
FILES_libiw-dbg = "${libdir}/.debug/*.so.*"
FILES_ifrename-dbg = "${sbindir}/.debug/ifrename"
FILES_libiw = "${libdir}/*.so.*"
FILES_libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
FILES_libiw-doc = "${mandir}/man7"
FILES_ifrename = "${sbindir}/ifrename"
FILES_ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5"
FILES_${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
FILES_${PN}-doc = "${mandir}"
FILES:libiw-dbg = "${libdir}/.debug/*.so.*"
FILES:ifrename-dbg = "${sbindir}/.debug/ifrename"
FILES:libiw = "${libdir}/*.so.*"
FILES:libiw-dev = "${libdir}/*.a ${libdir}/*.so ${includedir}"
FILES:libiw-doc = "${mandir}/man7"
FILES:ifrename = "${sbindir}/ifrename"
FILES:ifrename-doc = "${mandir}/man8/ifrename.8 ${mandir}/man5/iftab.5"
FILES:${PN} = "${bindir} ${sbindir}/iw* ${base_sbindir} ${base_bindir} ${sysconfdir}/network"
FILES:${PN}-doc = "${mandir}"

View File

@ -1,9 +1,9 @@
do_install_append_class-target () {
do_install:append:class-target () {
ln -sf flex ${D}${bindir}/lex
ln -sf flex ${D}${bindir}/lex++
}
do_install_append () {
do_install:append () {
ln -sf flex ${D}${bindir}/lex
ln -sf flex ${D}${bindir}/lex++
}

View File

@ -23,4 +23,4 @@ do_install() {
FILES_${PN} = "/lib/firmware"
FILES:${PN} = "/lib/firmware"

View File

@ -5,11 +5,11 @@ SECTION = "base"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://LICENSE.qca_firmware;md5=74852b14e2b35d8052226443d436a244"
RDEPENDS_${PN}-ath10k += "${PN}-ath10k-license"
RDEPENDS:${PN}-ath10k += "${PN}-ath10k-license"
PV = "1.0+git${SRCPV}"
SRCREV = "d622d160e9f552ead68d9ae81b715422892dc2ef"
SRC_URI = "git://github.com/kvalo/ath10k-firmware.git;protocol=https \
SRC_URI = "git://github.com/kvalo/ath10k-firmware.git;protocol=https;branch=master \
"
SRC_URI[md5sum] = "60cda5c6fef6bae671aeb71696a81cff"
@ -28,8 +28,8 @@ do_install() {
cp QCA988X/hw2.0/10.2.4-1.0/firmware-5.bin_10.2.4-1.0-00047 ${D}${nonarch_base_libdir}/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
}
FILES_${PN}-atheros-license = "${D}${nonarch_base_libdir}/firmware/LICENSE.qca_firmware"
FILES_${PN} = "${nonarch_base_libdir}/firmware"
FILES:${PN}-atheros-license = "${D}${nonarch_base_libdir}/firmware/LICENSE.qca_firmware"
FILES:${PN} = "${nonarch_base_libdir}/firmware"
PACKAGES =+ "${PN}-ath10k-license ${PN}-ath10k"

View File

@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
NO_GENERIC_LICENSE[Firmware-ti-wl18xx]="LICENCE"
SRC_URI += " \
git://git.ti.com/wilink8-wlan/wl18xx_fw.git \
git://git.ti.com/wilink8-wlan/wl18xx_fw.git;branch=master \
"
SRCREV = "5ec05007f2662f460f881c5868311fd3ab7e6e71"
@ -20,4 +20,4 @@ do_install () {
install -m 0644 wl18xx-fw-4.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/wl18xx-fw-4-mesh.bin
}
FILES_${PN} = "${nonarch_base_libdir}/firmware"
FILES:${PN} = "${nonarch_base_libdir}/firmware"

View File

@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
NO_GENERIC_LICENSE[Firmware-ti-wl18xx]="LICENCE"
SRC_URI += " \
git://git.ti.com/wilink8-wlan/wl18xx_fw.git \
git://git.ti.com/wilink8-wlan/wl18xx_fw.git;branch=master \
file://nm-wl18xx-TIInit_11.8.32.bts \
file://wl18xx-conf.bin \
"
@ -24,4 +24,4 @@ do_install () {
install -m 0644 ${WORKDIR}/nm-wl18xx-TIInit_11.8.32.bts ${D}${nonarch_base_libdir}/firmware/ti-connectivity/TIInit_11.8.32.bts
}
FILES_${PN} = "${nonarch_base_libdir}/firmware"
FILES:${PN} = "${nonarch_base_libdir}/firmware"

View File

@ -4,7 +4,7 @@
DESCRIPTION = "Linux Backports"
HOMEPAGE = "https://backports.wiki.kernel.org"
SECTION = "kernel/modules"
LICENSE = "GPLv2"
LICENSE = "GPL-2.0-only"
LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
inherit module cml1
@ -40,7 +40,7 @@ MAKE_TARGETS = "modules"
PACKAGE_CONFIGFILE := "config.${NM_TARGET}"
do_configure_prepend() {
do_configure:prepend() {
# Make sure kconf is built to run on the host
unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
oe_runmake -C kconf CC=${BUILD_CC} conf
@ -60,8 +60,8 @@ do_configure_prepend() {
# when requiered.
KERNEL_MODULES_META_PACKAGE = "kernel-module-wlan-backports"
FILES_${KERNEL_MODULES_META_PACKAGE} = ""
ALLOW_EMPTY_${KERNEL_MODULES_META_PACKAGE} = "1"
FILES:${KERNEL_MODULES_META_PACKAGE} = ""
ALLOW_EMPTY:${KERNEL_MODULES_META_PACKAGE} = "1"
PACKAGES += "${KERNEL_MODULES_META_PACKAGE}"

View File

@ -3,7 +3,7 @@ DESCRIPTION = "TI wl18xx calibrator tool"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;protocol=http \
SRC_URI = "git://git.ti.com/git/wilink8-wlan/18xx-ti-utils.git;protocol=http;branch=master \
file://wgod-ng \
file://btgod-ng \
file://0001-FIX-port-to-OE.patch \
@ -47,4 +47,4 @@ do_install () {
install -m 755 ${WORKDIR}/btgod-ng ${D}${bindir}/.
}
FILES_${PN} += "${bindir}/*"
FILES:${PN} += "${bindir}/*"