From 80a7a08f5cfc057aca9c8c1653bdbe778d4a50ef Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Wed, 20 May 2020 20:24:35 +0300 Subject: backports: get back legacy 4.19 version backports-5.4 is not compatible with tegra kernel 3.1.x and vf kernel 4.4. Use backports-legacy-4.19 for these kernels. Related-to: ELB-2724 Signed-off-by: Oleksandr Suvorov --- .../backports/backports-4.19/config-legacy | 67 ++++++++++++++++++++++ .../backports/backports-4.19/makefile-legacy.patch | 27 +++++++++ .../backports/backports-5.4/99-backports.conf | 8 +++ recipes-kernel/backports/backports-5.4/config | 25 ++++++++ .../backports/backports-5.4/makefile.patch | 24 ++++++++ recipes-kernel/backports/backports_4.19.bb | 42 ++++++++++++++ recipes-kernel/backports/files/99-backports.conf | 8 --- recipes-kernel/backports/files/config | 25 -------- recipes-kernel/backports/files/makefile.patch | 24 -------- 9 files changed, 193 insertions(+), 57 deletions(-) create mode 100644 recipes-kernel/backports/backports-4.19/config-legacy create mode 100644 recipes-kernel/backports/backports-4.19/makefile-legacy.patch create mode 100644 recipes-kernel/backports/backports-5.4/99-backports.conf create mode 100644 recipes-kernel/backports/backports-5.4/config create mode 100644 recipes-kernel/backports/backports-5.4/makefile.patch create mode 100644 recipes-kernel/backports/backports_4.19.bb delete mode 100644 recipes-kernel/backports/files/99-backports.conf delete mode 100644 recipes-kernel/backports/files/config delete mode 100644 recipes-kernel/backports/files/makefile.patch diff --git a/recipes-kernel/backports/backports-4.19/config-legacy b/recipes-kernel/backports/backports-4.19/config-legacy new file mode 100644 index 0000000..a8f390d --- /dev/null +++ b/recipes-kernel/backports/backports-4.19/config-legacy @@ -0,0 +1,67 @@ +CPTCFG_CFG80211=m +CPTCFG_MAC80211=m +CPTCFG_BT=m +CPTCFG_BT_RFCOMM=m +CPTCFG_BT_RFCOMM_TTY=y +CPTCFG_BT_BNEP=m +CPTCFG_BT_BNEP_MC_FILTER=y +CPTCFG_BT_BNEP_PROTO_FILTER=y +CPTCFG_BT_HIDP=m +CPTCFG_BT_HCIBTUSB=m +CPTCFG_BT_HCIBTSDIO=m +CPTCFG_BT_HCIUART=m +CPTCFG_BT_HCIUART_BCSP=y +CPTCFG_BT_HCIUART_ATH3K=y +CPTCFG_BT_HCIUART_3WIRE=y +CPTCFG_BT_HCIUART_INTEL=y +CPTCFG_BT_HCIUART_QCA=y +CPTCFG_BT_HCIUART_AG6XX=y +CPTCFG_BT_HCIUART_MRVL=y +CPTCFG_BT_MRVL=m +CPTCFG_BT_MRVL_SDIO=m +CPTCFG_BT_ATH3K=m +# CPTCFG_WLAN_VENDOR_ADMTEK is not set +CPTCFG_ATH9K=m +CPTCFG_ATH9K_HTC=m +CPTCFG_ATH9K_HWRNG=y +CPTCFG_ATH10K=m +CPTCFG_ATH10K_PCI=m +CPTCFG_ATH10K_SDIO=m +CPTCFG_ATH10K_USB=m +# CPTCFG_WLAN_VENDOR_ATMEL is not set +# CPTCFG_WLAN_VENDOR_BROADCOM is not set +# CPTCFG_WLAN_VENDOR_CISCO is not set +CPTCFG_IWL4965=m +CPTCFG_IWL3945=m +CPTCFG_IWLWIFI=m +CPTCFG_IWLDVM=m +CPTCFG_IWLMVM=m +CPTCFG_IWLWIFI_BCAST_FILTERING=y +CPTCFG_IWLWIFI_PCIE_RTPM=y +# CPTCFG_WLAN_VENDOR_INTERSIL is not set +CPTCFG_MWIFIEX=m +CPTCFG_MWIFIEX_SDIO=m +CPTCFG_MWIFIEX_PCIE=m +CPTCFG_MWIFIEX_USB=m +CPTCFG_MT7601U=m +CPTCFG_MT76x0U=m +CPTCFG_MT76x2E=m +CPTCFG_MT76x2U=m +CPTCFG_RT2X00=m +CPTCFG_RT2500USB=m +CPTCFG_RT2800USB=m +CPTCFG_RT2800USB_RT3573=y +CPTCFG_RT2800USB_RT53XX=y +CPTCFG_RT2800USB_RT55XX=y +# CPTCFG_RTL_CARDS is not set +CPTCFG_RTL8XXXU=m +CPTCFG_RTL8XXXU_UNTESTED=y +CPTCFG_RSI_91X=m +# CPTCFG_RSI_DEBUGFS is not set +# CPTCFG_WLAN_VENDOR_ST is not set +# CPTCFG_WLAN_VENDOR_TI is not set +# CPTCFG_WLAN_VENDOR_ZYDAS is not set +# CPTCFG_WLAN_VENDOR_QUANTENNA is not set +# CPTCFG_USB_NET_DRIVERS is not set +CPTCFG_SERIAL_DEV_BUS=m +CPTCFG_STAGING=y diff --git a/recipes-kernel/backports/backports-4.19/makefile-legacy.patch b/recipes-kernel/backports/backports-4.19/makefile-legacy.patch new file mode 100644 index 0000000..d6891e6 --- /dev/null +++ b/recipes-kernel/backports/backports-4.19/makefile-legacy.patch @@ -0,0 +1,27 @@ +--- a/Makefile.real ++++ b/Makefile.real +@@ -90,11 +90,6 @@ modules: backport-include/backport/autoconf.h + install: modules + @$(MAKE) -C $(KLIB_BUILD) M=$(BACKPORT_DIR) \ +- INSTALL_MOD_DIR=$(KMODDIR) $(KMODPATH_ARG) \ ++ INSTALL_MOD_DIR=$(KMODDIR) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) \ + modules_install +- @./scripts/blacklist.sh $(KLIB)/ $(KLIB)/$(KMODDIR) +- @./scripts/compress_modules.sh $(KLIB)/$(KMODDIR) +- @./scripts/check_depmod.sh +- @/sbin/depmod -a +- @./scripts/update-initramfs.sh $(KLIB) + @echo + @echo Your backported driver modules should be installed now. + @echo Reboot. +--- a/Makefile ++++ b/Makefile +@@ -84,7 +84,7 @@ mrproper: + echo "" ;\ + done \ + ) > Kconfig.kernel ;\ +- kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion | \ ++ kver=$$(echo $(KERNEL_VERSION) | \ + sed 's/^\(\([3-4]\|2\.6\)\.[0-9]\+\).*/\1/;t;d') ;\ + test "$$kver" != "" || echo "Kernel version parse failed!" ;\ + test "$$kver" != "" ;\ diff --git a/recipes-kernel/backports/backports-5.4/99-backports.conf b/recipes-kernel/backports/backports-5.4/99-backports.conf new file mode 100644 index 0000000..4784568 --- /dev/null +++ b/recipes-kernel/backports/backports-5.4/99-backports.conf @@ -0,0 +1,8 @@ +search built-in backports + +override cfg80211 * backports +override lib80211 * backports +override mwifiex_pcie * backports +override mwifiex_sdio * backports +override mwifiex_usb * backports +override r8188eu * backports diff --git a/recipes-kernel/backports/backports-5.4/config b/recipes-kernel/backports/backports-5.4/config new file mode 100644 index 0000000..5cf1f05 --- /dev/null +++ b/recipes-kernel/backports/backports-5.4/config @@ -0,0 +1,25 @@ +CPTCFG_CFG80211=m +CPTCFG_CFG80211_WEXT=y +CPTCFG_MAC80211=m +# CPTCFG_WLAN_VENDOR_ADMTEK is not set +# CPTCFG_WLAN_VENDOR_ATH is not set +# CPTCFG_WLAN_VENDOR_ATMEL is not set +# CPTCFG_WLAN_VENDOR_BROADCOM is not set +# CPTCFG_WLAN_VENDOR_CISCO is not set +# CPTCFG_WLAN_VENDOR_INTEL is not set +# CPTCFG_WLAN_VENDOR_INTERSIL is not set +CPTCFG_MWIFIEX=m +CPTCFG_MWIFIEX_SDIO=m +CPTCFG_MWIFIEX_PCIE=m +CPTCFG_MWIFIEX_USB=m +# CPTCFG_WLAN_VENDOR_MEDIATEK is not set +# CPTCFG_WLAN_VENDOR_RALINK is not set +# CPTCFG_WLAN_VENDOR_REALTEK is not set +# CPTCFG_WLAN_VENDOR_RSI is not set +# CPTCFG_WLAN_VENDOR_ST is not set +# CPTCFG_WLAN_VENDOR_TI is not set +# CPTCFG_WLAN_VENDOR_ZYDAS is not set +# CPTCFG_WLAN_VENDOR_QUANTENNA is not set +# CPTCFG_USB_NET_DRIVERS is not set +CPTCFG_STAGING=y +CPTCFG_R8188EU=m diff --git a/recipes-kernel/backports/backports-5.4/makefile.patch b/recipes-kernel/backports/backports-5.4/makefile.patch new file mode 100644 index 0000000..4023570 --- /dev/null +++ b/recipes-kernel/backports/backports-5.4/makefile.patch @@ -0,0 +1,24 @@ +commit 9e0b7ead828993280955f71afa3ad689f5e6e0a8 +Author: Oleksandr Suvorov +Date: Wed May 20 10:56:56 2020 +0300 + + Makefile: fix getting kernel version + + When backports build as a recipe, there is no Makefile available + in STAGING_KERNEL_BUILDDIR. Instead use the preset KERNEL_VERSION. + + Signed-off-by: Oleksandr Suvorov + +diff --git a/Makefile b/Makefile +index ee7df4ba..11044c0a 100644 +--- a/Makefile ++++ b/Makefile +@@ -84,7 +84,7 @@ mrproper: + echo "" ;\ + done \ + ) > Kconfig.kernel ;\ +- kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion | \ ++ kver=$$(echo $(KERNEL_VERSION) | \ + sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d') ;\ + test "$$kver" != "" || echo "Kernel version parse failed!" ;\ + test "$$kver" != "" ;\ diff --git a/recipes-kernel/backports/backports_4.19.bb b/recipes-kernel/backports/backports_4.19.bb new file mode 100644 index 0000000..a162ab8 --- /dev/null +++ b/recipes-kernel/backports/backports_4.19.bb @@ -0,0 +1,42 @@ +SUMMARY = "Backported kernel drivers v4.19 for T20/T30/VF" +HOMEPAGE = "https://backports.wiki.kernel.org" +SECTION = "kernel/modules" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" +INC_PR = "r1" + +DEPENDS_append = " coreutils-native" + +SRCREV = "cf2620f8c3bbbcc7ad33452e685cafd727997866" +SRCREV_use-head-next = "${AUTOREV}" +SRC_URI = " \ + git://git.toradex.com/backports-toradex.git;protocol=git;branch=toradex-${PV} \ + file://makefile-legacy.patch \ + file://config-legacy \ + " + +S = "${WORKDIR}/git" + +inherit module cml1 + +MAKE_TARGETS = "modules" +MODULES_INSTALL_TARGET = "modules_install" +PACKAGES_DYNAMIC += "^${BPN}-kernel-module-.*" + +KERNEL_MODULE_PACKAGE_PREFIX = "${BPN}-" + +EXTRA_OEMAKE = " KLIB=${STAGING_KERNEL_DIR} KLIB_BUILD=${STAGING_KERNEL_BUILDDIR} " + +KCONFIG_CONFIG_COMMAND = "CC=${BUILD_CC} LD=${BUILD_LD} AR=${BUILD_AR} menuconfig" + +do_configure() { + + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + make CC="${BUILD_CC}" LD="${BUILD_LD}" AR="${BUILD_AR}" \ + -C ${S}/kconf O=${S}/kconf conf + + cp ${WORKDIR}/config-legacy ${S}/.config + unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS + oe_runmake oldconfig +} + diff --git a/recipes-kernel/backports/files/99-backports.conf b/recipes-kernel/backports/files/99-backports.conf deleted file mode 100644 index 4784568..0000000 --- a/recipes-kernel/backports/files/99-backports.conf +++ /dev/null @@ -1,8 +0,0 @@ -search built-in backports - -override cfg80211 * backports -override lib80211 * backports -override mwifiex_pcie * backports -override mwifiex_sdio * backports -override mwifiex_usb * backports -override r8188eu * backports diff --git a/recipes-kernel/backports/files/config b/recipes-kernel/backports/files/config deleted file mode 100644 index 5cf1f05..0000000 --- a/recipes-kernel/backports/files/config +++ /dev/null @@ -1,25 +0,0 @@ -CPTCFG_CFG80211=m -CPTCFG_CFG80211_WEXT=y -CPTCFG_MAC80211=m -# CPTCFG_WLAN_VENDOR_ADMTEK is not set -# CPTCFG_WLAN_VENDOR_ATH is not set -# CPTCFG_WLAN_VENDOR_ATMEL is not set -# CPTCFG_WLAN_VENDOR_BROADCOM is not set -# CPTCFG_WLAN_VENDOR_CISCO is not set -# CPTCFG_WLAN_VENDOR_INTEL is not set -# CPTCFG_WLAN_VENDOR_INTERSIL is not set -CPTCFG_MWIFIEX=m -CPTCFG_MWIFIEX_SDIO=m -CPTCFG_MWIFIEX_PCIE=m -CPTCFG_MWIFIEX_USB=m -# CPTCFG_WLAN_VENDOR_MEDIATEK is not set -# CPTCFG_WLAN_VENDOR_RALINK is not set -# CPTCFG_WLAN_VENDOR_REALTEK is not set -# CPTCFG_WLAN_VENDOR_RSI is not set -# CPTCFG_WLAN_VENDOR_ST is not set -# CPTCFG_WLAN_VENDOR_TI is not set -# CPTCFG_WLAN_VENDOR_ZYDAS is not set -# CPTCFG_WLAN_VENDOR_QUANTENNA is not set -# CPTCFG_USB_NET_DRIVERS is not set -CPTCFG_STAGING=y -CPTCFG_R8188EU=m diff --git a/recipes-kernel/backports/files/makefile.patch b/recipes-kernel/backports/files/makefile.patch deleted file mode 100644 index 4023570..0000000 --- a/recipes-kernel/backports/files/makefile.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 9e0b7ead828993280955f71afa3ad689f5e6e0a8 -Author: Oleksandr Suvorov -Date: Wed May 20 10:56:56 2020 +0300 - - Makefile: fix getting kernel version - - When backports build as a recipe, there is no Makefile available - in STAGING_KERNEL_BUILDDIR. Instead use the preset KERNEL_VERSION. - - Signed-off-by: Oleksandr Suvorov - -diff --git a/Makefile b/Makefile -index ee7df4ba..11044c0a 100644 ---- a/Makefile -+++ b/Makefile -@@ -84,7 +84,7 @@ mrproper: - echo "" ;\ - done \ - ) > Kconfig.kernel ;\ -- kver=$$($(MAKE) --no-print-directory -C $(KLIB_BUILD) kernelversion | \ -+ kver=$$(echo $(KERNEL_VERSION) | \ - sed 's/^\(\([3-5]\|2\.6\)\.[0-9]\+\).*/\1/;t;d') ;\ - test "$$kver" != "" || echo "Kernel version parse failed!" ;\ - test "$$kver" != "" ;\ -- cgit v1.2.3