Compare commits
30 Commits
92d374f74f
...
5fec3b8b55
Author | SHA1 | Date |
---|---|---|
Denix | 5fec3b8b55 | |
j1nx | b1fb2843e0 | |
j1nx | 91fcb4e1d6 | |
j1nx | a16e44250d | |
j1nx | 5f79bf8820 | |
j1nx | 3a7be3234b | |
j1nx | 61b64f4abc | |
j1nx | 2525c95609 | |
Jan Čermák | b89f5e3322 | |
Jan Čermák | d2059c5531 | |
j1nx | 379e94dad3 | |
j1nx | f8e7a135e4 | |
j1nx | feb7a214ac | |
j1nx | c8617076da | |
j1nx | ce81526d60 | |
j1nx | 6bb37c4e82 | |
j1nx | 455f11d7a6 | |
j1nx | 49d12c56bc | |
j1nx | 141995d991 | |
denix | 67ed18fa84 | |
denix | d24ab107ad | |
denix | 6d5d3a4c78 | |
denix | 88acb88a0c | |
denix | 223aa8d17e | |
denix | e6e484b2b1 | |
denix | c5b494437a | |
denix | 6002cf9efb | |
denix | 5e5d9aa213 | |
denix | 747bb41ddb | |
denix | 673d8d3445 |
|
@ -6,3 +6,4 @@
|
|||
/release/*.swu
|
||||
/release/*.vdi
|
||||
/logs/*.txt
|
||||
*__pycache__*
|
||||
|
|
|
@ -0,0 +1,43 @@
|
|||
stages:
|
||||
- fetch-assets
|
||||
- generate-gitlab-ci
|
||||
- build
|
||||
|
||||
fetch-assets:
|
||||
stage: fetch-assets
|
||||
artifacts:
|
||||
untracked: true
|
||||
expire_in: 1 day
|
||||
when: on_success
|
||||
paths:
|
||||
- buildroot
|
||||
script:
|
||||
- git submodule update --init --recursive
|
||||
- git submodule update --remote --merge
|
||||
- ./scripts/br-patches.sh
|
||||
|
||||
build rpi3-gui:
|
||||
stage: build
|
||||
when: manual
|
||||
dependencies:
|
||||
- fetch-assets
|
||||
artifacts:
|
||||
when: on_success
|
||||
paths:
|
||||
- release
|
||||
script:
|
||||
- make clean
|
||||
- make rpi3_64-gui
|
||||
|
||||
build rpi4-gui:
|
||||
stage: build
|
||||
when: manual
|
||||
dependencies:
|
||||
- fetch-assets
|
||||
artifacts:
|
||||
when: on_success
|
||||
paths:
|
||||
- release
|
||||
script:
|
||||
- make clean
|
||||
- make rpi4_64-gui
|
3
Makefile
3
Makefile
|
@ -45,6 +45,9 @@ clean:
|
|||
menuconfig:
|
||||
$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) menuconfig
|
||||
|
||||
linux-check-dotconfig:
|
||||
$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) BR2_CHECK_DOTCONFIG_OPTS="--github-format" linux-check-dotconfig
|
||||
|
||||
linux-menuconfig:
|
||||
$(MAKE) -C $(BUILDROOT) BR2_EXTERNAL=../$(BUILDROOT_EXTERNAL) linux-menuconfig
|
||||
|
||||
|
|
|
@ -38,7 +38,7 @@ CONFIG_IWLMVM=m
|
|||
|
||||
CONFIG_WLAN_VENDOR_REALTEK=y
|
||||
CONFIG_RTL_CARDS=m
|
||||
CONFIG_RTL8723BE=y
|
||||
CONFIG_RTL8723BE=m
|
||||
|
||||
CONFIG_BCMA=m
|
||||
|
||||
|
@ -62,6 +62,16 @@ CONFIG_MMC_SDHCI_ACPI=y
|
|||
CONFIG_MMC_SDHCI_PCI=y
|
||||
CONFIG_X86_INTEL_LPSS=y
|
||||
|
||||
CONFIG_SND_HDA=m
|
||||
CONFIG_SND_HDA_CORE=m
|
||||
CONFIG_SND_HDA_GENERIC=m
|
||||
CONFIG_SND_HDA_INTEL=m
|
||||
CONFIG_SND_HDA_I915=y
|
||||
CONFIG_SND_HDA_CODEC_REALTEK=m
|
||||
CONFIG_SND_HDA_CODEC_ANALOG=m
|
||||
CONFIG_SND_HDA_CODEC_VIA=m
|
||||
CONFIG_SND_HDA_CODEC_HDMI=m
|
||||
|
||||
CONFIG_SND_SOC=m
|
||||
|
||||
CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
|
||||
|
@ -80,7 +90,6 @@ CONFIG_SND_SOC_INTEL_CFL=m
|
|||
CONFIG_SND_SOC_INTEL_CML_H=m
|
||||
CONFIG_SND_SOC_INTEL_CML_LP=m
|
||||
CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
|
||||
CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
|
||||
CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
|
||||
CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
|
||||
CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
|
||||
|
@ -88,13 +97,8 @@ CONFIG_SND_SOC_INTEL_MACH=y
|
|||
CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y
|
||||
CONFIG_SND_SOC_INTEL_HDA_DSP_COMMON=m
|
||||
CONFIG_SND_SOC_INTEL_SOF_MAXIM_COMMON=m
|
||||
CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BDW_RT5650_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYTCR_WM5102_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
|
||||
|
@ -103,38 +107,16 @@ CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
|
|||
CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
|
||||
# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
|
||||
CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_COMMON=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SOF_WM8804_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_GLK_DA7219_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SOF_CS42L42_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SOF_PCM512x_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SOF_ES8336_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SOF_CML_RT1011_RT5682_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SOF_DA7219_MAX98373_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_EHL_RT5660_MACH=m
|
||||
CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m
|
||||
CONFIG_SND_SOC_MTK_BTCVSD=m
|
||||
CONFIG_SND_SOC_SOF_TOPLEVEL=y
|
||||
CONFIG_SND_SOC_SOF_PCI_DEV=m
|
||||
CONFIG_SND_SOC_SOF_PCI=m
|
||||
CONFIG_SND_SOC_SOF_ACPI=m
|
||||
CONFIG_SND_SOC_SOF_ACPI_DEV=m
|
||||
# CONFIG_SND_SOC_SOF_DEBUG_PROBES is not set
|
||||
CONFIG_SND_SOC_SOF_DEBUG_PROBES=m
|
||||
CONFIG_SND_SOC_SOF=m
|
||||
CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
|
||||
CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
|
||||
|
@ -163,8 +145,6 @@ CONFIG_SND_SOC_SOF_HDA_LINK=y
|
|||
CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
|
||||
CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
|
||||
CONFIG_SND_SOC_SOF_HDA=m
|
||||
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE_LINK_BASELINE=m
|
||||
CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m
|
||||
CONFIG_SND_SOC_SOF_XTENSA=m
|
||||
|
||||
CONFIG_THINKPAD_ACPI=m
|
||||
|
|
|
@ -1 +1 @@
|
|||
cma=384M mitigations=off snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_compat_alsa=0 dwc_otg.lpm_enable=0 acpi=off cgroup_enable=memory psi=1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u
|
||||
mitigations=off snd_bcm2835.enable_headphones=1 snd_bcm2835.enable_hdmi=1 snd_bcm2835.enable_compat_alsa=0 dwc_otg.lpm_enable=0 acpi=off cgroup_enable=memory psi=1 usb-storage.quirks=174c:55aa:u,2109:0715:u,152d:0578:u,152d:0579:u,152d:1561:u,174c:0829:u,14b0:0206:u
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
CONFIG_ARCH_SUPPORTS_ACPI=y
|
||||
CONFIG_ACPI=y
|
||||
CONFIG_ACPI=ACPI
|
||||
|
||||
CONFIG_EFI=y
|
||||
CONFIG_EFI_STUB=y
|
||||
|
@ -25,7 +24,6 @@ CONFIG_VIRTIO_NET=y
|
|||
CONFIG_VIRTIO_BALLOON=m
|
||||
CONFIG_VIRTIO_INPUT=m
|
||||
CONFIG_VIRTIO_BLK=y
|
||||
CONFIG_VIRTIO_BLK_SCSI=y
|
||||
CONFIG_VIRTIO_CONSOLE=m
|
||||
CONFIG_VIRTIO_VSOCKETS=m
|
||||
CONFIG_VIRTIO_MMIO=y
|
||||
|
@ -38,14 +36,9 @@ CONFIG_NVME_HWMON=y
|
|||
|
||||
CONFIG_DRM_VIRTIO_GPU=m
|
||||
|
||||
CONFIG_HYPERVISOR_GUEST=y
|
||||
CONFIG_HYPERV=y
|
||||
CONFIG_HYPERV_UTILS=m
|
||||
CONFIG_HYPERV_BALLOON=m
|
||||
CONFIG_HYPERV_KEYBOARD=m
|
||||
CONFIG_HYPERV_STORAGE=y
|
||||
CONFIG_HYPERV_NET=y
|
||||
CONFIG_HYPERV_VSOCKETS=m
|
||||
CONFIG_PCI_HYPERV=m
|
||||
CONFIG_PCI_HYPERV_INTERFACE=m
|
||||
CONFIG_FB_HYPERV=y
|
||||
CONFIG_HYPERVISOR_GUEST=HYPERVISOR_GUEST
|
||||
|
||||
# Disabling devices that are non commonly used for smart speaker/devices
|
||||
# CONFIG_CDROM is not set
|
||||
# CONFIG_VIDEO_IRS1125 is not set
|
||||
# CONFIG_LEDS_TRIGGER_AUDIO is not set
|
||||
|
|
|
@ -31,7 +31,7 @@ disable_overscan=1
|
|||
display_auto_detect=1
|
||||
|
||||
# Enable DRM VC4 V3D driver and setup the mode
|
||||
dtoverlay=vc4-fkms-v3d
|
||||
dtoverlay=vc4-fkms-v3d,cma-384
|
||||
# dtoverlay=vc4-kms-v3d-pi4
|
||||
# hdmi_drive=2
|
||||
# hdmi_group=2
|
||||
|
|
|
@ -29,7 +29,7 @@ disable_overscan=1
|
|||
display_auto_detect=1
|
||||
|
||||
# Enable DRM VC4 V3D driver and setup the mode
|
||||
dtoverlay=vc4-fkms-v3d
|
||||
dtoverlay=vc4-fkms-v3d,cma-384
|
||||
# dtoverlay=vc4-kms-v3d-pi4
|
||||
# hdmi_drive=2
|
||||
# hdmi_group=2
|
||||
|
|
|
@ -1 +1,12 @@
|
|||
include $(sort $(wildcard $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/*/*.mk))
|
||||
|
||||
.PHONY: linux-check-dotconfig
|
||||
linux-check-dotconfig: linux-check-configuration-done
|
||||
CC=$(TARGET_CC) LD=$(TARGET_LD) srctree=$(LINUX_SRCDIR) \
|
||||
ARCH=$(if $(BR2_x86_64),x86,$(if $(BR2_arm)$(BR2_aarch64),arm,$(ARCH))) \
|
||||
SRCARCH=$(if $(BR2_x86_64),x86,$(if $(BR2_arm)$(BR2_aarch64),arm,$(ARCH))) \
|
||||
$(BR2_EXTERNAL_OPENVOICEOS_PATH)/scripts/check-dotconfig.py \
|
||||
$(BR2_CHECK_DOTCONFIG_OPTS) \
|
||||
--src-kconfig $(LINUX_SRCDIR)Kconfig \
|
||||
--actual-config $(LINUX_SRCDIR).config \
|
||||
$(shell echo $(BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE) $(BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES))
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
CONFIG_USB_GADGET=y
|
||||
|
||||
CONFIG_USBIP_CORE=m
|
||||
CONFIG_USBIP_VHCI_HCD=m
|
||||
CONFIG_USBIP_VHCI_HC_PORTS=8
|
||||
|
@ -8,7 +10,6 @@ CONFIG_USBIP_VUDC=m
|
|||
CONFIG_USB_SERIAL=y
|
||||
CONFIG_USB_SERIAL_GENERIC=y
|
||||
CONFIG_USB_SERIAL_OPTION=m
|
||||
CONFIG_USB_SERIAL_WWAN=m
|
||||
CONFIG_USB_SERIAL_SIMPLE=m
|
||||
CONFIG_USB_SERIAL_CP210X=m
|
||||
CONFIG_USB_SERIAL_FTDI_SIO=m
|
||||
|
@ -35,6 +36,9 @@ CONFIG_USB_NET_SMSC95XX=m
|
|||
|
||||
CONFIG_MEDIA_CEC_SUPPORT=y
|
||||
|
||||
# Required for BT drivers
|
||||
CONFIG_SERIAL_DEV_BUS=y
|
||||
|
||||
CONFIG_BT_INTEL=m
|
||||
CONFIG_BT_BCM=m
|
||||
CONFIG_BT_RTL=m
|
||||
|
@ -46,7 +50,6 @@ CONFIG_BT_HCIBTUSB_RTL=y
|
|||
CONFIG_RTL_CARDS=m
|
||||
CONFIG_RTL8192CU=m
|
||||
CONFIG_RTL8XXXU=m
|
||||
CONFIG_R8188EU=m
|
||||
|
||||
CONFIG_WLAN_VENDOR_MEDIATEK=y
|
||||
CONFIG_MT7601U=m
|
||||
|
@ -65,28 +68,18 @@ CONFIG_RT2800USB_UNKNOWN=y
|
|||
|
||||
# Multimedia core support
|
||||
CONFIG_MEDIA_SUPPORT=y
|
||||
CONFIG_MEDIA_SUPPORT_FILTER=n
|
||||
CONFIG_MEDIA_CONTROLLER=y
|
||||
CONFIG_MEDIA_CONTROLLER_DVB=y
|
||||
CONFIG_MEDIA_CAMERA_SUPPORT=y
|
||||
CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
|
||||
CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
|
||||
CONFIG_MEDIA_USB_SUPPORT=y
|
||||
CONFIG_MEDIA_PCI_SUPPORT=y
|
||||
CONFIG_VIDEO_DEV=m
|
||||
CONFIG_VIDEO_V4L2=m
|
||||
CONFIG_VIDEO_V4L2_SUBDEV_API=y
|
||||
CONFIG_VIDEO_V4L2_TPG=m
|
||||
CONFIG_VIDEO_TVEEPROM=m
|
||||
CONFIG_VIDEOBUF_GEN=m
|
||||
CONFIG_VIDEOBUF_DMA_SG=m
|
||||
CONFIG_VIDEOBUF_VMALLOC=m
|
||||
CONFIG_VIDEOBUF2_CORE=m
|
||||
CONFIG_VIDEOBUF2_V4L2=m
|
||||
CONFIG_VIDEOBUF2_MEMOPS=m
|
||||
CONFIG_VIDEOBUF2_DMA_CONTIG=m
|
||||
CONFIG_VIDEOBUF2_VMALLOC=m
|
||||
CONFIG_VIDEOBUF2_DMA_SG=m
|
||||
CONFIG_VIDEOBUF2_DVB=m
|
||||
CONFIG_MEDIA_PLATFORM_SUPPORT=y
|
||||
CONFIG_MEDIA_PLATFORM_DRIVERS=y
|
||||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||
|
||||
# Webcam devices
|
||||
|
@ -144,53 +137,10 @@ CONFIG_USB_GSPCA_XIRLINK_CIT=m
|
|||
CONFIG_USB_GSPCA_ZC3XX=m
|
||||
CONFIG_USB_PWC=m
|
||||
CONFIG_USB_PWC_INPUT_EVDEV=y
|
||||
CONFIG_VIDEO_CPIA2=m
|
||||
CONFIG_USB_ZR364XX=m
|
||||
CONFIG_USB_STKWEBCAM=m
|
||||
CONFIG_USB_S2255=m
|
||||
|
||||
# Analog capture USB devices
|
||||
CONFIG_VIDEO_USBTV=m
|
||||
CONFIG_VIDEO_PVRUSB2=m
|
||||
CONFIG_VIDEO_PVRUSB2_SYSFS=y
|
||||
CONFIG_VIDEO_PVRUSB2_DVB=y
|
||||
CONFIG_VIDEO_HDPVR=m
|
||||
CONFIG_VIDEO_USBVISION=m
|
||||
CONFIG_VIDEO_STK1160_COMMON=m
|
||||
CONFIG_VIDEO_STK1160=m
|
||||
CONFIG_VIDEO_SAA7146=m
|
||||
CONFIG_VIDEO_SAA7146_VV=m
|
||||
|
||||
# Analog/digital capture USB devices
|
||||
CONFIG_VIDEO_AU0828=m
|
||||
CONFIG_VIDEO_AU0828_V4L2=y
|
||||
CONFIG_VIDEO_CX231XX=m
|
||||
CONFIG_VIDEO_CX231XX_RC=y
|
||||
CONFIG_VIDEO_CX231XX_ALSA=m
|
||||
CONFIG_VIDEO_CX231XX_DVB=m
|
||||
CONFIG_VIDEO_TM6000=m
|
||||
CONFIG_VIDEO_TM6000_ALSA=m
|
||||
CONFIG_VIDEO_TM6000_DVB=m
|
||||
CONFIG_VIDEO_CX2341X=m
|
||||
|
||||
# Webcam/capture (analog/digital) USB devices
|
||||
CONFIG_VIDEO_EM28XX=m
|
||||
CONFIG_VIDEO_EM28XX_V4L2=m
|
||||
CONFIG_VIDEO_EM28XX_ALSA=m
|
||||
CONFIG_VIDEO_EM28XX_DVB=m
|
||||
CONFIG_VIDEO_EM28XX_RC=m
|
||||
|
||||
# Audio devices (USB/PCI)
|
||||
CONFIG_SND_USB_AUDIO=m
|
||||
CONFIG_SND_HDA=y
|
||||
CONFIG_SND_HDA_CORE=y
|
||||
CONFIG_SND_HDA_GENERIC=y
|
||||
CONFIG_SND_HDA_INTEL=m
|
||||
CONFIG_SND_HDA_I915=y
|
||||
CONFIG_SND_HDA_CODEC_REALTEK=m
|
||||
CONFIG_SND_HDA_CODEC_ANALOG=m
|
||||
CONFIG_SND_HDA_CODEC_VIA=m
|
||||
CONFIG_SND_HDA_CODEC_HDMI=m
|
||||
|
||||
# GPIO support
|
||||
CONFIG_GPIOLIB=y
|
||||
|
@ -210,3 +160,186 @@ CONFIG_W1=y
|
|||
CONFIG_W1_MASTER_DS2490=m
|
||||
CONFIG_W1_MASTER_DS2482=m
|
||||
CONFIG_W1_MASTER_GPIO=m
|
||||
|
||||
# Disabling devices that are non commonly used for smart speaker/devices
|
||||
# CONFIG_SENSORS_LIS3_SPI is not set
|
||||
# CONFIG_VIDEO_TUNER is not set
|
||||
# CONFIG_MEDIA_CONTROLLER_DVB is not set
|
||||
# CONFIG_DVB_NET is not set
|
||||
# CONFIG_DVB_DYNAMIC_MINORS is not set
|
||||
# CONFIG_USB_S2255 is not set
|
||||
# CONFIG_VIDEO_USBTV is not set
|
||||
# CONFIG_VIDEO_GO7007 is not set
|
||||
# CONFIG_VIDEO_HDPVR is not set
|
||||
# CONFIG_VIDEO_PVRUSB2 is not set
|
||||
# CONFIG_VIDEO_STK1160 is not set
|
||||
# CONFIG_VIDEO_AU0828 is not set
|
||||
# CONFIG_VIDEO_CX231XX is not set
|
||||
# CONFIG_DVB_AS102 is not set
|
||||
# CONFIG_DVB_B2C2_FLEXCOP_USB is not set
|
||||
# CONFIG_DVB_USB_V2 is not set
|
||||
# CONFIG_DVB_USB is not set
|
||||
# CONFIG_SMS_USB_DRV is not set
|
||||
# CONFIG_VIDEO_EM28XX is not set
|
||||
# CONFIG_MEDIA_PCI_SUPPORT is not set
|
||||
# CONFIG_RADIO_ADAPTERS is not set
|
||||
# CONFIG_VIDEO_ADV7180 is not set
|
||||
# CONFIG_VIDEO_SAA711X is not set
|
||||
# CONFIG_VIDEO_TC358743 is not set
|
||||
# CONFIG_VIDEO_TVP5150 is not set
|
||||
# CONFIG_VIDEO_TW2804 is not set
|
||||
# CONFIG_VIDEO_TW9903 is not set
|
||||
# CONFIG_VIDEO_TW9906 is not set
|
||||
# CONFIG_VIDEO_CX25840 is not set
|
||||
# CONFIG_MEDIA_TUNER_E4000 is not set
|
||||
# CONFIG_MEDIA_TUNER_FC0011 is not set
|
||||
# CONFIG_MEDIA_TUNER_FC0012 is not set
|
||||
# CONFIG_MEDIA_TUNER_FC0013 is not set
|
||||
# CONFIG_MEDIA_TUNER_FC2580 is not set
|
||||
# CONFIG_MEDIA_TUNER_IT913X is not set
|
||||
# CONFIG_MEDIA_TUNER_M88RS6000T is not set
|
||||
# CONFIG_MEDIA_TUNER_MAX2165 is not set
|
||||
# CONFIG_MEDIA_TUNER_MC44S803 is not set
|
||||
# CONFIG_MEDIA_TUNER_MSI001 is not set
|
||||
# CONFIG_MEDIA_TUNER_MT2060 is not set
|
||||
# CONFIG_MEDIA_TUNER_MT2063 is not set
|
||||
# CONFIG_MEDIA_TUNER_MT20XX is not set
|
||||
# CONFIG_MEDIA_TUNER_MT2131 is not set
|
||||
# CONFIG_MEDIA_TUNER_MT2266 is not set
|
||||
# CONFIG_MEDIA_TUNER_MXL301RF is not set
|
||||
# CONFIG_MEDIA_TUNER_MXL5005S is not set
|
||||
# CONFIG_MEDIA_TUNER_MXL5007T is not set
|
||||
# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set
|
||||
# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set
|
||||
# CONFIG_MEDIA_TUNER_QT1010 is not set
|
||||
# CONFIG_MEDIA_TUNER_R820T is not set
|
||||
# CONFIG_MEDIA_TUNER_SI2157 is not set
|
||||
# CONFIG_MEDIA_TUNER_SIMPLE is not set
|
||||
# CONFIG_MEDIA_TUNER_TDA18212 is not set
|
||||
# CONFIG_MEDIA_TUNER_TDA18218 is not set
|
||||
# CONFIG_MEDIA_TUNER_TDA18250 is not set
|
||||
# CONFIG_MEDIA_TUNER_TDA18271 is not set
|
||||
# CONFIG_MEDIA_TUNER_TDA827X is not set
|
||||
# CONFIG_MEDIA_TUNER_TDA8290 is not set
|
||||
# CONFIG_MEDIA_TUNER_TDA9887 is not set
|
||||
# CONFIG_MEDIA_TUNER_TEA5761 is not set
|
||||
# CONFIG_MEDIA_TUNER_TEA5767 is not set
|
||||
# CONFIG_MEDIA_TUNER_TUA9001 is not set
|
||||
# CONFIG_MEDIA_TUNER_XC2028 is not set
|
||||
# CONFIG_MEDIA_TUNER_XC4000 is not set
|
||||
# CONFIG_MEDIA_TUNER_XC5000 is not set
|
||||
# CONFIG_DVB_M88DS3103 is not set
|
||||
# CONFIG_DVB_MXL5XX is not set
|
||||
# CONFIG_DVB_STB0899 is not set
|
||||
# CONFIG_DVB_STB6100 is not set
|
||||
# CONFIG_DVB_STV090x is not set
|
||||
# CONFIG_DVB_STV0910 is not set
|
||||
# CONFIG_DVB_STV6110x is not set
|
||||
# CONFIG_DVB_STV6111 is not set
|
||||
# CONFIG_DVB_DRXK is not set
|
||||
# CONFIG_DVB_MN88472 is not set
|
||||
# CONFIG_DVB_MN88473 is not set
|
||||
# CONFIG_DVB_SI2165 is not set
|
||||
# CONFIG_DVB_TDA18271C2DD is not set
|
||||
# CONFIG_DVB_CX24110 is not set
|
||||
# CONFIG_DVB_CX24116 is not set
|
||||
# CONFIG_DVB_CX24117 is not set
|
||||
# CONFIG_DVB_CX24120 is not set
|
||||
# CONFIG_DVB_CX24123 is not set
|
||||
# CONFIG_DVB_DS3000 is not set
|
||||
# CONFIG_DVB_MB86A16 is not set
|
||||
# CONFIG_DVB_MT312 is not set
|
||||
# CONFIG_DVB_S5H1420 is not set
|
||||
# CONFIG_DVB_SI21XX is not set
|
||||
# CONFIG_DVB_STB6000 is not set
|
||||
# CONFIG_DVB_STV0288 is not set
|
||||
# CONFIG_DVB_STV0299 is not set
|
||||
# CONFIG_DVB_STV0900 is not set
|
||||
# CONFIG_DVB_STV6110 is not set
|
||||
# CONFIG_DVB_TDA10071 is not set
|
||||
# CONFIG_DVB_TDA10086 is not set
|
||||
# CONFIG_DVB_TDA8083 is not set
|
||||
# CONFIG_DVB_TDA8261 is not set
|
||||
# CONFIG_DVB_TDA826X is not set
|
||||
# CONFIG_DVB_TS2020 is not set
|
||||
# CONFIG_DVB_TUA6100 is not set
|
||||
# CONFIG_DVB_TUNER_CX24113 is not set
|
||||
# CONFIG_DVB_TUNER_ITD1000 is not set
|
||||
# CONFIG_DVB_VES1X93 is not set
|
||||
# CONFIG_DVB_ZL10036 is not set
|
||||
# CONFIG_DVB_ZL10039 is not set
|
||||
# CONFIG_DVB_AF9013 is not set
|
||||
# CONFIG_DVB_CX22700 is not set
|
||||
# CONFIG_DVB_CX22702 is not set
|
||||
# CONFIG_DVB_CXD2820R is not set
|
||||
# CONFIG_DVB_CXD2841ER is not set
|
||||
# CONFIG_DVB_DIB3000MB is not set
|
||||
# CONFIG_DVB_DIB3000MC is not set
|
||||
# CONFIG_DVB_DIB7000M is not set
|
||||
# CONFIG_DVB_DIB7000P is not set
|
||||
# CONFIG_DVB_DIB9000 is not set
|
||||
# CONFIG_DVB_DRXD is not set
|
||||
# CONFIG_DVB_EC100 is not set
|
||||
# CONFIG_DVB_L64781 is not set
|
||||
# CONFIG_DVB_MT352 is not set
|
||||
# CONFIG_DVB_NXT6000 is not set
|
||||
# CONFIG_DVB_RTL2830 is not set
|
||||
# CONFIG_DVB_RTL2832 is not set
|
||||
# CONFIG_DVB_RTL2832_SDR is not set
|
||||
# CONFIG_DVB_S5H1432 is not set
|
||||
# CONFIG_DVB_SI2168 is not set
|
||||
# CONFIG_DVB_SP887X is not set
|
||||
# CONFIG_DVB_STV0367 is not set
|
||||
# CONFIG_DVB_TDA10048 is not set
|
||||
# CONFIG_DVB_TDA1004X is not set
|
||||
# CONFIG_DVB_ZD1301_DEMOD is not set
|
||||
# CONFIG_DVB_ZL10353 is not set
|
||||
# CONFIG_DVB_CXD2880 is not set
|
||||
# CONFIG_DVB_STV0297 is not set
|
||||
# CONFIG_DVB_TDA10021 is not set
|
||||
# CONFIG_DVB_TDA10023 is not set
|
||||
# CONFIG_DVB_VES1820 is not set
|
||||
# CONFIG_DVB_AU8522_DTV is not set
|
||||
# CONFIG_DVB_AU8522_V4L is not set
|
||||
# CONFIG_DVB_BCM3510 is not set
|
||||
# CONFIG_DVB_LG2160 is not set
|
||||
# CONFIG_DVB_LGDT3305 is not set
|
||||
# CONFIG_DVB_LGDT3306A is not set
|
||||
# CONFIG_DVB_LGDT330X is not set
|
||||
# CONFIG_DVB_MXL692 is not set
|
||||
# CONFIG_DVB_NXT200X is not set
|
||||
# CONFIG_DVB_OR51132 is not set
|
||||
# CONFIG_DVB_OR51211 is not set
|
||||
# CONFIG_DVB_S5H1409 is not set
|
||||
# CONFIG_DVB_S5H1411 is not set
|
||||
# CONFIG_DVB_DIB8000 is not set
|
||||
# CONFIG_DVB_MB86A20S is not set
|
||||
# CONFIG_DVB_S921 is not set
|
||||
# CONFIG_DVB_MN88443X is not set
|
||||
# CONFIG_DVB_TC90522 is not set
|
||||
# CONFIG_DVB_PLL is not set
|
||||
# CONFIG_DVB_TUNER_DIB0070 is not set
|
||||
# CONFIG_DVB_TUNER_DIB0090 is not set
|
||||
# CONFIG_DVB_A8293 is not set
|
||||
# CONFIG_DVB_AF9033 is not set
|
||||
# CONFIG_DVB_ASCOT2E is not set
|
||||
# CONFIG_DVB_ATBM8830 is not set
|
||||
# CONFIG_DVB_HELENE is not set
|
||||
# CONFIG_DVB_HORUS3A is not set
|
||||
# CONFIG_DVB_ISL6405 is not set
|
||||
# CONFIG_DVB_ISL6421 is not set
|
||||
# CONFIG_DVB_ISL6423 is not set
|
||||
# CONFIG_DVB_IX2505V is not set
|
||||
# CONFIG_DVB_LGS8GL5 is not set
|
||||
# CONFIG_DVB_LGS8GXX is not set
|
||||
# CONFIG_DVB_LNBH25 is not set
|
||||
# CONFIG_DVB_LNBH29 is not set
|
||||
# CONFIG_DVB_LNBP21 is not set
|
||||
# CONFIG_DVB_LNBP22 is not set
|
||||
# CONFIG_DVB_M88RS2000 is not set
|
||||
# CONFIG_DVB_TDA665x is not set
|
||||
# CONFIG_DVB_DRX39XYJ is not set
|
||||
# CONFIG_DVB_CXD2099 is not set
|
||||
# CONFIG_DVB_SP2 is not set
|
||||
# CONFIG_USB_PRINTER is not set
|
||||
# CONFIG_USB_MICROTEK is not set
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
CONFIG_POSIX_MQUEUE=y
|
||||
CONFIG_CFQ_GROUP_IOSCHED=y
|
||||
CONFIG_CFS_BANDWIDTH=y
|
||||
CONFIG_FAIR_GROUP_SCHED=y
|
||||
CONFIG_NET_SCHED=y
|
||||
|
@ -7,13 +6,11 @@ CONFIG_NET_SCHED=y
|
|||
|
||||
CONFIG_CGROUPS=y
|
||||
CONFIG_CPUSETS=y
|
||||
CONFIG_HUGETLB_PAGE=y
|
||||
CONFIG_BLK_CGROUP=y
|
||||
CONFIG_BLK_DEV_THROTTLING=y
|
||||
CONFIG_CGROUP_SCHED=y
|
||||
CONFIG_CGROUP_PIDS=y
|
||||
CONFIG_CGROUP_FREEZER=y
|
||||
CONFIG_CGROUP_HUGETLB=y
|
||||
CONFIG_CGROUP_DEVICE=y
|
||||
CONFIG_CGROUP_CPUACCT=y
|
||||
CONFIG_CGROUP_PERF=y
|
||||
|
@ -24,7 +21,6 @@ CONFIG_CGROUP_BPF=y
|
|||
CONFIG_BPF_SYSCALL=y
|
||||
|
||||
CONFIG_MEMCG=y
|
||||
CONFIG_MEMCG_SWAP=y
|
||||
|
||||
CONFIG_NAMESPACES=y
|
||||
CONFIG_USER_NS=y
|
||||
|
@ -42,16 +38,13 @@ CONFIG_BRIDGE_VLAN_FILTERING=y
|
|||
CONFIG_INET=y
|
||||
CONFIG_IPV6=y
|
||||
CONFIG_INET_ESP=y
|
||||
CONFIG_INET_XFRM_MODE_TRANSPORT=y
|
||||
CONFIG_NETCONSOLE=y
|
||||
CONFIG_VETH=y
|
||||
CONFIG_NETFILTER=y
|
||||
CONFIG_NF_CONNTRACK=y
|
||||
CONFIG_NF_CONNTRACK_TFTP=y
|
||||
CONFIG_NF_NAT=y
|
||||
CONFIG_NF_NAT_NEEDED=y
|
||||
CONFIG_NF_NAT_TFTP=y
|
||||
CONFIG_NF_CONNTRACK_IPV4=y
|
||||
CONFIG_IP6_NF_IPTABLES=y
|
||||
CONFIG_IP6_NF_FILTER=y
|
||||
CONFIG_IP6_NF_MANGLE=y
|
||||
|
@ -74,9 +67,7 @@ CONFIG_IP_NF_TARGET_MASQUERADE=y
|
|||
CONFIG_IP_NF_TARGET_REDIRECT=y
|
||||
CONFIG_BRIDGE=y
|
||||
CONFIG_BRIDGE_NETFILTER=y
|
||||
CONFIG_XFRM=m
|
||||
CONFIG_XFRM_USER=y
|
||||
CONFIG_XFRM_ALGO=y
|
||||
|
||||
CONFIG_NET_L3_MASTER_DEV=y
|
||||
|
||||
|
@ -85,9 +76,7 @@ CONFIG_EXT4_FS_POSIX_ACL=y
|
|||
CONFIG_EXT4_FS_SECURITY=y
|
||||
CONFIG_OVERLAY_FS=y
|
||||
CONFIG_OVERLAY_FS_METACOPY=y
|
||||
CONFIG_VBOXSF_FS=m
|
||||
|
||||
CONFIG_CRYPTO_CCM=m
|
||||
CONFIG_CRYPTO_GCM=m
|
||||
CONFIG_CRYPTO_GCM=y
|
||||
CONFIG_CRYPTO_CMAC=m
|
||||
CONFIG_CRYPTO_ARC4=m
|
||||
|
|
|
@ -1,13 +1,20 @@
|
|||
CONFIG_LOCALVERSION="-ovos-buildroot"
|
||||
CONFIG_KERNEL_LZO=y
|
||||
# CONFIG_KERNEL_GZIP is not set
|
||||
CONFIG_EXPERT=y
|
||||
|
||||
# GCC plugins are disabled by linux.mk, disable them here to reduce
|
||||
# linux-diff-config noise
|
||||
|
||||
CONFIG_GCC_PLUGINS=n
|
||||
|
||||
CONFIG_CMDLINE=""
|
||||
CONFIG_PANIC_TIMEOUT=5
|
||||
|
||||
# CONFIG_PREEMPT_NONE is not set
|
||||
# CONFIG_PREEMPT_VOLUNTARY is not set
|
||||
# CONFIG_PREEMPT is not set
|
||||
CONFIG_PREEMPT_RT=y
|
||||
CONFIG_PREEMPT_COUNT=y
|
||||
CONFIG_PREEMPTION=y
|
||||
|
||||
CONFIG_PSI=y
|
||||
CONFIG_IKCONFIG=y
|
||||
CONFIG_IKCONFIG_PROC=y
|
||||
|
@ -33,12 +40,15 @@ CONFIG_EXFAT_FS=m
|
|||
CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
|
||||
CONFIG_MSDOS_FS=y
|
||||
CONFIG_VFAT_FS=y
|
||||
|
||||
CONFIG_SQUASHFS=y
|
||||
# CONFIG_SQUASHFS_FILE_CACHE is not set
|
||||
CONFIG_SQUASHFS_FILE_DIRECT=y
|
||||
# CONFIG_SQUASHFS_DECOMP_SINGLE is not set
|
||||
# CONFIG_SQUASHFS_DECOMP_MULTI is not set
|
||||
CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU=y
|
||||
# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set
|
||||
# CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE is not set
|
||||
# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set
|
||||
CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU=y
|
||||
CONFIG_SQUASHFS_XATTR=y
|
||||
CONFIG_SQUASHFS_ZLIB=y
|
||||
CONFIG_SQUASHFS_LZ4=y
|
||||
|
@ -48,12 +58,12 @@ CONFIG_SQUASHFS_ZSTD=y
|
|||
# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
|
||||
# CONFIG_SQUASHFS_EMBEDDED is not set
|
||||
CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
|
||||
|
||||
CONFIG_BTRFS_FS=m
|
||||
CONFIG_OVERLAY_FS=y
|
||||
CONFIG_TMPFS=y
|
||||
CONFIG_TMPFS_POSIX_ACL=y
|
||||
CONFIG_TMPFS_XATTR=y
|
||||
CONFIG_TMPFS_INODE64=y
|
||||
|
||||
CONFIG_SECCOMP=y
|
||||
CONFIG_SECCOMP_FILTER=y
|
||||
|
@ -72,7 +82,7 @@ CONFIG_MSDOS_PARTITION=y
|
|||
# CONFIG_LOGO is not set
|
||||
# CONFIG_DEBUG_STACK_USAGE is not set
|
||||
|
||||
CONFIG_BT=y
|
||||
CONFIG_BT=m
|
||||
CONFIG_BT_BREDR=y
|
||||
CONFIG_BT_RFCOMM=m
|
||||
CONFIG_BT_RFCOMM_TTY=y
|
||||
|
@ -80,13 +90,11 @@ CONFIG_BT_LE=y
|
|||
CONFIG_BT_BNEP=m
|
||||
CONFIG_BT_BNEP_MC_FILTER=y
|
||||
CONFIG_BT_BNEP_PROTO_FILTER=y
|
||||
CONFIG_BT_CMTP=m
|
||||
CONFIG_BT_HIDP=m
|
||||
CONFIG_BT_LEDS=y
|
||||
|
||||
CONFIG_IPV6=y
|
||||
CONFIG_IPV6_ROUTER_PREF=y
|
||||
CONFIG_IPV6_REACHABILITY_PROBE=y
|
||||
CONFIG_IPV6_SIT=m
|
||||
|
||||
CONFIG_IP_MROUTE=y
|
||||
|
@ -101,11 +109,11 @@ CONFIG_NF_TABLES_ARP=y
|
|||
CONFIG_NF_TPROXY_IPV6=m
|
||||
CONFIG_NF_TABLES_IPV6=y
|
||||
CONFIG_NF_TABLES_BRIDGE=m
|
||||
CONFIG_NF_FLOW_TABLE=m
|
||||
|
||||
CONFIG_NFT_NUMGEN=m
|
||||
CONFIG_NFT_CT=m
|
||||
CONFIG_NFT_FLOW_OFFLOAD=m
|
||||
CONFIG_NFT_COUNTER=m
|
||||
CONFIG_NFT_CONNLIMIT=m
|
||||
CONFIG_NFT_LOG=m
|
||||
CONFIG_NFT_LIMIT=m
|
||||
|
@ -113,7 +121,6 @@ CONFIG_NFT_MASQ=m
|
|||
CONFIG_NFT_REDIR=m
|
||||
CONFIG_NFT_NAT=m
|
||||
CONFIG_NFT_TUNNEL=m
|
||||
CONFIG_NFT_OBJREF=m
|
||||
CONFIG_NFT_QUEUE=m
|
||||
CONFIG_NFT_QUOTA=m
|
||||
CONFIG_NFT_REJECT=m
|
||||
|
@ -140,6 +147,7 @@ CONFIG_NFT_FIB_IPV6=m
|
|||
CONFIG_NFT_BRIDGE_META=m
|
||||
CONFIG_NFT_BRIDGE_REJECT=m
|
||||
|
||||
CONFIG_NETFILTER_NETLINK_QUEUE=m
|
||||
CONFIG_NETFILTER_XT_SET=m
|
||||
CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
|
||||
|
||||
|
@ -176,17 +184,15 @@ CONFIG_WEXT_CORE=y
|
|||
CONFIG_WEXT_PROC=y
|
||||
CONFIG_CFG80211=m
|
||||
CONFIG_CFG80211_WEXT=y
|
||||
# CONFIG_CFG80211_CRDA_SUPPORT is not set
|
||||
|
||||
CONFIG_CIFS=m
|
||||
CONFIG_CIFS_XATTR=y
|
||||
CONFIG_CIFS_POSIX=y
|
||||
CONFIG_CIFS_ACL=y
|
||||
CONFIG_CIFS_DFS_UPCALL=y
|
||||
|
||||
CONFIG_WIREGUARD=m
|
||||
|
||||
CONFIG_HID=m
|
||||
CONFIG_HID=y
|
||||
CONFIG_HIDRAW=y
|
||||
|
||||
CONFIG_NLS=y
|
||||
|
@ -195,12 +201,3 @@ CONFIG_NLS_CODEPAGE_437=y
|
|||
CONFIG_NLS_ASCII=y
|
||||
CONFIG_NLS_ISO8859_1=y
|
||||
CONFIG_NLS_UTF8=y
|
||||
|
||||
CONFIG_HAVE_PREEMPT_LAZY=y
|
||||
CONFIG_PREEMPT_LAZY=y
|
||||
# CONFIG_PREEMPT_NONE is not set
|
||||
# CONFIG_PREEMPT_VOLUNTARY is not set
|
||||
# CONFIG_PREEMPT is not set
|
||||
CONFIG_PREEMPT_RT=y
|
||||
CONFIG_PREEMPT_COUNT=y
|
||||
CONFIG_PREEMPTION=y
|
||||
|
|
|
@ -10,9 +10,7 @@ OVOS_CONTAINERS_LICENSE_FILES = $(BR2_EXTERNAL_OPENVOICEOS_PATH)/../LICENSE
|
|||
OVOS_CONTAINERS_SITE = $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers
|
||||
OVOS_CONTAINERS_SITE_METHOD = local
|
||||
|
||||
OVOS_CONTAINERS_IMAGES = ovos-messagebus \
|
||||
ovos-phal \
|
||||
ovos-phal-admin \
|
||||
OVOS_CONTAINERS_IMAGES = ovos-phal \
|
||||
ovos-listener-dinkum \
|
||||
ovos-audio \
|
||||
ovos-core \
|
||||
|
|
|
@ -0,0 +1,37 @@
|
|||
From d4dab0b7818bc3106f273cf24f02a3ea87cc653a Mon Sep 17 00:00:00 2001
|
||||
From: j1nx <p.steenbergen@j1nx.nl>
|
||||
Date: Tue, 6 Feb 2024 09:57:12 +0000
|
||||
Subject: [PATCH 1/1] Do not build the wm8960 driver
|
||||
|
||||
---
|
||||
Makefile | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index b9de7f4..b5f2595 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -12,12 +12,10 @@ uname_r=$(shell uname -r)
|
||||
ifneq ($(KERNELRELEASE),)
|
||||
# $(warning KERNELVERSION=$(KERNELVERSION))
|
||||
|
||||
-snd-soc-wm8960-objs := wm8960.o
|
||||
snd-soc-ac108-objs := ac108.o ac101.o
|
||||
snd-soc-seeed-voicecard-objs := seeed-voicecard.o
|
||||
|
||||
|
||||
-obj-m += snd-soc-wm8960.o
|
||||
obj-m += snd-soc-ac108.o
|
||||
obj-m += snd-soc-seeed-voicecard.o
|
||||
|
||||
@@ -41,7 +39,6 @@ clean:
|
||||
|
||||
install:
|
||||
sudo cp snd-soc-ac108.ko ${DEST}/sound/soc/codecs/
|
||||
- sudo cp snd-soc-wm8960.ko ${DEST}/sound/soc/codecs/
|
||||
sudo cp snd-soc-seeed-voicecard.ko ${DEST}/sound/soc/bcm/
|
||||
sudo depmod -a
|
||||
|
||||
--
|
||||
2.34.1
|
||||
|
|
@ -1,2 +1,2 @@
|
|||
# Locally computed
|
||||
sha256 fd191fc3b0c2ca790b88615c955b03c606a17e9fc9fcc23bf32d0a7aae36176a respeaker-4ab8158c18047e2c6d01e46958e3c1cb34f4983a.tar.gz
|
||||
sha256 8b6d94f5f51fb76ce2329bd71bebb78bc1e57c15880d413c7b662709c1da3422 respeaker-c693d203d997f61c41686ece2f5eb59e1fc1c75d.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
RESPEAKER_VERSION = 4ab8158c18047e2c6d01e46958e3c1cb34f4983a
|
||||
RESPEAKER_VERSION = c693d203d997f61c41686ece2f5eb59e1fc1c75d
|
||||
RESPEAKER_SITE = $(call github,HinTak,seeed-voicecard,$(RESPEAKER_VERSION))
|
||||
RESPEAKER_LICENSE = GNU General Public License v3.0
|
||||
RESPEAKER_DEPENDENCIES = rpi-firmware dtc
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
# Locally computed
|
||||
sha256 a9ca7572a336a925043543fe9e971a705eae02f299100662e5970254c8034442 vocalfusion-2c22f1bb90bf51fdde94ea263636678b22702062.tar.gz
|
||||
sha256 88bec397f9bf2a6887efa39cb660d37ef1f08e2e378a81a1b88d3b14798e44da vocalfusion-cc7c690176416998ee6a918f439130224fa24699.tar.gz
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
VOCALFUSION_VERSION = 2c22f1bb90bf51fdde94ea263636678b22702062
|
||||
VOCALFUSION_VERSION = cc7c690176416998ee6a918f439130224fa24699
|
||||
VOCALFUSION_SITE = $(call github,OpenVoiceOS,VocalFusionDriver,$(VOCALFUSION_VERSION))
|
||||
VOCALFUSION_MODULE_SUBDIRS = driver
|
||||
|
||||
|
|
|
@ -0,0 +1,100 @@
|
|||
{
|
||||
"confirm_listening": true,
|
||||
"play_wav_cmdline": "pw-play %1",
|
||||
"play_mp3_cmdline": "pw-play %1",
|
||||
"sounds": {
|
||||
"start_listening": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/start_listening.wav",
|
||||
"end_listening": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/end_listening.wav",
|
||||
"acknowledge": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/acknowledge.mp3"
|
||||
},
|
||||
"skills": {
|
||||
"wait_for_internet": true
|
||||
},
|
||||
"gui": {
|
||||
"extension": "ovos-gui-plugin-shell-companion",
|
||||
"idle_display_skill": "skill-ovos-homescreen.openvoiceos",
|
||||
"generic": {
|
||||
"homescreen_supported": true
|
||||
},
|
||||
"gui_file_host_path": "/home/ovos/.cache/gui_files"
|
||||
},
|
||||
"websocket": {
|
||||
"max_msg_size": 100
|
||||
},
|
||||
"listener": {
|
||||
"silence_end": 0.5,
|
||||
"recording_timeout": 7,
|
||||
"VAD": {
|
||||
"module": "ovos-vad-plugin-silero",
|
||||
"ovos-vad-plugin-silero": {"threshold": 0.2}
|
||||
},
|
||||
"remove_silence": true
|
||||
},
|
||||
"hotwords": {
|
||||
"hey_mycroft": {
|
||||
"module": "ovos-ww-plugin-precise-lite",
|
||||
"model": "https://github.com/OpenVoiceOS/precise-lite-models/raw/master/wakewords/en/hey_mycroft.tflite",
|
||||
"listen": true,
|
||||
"sound": "snd/start_listening.wav",
|
||||
"expected_duration": 3,
|
||||
"trigger_level": 3,
|
||||
"sensitivity": 0.5,
|
||||
"fallback_ww": "hey_mycroft_openwakeword"
|
||||
},
|
||||
"hey_mycroft_openwakeword": {
|
||||
"module": "ovos-ww-plugin-openwakeword",
|
||||
"threshold": 0.4,
|
||||
"fallback_ww": "hey_mycroft_vosk"
|
||||
}
|
||||
},
|
||||
"tts": {
|
||||
"module": "ovos-tts-plugin-server",
|
||||
"ovos-tts-plugin-server": {
|
||||
"host": "https://pipertts.ziggyai.online",
|
||||
"voice": "ryan-low",
|
||||
"sentence_tokenize": true
|
||||
}
|
||||
},
|
||||
"stt": {
|
||||
"module": "ovos-stt-plugin-server",
|
||||
"ovos-stt-plugin-server": {
|
||||
"url": "https://fasterwhisper.ziggyai.online/stt"
|
||||
},
|
||||
"fallback_module": "ovos-stt-plugin-vosk",
|
||||
"ovos-stt-plugin-vosk": {
|
||||
"model": "http://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
|
||||
}
|
||||
},
|
||||
"padatious": {
|
||||
"regex_only": false
|
||||
},
|
||||
"g2p": {
|
||||
"module": "ovos-g2p-plugin-mimic"
|
||||
},
|
||||
"Audio": {
|
||||
"backends": {
|
||||
"OCP": {
|
||||
"type": "ovos_common_play",
|
||||
"manage_external_players": true,
|
||||
"active": true,
|
||||
"youtube_backend": "youtube-dl",
|
||||
"ydl_backend": "auto",
|
||||
"disable_mpris": true
|
||||
},
|
||||
"vlc": {
|
||||
"type": "ovos_vlc",
|
||||
"active": false
|
||||
},
|
||||
"simple": {
|
||||
"type": "ovos_audio_simple",
|
||||
"active": false
|
||||
}
|
||||
}
|
||||
},
|
||||
"debug": false,
|
||||
"log_level": "INFO",
|
||||
"log_dir": "/var/log/mycroft",
|
||||
"logs": {
|
||||
"path": "stdout"
|
||||
}
|
||||
}
|
|
@ -16,6 +16,7 @@ HostName=hivemind-cli
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
Volume=%h/hivemind/config:/home/hivemind/.config/hivemind:z
|
||||
Volume=%h/hivemind/share:/home/hivemind/.local/share/hivemind:z
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -16,6 +16,7 @@ HostName=hivemind-listener
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
Volume=%h/hivemind/config:/home/hivemind/.config/hivemind:z
|
||||
Volume=%h/hivemind/share:/home/hivemind/.local/share/hivemind:z
|
||||
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -5,8 +5,10 @@ After=network-online.target
|
|||
Wants=network-online.target
|
||||
Wants=pipewire.service
|
||||
After=pipewire.service
|
||||
Wants=ovos-messagebus.service
|
||||
After=ovos-messagebus.service
|
||||
Wants=ovos-bus-server.service
|
||||
After=ovos-bus-server.service
|
||||
#Wants=ovos-messagebus.service
|
||||
#After=ovos-messagebus.service
|
||||
Wants=ovos-phal.service
|
||||
After=ovos-phal.service
|
||||
|
||||
|
@ -20,6 +22,7 @@ HostName=ovos-audio
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
EnvironmentFile=%h/.config/containers/env
|
||||
AddDevice=/dev/snd
|
||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -14,6 +14,7 @@ HostName=ovos-cli
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft
|
||||
Volume=%h/ovos/tmp:/tmp
|
||||
Volume=ovos_local_state:/home/ovos/.local/state/mycroft
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -5,8 +5,10 @@ After=network-online.target
|
|||
Wants=network-online.target
|
||||
Wants=pipewire.service
|
||||
After=pipewire.service
|
||||
Wants=ovos-messagebus.service
|
||||
After=ovos-messagebus.service
|
||||
Wants=ovos-bus-server.service
|
||||
After=ovos-bus-server.service
|
||||
#Wants=ovos-messagebus.service
|
||||
#After=ovos-messagebus.service
|
||||
Wants=ovos-phal.service
|
||||
After=ovos-phal.service
|
||||
|
||||
|
@ -20,6 +22,7 @@ HostName=ovos-core
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
EnvironmentFile=%h/.config/containers/env
|
||||
AddDevice=/dev/snd
|
||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -1,10 +1,10 @@
|
|||
[Unit]
|
||||
Description=OpenVoiceOS GUI Service
|
||||
After=local-fs.target
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
Wants=pipewire.service
|
||||
After=pipewire.service
|
||||
After=network.target
|
||||
#Wants=network-online.target
|
||||
#Wants=pipewire.service
|
||||
#After=pipewire.service
|
||||
#Wants=ovos-messagebus.service
|
||||
#After=ovos-messagebus.service
|
||||
#Wants=ovos-phal.service
|
||||
|
@ -22,6 +22,7 @@ HostName=ovos-gui-shell
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
EnvironmentFile=%h/.config/containers/env
|
||||
AddDevice=/dev/snd
|
||||
AddDevice=/dev/dri
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -3,8 +3,10 @@ Description=OpenVoiceOS GUI Websocket Service
|
|||
After=local-fs.target
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
Wants=ovos-messagebus.service
|
||||
After=ovos-messagebus.service
|
||||
Wants=ovos-bus-server.service
|
||||
After=ovos-bus-server.service
|
||||
#Wants=ovos-messagebus.service
|
||||
#After=ovos-messagebus.service
|
||||
|
||||
[Container]
|
||||
ContainerName=ovos-gui-websocket
|
||||
|
@ -16,6 +18,7 @@ HostName=ovos-gui-websocket
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
|
||||
Volume=%h/ovos/tmp:/tmp
|
||||
Volume=ovos_gui_files:/home/ovos/.cache/ovos_gui_file_server
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -5,8 +5,10 @@ After=network-online.target
|
|||
Wants=network-online.target
|
||||
Wants=pipewire.service
|
||||
After=pipewire.service
|
||||
Wants=ovos-messagebus.service
|
||||
After=ovos-messagebus.service
|
||||
Wants=ovos-bus-server.service
|
||||
After=ovos-bus-server.service
|
||||
#Wants=ovos-messagebus.service
|
||||
#After=ovos-messagebus.service
|
||||
Wants=ovos-phal.service
|
||||
After=ovos-phal.service
|
||||
|
||||
|
@ -20,6 +22,7 @@ HostName=ovos-listener-dinkum
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
EnvironmentFile=%h/.config/containers/env
|
||||
AddDevice=/dev/snd
|
||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -14,6 +14,7 @@ HostName=ovos-messagebus
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro
|
||||
Volume=ovos_local_state:/home/ovos/.local/state/mycroft
|
||||
Volume=%h/ovos/tmp:/tmp
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
[Install]
|
||||
WantedBy=multi-user.target default.target
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -5,8 +5,10 @@ After=network-online.target
|
|||
Wants=network-online.target
|
||||
Wants=pipewire.service
|
||||
After=pipewire.service
|
||||
Wants=ovos-messagebus.service
|
||||
After=ovos-messagebus.service
|
||||
Wants=ovos-bus-server.service
|
||||
After=ovos-bus-server.service
|
||||
#Wants=ovos-messagebus.service
|
||||
#After=ovos-messagebus.service
|
||||
|
||||
[Container]
|
||||
ContainerName=ovos-phal
|
||||
|
@ -18,6 +20,7 @@ HostName=ovos-phal
|
|||
Network=host
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
EnvironmentFile=%h/.config/containers/env
|
||||
AddDevice=/dev/snd
|
||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -15,6 +15,7 @@ Network=host
|
|||
PublishPort=8089-9666
|
||||
Timezone=local
|
||||
UserNS=keep-id:uid=%U,gid=%G
|
||||
SecurityLabelDisable=true
|
||||
EnvironmentFile=%h/.config/containers/env
|
||||
Volume=%h/ovos/config:/home/ovos/.config/mycroft:ro,z
|
||||
Volume=ovos_tts_piper_cache:/home/ovos/.local/share/piper_tts
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
[Container]
|
||||
Volume=/etc/mycroft/mycroft.conf:/etc/mycroft/mycroft.conf:ro
|
|
@ -1,104 +1,2 @@
|
|||
{
|
||||
"confirm_listening": true,
|
||||
"play_wav_cmdline": "pw-play %1",
|
||||
"play_mp3_cmdline": "pw-play %1",
|
||||
"sounds": {
|
||||
"start_listening": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/start_listening.wav",
|
||||
"end_listening": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/end_listening.wav",
|
||||
"acknowledge": "/home/ovos/.venv/lib/python3.11/site-packages/ovos_dinkum_listener/res/snd/acknowledge.mp3"
|
||||
},
|
||||
"skills": {
|
||||
"wait_for_internet": true
|
||||
},
|
||||
"gui": {
|
||||
"extension": "ovos-gui-plugin-shell-companion",
|
||||
"idle_display_skill": "skill-ovos-homescreen.openvoiceos",
|
||||
"generic": {
|
||||
"homescreen_supported": true
|
||||
},
|
||||
"gui_file_host_path": "/home/ovos/.cache/gui_files"
|
||||
},
|
||||
"websocket": {
|
||||
"max_msg_size": 100
|
||||
},
|
||||
"listener": {
|
||||
"silence_end": 0.5,
|
||||
"recording_timeout": 7,
|
||||
"VAD": {
|
||||
"module": "ovos-vad-plugin-silero",
|
||||
"ovos-vad-plugin-silero": {"threshold": 0.2}
|
||||
},
|
||||
"remove_silence": true
|
||||
},
|
||||
"hotwords": {
|
||||
"hey_mycroft": {
|
||||
"module": "ovos-ww-plugin-precise-lite",
|
||||
"model": "https://github.com/OpenVoiceOS/precise-lite-models/raw/master/wakewords/en/hey_mycroft.tflite",
|
||||
"listen": true,
|
||||
"sound": "snd/start_listening.wav",
|
||||
"expected_duration": 3,
|
||||
"trigger_level": 3,
|
||||
"sensitivity": 0.5,
|
||||
"fallback_ww": "hey_mycroft_openwakeword"
|
||||
},
|
||||
"hey_mycroft_openwakeword": {
|
||||
"module": "ovos-ww-plugin-openwakeword",
|
||||
"threshold": 0.4,
|
||||
"fallback_ww": "hey_mycroft_vosk"
|
||||
}
|
||||
},
|
||||
"tts": {
|
||||
"module": "ovos-tts-plugin-server",
|
||||
"ovos-tts-plugin-server": {
|
||||
"host": "https://pipertts.ziggyai.online",
|
||||
"voice": "ryan-low",
|
||||
"sentence_tokenize": true
|
||||
},
|
||||
"fallback_module": "ovos-tts-plugin-mimic",
|
||||
"ovos-tts-plugin-mimic": {
|
||||
"voice": "ap"
|
||||
}
|
||||
},
|
||||
"stt": {
|
||||
"module": "ovos-stt-plugin-server",
|
||||
"ovos-stt-plugin-server": {
|
||||
"url": "https://fasterwhisper.ziggyai.online/stt"
|
||||
},
|
||||
"fallback_module": "ovos-stt-plugin-vosk",
|
||||
"ovos-stt-plugin-vosk": {
|
||||
"model": "http://alphacephei.com/vosk/models/vosk-model-small-en-us-0.15.zip"
|
||||
}
|
||||
},
|
||||
"padatious": {
|
||||
"regex_only": false
|
||||
},
|
||||
"g2p": {
|
||||
"module": "ovos-g2p-plugin-mimic"
|
||||
},
|
||||
"Audio": {
|
||||
"backends": {
|
||||
"OCP": {
|
||||
"type": "ovos_common_play",
|
||||
"manage_external_players": true,
|
||||
"active": true,
|
||||
"youtube_backend": "youtube-dl",
|
||||
"ydl_backend": "auto",
|
||||
"disable_mpris": true
|
||||
},
|
||||
"vlc": {
|
||||
"type": "ovos_vlc",
|
||||
"active": false
|
||||
},
|
||||
"simple": {
|
||||
"type": "ovos_audio_simple",
|
||||
"active": false
|
||||
}
|
||||
}
|
||||
},
|
||||
"debug": false,
|
||||
"log_level": "INFO",
|
||||
"log_dir": "/var/log/mycroft",
|
||||
"logs": {
|
||||
"path": "stdout"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -8,9 +8,9 @@ enable ovos-splash-start.service
|
|||
enable ovos-splash-systemd.service
|
||||
enable mglru.service
|
||||
enable connectivity-check.service
|
||||
enable ovos-bus-server.service
|
||||
|
||||
disable ovos-splash-quit.service
|
||||
disable ovos-bus-server.service
|
||||
disable pipewire.service
|
||||
disable pipewire-pulse.service
|
||||
disable wireplumber.service
|
||||
|
|
|
@ -10,8 +10,6 @@ StandardError=null
|
|||
ExecStart=/usr/bin/ovos-bus-server
|
||||
Restart=always
|
||||
StartLimitInterval=0
|
||||
CPUSchedulingPolicy=fifo
|
||||
CPUSchedulingPriority=49
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
|
|
@ -0,0 +1,128 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
import argparse
|
||||
from collections import namedtuple
|
||||
import re
|
||||
|
||||
from kconfiglib import Kconfig
|
||||
|
||||
|
||||
# Can be either "CONFIG_OPTION=(y|m|n)" or "# CONFIG_OPTION is not set"
|
||||
regex = re.compile(
|
||||
r"^(CONFIG_(?P<option_set>[A-Z0-9_]+)=(?P<value>[mny])"
|
||||
r"|# CONFIG_(?P<option_unset>[A-Z0-9_]+) is not set)$"
|
||||
)
|
||||
|
||||
# use namedtuple as a lightweight representation of fragment-defined options
|
||||
OptionValue = namedtuple("OptionValue", ["option", "value", "file", "line"])
|
||||
|
||||
|
||||
def parse_fragment(
|
||||
filename: str, strip_path_prefix: str = None
|
||||
) -> dict[str, OptionValue]:
|
||||
"""
|
||||
Parse Buildroot Kconfig fragment and return dict of OptionValue objects.
|
||||
"""
|
||||
options: dict[str, OptionValue] = {}
|
||||
|
||||
with open(filename) as f:
|
||||
if strip_path_prefix and filename.startswith(strip_path_prefix):
|
||||
filename = filename[len(strip_path_prefix) :]
|
||||
|
||||
for line_number, line in enumerate(f, 1):
|
||||
if matches := re.match(regex, line):
|
||||
if matches["option_unset"]:
|
||||
value = OptionValue(
|
||||
matches["option_unset"], None, filename, line_number
|
||||
)
|
||||
options.update({matches.group("option_unset"): value})
|
||||
else:
|
||||
value = OptionValue(
|
||||
matches["option_set"], matches["value"], filename, line_number
|
||||
)
|
||||
options.update({matches.group("option_set"): value})
|
||||
|
||||
return options
|
||||
|
||||
|
||||
def _format_message(
|
||||
message: str, file: str, line: int, github_format: bool = False
|
||||
) -> str:
|
||||
"""
|
||||
Format message with source file and line number.
|
||||
"""
|
||||
if github_format:
|
||||
return f"::warning file={file},line={line}::{message}"
|
||||
return f"{message} (defined in {file}:{line})"
|
||||
|
||||
|
||||
def compare_configs(
|
||||
expected_options: dict[str, OptionValue],
|
||||
kconfig: Kconfig,
|
||||
github_format: bool = False,
|
||||
) -> None:
|
||||
"""
|
||||
Compare dictionary of expected options with actual Kconfig representation.
|
||||
"""
|
||||
for option, spec in expected_options.items():
|
||||
if option not in kconfig.syms:
|
||||
print(
|
||||
_format_message(
|
||||
f"{option}={spec.value} not found",
|
||||
file=spec.file,
|
||||
line=spec.line,
|
||||
github_format=github_format,
|
||||
)
|
||||
)
|
||||
elif (val := kconfig.syms[option].str_value) != spec.value:
|
||||
if spec.value is None and val == "n":
|
||||
continue
|
||||
print(
|
||||
_format_message(
|
||||
f"{option}={spec.value} requested, actual = {val}",
|
||||
file=spec.file,
|
||||
line=spec.line,
|
||||
github_format=github_format,
|
||||
)
|
||||
)
|
||||
|
||||
|
||||
def main() -> None:
|
||||
parser = argparse.ArgumentParser()
|
||||
parser.add_argument(
|
||||
"--src-kconfig", help="Path to top-level Kconfig file", required=True
|
||||
)
|
||||
parser.add_argument(
|
||||
"--actual-config",
|
||||
help="Path to config with actual config values (.config)",
|
||||
required=True,
|
||||
)
|
||||
parser.add_argument(
|
||||
"--github-format",
|
||||
action="store_true",
|
||||
help="Use Github Workflow commands output format",
|
||||
)
|
||||
parser.add_argument(
|
||||
"-s",
|
||||
"--strip-path-prefix",
|
||||
help="Path prefix to strip in the output from config fragment paths",
|
||||
)
|
||||
parser.add_argument("fragments", nargs="+", help="Paths to source config fragments")
|
||||
|
||||
args = parser.parse_args()
|
||||
|
||||
expected_options: dict[str, OptionValue] = {}
|
||||
|
||||
for f in args.fragments:
|
||||
expected_options.update(
|
||||
parse_fragment(f, strip_path_prefix=args.strip_path_prefix)
|
||||
)
|
||||
|
||||
kconfig = Kconfig(args.src_kconfig, warn_to_stderr=False)
|
||||
kconfig.load_config(args.actual_config)
|
||||
|
||||
compare_configs(expected_options, kconfig, github_format=args.github_format)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue