Compare commits
	
		
			3 Commits
		
	
	
		
			bard-kirke
			...
			HEAD
		
	
	| Author | SHA1 | Date | 
|---|---|---|
|  | a4ab48c63e | |
|  | a3e87ec6d9 | |
|  | 7cad5c1048 | 
|  | @ -3,24 +3,24 @@ | ||||||
| 
 | 
 | ||||||
| inherit systemd | inherit systemd | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN} += "libgpiod-tools" | RDEPENDS_${PN} += "libgpiod-tools" | ||||||
| 
 | 
 | ||||||
| FILESEXTRAPATHS:append := ":${THISDIR}/files" | FILESEXTRAPATHS_append := ":${THISDIR}/files" | ||||||
| 
 | 
 | ||||||
| SRC_URI:append = " \  | SRC_URI_append = " \  | ||||||
|            file://jody-w1-bt-init.service \ |            file://jody-w1-bt-init.service \ | ||||||
|            file://jody-w1-bt \ |            file://jody-w1-bt \ | ||||||
|            " |            " | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}" | S = "${WORKDIR}" | ||||||
| 
 | 
 | ||||||
| SYSTEMD_SERVICE:${PN} = " \ | SYSTEMD_SERVICE_${PN} = " \ | ||||||
|                           jody-w1-bt-init.service \ |                           jody-w1-bt-init.service \ | ||||||
|                         " |                         " | ||||||
| 
 | 
 | ||||||
| FILES:${PN}:append = "${systemd_unitdir}/system ${bindir}" | FILES_${PN}_append = "${systemd_unitdir}/system ${bindir}" | ||||||
| 
 | 
 | ||||||
| do_install:append() { | do_install_append() { | ||||||
|     install -d ${D}${systemd_unitdir}/system |     install -d ${D}${systemd_unitdir}/system | ||||||
|     install -m 644 ${WORKDIR}/jody-w1-bt-init.service ${D}${systemd_unitdir}/system/ |     install -m 644 ${WORKDIR}/jody-w1-bt-init.service ${D}${systemd_unitdir}/system/ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,11 +1,11 @@ | ||||||
| FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN}:remove = " ${PN}-wpa-supplicant ${PN}-hostapd" | RDEPENDS_${PN}_remove = " ${PN}-wpa-supplicant ${PN}-hostapd" | ||||||
| 
 | 
 | ||||||
| SRC_URI:append = "file://0001-Disable-wowlan_config.patch" | SRC_URI_append = "file://0001-Disable-wowlan_config.patch" | ||||||
| 
 | 
 | ||||||
| # unblacklist pcie driver and fw files (default) | # unblacklist pcie driver and fw files (default) | ||||||
| do_configure:prepend () { | do_configure_prepend () { | ||||||
|     for i in $(seq 1 4); do |     for i in $(seq 1 4); do | ||||||
|         sed -e "${i}s/^#*/#/" -i ${WORKDIR}/jody-w1-driver-pcie.conf |         sed -e "${i}s/^#*/#/" -i ${WORKDIR}/jody-w1-driver-pcie.conf | ||||||
|     done |     done | ||||||
|  |  | ||||||
|  | @ -6,17 +6,17 @@ do_assemble_fitimage[depends] += "fpga-image:do_deploy" | ||||||
| # $1 ... .its filename | # $1 ... .its filename | ||||||
| # $2 ... Image counter | # $2 ... Image counter | ||||||
| # $3 ... Path to fpga image | # $3 ... Path to fpga image | ||||||
| fitimage_emit_section_kernel:append() { | fitimage_emit_section_kernel_append() { | ||||||
|         fpgacount=1 |         fpgacount=1 | ||||||
|         cat << EOF >> ${1} |         cat << EOF >> ${1} | ||||||
|                 fpga-${fpgacount} { |                 fpga@${fpgacount} { | ||||||
|                         description = "FPGA"; |                         description = "FPGA"; | ||||||
|                         data = /incbin/("${DEPLOY_DIR_IMAGE}/fpga-image-${MACHINE}"); |                         data = /incbin/("${DEPLOY_DIR_IMAGE}/fpga-image-${MACHINE}"); | ||||||
|                         type = "fpga"; |                         type = "fpga"; | ||||||
|                         arch = "${UBOOT_ARCH}"; |                         arch = "${UBOOT_ARCH}"; | ||||||
|                         compression = "none"; |                         compression = "none"; | ||||||
|                         hashi-1 { |                         hash@1 { | ||||||
|                                 algo = "sha256"; |                                 algo = "sha1"; | ||||||
|                         }; |                         }; | ||||||
|                 }; |                 }; | ||||||
| EOF | EOF | ||||||
|  |  | ||||||
|  | @ -19,5 +19,5 @@ LAYERVERSION_netmodule-bsp = "1" | ||||||
| 
 | 
 | ||||||
| LAYERDEPENDS_netmodule-bsp = "core" | LAYERDEPENDS_netmodule-bsp = "core" | ||||||
| 
 | 
 | ||||||
| LAYERSERIES_COMPAT_netmodule-bsp = "dunfell kirkstone" | LAYERSERIES_COMPAT_netmodule-bsp = "dunfell" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -11,7 +11,7 @@ KERNEL_DEVICETREE_TO_USE = "${HW25_DT}" | ||||||
| SERIAL_CONSOLES = "115200;ttyS0" | SERIAL_CONSOLES = "115200;ttyS0" | ||||||
| DEFAULT_ETH = "lan0" | DEFAULT_ETH = "lan0" | ||||||
| 
 | 
 | ||||||
| MACHINE_FEATURES:remove = " \ | MACHINE_FEATURES_remove = " \ | ||||||
|     bluetooth \ |     bluetooth \ | ||||||
|     tibluetooth \ |     tibluetooth \ | ||||||
|     " |     " | ||||||
|  |  | ||||||
|  | @ -34,5 +34,5 @@ MACHINE_FEATURES += " \ | ||||||
| " | " | ||||||
| 
 | 
 | ||||||
| USER_MODULE_MACHINE_FEATURE = "user-module" | USER_MODULE_MACHINE_FEATURE = "user-module" | ||||||
| MACHINE_FEATURES:append = " ${USER_MODULE_MACHINE_FEATURE}" | MACHINE_FEATURES_append = " ${USER_MODULE_MACHINE_FEATURE}" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -21,7 +21,6 @@ WWAN_VENDORS = "ublox" | ||||||
| MACHINE_FEATURES += " \ | MACHINE_FEATURES += " \ | ||||||
| 	can \ | 	can \ | ||||||
| 	wwan \ | 	wwan \ | ||||||
| 	gnss \ |  | ||||||
| 	bluetooth \ | 	bluetooth \ | ||||||
| 	tibluetooth \ | 	tibluetooth \ | ||||||
| 	atsha \ | 	atsha \ | ||||||
|  |  | ||||||
|  | @ -14,7 +14,7 @@ KERNEL_DEVICETREE = "armada-385-nbhw14-prod1.dtb \ | ||||||
| KERNEL_IMAGETYPE = "zImage" | KERNEL_IMAGETYPE = "zImage" | ||||||
| 
 | 
 | ||||||
| PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" | PREFERRED_PROVIDER_virtual/kernel = "linux-netmodule" | ||||||
| PV:pn-linux-netmodule = "4.12.0-${SRCPV}" | PV_pn-linux-netmodule = "4.12.0-${SRCPV}" | ||||||
| SRC_URI:pn-linux-netmodule = "git://github.com/netmodule/linux.git;protocol=https;branch=4.12/standard/nrhw14" | SRC_URI_pn-linux-netmodule = "git://github.com/netmodule/linux.git;protocol=https;branch=4.12/standard/nrhw14" | ||||||
| SRCREV:pn-linux-netmodule = "2fb3360ec3cf672c74321e1dbe5c04e59d1ced11" | SRCREV_pn-linux-netmodule = "2fb3360ec3cf672c74321e1dbe5c04e59d1ced11" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -13,7 +13,7 @@ KERNEL_MODULE_PROBECONF += "ath10k_pci" | ||||||
| module_conf_ath10k_pci = "options ath10k_pci irq_mode=1" | module_conf_ath10k_pci = "options ath10k_pci irq_mode=1" | ||||||
| 
 | 
 | ||||||
| UBOOT_MACHINE = "armada-385-hw18_defconfig" | UBOOT_MACHINE = "armada-385-hw18_defconfig" | ||||||
| IMAGE_BOOT_FILES = "u-boot-armada-385-nrhw18.kwb" | IMAGE_BOOT_FILES = "u-boot-armada-385-hw18.kwb" | ||||||
| 
 | 
 | ||||||
| DEFAULT_ETH = "eth2" | DEFAULT_ETH = "eth2" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -14,7 +14,7 @@ KERNEL_DEVICETREE = "freescale/fsl-imx8qxp-mek.dtb freescale/fsl-imx8qxp-mek-dom | ||||||
| 
 | 
 | ||||||
| SOTA_MACHINE = "${MACHINE}" | SOTA_MACHINE = "${MACHINE}" | ||||||
| 
 | 
 | ||||||
| KERNEL_CLASSES:append = " kernel-fitimage" | KERNEL_CLASSES_append = " kernel-fitimage" | ||||||
| 
 | 
 | ||||||
| KERNEL_IMAGETYPE = "Image" | KERNEL_IMAGETYPE = "Image" | ||||||
| UBOOT_ENTRYPOINT ?= "0x80020000" | UBOOT_ENTRYPOINT ?= "0x80020000" | ||||||
|  |  | ||||||
|  | @ -7,4 +7,4 @@ KERNEL_DEVICETREE_TO_USE = "${HW23_DLM_DT}" | ||||||
| MACHINEOVERRIDES .= ":imx8-nmhw23" | MACHINEOVERRIDES .= ":imx8-nmhw23" | ||||||
| SOTA_MACHINE = "imx8-nmhw23" | SOTA_MACHINE = "imx8-nmhw23" | ||||||
| 
 | 
 | ||||||
| MACHINE_FEATURES:remove = "v2x" | MACHINE_FEATURES_remove = "v2x" | ||||||
|  |  | ||||||
|  | @ -12,7 +12,7 @@ KERNEL_DEVICETREE_TO_USE = "${HW23_DT}" | ||||||
| 
 | 
 | ||||||
| SOTA_MACHINE = "${MACHINE}" | SOTA_MACHINE = "${MACHINE}" | ||||||
| 
 | 
 | ||||||
| KERNEL_CLASSES:append = " kernel-fitimage" | KERNEL_CLASSES_append = " kernel-fitimage" | ||||||
| 
 | 
 | ||||||
| #UBOOT_MACHINE = "imx8_nmhw23_defconfig" | #UBOOT_MACHINE = "imx8_nmhw23_defconfig" | ||||||
| IMAGE_BOOT_FILES = "flash.bin" | IMAGE_BOOT_FILES = "flash.bin" | ||||||
|  |  | ||||||
|  | @ -3,14 +3,14 @@ require conf/machine/include/soc-family.inc | ||||||
| require netmodule-hardware.inc | require netmodule-hardware.inc | ||||||
| 
 | 
 | ||||||
| DEFAULTTUNE ?= "cortexa9thf-neon" | DEFAULTTUNE ?= "cortexa9thf-neon" | ||||||
| require conf/machine/include/arm/armv7a/tune-cortexa9.inc | require conf/machine/include/tune-cortexa9.inc | ||||||
| 
 | 
 | ||||||
| # Default providers, may need to override for specific machines
 | # Default providers, may need to override for specific machines
 | ||||||
| PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada" | PREFERRED_PROVIDER_virtual/bootloader = "u-boot-armada" | ||||||
| PREFERRED_PROVIDER_u-boot = "u-boot-armada" | PREFERRED_PROVIDER_u-boot = "u-boot-armada" | ||||||
| 
 | 
 | ||||||
| UBOOT_ARCH = "arm" | UBOOT_ARCH = "arm" | ||||||
| UBOOT_MACHINE = "mvebu_db:armada8k_config" | UBOOT_MACHINE = "mvebu_db_armada8k_config" | ||||||
| 
 | 
 | ||||||
| UBOOT_ENTRYPOINT = "0x13000000" | UBOOT_ENTRYPOINT = "0x13000000" | ||||||
| UBOOT_LOADADDRESS = "0x13000000" | UBOOT_LOADADDRESS = "0x13000000" | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ IMX_DEFAULT_BSP = "" | ||||||
| # Prevent usage of dynamic-packagearch for the kernel
 | # Prevent usage of dynamic-packagearch for the kernel
 | ||||||
| MACHINE_ARCH_FILTER = "" | MACHINE_ARCH_FILTER = "" | ||||||
| 
 | 
 | ||||||
| require conf/machine/include/arm/armv8a/tune-cortexa35.inc | require conf/machine/include/tune-cortexa35.inc | ||||||
| 
 | 
 | ||||||
| MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:" | MACHINEOVERRIDES =. "mx8:mx8x:mx8qxp:" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,10 +3,7 @@ require conf/machine/include/soc-family.inc | ||||||
| require netmodule-hardware.inc | require netmodule-hardware.inc | ||||||
| 
 | 
 | ||||||
| DEFAULTTUNE ?= "cortexa8thf-neon" | DEFAULTTUNE ?= "cortexa8thf-neon" | ||||||
| # dunfell
 | require conf/machine/include/tune-cortexa8.inc | ||||||
| include conf/machine/include/tune-cortexa8.inc |  | ||||||
| # kirkstone+
 |  | ||||||
| include conf/machine/include/arm/armv7a/tune-cortexa8.inc |  | ||||||
| 
 | 
 | ||||||
| PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,7 +3,7 @@ | ||||||
| DESCRIPTION = "i.MX ARM Trusted Firmware" | DESCRIPTION = "i.MX ARM Trusted Firmware" | ||||||
| SECTION = "BSP" | SECTION = "BSP" | ||||||
| LICENSE = "BSD-3-Clause" | LICENSE = "BSD-3-Clause" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" | ||||||
| 
 | 
 | ||||||
| PV = "1.5.0+git${SRCPV}" | PV = "1.5.0+git${SRCPV}" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,8 +3,8 @@ | ||||||
| require imx-mkimage_git.inc | require imx-mkimage_git.inc | ||||||
| 
 | 
 | ||||||
| DESCRIPTION = "Generate Boot Loader for i.MX 8 device" | DESCRIPTION = "Generate Boot Loader for i.MX 8 device" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
| SECTION = "BSP" | SECTION = "BSP" | ||||||
| 
 | 
 | ||||||
| IMX_EXTRA_FIRMWARE      = "firmware-imx-8 imx-sc-firmware" | IMX_EXTRA_FIRMWARE      = "firmware-imx-8 imx-sc-firmware" | ||||||
|  | @ -16,7 +16,7 @@ DEPENDS += " \ | ||||||
|     ${IMX_EXTRA_FIRMWARE} \ |     ${IMX_EXTRA_FIRMWARE} \ | ||||||
|     imx-atf \ |     imx-atf \ | ||||||
| " | " | ||||||
| DEPENDS:append_mx8m = " dtc-native" | DEPENDS_append_mx8m = " dtc-native" | ||||||
| BOOT_NAME = "imx-boot" | BOOT_NAME = "imx-boot" | ||||||
| PROVIDES = "${BOOT_NAME}" | PROVIDES = "${BOOT_NAME}" | ||||||
| 
 | 
 | ||||||
|  | @ -39,7 +39,7 @@ ATF_MACHINE_NAME_mx8qm = "bl31-imx8qm.bin" | ||||||
| ATF_MACHINE_NAME_mx8qxp = "bl31-imx8qxp.bin" | ATF_MACHINE_NAME_mx8qxp = "bl31-imx8qxp.bin" | ||||||
| ATF_MACHINE_NAME_mx8mq = "bl31-imx8mq.bin" | ATF_MACHINE_NAME_mx8mq = "bl31-imx8mq.bin" | ||||||
| ATF_MACHINE_NAME_mx8mm = "bl31-imx8mm.bin" | ATF_MACHINE_NAME_mx8mm = "bl31-imx8mm.bin" | ||||||
| ATF_MACHINE_NAME:append = "${@bb.utils.contains('COMBINED_FEATURES', 'optee', '-optee', '', d)}" | ATF_MACHINE_NAME_append = "${@bb.utils.contains('COMBINED_FEATURES', 'optee', '-optee', '', d)}" | ||||||
| 
 | 
 | ||||||
| DCD_NAME ?= "imx8qm_dcd.cfg.tmp" | DCD_NAME ?= "imx8qm_dcd.cfg.tmp" | ||||||
| DCD_NAME_mx8qm = "imx8qm_dcd.cfg.tmp" | DCD_NAME_mx8qm = "imx8qm_dcd.cfg.tmp" | ||||||
|  | @ -174,6 +174,6 @@ do_deploy() { | ||||||
| addtask deploy before do_build after do_compile | addtask deploy before do_build after do_compile | ||||||
| 
 | 
 | ||||||
| PACKAGE_ARCH = "${MACHINE_ARCH}" | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||||||
| FILES:${PN} = "/boot" | FILES_${PN} = "/boot" | ||||||
| 
 | 
 | ||||||
| COMPATIBLE_MACHINE = "(mx8)" | COMPATIBLE_MACHINE = "(mx8)" | ||||||
|  |  | ||||||
|  | @ -4,8 +4,8 @@ | ||||||
| require imx-mkimage_git.inc | require imx-mkimage_git.inc | ||||||
| 
 | 
 | ||||||
| DESCRIPTION = "i.MX make image" | DESCRIPTION = "i.MX make image" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
| SECTION = "BSP" | SECTION = "BSP" | ||||||
| 
 | 
 | ||||||
| inherit native deploy | inherit native deploy | ||||||
|  |  | ||||||
|  | @ -6,7 +6,7 @@ LICENSE = "Proprietary" | ||||||
| LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" | LIC_FILES_CHKSUM = "file://COPYING;md5=228c72f2a91452b8a03c4cab30f30ef9" | ||||||
| SECTION = "BSP" | SECTION = "BSP" | ||||||
| 
 | 
 | ||||||
| FILESEXTRAPATHS:prepend := "${THISDIR}/files/${MACHINE}:" | FILESEXTRAPATHS_prepend := "${THISDIR}/files/${MACHINE}:" | ||||||
| 
 | 
 | ||||||
| inherit fsl-eula-unpack deploy | inherit fsl-eula-unpack deploy | ||||||
| 
 | 
 | ||||||
|  | @ -20,7 +20,7 @@ symlink_name = "scfw_tcm.bin" | ||||||
| SRC_URI += "file://scfw_tcm_cfw.bin" | SRC_URI += "file://scfw_tcm_cfw.bin" | ||||||
| SC_FIRMWARE_NAME = "scfw_tcm_cfw.bin" | SC_FIRMWARE_NAME = "scfw_tcm_cfw.bin" | ||||||
| 
 | 
 | ||||||
| do_configure:prepend() { | do_configure_prepend() { | ||||||
|     cp ${WORKDIR}/scfw_tcm_cfw.bin ${B} |     cp ${WORKDIR}/scfw_tcm_cfw.bin ${B} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,18 +3,18 @@ | ||||||
| SUMMARY = "A Daemon wait for Freescale/NXP mfgtools host's command" | SUMMARY = "A Daemon wait for Freescale/NXP mfgtools host's command" | ||||||
| SECTION = "base" | SECTION = "base" | ||||||
| DEPENDS = "dosfstools-native" | DEPENDS = "dosfstools-native" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2" | ||||||
| LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||||||
| 
 | 
 | ||||||
| inherit autotools-brokensep | inherit autotools-brokensep | ||||||
| 
 | 
 | ||||||
| PV = "0.5.1+git${SRCPV}" | PV = "0.5.1+git${SRCPV}" | ||||||
| 
 | 
 | ||||||
| SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https;branch=master" | SRC_URI = "git://github.com/NXPmicro/imx-uuc.git;protocol=https" | ||||||
| SRCREV = "e3fbdfef978abd150d9ea71c4d174daded9c8d33" | SRCREV = "e3fbdfef978abd150d9ea71c4d174daded9c8d33" | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}/git" | S = "${WORKDIR}/git" | ||||||
| 
 | 
 | ||||||
| FILES:${PN} += "/linuxrc /fat" | FILES_${PN} += "/linuxrc /fat" | ||||||
| 
 | 
 | ||||||
| COMPATIBLE_MACHINE = "(imx)" | COMPATIBLE_MACHINE = "(imx)" | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| DESCRIPTION = "Bootloader configuration tool" | DESCRIPTION = "Bootloader configuration tool" | ||||||
| LICENSE = "Proprietary" | LICENSE = "Proprietary" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN} += " \ | RDEPENDS_${PN} += " \ | ||||||
|     python3-setuptools \ |     python3-setuptools \ | ||||||
|     " |     " | ||||||
| DEPENDS = "python3-setuptools-git-version-native" | DEPENDS = "python3-setuptools-git-version-native" | ||||||
|  | @ -20,14 +20,14 @@ S = "${WORKDIR}/git" | ||||||
| # Likely required in the future | # Likely required in the future | ||||||
| #PACKAGE_ARCH = "${MACHINE_ARCH}" | #PACKAGE_ARCH = "${MACHINE_ARCH}" | ||||||
| inherit allarch | inherit allarch | ||||||
| #do_configure:prepend() { | #do_configure_prepend() { | ||||||
| #    cp ${S}/platforms/${MACHINE}/* ${S}/bootloader_config | #    cp ${S}/platforms/${MACHINE}/* ${S}/bootloader_config | ||||||
| #} | #} | ||||||
| 
 | 
 | ||||||
| SYSTEMD_SERVICE:${PN} = "bootloader-config.service" | SYSTEMD_SERVICE_${PN} = "bootloader-config.service" | ||||||
| 
 | 
 | ||||||
| # do_install is done by setuptools | # do_install is done by setuptools | ||||||
| do_install:append() { | do_install_append() { | ||||||
|     install -d ${D}/${systemd_unitdir}/system/ |     install -d ${D}/${systemd_unitdir}/system/ | ||||||
|     install -m 0644 ${S}/systemd/bootloader-config.service ${D}/${systemd_unitdir}/system/ |     install -m 0644 ${S}/systemd/bootloader-config.service ${D}/${systemd_unitdir}/system/ | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| DESCRIPTION = "Fpga images" | DESCRIPTION = "Fpga images" | ||||||
| LICENSE = "Proprietary" | LICENSE = "Proprietary" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" | ||||||
| 
 | 
 | ||||||
| inherit deploy | inherit deploy | ||||||
| 
 | 
 | ||||||
|  | @ -21,6 +21,6 @@ do_deploy () { | ||||||
|     cp ${WORKDIR}/LG00000000 ${DEPLOYDIR}/fpga-image-${MACHINE} |     cp ${WORKDIR}/LG00000000 ${DEPLOYDIR}/fpga-image-${MACHINE} | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| FILES:${PN} += "/logic/LG00000000"  | FILES_${PN} += "/logic/LG00000000"  | ||||||
| 
 | 
 | ||||||
| addtask deploy before do_build after do_compile | addtask deploy before do_build after do_compile | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||||||
| 
 | 
 | ||||||
| PACKAGECONFIG = "" | PACKAGECONFIG = "" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,11 +2,8 @@ SUMMARY = "Set mac addresses of Wifi and bluetooth chips" | ||||||
| DESCRIPTION = "Small scripts that set the mac addresses based on ethernet mac" | DESCRIPTION = "Small scripts that set the mac addresses based on ethernet mac" | ||||||
| AUTHOR = "Alexandre Bard" | AUTHOR = "Alexandre Bard" | ||||||
| 
 | 
 | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2+" | ||||||
| 
 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
| include ${LAYERSERIES_CORENAMES}/licenses.inc |  | ||||||
| LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |  | ||||||
| 
 |  | ||||||
| PR = "r2" | PR = "r2" | ||||||
| 
 | 
 | ||||||
| inherit systemd | inherit systemd | ||||||
|  | @ -21,10 +18,10 @@ S = "${WORKDIR}" | ||||||
| 
 | 
 | ||||||
| INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | INHIBIT_PACKAGE_DEBUG_SPLIT = "1" | ||||||
| 
 | 
 | ||||||
| SYSTEMD_SERVICE:${PN} = "wlan-address-set.service bt-address-set.service" | SYSTEMD_SERVICE_${PN} = "wlan-address-set.service bt-address-set.service" | ||||||
| SYSTEMD_AUTO_ENABLE ?= "enable" | SYSTEMD_AUTO_ENABLE ?= "enable" | ||||||
| 
 | 
 | ||||||
| FILES:${PN}:append = " \ | FILES_${PN}_append = " \ | ||||||
|                     /lib \ |                     /lib \ | ||||||
|                     /usr \ |                     /usr \ | ||||||
|                     " |                     " | ||||||
|  |  | ||||||
|  | @ -9,23 +9,23 @@ SRCREV ?= "6584feb5fb3e18572fee1cea9e20a6b8e5cd0251" | ||||||
| PV = "0.0.1+git${SRCPV}" | PV = "0.0.1+git${SRCPV}" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| DEPENDS:append = " libnmapp" | DEPENDS_append = " libnmapp" | ||||||
| 
 | 
 | ||||||
| inherit systemd | inherit systemd | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}/git" | S = "${WORKDIR}/git" | ||||||
| B = "${S}/build" | B = "${S}/build" | ||||||
| 
 | 
 | ||||||
| SYSTEMD_SERVICE:${PN} = "storage-info.service" | SYSTEMD_SERVICE_${PN} = "storage-info.service" | ||||||
| 
 | 
 | ||||||
| FILES:${PN} += " \ | FILES_${PN} += " \ | ||||||
|                   ${bindir}/storage-info \ |                   ${bindir}/storage-info \ | ||||||
|                   ${systemd_system_unitdir}/storage-info.service \ |                   ${systemd_system_unitdir}/storage-info.service \ | ||||||
|                   ${sysconfdir}/storage/storage-info.conf \ |                   ${sysconfdir}/storage/storage-info.conf \ | ||||||
|                " |                " | ||||||
| 
 | 
 | ||||||
| # build variables for the target (rest is default) | # build variables for the target (rest is default) | ||||||
| EXTRA_OEMAKE:append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" | EXTRA_OEMAKE_append = " 'BUILD_TARGET=target' 'BUILD_CONFIG=rls' 'SYSROOT=${STAGING_DIR_TARGET}'" | ||||||
| 
 | 
 | ||||||
| do_install() { | do_install() { | ||||||
|     install -d ${D}${bindir} |     install -d ${D}${bindir} | ||||||
|  |  | ||||||
|  | @ -1,44 +0,0 @@ | ||||||
| From 52c3ac31426131c555093542d51f1e6e0623507c Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Marc Mattmueller <marc.mattmueller@netmodule.com> |  | ||||||
| Date: Mon, 18 Jul 2022 19:26:59 +0200 |  | ||||||
| Subject: [PATCH] u-boot-armada: Remove redundant YYLOC global declaration |  | ||||||
| 
 |  | ||||||
| Same as the upstream fix for building dtc with gcc 10. |  | ||||||
| 
 |  | ||||||
| After having consulted the team, this patch is only applied to |  | ||||||
| the armada bootloader as this one is used on the core os |  | ||||||
| environment build-up. |  | ||||||
| 
 |  | ||||||
| Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com> |  | ||||||
| ---
 |  | ||||||
|  scripts/dtc/dtc-lexer.l             | 1 - |  | ||||||
|  scripts/dtc/dtc-lexer.lex.c_shipped | 1 - |  | ||||||
|  2 files changed, 2 deletions(-) |  | ||||||
| 
 |  | ||||||
| diff --git a/scripts/dtc/dtc-lexer.l b/scripts/dtc/dtc-lexer.l
 |  | ||||||
| index fd825ebba6..24af549977 100644
 |  | ||||||
| --- a/scripts/dtc/dtc-lexer.l
 |  | ||||||
| +++ b/scripts/dtc/dtc-lexer.l
 |  | ||||||
| @@ -38,7 +38,6 @@ LINECOMMENT	"//".*\n
 |  | ||||||
|  #include "srcpos.h" |  | ||||||
|  #include "dtc-parser.tab.h" |  | ||||||
|   |  | ||||||
| -YYLTYPE yylloc;
 |  | ||||||
|  extern bool treesource_error; |  | ||||||
|   |  | ||||||
|  /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ |  | ||||||
| diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped
 |  | ||||||
| index 3934d8624d..22f6e0d1f8 100644
 |  | ||||||
| --- a/scripts/dtc/dtc-lexer.lex.c_shipped
 |  | ||||||
| +++ b/scripts/dtc/dtc-lexer.lex.c_shipped
 |  | ||||||
| @@ -639,7 +639,6 @@ char *yytext;
 |  | ||||||
|  #include "srcpos.h" |  | ||||||
|  #include "dtc-parser.tab.h" |  | ||||||
|   |  | ||||||
| -YYLTYPE yylloc;
 |  | ||||||
|  extern bool treesource_error; |  | ||||||
|   |  | ||||||
|  /* CAUTION: this will stop working if we ever use yyless() or yyunput() */ |  | ||||||
| -- 
 |  | ||||||
| 2.20.1 |  | ||||||
| 
 |  | ||||||
|  | @ -1,17 +1,14 @@ | ||||||
| require u-boot-nm.inc | require u-boot-nm.inc | ||||||
| 
 | 
 | ||||||
| # Be aware github/netmodule git | # Be aware github/netmodule git | ||||||
| SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2017.11/standard/armada-385 \ | SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2017.11/standard/armada-385" | ||||||
|            file://0001-remove-redundant-YYLOC-declaration.patch;name=yylloc \ |  | ||||||
| " |  | ||||||
| SRC_URI[yylloc.md5sum] = "504cb5b73a174a32e55c58f60608925d" |  | ||||||
| 
 | 
 | ||||||
| DEPENDS += "bc-native" | DEPENDS += "bc-native" | ||||||
| 
 | 
 | ||||||
| # Should be updated when a new U-Boot Version is available | # Should be updated when a new U-Boot Version is available | ||||||
|  | #SRCREV ?= "68d28424cf41e141207d9d8af76c5bc5e01a55e2" | ||||||
| SRCREV ?= "68d28424cf41e141207d9d8af76c5bc5e01a55e2" | SRCREV ?= "68d28424cf41e141207d9d8af76c5bc5e01a55e2" | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| UBOOT_SUFFIX = "kwb" | UBOOT_SUFFIX = "kwb" | ||||||
| UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" | UBOOT_BINARY = "u-boot-spl.${UBOOT_SUFFIX}" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -7,7 +7,7 @@ require recipes-bsp/u-boot/u-boot.inc | ||||||
| 
 | 
 | ||||||
| PROVIDES += "u-boot" | PROVIDES += "u-boot" | ||||||
| 
 | 
 | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2+" | ||||||
| LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | LIC_FILES_CHKSUM = "file://Licenses/gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||||||
| 
 | 
 | ||||||
| SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2018.03/imx/imx8-nmhw23;destsuffix=git" | SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2018.03/imx/imx8-nmhw23;destsuffix=git" | ||||||
|  | @ -23,14 +23,14 @@ LOCALVERSION ?= "-${SRCBRANCH}" | ||||||
| BOOT_TOOLS = "imx-boot-tools" | BOOT_TOOLS = "imx-boot-tools" | ||||||
| UBOOT_INITIAL_ENV = "" | UBOOT_INITIAL_ENV = "" | ||||||
| 
 | 
 | ||||||
| do_configure:prepend() { | do_configure_prepend() { | ||||||
|     if [ ! -d ${S}/board/netmodule/common ]; then |     if [ ! -d ${S}/board/netmodule/common ]; then | ||||||
|         mkdir -p ${S}/board/netmodule/ |         mkdir -p ${S}/board/netmodule/ | ||||||
|         ln -s ${S}/board/freescale/common ${S}/board/netmodule/common |         ln -s ${S}/board/freescale/common ${S}/board/netmodule/common | ||||||
|     fi |     fi | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| do_deploy:append_mx8m() { | do_deploy_append_mx8m() { | ||||||
|     # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary |     # Deploy the mkimage, u-boot-nodtb.bin and fsl-imx8m*-XX.dtb for mkimage to generate boot binary | ||||||
|     if [ -n "${UBOOT_CONFIG}" ] |     if [ -n "${UBOOT_CONFIG}" ] | ||||||
|     then |     then | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| require recipes-bsp/u-boot/u-boot.inc | require recipes-bsp/u-boot/u-boot.inc | ||||||
| 
 | 
 | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2+" | ||||||
| LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" | LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6" | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}/git" | S = "${WORKDIR}/git" | ||||||
|  |  | ||||||
|  | @ -4,7 +4,7 @@ require u-boot-nm.inc | ||||||
| SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2016.05/standard/am335x" | SRC_URI = "git://gitlab.com/netmodule/bootloader/netmodule-uboot.git;protocol=ssh;user=git;branch=2016.05/standard/am335x" | ||||||
| 
 | 
 | ||||||
| # Should be updated when a new U-Boot Version is available | # Should be updated when a new U-Boot Version is available | ||||||
| SRCREV = "4bbdb87d6be83386e15f5c38e80a49be9308f2a7" | SRCREV = "69e9c386dd3734a01af79ca1cc565896facfb9f6" | ||||||
| 
 | 
 | ||||||
| SPL_BINARY = "MLO" | SPL_BINARY = "MLO" | ||||||
| UBOOT_SUFFIX = "img" | UBOOT_SUFFIX = "img" | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ DESCRIPTION = "USB-Hub Reset on HW23" | ||||||
| HOMEPAGE = "www.netmodule.com" | HOMEPAGE = "www.netmodule.com" | ||||||
| LICENSE = "MIT" | LICENSE = "MIT" | ||||||
| SECTION = "bsp" | SECTION = "bsp" | ||||||
| RDEPENDS:${PN} = "usbutils coreutils" | RDEPENDS_${PN} = "usbutils coreutils" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||||||
| 
 | 
 | ||||||
| inherit systemd | inherit systemd | ||||||
|  | @ -14,11 +14,11 @@ SRC_URI = " \ | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}" | S = "${WORKDIR}" | ||||||
| 
 | 
 | ||||||
| SYSTEMD_SERVICE:${PN} = " \ | SYSTEMD_SERVICE_${PN} = " \ | ||||||
|                           usb-hub-reset.service \ |                           usb-hub-reset.service \ | ||||||
|                         " |                         " | ||||||
| 
 | 
 | ||||||
| FILES:${PN} = "${systemd_unitdir}/system ${bindir}" | FILES_${PN} = "${systemd_unitdir}/system ${bindir}" | ||||||
| 
 | 
 | ||||||
| do_install() { | do_install() { | ||||||
|     install -d ${D}${systemd_unitdir}/system |     install -d ${D}${systemd_unitdir}/system | ||||||
|  |  | ||||||
|  | @ -5,7 +5,7 @@ DESCRIPTION = "Murata v2x module firmware loader service" | ||||||
| HOMEPAGE = "www.netmodule.com" | HOMEPAGE = "www.netmodule.com" | ||||||
| LICENSE = "MIT" | LICENSE = "MIT" | ||||||
| SECTION = "bsp/firmware" | SECTION = "bsp/firmware" | ||||||
| RDEPENDS:${PN} = "dfu-util usbutils coreutils" | RDEPENDS_${PN} = "dfu-util usbutils coreutils" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" | ||||||
| 
 | 
 | ||||||
| inherit systemd | inherit systemd | ||||||
|  | @ -20,11 +20,11 @@ SRC_URI = " \ | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}" | S = "${WORKDIR}" | ||||||
| 
 | 
 | ||||||
| SYSTEMD_SERVICE:${PN} = " \ | SYSTEMD_SERVICE_${PN} = " \ | ||||||
|                           v2x-ieee802.11p.service \ |                           v2x-ieee802.11p.service \ | ||||||
|                         " |                         " | ||||||
| 
 | 
 | ||||||
| FILES:${PN} = "${systemd_unitdir}/system ${bindir} ${nonarch_base_libdir}/firmware/v2x ${sysconfdir} " | FILES_${PN} = "${systemd_unitdir}/system ${bindir} ${nonarch_base_libdir}/firmware/v2x ${sysconfdir} " | ||||||
| 
 | 
 | ||||||
| do_install() { | do_install() { | ||||||
|     install -d ${D}${systemd_unitdir}/system |     install -d ${D}${systemd_unitdir}/system | ||||||
|  |  | ||||||
|  | @ -0,0 +1,29 @@ | ||||||
|  | SUMMARY = "SocketCAN over Ethernet tunnel using UDP to transfer CAN frames between two machines" | ||||||
|  | SECTION = "socketcan" | ||||||
|  | LICENSE = "GPLv2" | ||||||
|  | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
|  | PR = "r0" | ||||||
|  | 
 | ||||||
|  | RDEPENDS_${PN}-dev += "${PN}-staticdev" | ||||||
|  | 
 | ||||||
|  | SRCREV = "e3ac7393b566345d057c2d17a4d328007caaacac" | ||||||
|  | 
 | ||||||
|  | SRC_URI = "git://github.com/mguentner/cannelloni.git;protocol=http" | ||||||
|  | 
 | ||||||
|  | S = "${WORKDIR}/git" | ||||||
|  | 
 | ||||||
|  | inherit pkgconfig cmake | ||||||
|  | inherit systemd | ||||||
|  | 
 | ||||||
|  | EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release" | ||||||
|  | 
 | ||||||
|  | INSANE_SKIP_${PN} = "ldflags" | ||||||
|  | INHIBIT_PACKAGE_STRIP = "1" | ||||||
|  | INHIBIT_SYSROOT_STRIP = "1" | ||||||
|  | SOLIBS = ".so" | ||||||
|  | FILES_SOLIBSDEV = "" | ||||||
|  | 
 | ||||||
|  | do_install_append () { | ||||||
|  | 	install -d ${D}${libdir} | ||||||
|  | 	install -m 0755 ${WORKDIR}/build/libcannelloni-common.so ${D}${libdir} | ||||||
|  | } | ||||||
|  | @ -9,21 +9,21 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda | ||||||
| 
 | 
 | ||||||
| inherit systemd | inherit systemd | ||||||
| 
 | 
 | ||||||
| FILESEXTRAPATHS:append := ":${THISDIR}/files" | FILESEXTRAPATHS_append := ":${THISDIR}/files" | ||||||
| 
 | 
 | ||||||
| SRC_URI:append = " \  | SRC_URI_append = " \  | ||||||
|            file://gnss-init.service \ |            file://gnss-init.service \ | ||||||
|            " |            " | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}" | S = "${WORKDIR}" | ||||||
| 
 | 
 | ||||||
| SYSTEMD_SERVICE:${PN} = " \ | SYSTEMD_SERVICE_${PN} = " \ | ||||||
|                           gnss-init.service \ |                           gnss-init.service \ | ||||||
|                         " |                         " | ||||||
| 
 | 
 | ||||||
| FILES:${PN}:append = "${systemd_unitdir}/system ${bindir}" | FILES_${PN}_append = "${systemd_unitdir}/system ${bindir}" | ||||||
| 
 | 
 | ||||||
| do_install:append() { | do_install_append() { | ||||||
|     install -d ${D}${systemd_unitdir}/system |     install -d ${D}${systemd_unitdir}/system | ||||||
|     install -m 644 ${WORKDIR}/gnss-init.service ${D}${systemd_unitdir}/system/ |     install -m 644 ${WORKDIR}/gnss-init.service ${D}${systemd_unitdir}/system/ | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| DESCRIPTION = "NetModule GNSS management tool" | DESCRIPTION = "NetModule GNSS management tool" | ||||||
| LICENSE = "LGPL-3.0-only" | LICENSE = "LGPLv3" | ||||||
| LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404" | LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404" | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN} += " \ | RDEPENDS_${PN} += " \ | ||||||
|     python3-setuptools \ |     python3-setuptools \ | ||||||
|     nmubxlib \ |     nmubxlib \ | ||||||
|     python3-systemd \ |     python3-systemd \ | ||||||
|  | @ -14,7 +14,7 @@ inherit setuptools3 | ||||||
| inherit gitpkgv | inherit gitpkgv | ||||||
| 
 | 
 | ||||||
| inherit systemd | inherit systemd | ||||||
| SYSTEMD_SERVICE:${PN} = "gnss-mgr.service" | SYSTEMD_SERVICE_${PN} = "gnss-mgr.service" | ||||||
| 
 | 
 | ||||||
| inherit allarch | inherit allarch | ||||||
| 
 | 
 | ||||||
|  | @ -25,14 +25,14 @@ PV = "1.0-git${SRCPV}" | ||||||
| PR = "r1" | PR = "r1" | ||||||
| 
 | 
 | ||||||
| SRC_URI = "git://gitlab.com/netmodule/tools/gnssmgr.git;protocol=ssh;user=git;branch=master" | SRC_URI = "git://gitlab.com/netmodule/tools/gnssmgr.git;protocol=ssh;user=git;branch=master" | ||||||
| SRCREV ?= "a3dad8288286ba10b6b753d896c9c79586ce2e90" | SRCREV = "3d80bb4871ddc2e3e84553a86b767b419b96148f" | ||||||
| S = "${WORKDIR}/git" | S = "${WORKDIR}/git" | ||||||
| 
 | 
 | ||||||
| PACKAGES =+ "${PN}-test" | PACKAGES =+ "${PN}-test" | ||||||
| SUMMARY:${PN}-test = "Addon to gnss-mgr for testing purposes" | SUMMARY_${PN}-test = "Addon to gnss-mgr for testing purposes" | ||||||
| FILES:${PN}-test = "${bindir}/gnss-config-reader" | FILES_${PN}-test = "${bindir}/gnss-config-reader" | ||||||
| 
 | 
 | ||||||
| do_install:append() { | do_install_append() { | ||||||
|     install -d ${D}${sysconfdir}/gnss |     install -d ${D}${sysconfdir}/gnss | ||||||
|     install -m 0644 ${S}/config/gnss-neom8.conf ${D}${sysconfdir}/gnss/gnss0.conf |     install -m 0644 ${S}/config/gnss-neom8.conf ${D}${sysconfdir}/gnss/gnss0.conf | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,4 +1,4 @@ | ||||||
| FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||||||
| 
 | 
 | ||||||
| DEPENDS = "libnl dbus" | DEPENDS = "libnl dbus" | ||||||
|   |   | ||||||
|  | @ -7,6 +7,6 @@ export EXTRA_CFLAGS = " \ | ||||||
|     -I${STAGING_DIR_TARGET}/usr/include/libnl3 \ |     -I${STAGING_DIR_TARGET}/usr/include/libnl3 \ | ||||||
| " | " | ||||||
| 
 | 
 | ||||||
| do_configure:prepend () { | do_configure_prepend () { | ||||||
|     sed -i 's/CONFIG_LIBNL_TINY=y/#CONFIG_LIBNL_TINY=y/g' ${WORKDIR}/hostapd-full.config |     sed -i 's/CONFIG_LIBNL_TINY=y/#CONFIG_LIBNL_TINY=y/g' ${WORKDIR}/hostapd-full.config | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -5,12 +5,12 @@ export EXTRA_CFLAGS = " \ | ||||||
|     -I${STAGING_DIR_TARGET}/usr/include/libnl3 \ |     -I${STAGING_DIR_TARGET}/usr/include/libnl3 \ | ||||||
| " | " | ||||||
| 
 | 
 | ||||||
| SYSTEMD_SERVICE:${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service" | SYSTEMD_SERVICE_${PN} = "wpa_supplicant.service wpa_supplicant-nl80211@.service wpa_supplicant-wired@.service" | ||||||
| SYSTEMD_AUTO_ENABLE = "disable" | SYSTEMD_AUTO_ENABLE = "disable" | ||||||
| 
 | 
 | ||||||
| FILES:${PN} += "/usr/lib/systemd/system/*" | FILES_${PN} += "/usr/lib/systemd/system/*" | ||||||
| 
 | 
 | ||||||
| do_configure:prepend () { | do_configure_prepend () { | ||||||
|     sed -i 's/#CONFIG_CTRL_IFACE_DBUS_NEW=y/CONFIG_CTRL_IFACE_DBUS_NEW=y/g' ${WORKDIR}/wpa_supplicant-full.config |     sed -i 's/#CONFIG_CTRL_IFACE_DBUS_NEW=y/CONFIG_CTRL_IFACE_DBUS_NEW=y/g' ${WORKDIR}/wpa_supplicant-full.config | ||||||
|     sed -i 's/#CONFIG_CTRL_IFACE_DBUS_INTRO=y/CONFIG_CTRL_IFACE_DBUS_INTRO=y/g' ${WORKDIR}/wpa_supplicant-full.config |     sed -i 's/#CONFIG_CTRL_IFACE_DBUS_INTRO=y/CONFIG_CTRL_IFACE_DBUS_INTRO=y/g' ${WORKDIR}/wpa_supplicant-full.config | ||||||
| 
 | 
 | ||||||
|  | @ -18,7 +18,7 @@ do_configure:prepend () { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| do_install:append () { | do_install_append () { | ||||||
| 
 | 
 | ||||||
| 	install -d ${D}/${sysconfdir}/dbus-1/system.d | 	install -d ${D}/${sysconfdir}/dbus-1/system.d | ||||||
| 	install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d | 	install -m 644 ${S}/wpa_supplicant/dbus/dbus-wpa_supplicant.conf ${D}/${sysconfdir}/dbus-1/system.d | ||||||
|  |  | ||||||
|  | @ -0,0 +1,21 @@ | ||||||
|  | SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" | ||||||
|  | DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ | ||||||
|  |                devices which speak the Qualcomm MSM Interface (QMI) protocol" | ||||||
|  | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" | ||||||
|  | LICENSE = "GPLv2 & LGPLv2.1" | ||||||
|  | LIC_FILES_CHKSUM = " \ | ||||||
|  |     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||||||
|  |     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | ||||||
|  | " | ||||||
|  | 
 | ||||||
|  | DEPENDS = "glib-2.0 glib-2.0-native" | ||||||
|  | 
 | ||||||
|  | inherit autotools pkgconfig bash-completion gobject-introspection | ||||||
|  | 
 | ||||||
|  | SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BPN}-${PV}.tar.xz" | ||||||
|  | 
 | ||||||
|  | SRC_URI[sha256sum] = "a71963bb1097a42665287e40a9a36f95b8f9d6d6a4b7a5de22d660328af97cb9" | ||||||
|  | 
 | ||||||
|  | PACKAGECONFIG ??= "udev mbim" | ||||||
|  | PACKAGECONFIG[udev] = ",--without-udev,libgudev" | ||||||
|  | PACKAGECONFIG[mbim] = "--enable-mbim-qmux,--disable-mbim-qmux,libmbim" | ||||||
|  | @ -1,28 +0,0 @@ | ||||||
| SUMMARY = "libqmi is a library for talking to WWAN devices by QMI protocol" |  | ||||||
| DESCRIPTION = "libqmi is a glib-based library for talking to WWAN modems and \ |  | ||||||
|                devices which speak the Qualcomm MSM Interface (QMI) protocol" |  | ||||||
| HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libqmi" |  | ||||||
| LICENSE = "GPL-2.0-only& LGPL-2.1-only" |  | ||||||
| LIC_FILES_CHKSUM = " \ |  | ||||||
|     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |  | ||||||
|     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ |  | ||||||
| " |  | ||||||
| 
 |  | ||||||
| DEPENDS = "glib-2.0 glib-2.0-native" |  | ||||||
| 
 |  | ||||||
| inherit meson pkgconfig bash-completion gobject-introspection |  | ||||||
| 
 |  | ||||||
| SRCREV = "6e248aceb66f53b467b343bca1c467a8211dd30d" |  | ||||||
| SRC_URI = "git://gitlab.freedesktop.org/mobile-broadband/libqmi.git;protocol=https;branch=qmi-1-32" |  | ||||||
| 
 |  | ||||||
| S = "${WORKDIR}/git" |  | ||||||
| 
 |  | ||||||
| PACKAGECONFIG ??= "udev mbim" |  | ||||||
| PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,libgudev" |  | ||||||
| PACKAGECONFIG[mbim] = "-Dmbim_qmux=true,-Dmbim_qmux=false,libmbim" |  | ||||||
| PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib" |  | ||||||
| 
 |  | ||||||
| EXTRA_OEMESON = " \ |  | ||||||
|     -Dgtk_doc=false \ |  | ||||||
|     -Dman=false \ |  | ||||||
| " |  | ||||||
|  | @ -1,70 +0,0 @@ | ||||||
| From 35173fa04d0116ba30a86dc1a19f859f2be14a24 Mon Sep 17 00:00:00 2001 |  | ||||||
| From: "Bruce A. Johnson" <waterfordtrack@gmail.com> |  | ||||||
| Date: Wed, 22 Dec 2021 14:24:02 -0500 |  | ||||||
| Subject: [PATCH] core: switch bash shell scripts to use /bin/sh for use |  | ||||||
|  w/Busybox. |  | ||||||
| 
 |  | ||||||
| Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/483 |  | ||||||
| 
 |  | ||||||
| %% original patch: 0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch |  | ||||||
| ---
 |  | ||||||
|  data/dispatcher-fcc-unlock/105b | 2 +- |  | ||||||
|  data/dispatcher-fcc-unlock/1199 | 2 +- |  | ||||||
|  data/dispatcher-fcc-unlock/1eac | 2 +- |  | ||||||
|  test/mmcli-test-sms             | 2 +- |  | ||||||
|  tools/tests/test-wrapper.sh.in  | 2 +- |  | ||||||
|  5 files changed, 5 insertions(+), 5 deletions(-) |  | ||||||
| 
 |  | ||||||
| diff --git a/data/dispatcher-fcc-unlock/105b b/data/dispatcher-fcc-unlock/105b
 |  | ||||||
| index 444bd51f..772c90f4 100644
 |  | ||||||
| --- a/data/dispatcher-fcc-unlock/105b
 |  | ||||||
| +++ b/data/dispatcher-fcc-unlock/105b
 |  | ||||||
| @@ -1,4 +1,4 @@
 |  | ||||||
| -#!/bin/bash
 |  | ||||||
| +#!/bin/sh
 |  | ||||||
|   |  | ||||||
|  # SPDX-License-Identifier: CC0-1.0 |  | ||||||
|  # 2021 Aleksander Morgado <aleksander@aleksander.es> |  | ||||||
| diff --git a/data/dispatcher-fcc-unlock/1199 b/data/dispatcher-fcc-unlock/1199
 |  | ||||||
| index 83ab2c9e..6dbf8d1b 100644
 |  | ||||||
| --- a/data/dispatcher-fcc-unlock/1199
 |  | ||||||
| +++ b/data/dispatcher-fcc-unlock/1199
 |  | ||||||
| @@ -1,4 +1,4 @@
 |  | ||||||
| -#!/bin/bash
 |  | ||||||
| +#!/bin/sh
 |  | ||||||
|   |  | ||||||
|  # SPDX-License-Identifier: CC0-1.0 |  | ||||||
|  # 2021 Aleksander Morgado <aleksander@aleksander.es> |  | ||||||
| diff --git a/data/dispatcher-fcc-unlock/1eac b/data/dispatcher-fcc-unlock/1eac
 |  | ||||||
| index 1a048dc8..44ce46d7 100644
 |  | ||||||
| --- a/data/dispatcher-fcc-unlock/1eac
 |  | ||||||
| +++ b/data/dispatcher-fcc-unlock/1eac
 |  | ||||||
| @@ -1,4 +1,4 @@
 |  | ||||||
| -#!/bin/bash
 |  | ||||||
| +#!/bin/sh
 |  | ||||||
|   |  | ||||||
|  # SPDX-License-Identifier: CC0-1.0 |  | ||||||
|  # 2021 Aleksander Morgado <aleksander@aleksander.es> |  | ||||||
| diff --git a/test/mmcli-test-sms b/test/mmcli-test-sms
 |  | ||||||
| index 18e0a7b4..7136ee0d 100755
 |  | ||||||
| --- a/test/mmcli-test-sms
 |  | ||||||
| +++ b/test/mmcli-test-sms
 |  | ||||||
| @@ -1,4 +1,4 @@
 |  | ||||||
| -#!/bin/bash
 |  | ||||||
| +#!/bin/sh
 |  | ||||||
|   |  | ||||||
|  print_usage () { |  | ||||||
|      echo "usage: $0 [MODEM INDEX] [all|ucs2|gsm7|data] [NUMBER]" |  | ||||||
| diff --git a/tools/tests/test-wrapper.sh.in b/tools/tests/test-wrapper.sh.in
 |  | ||||||
| index d64ea4cb..fcdb56de 100644
 |  | ||||||
| --- a/tools/tests/test-wrapper.sh.in
 |  | ||||||
| +++ b/tools/tests/test-wrapper.sh.in
 |  | ||||||
| @@ -1,4 +1,4 @@
 |  | ||||||
| -#!/bin/bash
 |  | ||||||
| +#!/bin/sh
 |  | ||||||
|   |  | ||||||
|  # For debugging behavior of test-modemmanager-service.py, you can modify |  | ||||||
|  # this line to add --log-file option |  | ||||||
| -- 
 |  | ||||||
| 2.35.3 |  | ||||||
| 
 |  | ||||||
|  | @ -0,0 +1,57 @@ | ||||||
|  | # NB: backport from meta-oe/master | ||||||
|  | 
 | ||||||
|  | SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" | ||||||
|  | DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" | ||||||
|  | HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" | ||||||
|  | LICENSE = "GPL-2.0 & LGPL-2.1" | ||||||
|  | LIC_FILES_CHKSUM = " \ | ||||||
|  |     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||||||
|  |     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ | ||||||
|  | " | ||||||
|  | 
 | ||||||
|  | inherit gnomebase gettext systemd vala gobject-introspection bash-completion | ||||||
|  | 
 | ||||||
|  | DEPENDS = "glib-2.0 libgudev intltool-native libxslt-native" | ||||||
|  | 
 | ||||||
|  | SRC_URI = "http://www.freedesktop.org/software/ModemManager/ModemManager-${PV}.tar.xz" | ||||||
|  | SRC_URI[sha256sum] = "fe1a26ba51b4bda7abd09ad4dadedd87d8b8154809fc9d88e94f75fdfff19295" | ||||||
|  | S = "${WORKDIR}/ModemManager-${PV}" | ||||||
|  | 
 | ||||||
|  | PACKAGECONFIG = "systemd" | ||||||
|  | PACKAGECONFIG ??= "mbim qmi \ | ||||||
|  |     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ | ||||||
|  | " | ||||||
|  | 
 | ||||||
|  | PACKAGECONFIG[at] = "--with-at-command-via-dbus" | ||||||
|  | PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/,," | ||||||
|  | PACKAGECONFIG[polkit] = "--with-polkit=yes,--with-polkit=no,polkit" | ||||||
|  | # Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. | ||||||
|  | PACKAGECONFIG[mbim] = "--with-mbim,--without-mbim,libmbim" | ||||||
|  | # Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. | ||||||
|  | PACKAGECONFIG[qmi] = "--with-qmi,--without-qmi,libqmi" | ||||||
|  | 
 | ||||||
|  | EXTRA_OECONF = " \ | ||||||
|  |     --with-udev-base-dir=${nonarch_base_libdir}/udev \ | ||||||
|  | " | ||||||
|  | 
 | ||||||
|  | FILES_${PN} += " \ | ||||||
|  |     ${datadir}/icons \ | ||||||
|  |     ${datadir}/polkit-1 \ | ||||||
|  |     ${datadir}/dbus-1 \ | ||||||
|  |     ${datadir}/ModemManager \ | ||||||
|  |     ${libdir}/ModemManager \ | ||||||
|  |     ${systemd_unitdir}/system \ | ||||||
|  | " | ||||||
|  | 
 | ||||||
|  | FILES_${PN}-dev += " \ | ||||||
|  |     ${libdir}/ModemManager/*.la \ | ||||||
|  | " | ||||||
|  | 
 | ||||||
|  | FILES_${PN}-staticdev += " \ | ||||||
|  |     ${libdir}/ModemManager/*.a \ | ||||||
|  | " | ||||||
|  | 
 | ||||||
|  | FILES_${PN}-dbg += "${libdir}/ModemManager/.debug" | ||||||
|  | 
 | ||||||
|  | SYSTEMD_SERVICE_${PN} = "ModemManager.service" | ||||||
|  | 
 | ||||||
|  | @ -1,61 +0,0 @@ | ||||||
| SUMMARY = "ModemManager is a daemon controlling broadband devices/connections" |  | ||||||
| DESCRIPTION = "ModemManager is a DBus-activated daemon which controls mobile broadband (2G/3G/4G) devices and connections" |  | ||||||
| HOMEPAGE = "http://www.freedesktop.org/wiki/Software/ModemManager/" |  | ||||||
| LICENSE = "GPL-2.0-only & LGPL-2.1-only" |  | ||||||
| LIC_FILES_CHKSUM = " \ |  | ||||||
|     file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ |  | ||||||
|     file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ |  | ||||||
| " |  | ||||||
| 
 |  | ||||||
| GNOMEBASEBUILDCLASS = "meson" |  | ||||||
| inherit gnomebase gettext systemd gobject-introspection bash-completion |  | ||||||
| 
 |  | ||||||
| DEPENDS = "glib-2.0 libgudev libxslt-native dbus" |  | ||||||
| 
 |  | ||||||
| SRCREV ?= "0d8b5e93fc62eb0f41e18a2d9d845331d7af36ec" |  | ||||||
| 
 |  | ||||||
| # Patch 0001 will be in ModemManager > 1.19 |  | ||||||
| SRC_URI = " \ |  | ||||||
|     git://gitlab.freedesktop.org/mobile-broadband/ModemManager.git;protocol=https;branch=mm-1-18 \ |  | ||||||
|     file://0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch \ |  | ||||||
| " |  | ||||||
| 
 |  | ||||||
| S = "${WORKDIR}/git" |  | ||||||
| 
 |  | ||||||
| # strict, permissive |  | ||||||
| MODEMMANAGER_POLKIT_TYPE ??= "permissive" |  | ||||||
| 
 |  | ||||||
| PACKAGECONFIG ??= "vala mbim qmi \ |  | ||||||
|     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} \ |  | ||||||
| " |  | ||||||
| 
 |  | ||||||
| PACKAGECONFIG[at] = "-Dat_command_via_dbus=true" |  | ||||||
| PACKAGECONFIG[systemd] = " \ |  | ||||||
|     -Dsystemdsystemunitdir=${systemd_unitdir}/system/, \ |  | ||||||
|     -Dsystemdsystemunitdir=no -Dsystemd_journal=false -Dsystemd_suspend_resume=false \ |  | ||||||
| " |  | ||||||
| PACKAGECONFIG[polkit] = "-Dpolkit=${MODEMMANAGER_POLKIT_TYPE},-Dpolkit=no,polkit" |  | ||||||
| # Support WWAN modems and devices which speak the Mobile Interface Broadband Model (MBIM) protocol. |  | ||||||
| PACKAGECONFIG[mbim] = "-Dmbim=true,-Dmbim=false -Dplugin_dell=disabled -Dplugin_foxconn=disabled,libmbim" |  | ||||||
| # Support WWAN modems and devices which speak the Qualcomm MSM Interface (QMI) protocol. |  | ||||||
| PACKAGECONFIG[qmi] = "-Dqmi=true,-Dqmi=false,libqmi" |  | ||||||
| PACKAGECONFIG[qrtr] = "-Dqrtr=true,-Dqrtr=false,libqrtr-glib" |  | ||||||
| PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false" |  | ||||||
| 
 |  | ||||||
| inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)} |  | ||||||
| 
 |  | ||||||
| EXTRA_OEMESON = " \ |  | ||||||
|     -Dudevdir=${nonarch_base_libdir}/udev \ |  | ||||||
|     -Dqrtr=false \ |  | ||||||
| " |  | ||||||
| 
 |  | ||||||
| FILES:${PN} += " \ |  | ||||||
|     ${datadir}/icons \ |  | ||||||
|     ${datadir}/polkit-1 \ |  | ||||||
|     ${datadir}/dbus-1 \ |  | ||||||
|     ${datadir}/ModemManager \ |  | ||||||
|     ${libdir}/ModemManager \ |  | ||||||
|     ${systemd_unitdir}/system \ |  | ||||||
| " |  | ||||||
| 
 |  | ||||||
| SYSTEMD_SERVICE:${PN} = "ModemManager.service" |  | ||||||
|  | @ -1,14 +1,8 @@ | ||||||
| require recipes-connectivity/modemmanager/modemmanager_1.18.8.bb | require recipes-connectivity/modemmanager/modemmanager_1.14.8.bb | ||||||
| 
 |  | ||||||
| FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |  | ||||||
| 
 | 
 | ||||||
| # Use custom git repo as SRC | # Use custom git repo as SRC | ||||||
| SRC_URI = " \ | SRC_URI = "git://gitlab.com/netmodule/third-party/ModemManager;protocol=ssh;user=git;branch=mm-1-14-netmodule;" | ||||||
|     git://gitlab.com/netmodule/third-party/ModemManager;protocol=ssh;user=git;branch=mm-1-18-netmodule \ | SRCREV ?= "35ef2f387bf53f0601901a5f08ab0f6bf57105c4" | ||||||
|     file://0001-core-switch-bash-shell-scripts-to-use-bin-sh-for-use.patch \ |  | ||||||
| " |  | ||||||
| 
 |  | ||||||
| SRCREV = "${AUTOREV}" |  | ||||||
| S = "${WORKDIR}/git" | S = "${WORKDIR}/git" | ||||||
| 
 | 
 | ||||||
| # Keep only ublox plugin | # Keep only ublox plugin | ||||||
|  | @ -18,9 +12,10 @@ EXTRA_OECONF += "--disable-all-plugins --enable-plugin-ublox --enable-plugin-gen | ||||||
| PACKAGECONFIG = "systemd qmi" | PACKAGECONFIG = "systemd qmi" | ||||||
| 
 | 
 | ||||||
| # Add whitelist rules | # Add whitelist rules | ||||||
|  | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | ||||||
| SRC_URI += "file://77-mm-netmodule-whitelist.rules" | SRC_URI += "file://77-mm-netmodule-whitelist.rules" | ||||||
| 
 | 
 | ||||||
| do_install:append() { | do_install_append() { | ||||||
|     install -m 0644 ${WORKDIR}/77-mm-netmodule-whitelist.rules ${D}${libdir}/udev/rules.d/ |     install -m 0644 ${WORKDIR}/77-mm-netmodule-whitelist.rules ${D}${libdir}/udev/rules.d/ | ||||||
|     sed -i -e 's/bin\/ModemManager/bin\/ModemManager --filter-policy=WHITELIST-ONLY/g' ${D}${systemd_unitdir}/system/ModemManager.service |     sed -i -e 's/bin\/ModemManager/bin\/ModemManager --filter-policy=WHITELIST-ONLY/g' ${D}${systemd_unitdir}/system/ModemManager.service | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -1,9 +1,9 @@ | ||||||
| DESCRIPTION = "Configuration files for NetworkManager" | DESCRIPTION = "Configuration files for NetworkManager" | ||||||
| 
 | 
 | ||||||
| LICENSE = "Proprietary" | LICENSE = "Proprietary" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN} = "networkmanager" | RDEPENDS_${PN} = "networkmanager" | ||||||
| PACKAGECONFIG ?= "" | PACKAGECONFIG ?= "" | ||||||
| 
 | 
 | ||||||
| export DEFAULT_ETH ??= "eth0" | export DEFAULT_ETH ??= "eth0" | ||||||
|  | @ -19,7 +19,7 @@ SRC_URI = " \ | ||||||
|                  file://unmanaged-devices.conf \ |                  file://unmanaged-devices.conf \ | ||||||
| " | " | ||||||
| 
 | 
 | ||||||
| SRC_URI:append_am335x-nrhw20 = " \ | SRC_URI_append_am335x-nrhw20 = " \ | ||||||
|                 file://system-connections-static.tar.gz \ |                 file://system-connections-static.tar.gz \ | ||||||
|                 file://system-connections-dhcp.tar.gz \ |                 file://system-connections-dhcp.tar.gz \ | ||||||
| " | " | ||||||
|  | @ -85,7 +85,7 @@ do_install () { | ||||||
|     fi |     fi | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| do_install:append_am335x-nrhw20() { | do_install_append_am335x-nrhw20() { | ||||||
|     rm -rf ${SYSTEM_CONNECTIONS}/* |     rm -rf ${SYSTEM_CONNECTIONS}/* | ||||||
|     if ${@bb.utils.contains('PACKAGECONFIG','ethernet-dhcp','true','false',d)}; then |     if ${@bb.utils.contains('PACKAGECONFIG','ethernet-dhcp','true','false',d)}; then | ||||||
|         install -m 0600 ${WORKDIR}/system-connections-dhcp/* ${SYSTEM_CONNECTIONS}/ |         install -m 0600 ${WORKDIR}/system-connections-dhcp/* ${SYSTEM_CONNECTIONS}/ | ||||||
|  | @ -95,7 +95,7 @@ do_install:append_am335x-nrhw20() { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| FILES:${PN} = " \ | FILES_${PN} = " \ | ||||||
|     ${sysconfdir}/NetworkManager/NetworkManager.conf \ |     ${sysconfdir}/NetworkManager/NetworkManager.conf \ | ||||||
|     ${sysconfdir}/NetworkManager/dnsmasq.d \ |     ${sysconfdir}/NetworkManager/dnsmasq.d \ | ||||||
|     ${sysconfdir}/NetworkManager/system-connections \ |     ${sysconfdir}/NetworkManager/system-connections \ | ||||||
|  |  | ||||||
|  | @ -1,61 +0,0 @@ | ||||||
| From 8558b348c92e276b586cfd502992c07679970085 Mon Sep 17 00:00:00 2001 |  | ||||||
| From: Alexandre Bard <alexandre.bard@netmodule.com> |  | ||||||
| Date: Mon, 18 Jul 2022 17:06:03 +0200 |  | ||||||
| Subject: [PATCH] Reactivate GSM connections when ModemManager reconnects by |  | ||||||
|  itself |  | ||||||
| 
 |  | ||||||
| After a disconnection from network side, ModemManager can reconnect |  | ||||||
| itself if the modem requests it. This commit makes sure that a |  | ||||||
| reconnection of the modem makes the GSM connection active in NM. |  | ||||||
| 
 |  | ||||||
| BugzID: 60029 |  | ||||||
| Signed-off-by: Alexandre Bard <alexandre.bard@netmodule.com> |  | ||||||
| ---
 |  | ||||||
|  src/core/devices/wwan/nm-device-modem.c | 7 ++++--- |  | ||||||
|  src/core/nm-policy.c                    | 5 +++++ |  | ||||||
|  2 files changed, 9 insertions(+), 3 deletions(-) |  | ||||||
| 
 |  | ||||||
| diff --git a/src/core/devices/wwan/nm-device-modem.c b/src/core/devices/wwan/nm-device-modem.c
 |  | ||||||
| index ef802a44f2..9914f2b33a 100644
 |  | ||||||
| --- a/src/core/devices/wwan/nm-device-modem.c
 |  | ||||||
| +++ b/src/core/devices/wwan/nm-device-modem.c
 |  | ||||||
| @@ -308,9 +308,10 @@ modem_state_cb(NMModem *modem, int new_state_i, int old_state_i, gpointer user_d
 |  | ||||||
|          nm_device_recheck_available_connections(device); |  | ||||||
|      } |  | ||||||
|   |  | ||||||
| -    nm_device_queue_recheck_available(device,
 |  | ||||||
| -                                      NM_DEVICE_STATE_REASON_MODEM_AVAILABLE,
 |  | ||||||
| -                                      NM_DEVICE_STATE_REASON_MODEM_FAILED);
 |  | ||||||
| +    nm_device_recheck_available_connections(device);
 |  | ||||||
| +
 |  | ||||||
| +    if (new_state == NM_MODEM_STATE_CONNECTED)
 |  | ||||||
| +        nm_device_emit_recheck_auto_activate(device);
 |  | ||||||
|  } |  | ||||||
|   |  | ||||||
|  static void |  | ||||||
| diff --git a/src/core/nm-policy.c b/src/core/nm-policy.c
 |  | ||||||
| index d77fc0a025..71dff18548 100644
 |  | ||||||
| --- a/src/core/nm-policy.c
 |  | ||||||
| +++ b/src/core/nm-policy.c
 |  | ||||||
| @@ -1075,6 +1075,9 @@ update_ip4_routing(NMPolicy *self, gboolean force_update)
 |  | ||||||
|            nm_connection_get_id(nm_active_connection_get_applied_connection(best_ac)), |  | ||||||
|            ip_iface); |  | ||||||
|      _notify(self, PROP_DEFAULT_IP4_AC); |  | ||||||
| +
 |  | ||||||
| +    /* Recheck all connections to enable potential VPN depending on new route */
 |  | ||||||
| +    schedule_activate_all(self);
 |  | ||||||
|  } |  | ||||||
|   |  | ||||||
|  static void |  | ||||||
| @@ -2200,6 +2203,8 @@ device_recheck_auto_activate(NMDevice *device, gpointer user_data)
 |  | ||||||
|      NMPolicyPrivate *priv = user_data; |  | ||||||
|      NMPolicy        *self = _PRIV_TO_SELF(priv); |  | ||||||
|   |  | ||||||
| +    /* Reset retries count */
 |  | ||||||
| +    reset_autoconnect_all(self, device, FALSE);
 |  | ||||||
|      schedule_activate_check(self, device); |  | ||||||
|  } |  | ||||||
|   |  | ||||||
| -- 
 |  | ||||||
| 2.20.1 |  | ||||||
| 
 |  | ||||||
|  | @ -1,12 +1,9 @@ | ||||||
| RDEPENDS:${PN} = "networkmanager-conf" | FILESEXTRAPATHS_append := "${THISDIR}/${PN}" | ||||||
| 
 | 
 | ||||||
| FILESEXTRAPATHS:append := "${THISDIR}/${PN}" | RDEPENDS_${PN} = "networkmanager-conf" | ||||||
| 
 | 
 | ||||||
| SRC_URI:append = " \ | SRC_URI_append = "\ | ||||||
|     ${@bb.utils.contains('PV', '1.22.16', \ |                  file://0001-Reactivate-GSM-connections-when-ModemManager-reconne.patch \ | ||||||
|       'file://0001-nm-1-22-Reactivate-GSM-connections-when-ModemManager.patch', \ |  | ||||||
|       'file://0001-nm-1-36-Reactivate-GSM-connections-when-ModemManager.patch', \ |  | ||||||
|     d)} \ |  | ||||||
|                  " |                  " | ||||||
| 
 | 
 | ||||||
| #PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq,,,dnsmasq" | PACKAGECONFIG[dnsmasq] = "--with-dnsmasq=${bindir}/dnsmasq,,,dnsmasq" | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ DESCRIPTION = "Library implementing UBX protocol for u-blox gnss modems" | ||||||
| LICENSE = "MIT" | LICENSE = "MIT" | ||||||
| LIC_FILES_CHKSUM = "file://LICENSE;md5=331a9220a74b05f133bf1ef09b6903b2" | LIC_FILES_CHKSUM = "file://LICENSE;md5=331a9220a74b05f133bf1ef09b6903b2" | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN} += " \ | RDEPENDS_${PN} += " \ | ||||||
|     python3-setuptools \ |     python3-setuptools \ | ||||||
|     " |     " | ||||||
| 
 | 
 | ||||||
|  | @ -18,7 +18,7 @@ PV = "1.0-git${SRCPV}" | ||||||
| PR = "r1" | PR = "r1" | ||||||
| 
 | 
 | ||||||
| SRC_URI = "git://gitlab.com/netmodule/tools/nmubxlib.git;protocol=ssh;user=git;branch=master" | SRC_URI = "git://gitlab.com/netmodule/tools/nmubxlib.git;protocol=ssh;user=git;branch=master" | ||||||
| SRCREV ?= "7cf0e2563028a9970b88c4b5c9ba43cfaf79d7b2" | SRCREV = "7c22b57cdd169a6651cb0c17a215d1e448727bcb" | ||||||
| S = "${WORKDIR}/git" | S = "${WORKDIR}/git" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -3,17 +3,14 @@ DESCRIPTION = "Run hciattach for ti bluetooth wl12xx module" | ||||||
| AUTHOR = "Stefan Eichenberger" | AUTHOR = "Stefan Eichenberger" | ||||||
| 
 | 
 | ||||||
| SECTION = "connectivity" | SECTION = "connectivity" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2+" | ||||||
| 
 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
| include ${LAYERSERIES_CORENAMES}/licenses.inc |  | ||||||
| LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |  | ||||||
| 
 |  | ||||||
| PR = "r2" | PR = "r2" | ||||||
| 
 | 
 | ||||||
| inherit systemd | inherit systemd | ||||||
| inherit allarch | inherit allarch | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN} = "\ | RDEPENDS_${PN} = "\ | ||||||
|     firmware-ti-wl18xx \ |     firmware-ti-wl18xx \ | ||||||
|     bash \ |     bash \ | ||||||
|     libgpiod-tools \ |     libgpiod-tools \ | ||||||
|  | @ -27,10 +24,10 @@ SRC_URI =  " \ | ||||||
| S = "${WORKDIR}" | S = "${WORKDIR}" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| SYSTEMD_SERVICE:${PN} = "tibluetooth.service" | SYSTEMD_SERVICE_${PN} = "tibluetooth.service" | ||||||
| SYSTEMD_AUTO_ENABLE ?= "enable" | SYSTEMD_AUTO_ENABLE ?= "enable" | ||||||
| 
 | 
 | ||||||
| FILES:${PN}:append = " \ | FILES_${PN}_append = " \ | ||||||
|                     ${nonarch_base_libdir} \ |                     ${nonarch_base_libdir} \ | ||||||
|                     " |                     " | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,11 +1,12 @@ | ||||||
| DESCRIPTION = "WWAN modems configuration tool" | DESCRIPTION = "WWAN modems configuration tool" | ||||||
| LICENSE = "Proprietary" | LICENSE = "Proprietary" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Proprietary;md5=0557f9d92cf58f2ccdd50f62f8ac0b28" | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN} += " \ | RDEPENDS_${PN} += " \ | ||||||
|     python3-pyserial \ |     python3-pyserial \ | ||||||
|     libgpiod-python \ |     libgpiod-python \ | ||||||
|     python3-setuptools \ |     python3-setuptools \ | ||||||
|  |     python3-configparser \ | ||||||
|     python3-systemd \ |     python3-systemd \ | ||||||
|     lmsensors-sensors \ |     lmsensors-sensors \ | ||||||
|     lmsensors-config-libsensors \ |     lmsensors-config-libsensors \ | ||||||
|  | @ -22,7 +23,7 @@ PV = "1.0-git${SRCPV}" | ||||||
| 
 | 
 | ||||||
| PR = "r1" | PR = "r1" | ||||||
| 
 | 
 | ||||||
| SRCREV = "44c80a562991b86b913a58f8d5b7dad7dabc6057" | SRCREV = "f885ccb90b31c90bfed0b6d62c26ad64d69805c1" | ||||||
| SRC_URI = "git://gitlab.com/netmodule/tools/wwan-config.git;protocol=ssh;user=git;branch=master \ | SRC_URI = "git://gitlab.com/netmodule/tools/wwan-config.git;protocol=ssh;user=git;branch=master \ | ||||||
|            file://wwan-config@.service \ |            file://wwan-config@.service \ | ||||||
|            file://default.conf \ |            file://default.conf \ | ||||||
|  | @ -31,7 +32,7 @@ S = "${WORKDIR}/git" | ||||||
| 
 | 
 | ||||||
| inherit setuptools3  | inherit setuptools3  | ||||||
| 
 | 
 | ||||||
| do_install:append() { | do_install_append() { | ||||||
|     install -d ${D}/${systemd_unitdir}/system/ |     install -d ${D}/${systemd_unitdir}/system/ | ||||||
|     install -m 0644 ${WORKDIR}/wwan-config@.service ${D}/${systemd_unitdir}/system/ |     install -m 0644 ${WORKDIR}/wwan-config@.service ${D}/${systemd_unitdir}/system/ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,19 +2,16 @@ SUMMARY = "Boarddescriptor Tool" | ||||||
| DESCRIPTION = "Read and write from/to the boarddescriptor" | DESCRIPTION = "Read and write from/to the boarddescriptor" | ||||||
| AUTHOR = "Stefan Eichenberger (stefan.eichenberger@netmodule.com)" | AUTHOR = "Stefan Eichenberger (stefan.eichenberger@netmodule.com)" | ||||||
| 
 | 
 | ||||||
| FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}/${MACHINE}:" | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" | ||||||
| 
 | 
 | ||||||
| SECTION = "core" | SECTION = "core" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2+" | ||||||
| 
 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
| include ${LAYERSERIES_CORENAMES}/licenses.inc |  | ||||||
| LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |  | ||||||
| 
 |  | ||||||
| PR = "r0" | PR = "r0" | ||||||
| 
 | 
 | ||||||
| inherit python3-dir | inherit python3-dir | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN} = "python3-core python3-json" | RDEPENDS_${PN} = "python3-core python3-json" | ||||||
| 
 | 
 | ||||||
| SRC_URI =  " \ | SRC_URI =  " \ | ||||||
|             file://bd.py \ |             file://bd.py \ | ||||||
|  | @ -25,7 +22,7 @@ SRC_URI =  " \ | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}" | S = "${WORKDIR}" | ||||||
| 
 | 
 | ||||||
| FILES:${PN} = " \ | FILES_${PN} = " \ | ||||||
|             ${bindir}/* \ |             ${bindir}/* \ | ||||||
|             ${libdir}/* \ |             ${libdir}/* \ | ||||||
|             ${sysconfdir}/* \ |             ${sysconfdir}/* \ | ||||||
|  |  | ||||||
|  | @ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda | ||||||
| SECTION = "base" | SECTION = "base" | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}/git" | S = "${WORKDIR}/git" | ||||||
| SRCREV ?= "6ecd4c6691c8b71e7147532faea40ba29988c062" | SRCREV = "26cf27fd134036e4d756ac289764a5b5083966d2" | ||||||
| 
 | 
 | ||||||
| SRC_URI = "git://gitlab.com/netmodule/tools/udev-rules-nmhw;protocol=ssh;user=git;branch=master;" | SRC_URI = "git://gitlab.com/netmodule/tools/udev-rules-nmhw;protocol=ssh;user=git;branch=master;" | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| FILESEXTRAPATHS:append:= ":${THISDIR}/firmware-ti-wl18xx" | FILESEXTRAPATHS_append:= ":${THISDIR}/firmware-ti-wl18xx" | ||||||
| 
 | 
 | ||||||
| SRC_URI:append = " file://wl1271-nvs.bin " | SRC_URI_append = " file://wl1271-nvs.bin " | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| do_install:append() { | do_install_append() { | ||||||
|         install -m 0644 ${WORKDIR}/wl1271-nvs.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin |         install -m 0644 ${WORKDIR}/wl1271-nvs.bin ${D}${nonarch_base_libdir}/firmware/ti-connectivity/wl1271-nvs.bin | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| DESCRIPTION = "Driver for wakeup from standby via AM335x dmtimer" | DESCRIPTION = "Driver for wakeup from standby via AM335x dmtimer" | ||||||
| HOMEPAGE = "http://www.netmodule.com/" | HOMEPAGE = "http://www.netmodule.com/" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
| 
 | 
 | ||||||
| inherit module | inherit module | ||||||
| 
 | 
 | ||||||
|  | @ -11,6 +11,6 @@ PACKAGE_ARCH = "${TUNE_PKGARCH}" | ||||||
| PV = "1.0.0" | PV = "1.0.0" | ||||||
| SRCREV ?= "1711171ae3bcc9f804d7973f4068cdd7cade78d0" | SRCREV ?= "1711171ae3bcc9f804d7973f4068cdd7cade78d0" | ||||||
| 
 | 
 | ||||||
| SRC_URI = "git://github.com/netmodule/am335x-wakeup-timer.git;protocol=https;branch=master" | SRC_URI = "git://github.com/netmodule/am335x-wakeup-timer.git;protocol=https" | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}/git" | S = "${WORKDIR}/git" | ||||||
|  |  | ||||||
|  | @ -4,11 +4,11 @@ inherit kernel | ||||||
| 
 | 
 | ||||||
| DESCRIPTION = "Linux kernel for various NetModule hardware" | DESCRIPTION = "Linux kernel for various NetModule hardware" | ||||||
| 
 | 
 | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2" | ||||||
| LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | ||||||
| 
 | 
 | ||||||
| # Avoids installing the kernel in /boot directory
 | # Avoids installing the kernel in /boot directory
 | ||||||
| RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" | RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" | ||||||
| 
 | 
 | ||||||
| # We are building one kernel for all machines with the same architecture
 | # We are building one kernel for all machines with the same architecture
 | ||||||
| PACKAGE_ARCH = "${TUNE_PKGARCH}" | PACKAGE_ARCH = "${TUNE_PKGARCH}" | ||||||
|  | @ -19,7 +19,7 @@ INITRAMFS_IMAGE_NAME = "-" | ||||||
| 
 | 
 | ||||||
| S = "${WORKDIR}/git" | S = "${WORKDIR}/git" | ||||||
| 
 | 
 | ||||||
| INSANE_SKIP:${PN} += "version-going-backwards" | INSANE_SKIP_${PN} += "version-going-backwards" | ||||||
| 
 | 
 | ||||||
| copy_initramfs () { | copy_initramfs () { | ||||||
|     # We do not use this feature and it is depending on MACHINE variable
 |     # We do not use this feature and it is depending on MACHINE variable
 | ||||||
|  | @ -28,7 +28,7 @@ copy_initramfs () { | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| #If a KERNEL_DEFCONFIG is specified, the defconfig specified in SRC_URI will be overwritten!
 | #If a KERNEL_DEFCONFIG is specified, the defconfig specified in SRC_URI will be overwritten!
 | ||||||
| do_configure:append(){ | do_configure_append(){ | ||||||
|     if [ "${KERNEL_DEFCONFIG}" != "" ]; then |     if [ "${KERNEL_DEFCONFIG}" != "" ]; then | ||||||
|         oe_runmake ${KERNEL_DEFCONFIG} |         oe_runmake ${KERNEL_DEFCONFIG} | ||||||
|     fi |     fi | ||||||
|  |  | ||||||
|  | @ -1,8 +1,8 @@ | ||||||
| require linux-netmodule.inc | require linux-netmodule.inc | ||||||
| 
 | 
 | ||||||
| SRC_URI = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;protocol=ssh;user=git;branch=5.10/standard/base" | SRC_URI = "git://gitlab.com/netmodule/kernel/linux-netmodule.git;protocol=ssh;user=git;branch=5.10/standard/base" | ||||||
| SRCREV = "68a67a669043c1fdf61da96ce87481e61207a8b5" | SRCREV = "de7d43cb3f26bc0491865d0a2a14d5fa71ee2f61" | ||||||
| 
 | 
 | ||||||
| # Config fragments | # Config fragments | ||||||
| FILESEXTRAPATHS:prepend := "${THISDIR}/conf:" | FILESEXTRAPATHS_prepend := "${THISDIR}/conf:" | ||||||
| SRC_URI:append_netbird = " file://wlan.cfg" | SRC_URI_append_netbird = " file://wlan.cfg" | ||||||
|  |  | ||||||
|  | @ -1,7 +1,7 @@ | ||||||
| # Copyright (C) 2021 Lucien Mueller <lucien.mueller@netmodule.com> | # Copyright (C) 2021 Lucien Mueller <lucien.mueller@netmodule.com> | ||||||
| 
 | 
 | ||||||
| DESCRIPTION = "make fitimage" | DESCRIPTION = "make fitimage" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPLv2" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| inherit kernel-fitimage | inherit kernel-fitimage | ||||||
|  | @ -18,7 +18,7 @@ KERNEL_IMAGETYPES = "fitImage" | ||||||
| PACKAGE_ARCH = "${MACHINE_ARCH}" | PACKAGE_ARCH = "${MACHINE_ARCH}" | ||||||
| 
 | 
 | ||||||
| PROVIDES = "virtual/netmodule-image" | PROVIDES = "virtual/netmodule-image" | ||||||
| PROVIDES:sota = "" | PROVIDES_sota = "" | ||||||
| 
 | 
 | ||||||
| addtask assemble_fitimage_initramfs before do_install after do_compile | addtask assemble_fitimage_initramfs before do_install after do_compile | ||||||
| addtask do_deploy after assemble_fitimage_initramfs | addtask do_deploy after assemble_fitimage_initramfs | ||||||
|  | @ -29,7 +29,7 @@ UBOOT_LOADADDRESS ?= "${UBOOT_ENTRYPOINT}" | ||||||
| 
 | 
 | ||||||
| KERNEL_DEVICETREE = "${KERNEL_DEVICETREE_TO_USE}" | KERNEL_DEVICETREE = "${KERNEL_DEVICETREE_TO_USE}" | ||||||
| 
 | 
 | ||||||
| do_configure:prepend () { | do_configure_prepend () { | ||||||
| 	install -d ${S}/arch/${ARCH}/boot/ | 	install -d ${S}/arch/${ARCH}/boot/ | ||||||
| 	for DTB in ${KERNEL_DEVICETREE}; do | 	for DTB in ${KERNEL_DEVICETREE}; do | ||||||
| 		# We have to watch out for when the device-tree is located in its own subdirectory in the kernel sources. | 		# We have to watch out for when the device-tree is located in its own subdirectory in the kernel sources. | ||||||
|  |  | ||||||
|  | @ -1,16 +1,14 @@ | ||||||
| # Copyright (C) 2021 Netmodule AG | # Copyright (C) 2021 Netmodule AG | ||||||
| DESCRIPTION = "implements a publish/subscribe broker for the various system state topics" | DESCRIPTION = "implements a publish/subscribe broker for the various system state topics" | ||||||
| HOMEPAGE = "http://www.netmodule.com/" | HOMEPAGE = "http://www.netmodule.com/" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPL-2.0" | ||||||
| 
 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"    | ||||||
| include ${LAYERSERIES_CORENAMES}/licenses.inc |  | ||||||
| LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |  | ||||||
| 
 | 
 | ||||||
| inherit packagegroup | inherit packagegroup | ||||||
| 
 | 
 | ||||||
| PROVIDES = "${PN}" | PROVIDES = "${PN}" | ||||||
| 
 | 
 | ||||||
| RDEPENDS:${PN} = " \ | RDEPENDS_${PN} = " \ | ||||||
|     ssc-broker-driver \ |     ssc-broker-driver \ | ||||||
|     ssc-sysstate-driver \ |     ssc-sysstate-driver \ | ||||||
|     " |     " | ||||||
|  |  | ||||||
|  | @ -2,10 +2,8 @@ | ||||||
| 
 | 
 | ||||||
| DESCRIPTION = "implements a publish/subscribe broker for the various system state topics" | DESCRIPTION = "implements a publish/subscribe broker for the various system state topics" | ||||||
| HOMEPAGE = "http://www.netmodule.com/" | HOMEPAGE = "http://www.netmodule.com/" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPL-2.0" | ||||||
| 
 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
| include ${LAYERSERIES_CORENAMES}/licenses.inc |  | ||||||
| LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |  | ||||||
| 
 | 
 | ||||||
| inherit module | inherit module | ||||||
| 
 | 
 | ||||||
|  | @ -20,7 +18,7 @@ SRCREV ?= "4950e67e4a94bde44f8cf7a8c3f0c8eed8d18ad9" | ||||||
| SRC_URI = "git://gitlab.com/netmodule/kernel/ssc-broker-driver.git;protocol=ssh;user=git;branch=develop" | SRC_URI = "git://gitlab.com/netmodule/kernel/ssc-broker-driver.git;protocol=ssh;user=git;branch=develop" | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| do_install:append () { | do_install_append () { | ||||||
|     install -d ${D}${includedir}/broker |     install -d ${D}${includedir}/broker | ||||||
|     install -m 0644 ${S}/broker.h ${D}${includedir}/broker/broker.h |     install -m 0644 ${S}/broker.h ${D}${includedir}/broker/broker.h | ||||||
|     install -m 0644 ${S}/worker.h ${D}${includedir}/broker/worker.h |     install -m 0644 ${S}/worker.h ${D}${includedir}/broker/worker.h | ||||||
|  |  | ||||||
|  | @ -2,13 +2,11 @@ | ||||||
| 
 | 
 | ||||||
| DESCRIPTION = "implements a publish/subscribe broker for the various system state topics" | DESCRIPTION = "implements a publish/subscribe broker for the various system state topics" | ||||||
| HOMEPAGE = "http://www.netmodule.com/" | HOMEPAGE = "http://www.netmodule.com/" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPL-2.0" | ||||||
| 
 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
| include ${LAYERSERIES_CORENAMES}/licenses.inc |  | ||||||
| LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |  | ||||||
| 
 | 
 | ||||||
| DEPENDS = "ssc-broker-driver" | DEPENDS = "ssc-broker-driver" | ||||||
| RDEPENDS:${PN} = "ssc-broker-driver" | RDEPENDS_${PN} = "ssc-broker-driver" | ||||||
| 
 | 
 | ||||||
| inherit module | inherit module | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2,14 +2,11 @@ | ||||||
| 
 | 
 | ||||||
| DESCRIPTION = "implements a publish/subscribe broker for the various system state topics" | DESCRIPTION = "implements a publish/subscribe broker for the various system state topics" | ||||||
| HOMEPAGE = "http://www.netmodule.com/" | HOMEPAGE = "http://www.netmodule.com/" | ||||||
| LICENSE = "GPL-2.0-only" | LICENSE = "GPL-2.0" | ||||||
| 
 | LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" | ||||||
| include ${LAYERSERIES_CORENAMES}/licenses.inc |  | ||||||
| LIC_FILES_CHKSUM ?= "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" |  | ||||||
| 
 |  | ||||||
| 
 | 
 | ||||||
| DEPENDS = "ssc-broker-driver" | DEPENDS = "ssc-broker-driver" | ||||||
| RDEPENDS:${PN} = "ssc-broker-driver" | RDEPENDS_${PN} = "ssc-broker-driver" | ||||||
| 
 | 
 | ||||||
| inherit module | inherit module | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1,6 +1,6 @@ | ||||||
| SUMMARY = "Machine specific gpsd config" | SUMMARY = "Machine specific gpsd config" | ||||||
| LICENSE = "BSD-3-Clause" | LICENSE = "BSD-3-Clause" | ||||||
| LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/BSD-3-Clause;md5=550794465ba0ec5312d6919e203a55f9" | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD;md5=3775480a712fc46a69647678acb234cb" | ||||||
| 
 | 
 | ||||||
| # empty by default | # empty by default | ||||||
| # BSP layers can add stuff like meta-openmoko example: | # BSP layers can add stuff like meta-openmoko example: | ||||||
|  |  | ||||||
|  | @ -2,7 +2,7 @@ | ||||||
| TTY_DEVICE = "/dev/gnss0" | TTY_DEVICE = "/dev/gnss0" | ||||||
| USBAUTO_STATE = "false" | USBAUTO_STATE = "false" | ||||||
| 
 | 
 | ||||||
| do_install:append () { | do_install_append () { | ||||||
|     sed -i 's|DEVICES=""|DEVICES="${TTY_DEVICE}"|g' ${D}/etc/default/gpsd.default |     sed -i 's|DEVICES=""|DEVICES="${TTY_DEVICE}"|g' ${D}/etc/default/gpsd.default | ||||||
|     sed -i 's|USBAUTO="true"|USBAUTO="${USBAUTO_STATE}"|g' ${D}/etc/default/gpsd.default  |     sed -i 's|USBAUTO="true"|USBAUTO="${USBAUTO_STATE}"|g' ${D}/etc/default/gpsd.default  | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue