Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
commit
f590097045
@ -146,6 +146,15 @@ endif
|
||||
|
||||
comment "Legacy options removed in 2019.05"
|
||||
|
||||
config BR2_CSKY_DSP
|
||||
bool "C-SKY DSP support removed"
|
||||
select BR2_LEGACY
|
||||
help
|
||||
C-SKY DSP instruction support for ck810 / ck807 was removed,
|
||||
as it was no longer supported in C-SKY gcc. Perhaps the VDSP
|
||||
instructions should be used instead, using the BR2_CSKY_VDSP
|
||||
option.
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR
|
||||
bool "compositor moved to gst1-plugins-base"
|
||||
select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_COMPOSITOR
|
||||
|
16
DEVELOPERS
16
DEVELOPERS
@ -1228,6 +1228,10 @@ F: package/python-xlib/
|
||||
N: Joshua Henderson <joshua.henderson@microchip.com>
|
||||
F: package/qt5/qt5wayland/
|
||||
|
||||
N: Jugurtha BELKALEM <jugurtha.belkalem@smile.fr>
|
||||
F: package/python-cycler/
|
||||
F: package/python-matplotlib/
|
||||
|
||||
N: Juha Rantanen <juha@codercoded.com>
|
||||
F: package/acsccid/
|
||||
|
||||
@ -1387,6 +1391,7 @@ F: package/easydbus/
|
||||
F: package/lua-flu/
|
||||
F: package/lua-stdlib/
|
||||
F: package/luaossl/
|
||||
F: package/murata-cyw-fw/
|
||||
F: package/rs485conf/
|
||||
F: package/turbolua/
|
||||
|
||||
@ -1616,6 +1621,8 @@ F: board/altera/socrates_cyclone5/
|
||||
F: board/pine64/rock64
|
||||
F: configs/rock64_defconfig
|
||||
F: configs/socrates_cyclone5_defconfig
|
||||
F: package/openrc/
|
||||
F: package/skeleton-init-openrc/
|
||||
|
||||
N: Michel Stempin <michel.stempin@wanadoo.fr>
|
||||
F: board/licheepi/
|
||||
@ -1746,8 +1753,10 @@ F: configs/sheevaplug_defconfig
|
||||
F: package/bats-core/
|
||||
F: package/docker-compose/
|
||||
F: package/dump1090/
|
||||
F: package/fatcat/
|
||||
F: package/flickcurl/
|
||||
F: package/fscryptctl/
|
||||
F: package/ifmetric/
|
||||
F: package/jo/
|
||||
F: package/jose/
|
||||
F: package/libfastjson/
|
||||
@ -1842,6 +1851,9 @@ F: package/kf5/
|
||||
N: Pierre Floury <pierre.floury@gmail.com>
|
||||
F: package/trace-cmd/
|
||||
|
||||
N: Pierre-Jean Texier <pjtexier@koncepto.io>
|
||||
F: package/libubootenv/
|
||||
|
||||
N: Pieter De Gendt <pieter.degendt@gmail.com>
|
||||
F: package/libvips/
|
||||
|
||||
@ -1939,6 +1951,7 @@ F: package/tk/
|
||||
F: package/upower/
|
||||
F: package/waffle/
|
||||
F: package/xenomai/
|
||||
F: package/zziplib/
|
||||
F: toolchain/toolchain-external/toolchain-external-arm-aarch64/
|
||||
F: toolchain/toolchain-external/toolchain-external-arm-aarch64-be/
|
||||
F: toolchain/toolchain-external/toolchain-external-arm-arm/
|
||||
@ -2223,6 +2236,9 @@ F: toolchain/
|
||||
N: Timo Ketola <timo.ketola@exertus.fi>
|
||||
F: package/fbgrab/
|
||||
|
||||
N: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||
F: package/redis/
|
||||
|
||||
N: Trent Piepho <tpiepho@impinj.com>
|
||||
F: package/libp11/
|
||||
|
||||
|
@ -77,7 +77,6 @@ config BR2_aarch64_be
|
||||
|
||||
config BR2_csky
|
||||
bool "csky"
|
||||
select BR2_ARCH_HAS_NO_TOOLCHAIN_BUILDROOT
|
||||
select BR2_ARCH_HAS_MMU_MANDATORY
|
||||
help
|
||||
csky is processor IP from china.
|
||||
|
@ -79,3 +79,6 @@ config BR2_ARC_PAGE_SIZE
|
||||
default "4K" if BR2_ARC_PAGE_SIZE_4K
|
||||
default "8K" if BR2_ARC_PAGE_SIZE_8K
|
||||
default "16K" if BR2_ARC_PAGE_SIZE_16K
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -866,3 +866,6 @@ config BR2_GCC_TARGET_MODE
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "ARM" if BR2_arm || BR2_armeb
|
||||
default "AArch64" if BR2_aarch64 || BR2_aarch64_be
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -13,19 +13,26 @@ config BR2_ck807
|
||||
config BR2_ck810
|
||||
bool "ck810"
|
||||
|
||||
config BR2_ck860
|
||||
bool "ck860"
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_CSKY_FPU
|
||||
bool "Enable FPU coprocessor"
|
||||
depends on BR2_ck810 || BR2_ck807
|
||||
depends on BR2_ck810 || BR2_ck807 || BR2_ck860
|
||||
help
|
||||
You can say N here if your C-SKY CPU doesn't have a
|
||||
Floating-Point Coprocessor or if you don't need FPU support
|
||||
for your user-space programs.
|
||||
|
||||
config BR2_CSKY_DSP
|
||||
bool "Enable DSP enhanced instructions"
|
||||
depends on BR2_ck810 || BR2_ck807
|
||||
config BR2_CSKY_VDSP
|
||||
bool "Enable VDSP enhanced instructions Co-processor"
|
||||
depends on BR2_CSKY_FPU
|
||||
|
||||
config BR2_GCC_TARGET_FLOAT_ABI
|
||||
default "soft" if !BR2_CSKY_FPU
|
||||
default "hard" if BR2_CSKY_FPU
|
||||
|
||||
config BR2_ARCH
|
||||
default "csky"
|
||||
@ -33,16 +40,8 @@ config BR2_ARCH
|
||||
config BR2_ENDIAN
|
||||
default "LITTLE"
|
||||
|
||||
config BR2_GCC_TARGET_CPU
|
||||
default "ck610" if (BR2_ck610 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
|
||||
default "ck807" if (BR2_ck807 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
|
||||
default "ck807e" if (BR2_ck807 && !BR2_CSKY_FPU && BR2_CSKY_DSP)
|
||||
default "ck807f" if (BR2_ck807 && BR2_CSKY_FPU && !BR2_CSKY_DSP)
|
||||
default "ck807ef" if (BR2_ck807 && BR2_CSKY_FPU && BR2_CSKY_DSP)
|
||||
default "ck810" if (BR2_ck810 && !BR2_CSKY_FPU && !BR2_CSKY_DSP)
|
||||
default "ck810e" if (BR2_ck810 && !BR2_CSKY_FPU && BR2_CSKY_DSP)
|
||||
default "ck810f" if (BR2_ck810 && BR2_CSKY_FPU && !BR2_CSKY_DSP)
|
||||
default "ck810ef" if (BR2_ck810 && BR2_CSKY_FPU && BR2_CSKY_DSP)
|
||||
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "CSKY"
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -38,3 +38,6 @@ config BR2_GCC_TARGET_CPU
|
||||
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "MC68000"
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -12,3 +12,6 @@ config BR2_READELF_ARCH_NAME
|
||||
config BR2_microblaze
|
||||
bool
|
||||
default y if BR2_microblazeel || BR2_microblazebe
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -271,3 +271,6 @@ config BR2_GCC_TARGET_ABI
|
||||
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "MIPS R3000"
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -6,3 +6,6 @@ config BR2_ENDIAN
|
||||
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "Altera Nios II"
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -6,3 +6,6 @@ config BR2_ENDIAN
|
||||
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "OpenRISC 1000"
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -208,3 +208,6 @@ config BR2_GCC_TARGET_CPU
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "PowerPC" if BR2_powerpc
|
||||
default "PowerPC64" if BR2_powerpc64 || BR2_powerpc64le
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -125,3 +125,6 @@ config BR2_GCC_TARGET_ABI
|
||||
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "RISC-V"
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -30,3 +30,6 @@ config BR2_ENDIAN
|
||||
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "Renesas / SuperH SH"
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -32,3 +32,6 @@ config BR2_GCC_TARGET_CPU
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "Sparc" if BR2_sparc
|
||||
default "Sparc v9" if BR2_sparc64
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -290,3 +290,6 @@ config BR2_GCC_TARGET_ARCH
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "Intel 80386" if BR2_i386
|
||||
default "Advanced Micro Devices X86-64" if BR2_x86_64
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
@ -50,3 +50,6 @@ config BR2_ARCH
|
||||
|
||||
config BR2_READELF_ARCH_NAME
|
||||
default "Tensilica Xtensa Processor"
|
||||
|
||||
# vim: ft=kconfig
|
||||
# -*- mode:kconfig; -*-
|
||||
|
26
arch/arch.mk.csky
Normal file
26
arch/arch.mk.csky
Normal file
@ -0,0 +1,26 @@
|
||||
#
|
||||
# Configure the GCC_TARGET_ARCH variable and append the
|
||||
# appropriate C-SKY ISA extensions.
|
||||
#
|
||||
|
||||
ifeq ($(BR2_csky),y)
|
||||
|
||||
ifeq ($(BR2_ck610),y)
|
||||
GCC_TARGET_CPU := ck610
|
||||
else ifeq ($(BR2_ck807),y)
|
||||
GCC_TARGET_CPU := ck807
|
||||
else ifeq ($(BR2_ck810),y)
|
||||
GCC_TARGET_CPU := ck810
|
||||
else ifeq ($(BR2_ck860),y)
|
||||
GCC_TARGET_CPU := ck860
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_CSKY_FPU),y)
|
||||
GCC_TARGET_CPU := $(GCC_TARGET_CPU)f
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_CSKY_VDSP),y)
|
||||
GCC_TARGET_CPU := $(GCC_TARGET_CPU)v
|
||||
endif
|
||||
|
||||
endif
|
@ -12,7 +12,7 @@ choice
|
||||
Select the specific Barebox version you want to use
|
||||
|
||||
config BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
bool "2019.04.0"
|
||||
bool "2019.05.0"
|
||||
|
||||
config BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
bool "Custom version"
|
||||
@ -40,7 +40,7 @@ endif
|
||||
|
||||
config BR2_TARGET_BAREBOX_VERSION
|
||||
string
|
||||
default "2019.04.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default "2019.05.0" if BR2_TARGET_BAREBOX_LATEST_VERSION
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_VERSION_VALUE if BR2_TARGET_BAREBOX_CUSTOM_VERSION
|
||||
default "custom" if BR2_TARGET_BAREBOX_CUSTOM_TARBALL
|
||||
default BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION if BR2_TARGET_BAREBOX_CUSTOM_GIT
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://www.barebox.org/download/barebox-2019.04.0.tar.bz2.md5
|
||||
md5 2d9619dfe6aaaf3b10d6327486e18571 barebox-2019.04.0.tar.bz2
|
||||
# From https://www.barebox.org/download/barebox-2019.05.0.tar.bz2.md5
|
||||
md5 2e721cce90f1ea1492710ca23680311f barebox-2019.05.0.tar.bz2
|
||||
|
||||
# Locally calculated
|
||||
sha256 d2834b612228b82bbaa713b26dec1fa770123bb02727400e4c56f6f2bffb01cc barebox-2019.04.0.tar.bz2
|
||||
sha256 704bb09b2bf1347e43ebb9138da32a7e1b4d13892fd187be98f4f9dae000501d barebox-2019.05.0.tar.bz2
|
||||
|
@ -1,4 +0,0 @@
|
||||
# From https://github.com/OP-TEE/optee_os/archive/3.4.0.tar.gz
|
||||
sha256 51d42ac7aa780ec8d8ee471eff689a29a7621aacace046722b1490b62ec2d481 optee-os-3.4.0.tar.gz
|
||||
# Locally computed
|
||||
sha256 fda8385993f112d7ca61b88b54ba5b4cbeec7e43a0f9b317d5186703c1985e8f LICENSE
|
@ -18,7 +18,7 @@ choice
|
||||
Select the version of OP-TEE OS you want to use
|
||||
|
||||
config BR2_TARGET_OPTEE_OS_LATEST
|
||||
bool "3.4.0"
|
||||
bool "3.5.0"
|
||||
help
|
||||
Use the latest release tag from the OP-TEE OS official Git
|
||||
repository.
|
||||
@ -50,7 +50,7 @@ endif
|
||||
|
||||
config BR2_TARGET_OPTEE_OS_VERSION
|
||||
string
|
||||
default "3.4.0" if BR2_TARGET_OPTEE_OS_LATEST
|
||||
default "3.5.0" if BR2_TARGET_OPTEE_OS_LATEST
|
||||
default BR2_TARGET_OPTEE_OS_CUSTOM_REPO_VERSION \
|
||||
if BR2_TARGET_OPTEE_OS_CUSTOM_GIT
|
||||
|
||||
|
4
boot/optee-os/optee-os.hash
Normal file
4
boot/optee-os/optee-os.hash
Normal file
@ -0,0 +1,4 @@
|
||||
# From https://github.com/OP-TEE/optee_os/archive/3.5.0.tar.gz
|
||||
sha256 a02fe8e7fdee9653e9207059071735a839b1255fdaf311a2a6cfd185a4cee6a2 optee-os-3.5.0.tar.gz
|
||||
# Locally computed
|
||||
sha256 1247ee90858f4037b6cac63cbffddfed435d0d73c631b37d78c1e6e6ab3e5d1a LICENSE
|
@ -22,7 +22,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/lemaker/bananapro/post-image.sh"
|
||||
# Kernel
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.91"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.14.116"
|
||||
BR2_LINUX_KERNEL_USE_DEFCONFIG=y
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="sunxi"
|
||||
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/lemaker/bananapro/linux-wifi.fragment"
|
||||
@ -39,7 +39,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.11"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="Bananapro"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
|
||||
|
@ -1,11 +1,11 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a8=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y
|
||||
BR2_SYSTEM_DHCP="eth0"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/chiliboard/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.1"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="omap2plus"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="am335x-chiliboard"
|
||||
@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="chiliboard"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMG=y
|
||||
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
|
||||
|
@ -1,11 +1,11 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a7=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_16=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_1=y
|
||||
BR2_SYSTEM_DHCP="eth0"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/grinn/liteboard/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.16.2"
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.1.1"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="imx_v6_v7"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx6ul-liteboard"
|
||||
@ -15,7 +15,7 @@ BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.03"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.04"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="liteboard"
|
||||
BR2_TARGET_UBOOT_FORMAT_IMG=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
|
@ -536,12 +536,13 @@ different steps of the build process.
|
||||
should utilize this step if it has binaries which would be similar
|
||||
to the kernel image, bootloader or root filesystem images.
|
||||
|
||||
* +LIBFOO_INSTALL_INIT_SYSV+ and +LIBFOO_INSTALL_INIT_SYSTEMD+ list the
|
||||
actions to install init scripts either for the systemV-like init systems
|
||||
(busybox, sysvinit, etc.) or for the systemd units. These commands
|
||||
will be run only when the relevant init system is installed (i.e. if
|
||||
systemd is selected as the init system in the configuration, only
|
||||
+LIBFOO_INSTALL_INIT_SYSTEMD+ will be run).
|
||||
* +LIBFOO_INSTALL_INIT_SYSV+, +LIBFOO_INSTALL_INIT_OPENRC+ and
|
||||
+LIBFOO_INSTALL_INIT_SYSTEMD+ list the actions to install init
|
||||
scripts either for the systemV-like init systems (busybox,
|
||||
sysvinit, etc.), openrc or for the systemd units. These commands
|
||||
will be run only when the relevant init system is installed (i.e.
|
||||
if systemd is selected as the init system in the configuration,
|
||||
only +LIBFOO_INSTALL_INIT_SYSTEMD+ will be run).
|
||||
|
||||
* +LIBFOO_HELP_CMDS+ lists the actions to print the package help, which
|
||||
is included to the main +make help+ output. These commands can print
|
||||
|
@ -22,18 +22,21 @@ config BR2_LINUX_KERNEL_EXT_XENOMAI
|
||||
|
||||
However, it is recommended to use the latest version of the
|
||||
Adeos/Ipipe patch available at
|
||||
http://download.gna.org/adeos/patches
|
||||
https://xenomai.org/downloads/ipipe/
|
||||
|
||||
Xenomai is know to support Blackfin, SH4, x86, ARM, NIOS2
|
||||
and PowerPC architectures.
|
||||
|
||||
config BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH
|
||||
string "Path for Adeos patch file"
|
||||
string "Path/URL for Adeos patch file"
|
||||
depends on BR2_LINUX_KERNEL_EXT_XENOMAI
|
||||
help
|
||||
Optionally, explicitly specify the Adeos patch to use.
|
||||
Download it at http://download.gna.org/adeos/patches
|
||||
and verify that your kernel version in buildroot matches.
|
||||
Optionally, explicitly specify where to find the Adeos
|
||||
patch to use.
|
||||
Examples:
|
||||
https://xenomai.org/downloads/ipipe/v4.x/arm/ipipe-core-4.19.33-arm-2.patch
|
||||
or /home/foo/ipipe-core-4.19.33-arm-2.patch
|
||||
Please verify that your kernel version in Buildroot matches.
|
||||
|
||||
comment "xenomai needs a uClibc or glibc toolchain w/ threads"
|
||||
depends on BR2_PACKAGE_XENOMAI_COBALT_ARCH_SUPPORTS
|
||||
|
@ -8,10 +8,20 @@ LINUX_EXTENSIONS += xenomai
|
||||
|
||||
# Adeos patch version
|
||||
XENOMAI_ADEOS_PATCH = $(call qstrip,$(BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH))
|
||||
|
||||
ifneq ($(filter ftp://% http://% https://%,$(XENOMAI_ADEOS_PATCH)),)
|
||||
XENOMAI_ADEOS_PATCH_NAME = $(notdir $(XENOMAI_ADEOS_PATCH))
|
||||
XENOMAI_ADEOS_PATCH_PATH = $(LINUX_DL_DIR)/$(XENOMAI_ADEOS_PATCH_NAME)
|
||||
LINUX_EXTRA_DOWNLOADS += $(XENOMAI_ADEOS_PATCH)
|
||||
BR_NO_CHECK_HASH_FOR += $(XENOMAI_ADEOS_PATCH_NAME)
|
||||
else
|
||||
XENOMAI_ADEOS_PATCH_PATH = $(XENOMAI_ADEOS_PATCH)
|
||||
endif
|
||||
|
||||
ifeq ($(XENOMAI_ADEOS_PATCH),)
|
||||
XENOMAI_ADEOS_OPTS = --default
|
||||
else
|
||||
XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH)
|
||||
XENOMAI_ADEOS_OPTS = --adeos=$(XENOMAI_ADEOS_PATCH_PATH)
|
||||
endif
|
||||
|
||||
# Prepare kernel patch
|
||||
|
@ -5,6 +5,7 @@ menu "Target packages"
|
||||
source "package/skeleton-custom/Config.in"
|
||||
source "package/skeleton-init-common/Config.in"
|
||||
source "package/skeleton-init-none/Config.in"
|
||||
source "package/skeleton-init-openrc/Config.in"
|
||||
source "package/skeleton-init-systemd/Config.in"
|
||||
source "package/skeleton-init-sysv/Config.in"
|
||||
|
||||
@ -382,6 +383,7 @@ menu "Firmware"
|
||||
source "package/armbian-firmware/Config.in"
|
||||
source "package/b43-firmware/Config.in"
|
||||
source "package/linux-firmware/Config.in"
|
||||
source "package/murata-cyw-fw/Config.in"
|
||||
source "package/rpi-bt-firmware/Config.in"
|
||||
source "package/rpi-firmware/Config.in"
|
||||
source "package/rpi-wifi-firmware/Config.in"
|
||||
@ -458,6 +460,7 @@ endmenu
|
||||
source "package/iucode-tool/Config.in"
|
||||
source "package/kbd/Config.in"
|
||||
source "package/lcdproc/Config.in"
|
||||
source "package/libubootenv/Config.in"
|
||||
source "package/libuio/Config.in"
|
||||
source "package/linuxconsoletools/Config.in"
|
||||
source "package/linux-backports/Config.in"
|
||||
@ -859,6 +862,7 @@ menu "External python modules"
|
||||
source "package/python-cryptography/Config.in"
|
||||
source "package/python-cssselect/Config.in"
|
||||
source "package/python-cssutils/Config.in"
|
||||
source "package/python-cycler/Config.in"
|
||||
source "package/python-daemon/Config.in"
|
||||
source "package/python-daemonize/Config.in"
|
||||
source "package/python-dataproperty/Config.in"
|
||||
@ -931,6 +935,7 @@ menu "External python modules"
|
||||
source "package/python-markdown/Config.in"
|
||||
source "package/python-markdown2/Config.in"
|
||||
source "package/python-markupsafe/Config.in"
|
||||
source "package/python-matplotlib/Config.in"
|
||||
source "package/python-mbstrdecoder/Config.in"
|
||||
source "package/python-meld3/Config.in"
|
||||
source "package/python-mimeparse/Config.in"
|
||||
@ -1184,6 +1189,7 @@ menu "Compression and decompression"
|
||||
source "package/snappy/Config.in"
|
||||
source "package/szip/Config.in"
|
||||
source "package/zlib/Config.in"
|
||||
source "package/zziplib/Config.in"
|
||||
endmenu
|
||||
|
||||
menu "Crypto"
|
||||
@ -1903,6 +1909,7 @@ menu "Networking applications"
|
||||
source "package/ibrdtn-tools/Config.in"
|
||||
source "package/ibrdtnd/Config.in"
|
||||
source "package/ifenslave/Config.in"
|
||||
source "package/ifmetric/Config.in"
|
||||
source "package/ifplugd/Config.in"
|
||||
source "package/iftop/Config.in"
|
||||
source "package/ifupdown/Config.in"
|
||||
@ -2194,6 +2201,7 @@ menu "System tools"
|
||||
source "package/ncdu/Config.in"
|
||||
source "package/numactl/Config.in"
|
||||
source "package/nut/Config.in"
|
||||
source "package/openrc/Config.in"
|
||||
source "package/openvmtools/Config.in"
|
||||
source "package/pamtester/Config.in"
|
||||
source "package/polkit/Config.in"
|
||||
|
@ -18,6 +18,7 @@ menu "Host utilities"
|
||||
source "package/e2tools/Config.in.host"
|
||||
source "package/f2fs-tools/Config.in.host"
|
||||
source "package/faketime/Config.in.host"
|
||||
source "package/fatcat/Config.in.host"
|
||||
source "package/fwup/Config.in.host"
|
||||
source "package/genext2fs/Config.in.host"
|
||||
source "package/genimage/Config.in.host"
|
||||
|
@ -70,6 +70,15 @@ ABI := $(ABI)hf
|
||||
endif
|
||||
endif
|
||||
|
||||
# For C-SKY abiv1 & abiv2
|
||||
ifeq ($(BR2_csky),y)
|
||||
ifeq ($(BR2_ck610),y)
|
||||
ABI = abiv1
|
||||
else
|
||||
ABI = abiv2
|
||||
endif
|
||||
endif
|
||||
|
||||
# For FSL PowerPC there's SPE
|
||||
ifeq ($(BR2_powerpc_SPE),y)
|
||||
ABI = spe
|
||||
|
@ -1,2 +1,6 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 06be9865c6f418d851ff4494e12406568353b891ffe1f596b34693c387af26c7 acl-2.2.53.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 a45a845012742796534f7e91fe623262ccfb99460a2bd04015bd28d66fba95b8 doc/COPYING
|
||||
sha256 01b1f9f2c8ee648a7a596a1abe8aa4ed7899b1c9e5551bda06da6e422b04aa55 doc/COPYING.LGPL
|
||||
|
@ -1,49 +0,0 @@
|
||||
From 2aba563bd077fda94fb9c2c33002ee0ac119b345 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
|
||||
Date: Fri, 13 Apr 2018 09:13:46 +0200
|
||||
Subject: [PATCH] alsa-lib: conditionally enable libdl in AM_PATH_ALSA m4 macro
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This
|
||||
breaks compilation of alsa-utils (and probably other packages using this
|
||||
macro) for targets that do not support dynamic loading, such as for
|
||||
Blackfin FLAT binaries.
|
||||
|
||||
This patch updates the macro to check if dlopen is available, and use that
|
||||
result to conditionally add -ldl to the list of libraries.
|
||||
|
||||
Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com>
|
||||
[Jörg: update for 1.1.6]
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141377.html
|
||||
---
|
||||
utils/alsa.m4 | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/utils/alsa.m4 b/utils/alsa.m4
|
||||
index e12310df..a5c5a292 100644
|
||||
--- a/utils/alsa.m4
|
||||
+++ b/utils/alsa.m4
|
||||
@@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then
|
||||
fi
|
||||
AC_MSG_RESULT($ALSA_CFLAGS)
|
||||
|
||||
+AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")])
|
||||
+
|
||||
dnl add any special lib dirs
|
||||
AC_MSG_CHECKING(for ALSA LDFLAGS)
|
||||
if test "$alsa_prefix" != "" ; then
|
||||
@@ -52,7 +54,7 @@ if test "$alsa_prefix" != "" ; then
|
||||
fi
|
||||
|
||||
dnl add the alsa library
|
||||
-ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread"
|
||||
+ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread"
|
||||
LIBS="$ALSA_LIBS $LIBS"
|
||||
AC_MSG_RESULT($ALSA_LIBS)
|
||||
|
||||
--
|
||||
2.14.3
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 9d6000b882a3b2df56300521225d69717be6741b71269e488bb20a20783bdc09 alsa-lib-1.1.7.tar.bz2
|
||||
sha256 488373aef5396682f3a411a6d064ae0ad196b9c96269d0bb912fbdeec94b994b alsa-lib-1.1.9.tar.bz2
|
||||
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
|
||||
sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_LIB_VERSION = 1.1.7
|
||||
ALSA_LIB_VERSION = 1.1.9
|
||||
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
|
||||
ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib
|
||||
ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)
|
||||
|
@ -1,2 +1,6 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 5ead72b358ec709ed00bbf7a9eaef1654baad937c001c044fe8b74c57f5324e7 attr-2.4.48.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 98f318493be6b08bff3cd295791cde06c54e17882a3c74a1ed245eaa02533d52 doc/COPYING
|
||||
sha256 5decad7e58d90d44335bf2f45ce27563bd911065c6a1a02dfa7647c4efee75c8 doc/COPYING.LGPL
|
||||
|
@ -7,28 +7,38 @@ config BR2_PACKAGE_HOST_BINUTILS_SUPPORTS_CFI
|
||||
|
||||
choice
|
||||
prompt "Binutils Version"
|
||||
default BR2_BINUTILS_VERSION_2_31_X if !BR2_arc
|
||||
default BR2_BINUTILS_VERSION_2_31_X if !BR2_arc && !BR2_csky
|
||||
default BR2_BINUTILS_VERSION_ARC if BR2_arc
|
||||
default BR2_BINUTILS_VERSION_CSKY if BR2_csky
|
||||
help
|
||||
Select the version of binutils you wish to use.
|
||||
|
||||
config BR2_BINUTILS_VERSION_2_30_X
|
||||
bool "binutils 2.30"
|
||||
depends on !BR2_csky
|
||||
|
||||
config BR2_BINUTILS_VERSION_2_31_X
|
||||
bool "binutils 2.31.1"
|
||||
depends on !BR2_csky
|
||||
|
||||
config BR2_BINUTILS_VERSION_2_32_X
|
||||
bool "binutils 2.32"
|
||||
depends on !BR2_csky
|
||||
|
||||
config BR2_BINUTILS_VERSION_ARC
|
||||
bool "binutils arc (2.31)"
|
||||
depends on BR2_arc
|
||||
|
||||
config BR2_BINUTILS_VERSION_CSKY
|
||||
bool "binutils csky"
|
||||
depends on BR2_csky
|
||||
|
||||
endchoice
|
||||
|
||||
config BR2_BINUTILS_VERSION
|
||||
string
|
||||
default "arc-2018.09-release" if BR2_BINUTILS_VERSION_ARC
|
||||
default "arc-2019.03-rc1" if BR2_BINUTILS_VERSION_ARC
|
||||
default "c66d8bbcebfddf713b2b436e1b135e6b125a55a5" if BR2_BINUTILS_VERSION_CSKY
|
||||
default "2.30" if BR2_BINUTILS_VERSION_2_30_X
|
||||
default "2.31.1" if BR2_BINUTILS_VERSION_2_31_X
|
||||
default "2.32" if BR2_BINUTILS_VERSION_2_32_X
|
||||
|
@ -4,4 +4,7 @@ sha512 0fca326feb1d5f5fe505a827b20237fe3ec9c13eaf7ec7e35847fd71184f605ba1cefe13
|
||||
sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 a96dfcea6064fcd1aac1333ac0d631491bed8b0be9bdcf62f1447909c8f30d2cb8d9323ffeb7c9ad6b326ecddb72e3d28281684e73343189d0a4a37a11aef62f binutils-gdb-arc-2018.09-release.tar.gz
|
||||
sha512 ceb0546cb73a29526f2f8916d855fbed52b2fc86b6706687cabf57b96df06932714820edec2f9038529790e7925304778ded0944babc985a39371eb08c6c7f52 binutils-gdb-arc-2019.03-rc1.tar.gz
|
||||
|
||||
# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb)
|
||||
sha512 979552d4b3a4f31e9f3b9a7027321bd4eb3ac6c2d8deac1720e94e54f81d736db09c53c5d87c301010e307b64127e14400a036c7a35e5d63a954a4edd9cc8e2c binutils-c66d8bbcebfddf713b2b436e1b135e6b125a55a5.tar.gz
|
||||
|
@ -9,17 +9,24 @@
|
||||
BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION))
|
||||
ifeq ($(BINUTILS_VERSION),)
|
||||
ifeq ($(BR2_arc),y)
|
||||
BINUTILS_VERSION = arc-2018.09-release
|
||||
BINUTILS_VERSION = arc-2019.03-rc1
|
||||
else
|
||||
BINUTILS_VERSION = 2.31.1
|
||||
endif
|
||||
endif # BINUTILS_VERSION
|
||||
|
||||
ifeq ($(BINUTILS_VERSION),arc-2018.09-release)
|
||||
ifeq ($(BINUTILS_VERSION),arc-2019.03-rc1)
|
||||
BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION))
|
||||
BINUTILS_SOURCE = binutils-gdb-$(BINUTILS_VERSION).tar.gz
|
||||
BINUTILS_FROM_GIT = y
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_csky),y)
|
||||
BINUTILS_SITE = $(call github,c-sky,binutils-gdb,$(BINUTILS_VERSION))
|
||||
BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz
|
||||
BINUTILS_FROM_GIT = y
|
||||
endif
|
||||
|
||||
BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils
|
||||
BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.xz
|
||||
BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS))
|
||||
|
@ -42,6 +42,7 @@ config BR2_PACKAGE_BUSYBOX_SELINUX
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on !BR2_arc
|
||||
select BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES
|
||||
select BR2_PACKAGE_LIBSELINUX
|
||||
help
|
||||
Enable SELinux support in BusyBox. Please note that
|
||||
|
@ -1,2 +1,6 @@
|
||||
# From http://www.bzip.org/downloads.html
|
||||
md5 00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd bzip2-1.0.6.tar.gz
|
||||
sha256 4919cfb14a73cd64fcef67b107613970cf1659a09aa675dba31314f373bc7204 LICENSE
|
||||
|
@ -1,2 +1,5 @@
|
||||
# From http://www.cmake.org/files/v3.8/cmake-3.8.2-SHA-256.txt
|
||||
sha256 da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d cmake-3.8.2.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 af3030e1bf1af2f534430fdfe3cfc5a617966648a2a7f0c06a631adc92be1e5f Copyright.txt
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally generated
|
||||
sha256 a6abadb78395226bac2e1dd5467feab2cc8c493eab6894a09a51a8e072e38c06 cog-v0.2.0.tar.gz
|
||||
sha256 755c68029bbd05a17784262e56021362740783d15868dab9402a125ef35eedaf cog-v0.3.0.tar.gz
|
||||
|
||||
# Hashes for license files:
|
||||
sha256 e6c42d93c68b292bcccf6d2ec3e13da85df90b718ba27c2c2a01053a9d009252 COPYING
|
||||
|
@ -4,8 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
COG_VERSION = v0.2.0
|
||||
COG_VERSION = v0.3.0
|
||||
COG_SITE = $(call github,Igalia,cog,$(COG_VERSION))
|
||||
COG_INSTALL_STAGING = YES
|
||||
COG_DEPENDENCIES = dbus wpewebkit wpebackend-fdo
|
||||
COG_LICENSE = MIT
|
||||
COG_LICENSE_FILES = COPYING
|
||||
|
@ -1,4 +1,4 @@
|
||||
# From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc
|
||||
sha256 c789db41cc443fa41e661217ea321492ad59a004bebcd1aa013f3bc10a6e0074 connman-1.36.tar.xz
|
||||
sha256 6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16 connman-1.37.tar.xz
|
||||
# Locally computed
|
||||
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CONNMAN_VERSION = 1.36
|
||||
CONNMAN_VERSION = 1.37
|
||||
CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
|
||||
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
|
||||
CONNMAN_DEPENDENCIES = libglib2 dbus iptables
|
||||
|
@ -1,79 +0,0 @@
|
||||
From 6b0747c1630dd973acd138f927dbded4ea45e360 Mon Sep 17 00:00:00 2001
|
||||
From: Olivier Schonken <olivier.schonken@gmail.com>
|
||||
Date: Fri, 5 Oct 2018 12:05:31 +0200
|
||||
Subject: [PATCH] Poppler removed memCheck and gMemReport functions
|
||||
|
||||
Only use gMemReport and memCheck functions if poppler version less
|
||||
than 0.69.0
|
||||
|
||||
The poppler project removed the memCheck and gMemReport functions in
|
||||
commits c362ab1b97f20c5b73b3bad8d52015f679178748 - Remove DEBUG_MEM
|
||||
from Object since this uses RAII now and hence cannot leak.
|
||||
(The existing tracking also is not thread-safe and hence unreliable.)
|
||||
|
||||
and
|
||||
|
||||
f89446f6917a869b0f1a80fcc8ce81a7213dade4 - Remove generic heap debugging
|
||||
from gmem since external tools and compiler instrumentation achieve the
|
||||
same effect.
|
||||
|
||||
This commit solves https://github.com/OpenPrinting/cups-filters/issues/62
|
||||
|
||||
Signed-off-by: Olivier Schonken <olivier.schonken@gmail.com>
|
||||
---
|
||||
filter/pdftoijs.cxx | 2 ++
|
||||
filter/pdftoopvp/pdftoopvp.cxx | 2 ++
|
||||
filter/pdftoraster.cxx | 2 ++
|
||||
3 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/filter/pdftoijs.cxx b/filter/pdftoijs.cxx
|
||||
index 22bc33f4..dd6b6fa0 100644
|
||||
--- a/filter/pdftoijs.cxx
|
||||
+++ b/filter/pdftoijs.cxx
|
||||
@@ -503,9 +503,11 @@ err1:
|
||||
ppdClose(ppd);
|
||||
free(outputfile);
|
||||
|
||||
+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
|
||||
// Check for memory leaks
|
||||
Object::memCheck(stderr);
|
||||
gMemReport(stderr);
|
||||
+#endif
|
||||
|
||||
return exitCode;
|
||||
}
|
||||
diff --git a/filter/pdftoopvp/pdftoopvp.cxx b/filter/pdftoopvp/pdftoopvp.cxx
|
||||
index 024941ab..bf25983b 100644
|
||||
--- a/filter/pdftoopvp/pdftoopvp.cxx
|
||||
+++ b/filter/pdftoopvp/pdftoopvp.cxx
|
||||
@@ -763,9 +763,11 @@ err2:
|
||||
err0:
|
||||
delete globalParams;
|
||||
|
||||
+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
|
||||
// check for memory leaks
|
||||
Object::memCheck(stderr);
|
||||
gMemReport(stderr);
|
||||
+#endif
|
||||
|
||||
}
|
||||
/* muntrace(); */
|
||||
diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx
|
||||
index 0c63ab8d..4ebf02b0 100644
|
||||
--- a/filter/pdftoraster.cxx
|
||||
+++ b/filter/pdftoraster.cxx
|
||||
@@ -2162,9 +2162,11 @@ err1:
|
||||
cmsDeleteTransform(colorTransform);
|
||||
}
|
||||
|
||||
+#if POPPLER_VERSION_MAJOR == 0 && POPPLER_VERSION_MINOR < 69
|
||||
// Check for memory leaks
|
||||
Object::memCheck(stderr);
|
||||
gMemReport(stderr);
|
||||
+#endif
|
||||
|
||||
return exitCode;
|
||||
}
|
||||
--
|
||||
2.17.1
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 981b280bc5275a21c6f436aff6207e03cab36dc304c119bbac507db940e7421c cups-filters-1.21.3.tar.gz
|
||||
sha256 3c03ab7dbfe3642b6cd279a0b63edc8274b7d9740cb087f68d3186c9144988a6 cups-filters-1.23.0.tar.gz
|
||||
sha256 8e697cf4681ebbca716bf8cc30dde51c264e32ceee41fa63ceb5213334204b83 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CUPS_FILTERS_VERSION = 1.21.3
|
||||
CUPS_FILTERS_VERSION = 1.23.0
|
||||
CUPS_FILTERS_SITE = http://openprinting.org/download/cups-filters
|
||||
CUPS_FILTERS_LICENSE = GPL-2.0, GPL-2.0+, GPL-3.0, GPL-3.0+, LGPL-2, LGPL-2.1+, MIT, BSD-4-Clause
|
||||
CUPS_FILTERS_LICENSE_FILES = COPYING
|
||||
|
@ -1,2 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 7ce4760cf66c69148f6bd6c92feaabb8812dee30846b24cd0f7395c436d7e825 dbus-glib-0.110.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 ef1634fc21d9112dca08f2557313584719d534d05213cf14f3c77938506266b4 COPYING
|
||||
|
@ -1,2 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f dbus-python-1.2.8.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 1e4562245383fdb5203b1769789e5b28bba21af4923aea7e8b2614f7f93623c0 COPYING
|
||||
|
@ -1,4 +1,4 @@
|
||||
# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-7.0.3.tar.xz.distinfo.asc
|
||||
sha256 a255d9aecceb1c77a9862f1c0d31a48ba37aab5ef2ca5ad76fc7a907b6ea292e dhcpcd-7.0.3.tar.xz
|
||||
# sha256 from ftp://roy.marples.name/pub/dhcpcd/dhcpcd-7.2.2.tar.xz.distinfo
|
||||
sha256 3db7ff18cba9274da1d2176fb3c7cbe23926a8e58d5c8e244ad55c62d38ba09e dhcpcd-7.2.2.tar.xz
|
||||
# Locally calculated
|
||||
sha256 b120a64b92cfb2453b61df4457a3c0eb163ef9c1c397822826756a31581f3947 LICENSE
|
||||
sha256 213fc1a704cecdb322276fa7c95891fd1c23137d9ab572af1fc5e91b48762303 LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DHCPCD_VERSION = 7.0.3
|
||||
DHCPCD_VERSION = 7.2.2
|
||||
DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz
|
||||
DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd
|
||||
DHCPCD_DEPENDENCIES = host-pkgconf
|
||||
|
@ -1,20 +0,0 @@
|
||||
From 98723b7da9467a49222b8a7ffaae276c5bc075c1 Mon Sep 17 00:00:00 2001
|
||||
From: gizmocuz <gizmocuz@users.noreply.github.com>
|
||||
Date: Thu, 28 Jun 2018 08:00:58 +0200
|
||||
Subject: [PATCH] Bumped version
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from https://github.com/domoticz/domoticz/commit/98723b7da9467a49222b8a7ffaae276c5bc075c1]
|
||||
---
|
||||
appversion.default | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/appversion.default b/appversion.default
|
||||
index beaa069bb..7d3530590 100644
|
||||
--- a/appversion.default
|
||||
+++ b/appversion.default
|
||||
@@ -1,3 +1,3 @@
|
||||
-#define APPVERSION 5876
|
||||
+#define APPVERSION 9700
|
||||
#define APPHASH "b97777b"
|
||||
#define APPDATE 1478691222
|
@ -0,0 +1,23 @@
|
||||
From 4d8bbaf4bdffe4fa77a060cd7fa848f3001d46a8 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 21 May 2019 21:08:13 +0200
|
||||
Subject: [PATCH] appversion.default: bump version to 10717
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/domoticz/domoticz/pull/3251]
|
||||
---
|
||||
appversion.default | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/appversion.default b/appversion.default
|
||||
index 7d3530590..6fc5766c2 100644
|
||||
--- a/appversion.default
|
||||
+++ b/appversion.default
|
||||
@@ -1,3 +1,3 @@
|
||||
-#define APPVERSION 9700
|
||||
+#define APPVERSION 10717
|
||||
#define APPHASH "b97777b"
|
||||
#define APPDATE 1478691222
|
||||
--
|
||||
2.20.1
|
||||
|
@ -1,40 +0,0 @@
|
||||
From 4b77662232c806b8aba7680405144ad51ac3671b Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 29 Nov 2018 00:36:00 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: fix build with python and cmake <= 3.7
|
||||
|
||||
domoticz will fail to build with python and older cmake
|
||||
Indeed, find_package(PythonLibs 3.4) will not recognize python 3.7 until
|
||||
cmake 3.7 and the following commit:
|
||||
https://github.com/Kitware/CMake/commit/c31573b9641e0f1bc7a34149506db51f3494323b
|
||||
|
||||
To fix this, add a call to find_package(PythonInterp 3.4). Indeed, if
|
||||
FindPythonInterp has already found the major and minor version, that
|
||||
version will be inserted between the user supplied versions and the
|
||||
stock version list since cmake in version 3.1 and
|
||||
https://github.com/Kitware/CMake/commit/3816cd2dc7a7cc220e4f1b1e87fee986545b9cb3
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/8e82501a7b49da628ec026132ffca44c0c813040
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/domoticz/domoticz/pull/2889]
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index f4e38b88..41003a0c 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -125,6 +125,7 @@ ENDIF(USE_BUILTIN_SQLITE)
|
||||
|
||||
option(USE_PYTHON "Use Python for Plugins and Event-Scripts" YES)
|
||||
IF(USE_PYTHON)
|
||||
+ find_package(PythonInterp 3.4)
|
||||
find_package(PythonLibs 3.4)
|
||||
IF(PYTHONLIBS_FOUND)
|
||||
MESSAGE(STATUS "Python3 includes found at: ${PYTHON_INCLUDE_PATH}")
|
||||
--
|
||||
2.14.1
|
||||
|
@ -1,74 +0,0 @@
|
||||
From 9d226dab339f5767ec01ea1bcc9043ceee185cca Mon Sep 17 00:00:00 2001
|
||||
From: Rob Peters <info@domoticz.com>
|
||||
Date: Mon, 25 Mar 2019 08:50:23 +0100
|
||||
Subject: [PATCH] Fix for boot 1.70 get_io_service, fixed #3117
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/domoticz/domoticz/commit/9d226dab339f5767ec01ea1bcc9043ceee185cca]
|
||||
---
|
||||
hardware/Pinger.cpp | 10 ++++++++--
|
||||
hardware/TCPProxy/tcpproxy_server.cpp | 8 +++++++-
|
||||
2 files changed, 15 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/hardware/Pinger.cpp b/hardware/Pinger.cpp
|
||||
index 01a955ba4..184378738 100644
|
||||
--- a/hardware/Pinger.cpp
|
||||
+++ b/hardware/Pinger.cpp
|
||||
@@ -18,6 +18,12 @@
|
||||
|
||||
#include <iostream>
|
||||
|
||||
+#if BOOST_VERSION >= 107000
|
||||
+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
|
||||
+#else
|
||||
+#define GET_IO_SERVICE(s) ((s).get_io_service())
|
||||
+#endif
|
||||
+
|
||||
class pinger
|
||||
: private domoticz::noncopyable
|
||||
{
|
||||
@@ -76,7 +82,7 @@ class pinger
|
||||
num_tries_++;
|
||||
if (num_tries_ > 4)
|
||||
{
|
||||
- resolver_.get_io_service().stop();
|
||||
+ GET_IO_SERVICE(resolver_).stop();
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -118,7 +124,7 @@ class pinger
|
||||
if (num_replies_++ == 0)
|
||||
timer_.cancel();
|
||||
m_PingState = true;
|
||||
- resolver_.get_io_service().stop();
|
||||
+ GET_IO_SERVICE(resolver_).stop();
|
||||
}
|
||||
else
|
||||
{
|
||||
diff --git a/hardware/TCPProxy/tcpproxy_server.cpp b/hardware/TCPProxy/tcpproxy_server.cpp
|
||||
index fddac08de..60445d9c2 100644
|
||||
--- a/hardware/TCPProxy/tcpproxy_server.cpp
|
||||
+++ b/hardware/TCPProxy/tcpproxy_server.cpp
|
||||
@@ -15,6 +15,12 @@
|
||||
#include "stdafx.h"
|
||||
#include "tcpproxy_server.h"
|
||||
|
||||
+#if BOOST_VERSION >= 107000
|
||||
+#define GET_IO_SERVICE(s) ((boost::asio::io_context&)(s).get_executor().context())
|
||||
+#else
|
||||
+#define GET_IO_SERVICE(s) ((s).get_io_service())
|
||||
+#endif
|
||||
+
|
||||
namespace tcp_proxy
|
||||
{
|
||||
bridge::bridge(boost::asio::io_service& ios)
|
||||
@@ -38,7 +44,7 @@ namespace tcp_proxy
|
||||
boost::asio::ip::tcp::endpoint end;
|
||||
|
||||
|
||||
- boost::asio::io_service &ios=downstream_socket_.get_io_service();
|
||||
+ boost::asio::io_service &ios= GET_IO_SERVICE(downstream_socket_);
|
||||
boost::asio::ip::tcp::resolver resolver(ios);
|
||||
boost::asio::ip::tcp::resolver::query query(upstream_host, upstream_port, boost::asio::ip::resolver_query_base::numeric_service);
|
||||
boost::asio::ip::tcp::resolver::iterator i = resolver.resolve(query);
|
@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 c31f185a1ffac01b86a77bf33e059a4403d814e826c9d6639c63c2e9afa55a46 domoticz-4.9700.tar.gz
|
||||
sha256 c053a2161942529f56b748945ec297dcd67f449e68029fc886893a528891ad86 domoticz-4.10717.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DOMOTICZ_VERSION = 4.9700
|
||||
DOMOTICZ_VERSION = 4.10717
|
||||
DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
|
||||
DOMOTICZ_LICENSE = GPL-3.0
|
||||
DOMOTICZ_LICENSE_FILES = License.txt
|
||||
|
@ -66,4 +66,11 @@ config BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO
|
||||
DSA public keys
|
||||
Diffie-Hellman Group1 key exchange
|
||||
|
||||
config BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE
|
||||
string "path to custom localoptions.h definitions file"
|
||||
help
|
||||
Path to a file whose contents will be appended to Dropbear
|
||||
localoptions.h. It can be used to tweak the Dropbear
|
||||
configuration.
|
||||
|
||||
endif
|
||||
|
@ -124,6 +124,14 @@ ifneq ($(BR2_PACKAGE_DROPBEAR_LASTLOG),y)
|
||||
DROPBEAR_CONF_OPTS += --disable-lastlog
|
||||
endif
|
||||
|
||||
DROPBEAR_LOCALOPTIONS_FILE = $(call qstrip,$(BR2_PACKAGE_DROPBEAR_LOCALOPTIONS_FILE))
|
||||
ifneq ($(DROPBEAR_LOCALOPTIONS_FILE),)
|
||||
define DROPBEAR_APPEND_LOCALOPTIONS_FILE
|
||||
cat $(DROPBEAR_LOCALOPTIONS_FILE) >> $(@D)/localoptions.h
|
||||
endef
|
||||
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_APPEND_LOCALOPTIONS_FILE
|
||||
endif
|
||||
|
||||
define DROPBEAR_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 755 $(@D)/dropbearmulti $(TARGET_DIR)/usr/sbin/dropbear
|
||||
for f in $(DROPBEAR_TARGET_BINS); do \
|
||||
|
@ -1,75 +0,0 @@
|
||||
From 1c80e31872aec9f2ef7eca6a52aa89c0ea759d8f Mon Sep 17 00:00:00 2001
|
||||
From: Enrico Joerns <ejo@pengutronix.de>
|
||||
Date: Wed, 5 Sep 2018 12:28:28 +0200
|
||||
Subject: [PATCH] src: fix compilation for glibc version 2.27.9000-36.fc29 and
|
||||
newer
|
||||
|
||||
As recent glibc versions (>= 2.27.9000-36.fc29) also define 'struct
|
||||
statx' which is also defined in linux/stat.h, compilation fails with
|
||||
error:
|
||||
|
||||
| In file included from ../dt-utils-2018.05.0/src/crypto/digest.c:24:
|
||||
| [..]/usr/include/linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp'
|
||||
| struct statx_timestamp {
|
||||
| ^~~~~~~~~~~~~~~
|
||||
| In file included from [..]/usr/include/sys/stat.h:446,
|
||||
| from ../dt-utils-2018.05.0/src/dt/common.h:15,
|
||||
| from ../dt-utils-2018.05.0/src/crypto/digest.c:19:
|
||||
| [..]/usr/include/bits/statx.h:25:8: note: originally defined here
|
||||
| struct statx_timestamp
|
||||
| ^~~~~~~~~~~~~~~
|
||||
| In file included from ../dt-utils-2018.05.0/src/crypto/digest.c:24:
|
||||
| [..]/usr/include/linux/stat.h:99:8: error: redefinition of 'struct statx'
|
||||
| struct statx {
|
||||
| ^~~~~
|
||||
| In file included from [..]/usr/include/sys/stat.h:446,
|
||||
| from ../dt-utils-2018.05.0/src/dt/common.h:15,
|
||||
| from ../dt-utils-2018.05.0/src/crypto/digest.c:19:
|
||||
| [..]/usr/include/bits/statx.h:36:8: note: originally defined here
|
||||
| struct statx
|
||||
| ^~~~~
|
||||
|
||||
The linux/stat.h originates from the code that was copied from barebox
|
||||
but is not explicitly required to be linux/stat.h instead of sys/stat.h
|
||||
and we do not actually use struct statx.
|
||||
|
||||
Thus it is safe to simply replace occurrences of linux/stat.h by
|
||||
sys/stat.h to fix compilation.
|
||||
|
||||
Signed-off-by: Enrico Joerns <ejo@pengutronix.de>
|
||||
[Thomas: backport from upstream.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
src/barebox-state/backend_storage.c | 2 +-
|
||||
src/crypto/digest.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/barebox-state/backend_storage.c b/src/barebox-state/backend_storage.c
|
||||
index 53fe829..1052656 100644
|
||||
--- a/src/barebox-state/backend_storage.c
|
||||
+++ b/src/barebox-state/backend_storage.c
|
||||
@@ -19,7 +19,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/list.h>
|
||||
#include <linux/mtd/mtd-abi.h>
|
||||
-#include <linux/stat.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <linux/fs.h>
|
||||
#include <malloc.h>
|
||||
#include <printk.h>
|
||||
diff --git a/src/crypto/digest.c b/src/crypto/digest.c
|
||||
index 7a8c3c0..8353412 100644
|
||||
--- a/src/crypto/digest.c
|
||||
+++ b/src/crypto/digest.c
|
||||
@@ -21,7 +21,7 @@
|
||||
#include <malloc.h>
|
||||
#include <fs.h>
|
||||
#include <fcntl.h>
|
||||
-#include <linux/stat.h>
|
||||
+#include <sys/stat.h>
|
||||
#include <errno.h>
|
||||
#include <module.h>
|
||||
#include <linux/err.h>
|
||||
--
|
||||
2.19.2
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 d0f53c76bc9f821a6506c8db3b623922d82570a017a9a40ad118bd7c957672b6 dt-utils-v2018.05.0.tar.gz
|
||||
sha256 61440ab222543268923175eb5c7425076d2b8bce4c1dfc177f2eb3873449af7c dt-utils-v2019.01.0.tar.gz
|
||||
sha256 a45932c79317d15116eadbf1c9c6fc59117ec3c4621db3a876066defa723963b COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DT_UTILS_VERSION = v2018.05.0
|
||||
DT_UTILS_VERSION = v2019.01.0
|
||||
DT_UTILS_SITE = https://git.pengutronix.de/git/tools/dt-utils
|
||||
DT_UTILS_SITE_METHOD = git
|
||||
DT_UTILS_LICENSE = GPL-2.0
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.1.tar.xz.sha256
|
||||
sha256 20d3e5e945d54ae46ec916c7341b5dec24f904b6c0123b4d3ecb8cd8d596ae12 efl-1.22.1.tar.xz
|
||||
# From https://download.enlightenment.org/rel/libs/efl/efl-1.22.2.tar.xz.sha256
|
||||
sha256 1699891f825911622de0aa77fe1140eff7335aba619d2352485e54dcff6b1cd0 efl-1.22.2.tar.xz
|
||||
|
||||
sha256 d949e42ca8fd48d275c397c5fc2ac34c9b63ada715dcaf1a670e17bb62964341 COMPLIANCE
|
||||
sha256 1f0597d326e2fdb54aa2f0caec6d8bb0afb9941ef32475f017ed02ca214fcf37 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
EFL_VERSION = 1.22.1
|
||||
EFL_VERSION = 1.22.2
|
||||
EFL_SOURCE = efl-$(EFL_VERSION).tar.xz
|
||||
EFL_SITE = http://download.enlightenment.org/rel/libs/efl
|
||||
EFL_LICENSE = BSD-2-Clause, LGPL-2.1+, GPL-2.0+, FTL, MIT
|
||||
|
31
package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch
Normal file
31
package/ell/0001-ell-ecc.h-fix-build-with-uclibc.patch
Normal file
@ -0,0 +1,31 @@
|
||||
From 3ca3044859f40d7c595daf0a93393352e4999fb7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 30 May 2019 23:46:27 +0200
|
||||
Subject: [PATCH] ell/ecc.h: fix build with uclibc
|
||||
|
||||
ssize_t is defined in sys/types.h
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/444c9deb728fb041e560d940145f96cc4f455080
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
ell/ecc.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/ell/ecc.h b/ell/ecc.h
|
||||
index 26a5889..65c49e8 100644
|
||||
--- a/ell/ecc.h
|
||||
+++ b/ell/ecc.h
|
||||
@@ -27,6 +27,8 @@
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
+#include <sys/types.h> // for ssize_t
|
||||
+
|
||||
#define L_ECC_MAX_DIGITS 6
|
||||
#define L_ECC_SCALAR_MAX_BYTES L_ECC_MAX_DIGITS * 8
|
||||
#define L_ECC_POINT_MAX_BYTES L_ECC_SCALAR_MAX_BYTES * 2
|
||||
--
|
||||
2.20.1
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally computed
|
||||
sha256 bb7038340bfa4eed57700a42da235ba2efce19fe7ab6b976af3e69ee9597a4dd ell-0.16.tar.gz
|
||||
sha256 6faf84fb5a5285f97c65f21e43d496c5954f62f94079422883c01e80d488c676 ell-0.20.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 ec60b993835e2c6b79e6d9226345f4e614e686eb57dc13b6420c15a33a8996e5 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ELL_VERSION = 0.16
|
||||
ELL_VERSION = 0.20
|
||||
ELL_SITE = https://git.kernel.org/pub/scm/libs/ell/ell.git
|
||||
ELL_SITE_METHOD = git
|
||||
ELL_LICENSE = LGPL-2.1+
|
||||
|
8
package/fatcat/Config.in.host
Normal file
8
package/fatcat/Config.in.host
Normal file
@ -0,0 +1,8 @@
|
||||
config BR2_PACKAGE_HOST_FATCAT
|
||||
bool "host fatcat"
|
||||
help
|
||||
Fatcat is designed to manipulate FAT filesystems, in order
|
||||
to explore, extract, repair, recover and forensic them. It
|
||||
currently supports FAT12, FAT16 and FAT32.
|
||||
|
||||
https://github.com/Gregwar/fatcat
|
3
package/fatcat/fatcat.hash
Normal file
3
package/fatcat/fatcat.hash
Normal file
@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 d44f6bb80d20ed50095ace9e71df8da98037db9f22cda76bdd9724d37df69130 fatcat-1.0.6.tar.gz
|
||||
sha256 3ea03755e32cf7f5b12981de92a0fdad396448195fe0024990c9cbc388e9866c LICENSE
|
12
package/fatcat/fatcat.mk
Normal file
12
package/fatcat/fatcat.mk
Normal file
@ -0,0 +1,12 @@
|
||||
################################################################################
|
||||
#
|
||||
# fatcat
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FATCAT_VERSION = 1.0.6
|
||||
FATCAT_SITE = $(call github,Gregwar,fatcat,$(FATCAT_VERSION))
|
||||
FATCAT_LICENSE = MIT
|
||||
FATCAT_LICENSE_FILES = LICENSE
|
||||
|
||||
$(eval $(host-cmake-package))
|
@ -1,2 +1,5 @@
|
||||
# From https://lists.freedesktop.org/archives/fontconfig/2018-August/006324.html
|
||||
sha256 f655dd2a986d7aa97e052261b36aa67b0a64989496361eca8d604e6414006741 fontconfig-2.13.1.tar.bz2
|
||||
|
||||
# Locally calculated
|
||||
sha256 fa4cd9ab005185e10cd8f7504518856c7dd36c01e766c2bac87f4fc638e9f886 COPYING
|
||||
|
@ -3,6 +3,7 @@ comment "GCC Options"
|
||||
choice
|
||||
prompt "GCC compiler Version"
|
||||
default BR2_GCC_VERSION_ARC if BR2_arc
|
||||
default BR2_GCC_VERSION_CSKY if BR2_csky
|
||||
default BR2_GCC_VERSION_OR1K if BR2_or1k
|
||||
default BR2_GCC_VERSION_7_X
|
||||
help
|
||||
@ -14,6 +15,12 @@ config BR2_GCC_VERSION_ARC
|
||||
depends on BR2_arc
|
||||
select BR2_TOOLCHAIN_GCC_AT_LEAST_8
|
||||
|
||||
config BR2_GCC_VERSION_CSKY
|
||||
bool "gcc csky"
|
||||
# Only supported architecture
|
||||
depends on BR2_csky
|
||||
select BR2_TOOLCHAIN_GCC_AT_LEAST_6
|
||||
|
||||
config BR2_GCC_VERSION_OR1K
|
||||
bool "gcc or1k (5.x)"
|
||||
# Only supported architecture
|
||||
@ -25,6 +32,7 @@ config BR2_GCC_VERSION_4_9_X
|
||||
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_5
|
||||
# Broken or unsupported architectures
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_csky
|
||||
depends on !BR2_or1k
|
||||
# musl on microblaze, ppc64 and mips64 unsupported
|
||||
depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe))
|
||||
@ -39,6 +47,7 @@ config BR2_GCC_VERSION_5_X
|
||||
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_6
|
||||
# Broken or unsupported architectures
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_csky
|
||||
depends on !BR2_or1k
|
||||
# musl on ppc64 and mips64 unsupported
|
||||
depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le))
|
||||
@ -52,6 +61,7 @@ config BR2_GCC_VERSION_6_X
|
||||
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_7
|
||||
# Broken or unsupported architectures
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_csky
|
||||
depends on !BR2_or1k
|
||||
select BR2_TOOLCHAIN_GCC_AT_LEAST_6
|
||||
|
||||
@ -59,12 +69,14 @@ config BR2_GCC_VERSION_7_X
|
||||
bool "gcc 7.x"
|
||||
depends on !BR2_ARCH_NEEDS_GCC_AT_LEAST_8
|
||||
# Broken or unsupported architectures
|
||||
depends on !BR2_csky
|
||||
depends on !BR2_or1k
|
||||
select BR2_TOOLCHAIN_GCC_AT_LEAST_7
|
||||
|
||||
config BR2_GCC_VERSION_8_X
|
||||
bool "gcc 8.x"
|
||||
# Broken or unsupported architectures
|
||||
depends on !BR2_csky
|
||||
depends on !BR2_or1k
|
||||
# powerpc spe support has been deprecated since gcc 8.x.
|
||||
# https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html
|
||||
@ -86,8 +98,9 @@ config BR2_GCC_VERSION
|
||||
default "6.5.0" if BR2_GCC_VERSION_6_X
|
||||
default "7.4.0" if BR2_GCC_VERSION_7_X
|
||||
default "8.3.0" if BR2_GCC_VERSION_8_X
|
||||
default "arc-2018.09-release" if BR2_GCC_VERSION_ARC
|
||||
default "arc-2019.03-rc1" if BR2_GCC_VERSION_ARC
|
||||
default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
|
||||
default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY
|
||||
|
||||
config BR2_EXTRA_GCC_CONFIG_OPTIONS
|
||||
string "Additional gcc options"
|
||||
|
@ -10,6 +10,8 @@ sha512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6
|
||||
sha512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802 gcc-8.3.0.tar.xz
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 4d12c3ac27b9de9c533be3b8964cf23d21bf6933b5073183e1affe714b0ff33f9d6169e3b55a5c505d7dae33c9bb4f8b0d110461e3a124182d8c8d51b66b8e45 gcc-arc-2018.09-release.tar.gz
|
||||
sha512 5b80cfa987f615659ccfbd4b3f0cea5a28d8464398b5f7163d9cfad2fec1b15e8e6575628f3f6094a1081be9d4f521ca33795105d1d12295c7207935f51603c0 gcc-arc-2019.03-rc1.tar.gz
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 2de7cf47333a4092b02d3bb98f4206f14966f1d139a724d09cf3b22f8a43ae0c704f33e6477d6367a03c29b265480dc900169e9d417006c5d46f0ae446b8c6f1 gcc-or1k-musl-5.4.0-20170218.tar.gz
|
||||
# Locally calculated (fetched from https://github.com/c-sky/gcc)
|
||||
sha512 1c3564fd6573dce13451a73015e7d88fecbb214dc1df96607976255b1d8b9e60318405333f4f218eea8d07e3675a802b66eff6df3921d505c4036481512792c2 gcc-48152afb96c59733d5bc79e3399bb7b3d4b44266.tar.gz
|
||||
|
@ -16,6 +16,9 @@ GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
|
||||
else ifeq ($(BR2_or1k),y)
|
||||
GCC_SITE = $(call github,openrisc,or1k-gcc,$(GCC_VERSION))
|
||||
GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
|
||||
else ifeq ($(BR2_csky),y)
|
||||
GCC_SITE = $(call github,c-sky,gcc,$(GCC_VERSION))
|
||||
GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz
|
||||
else
|
||||
GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION)
|
||||
# From version 5.5.0, 6.4.0, 7.2.0 and 8.1.0 a bz2 release tarball is not
|
||||
|
@ -1,2 +1,3 @@
|
||||
# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.20/gcr-3.20.0.sha256sum
|
||||
sha256 90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379 gcr-3.20.0.tar.xz
|
||||
# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.28/gcr-3.28.1.sha256sum
|
||||
sha256 95204aa2111c301778ebfbe60975ce3ed698c958430ffcc2a785ac5e593d168b gcr-3.28.1.tar.xz
|
||||
sha256 94b03f1a60a7fd5007149530626a895a6ef5a8b9342abfd56860c5f3956f5d23 COPYING
|
||||
|
@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GCR_VERSION_MAJOR = 3.20
|
||||
GCR_VERSION = $(GCR_VERSION_MAJOR).0
|
||||
GCR_VERSION_MAJOR = 3.28
|
||||
GCR_VERSION = $(GCR_VERSION_MAJOR).1
|
||||
GCR_SITE = http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(GCR_VERSION_MAJOR)
|
||||
GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz
|
||||
GCR_DEPENDENCIES = host-intltool host-pkgconf libgcrypt libglib2 p11-kit
|
||||
|
@ -57,6 +57,7 @@ config BR2_PACKAGE_GDB_DEBUGGER
|
||||
bool "full debugger"
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on !BR2_sh
|
||||
depends on !BR2_csky
|
||||
select BR2_PACKAGE_NCURSES
|
||||
|
||||
comment "full gdb on target needs a toolchain w/ wchar"
|
||||
|
@ -48,6 +48,7 @@ choice
|
||||
prompt "GDB debugger Version"
|
||||
default BR2_GDB_VERSION_8_1
|
||||
depends on !BR2_arc
|
||||
depends on !BR2_csky
|
||||
help
|
||||
Select the version of gdb you wish to use.
|
||||
|
||||
@ -94,7 +95,8 @@ config BR2_PACKAGE_GDB_NEEDS_CXX11
|
||||
# If cross-gdb is not enabled, the latest working version is chosen.
|
||||
config BR2_GDB_VERSION
|
||||
string
|
||||
default "arc-2018.09-release-gdb" if BR2_arc
|
||||
default "arc-2019.03-rc1-gdb" if BR2_arc
|
||||
default "4ecb98fbc2f94dbe01b69384afbc515107de73df" if BR2_csky
|
||||
default "7.12.1" if BR2_GDB_VERSION_7_12
|
||||
default "8.0.1" if BR2_GDB_VERSION_8_0
|
||||
default "8.1.1" if BR2_GDB_VERSION_8_1 || !BR2_PACKAGE_HOST_GDB
|
||||
|
@ -5,4 +5,7 @@ sha512 7dcd5e8c90de92f577834d887b5f54edb93a07083bfe661bc46c270a6cc4919f0b348e7e
|
||||
sha512 2aa81cfd389bb48c35d7d9f95cc10e88b4f7ad4597bdde0f8f1fd312f60f10d9fb2cc6e5a9355227d89ff328f7feb0fc411a69394560cafeb9fa75d35d896d11 gdb-8.2.1.tar.xz
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 8303e399e396f5c15dc976e48503fc7d45a720dd1a470443f755c5f2458d092b4392e7ae582abc251bc4b43a778ad784f764286a2a05abfc1649cbeeeb6e7d15 gdb-arc-2018.09-release-gdb.tar.gz
|
||||
sha512 bc6dcd92991222418795c49b8fc13df7354b34ba7a7f1e4214b108776da0dad730259aa4611086694bc9291126f5182b449bbc22409aeadc44b89e7a42fb4e00 gdb-arc-2019.03-rc1-gdb.tar.gz
|
||||
|
||||
# Locally calculated (fetched from https://github.com/c-sky/binutils-gdb)
|
||||
sha512 c421e1f3c0d6cfb3c04544573c0c4b0075c8d8e3d563c6c234fcc1e4c2167ab203d1e57aec3b58abd348dc46f8cf9b47b753d3a43dba3ea970c9c9a6bd78c07b gdb-4ecb98fbc2f94dbe01b69384afbc515107de73df.tar.gz
|
||||
|
@ -14,6 +14,12 @@ GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
|
||||
GDB_FROM_GIT = y
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_csky),y)
|
||||
GDB_SITE = $(call github,c-sky,binutils-gdb,$(GDB_VERSION))
|
||||
GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz
|
||||
GDB_FROM_GIT = y
|
||||
endif
|
||||
|
||||
GDB_LICENSE = GPL-2.0+, LGPL-2.0+, GPL-3.0+, LGPL-3.0+
|
||||
GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB
|
||||
|
||||
|
@ -1,2 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 5a36b2c1387007c2d6535a722ee257a387d0913bddcf8a94d460e6acd4d01859 genimage-10.tar.xz
|
||||
sha256 2ee024bfb2ec157651b86f3365d138ee013dcc48277d86e1eed6f3285a67b532 genimage-11.tar.xz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GENIMAGE_VERSION = 10
|
||||
GENIMAGE_VERSION = 11
|
||||
GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz
|
||||
GENIMAGE_SITE = https://github.com/pengutronix/genimage/releases/download/v$(GENIMAGE_VERSION)
|
||||
HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse
|
||||
|
@ -0,0 +1,2 @@
|
||||
# Locally calculated (fetched from https://github.com/c-sky/glibc)
|
||||
sha512 9deb2deceefe347d72de13510a5baa3de00f94c684f3b25e136ca3660f61e65a69f2115abb488c2ab0fa93cda8535853ce1e13e186efcc8434ecc4049efd82b5 glibc-7630ed2fa60caea98f500e4a7a51b88f9bf1e176.tar.gz
|
@ -1,5 +1,5 @@
|
||||
# Locally calculated (fetched from Github)
|
||||
sha256 cc2aa6b16641ebcf1492bf6245897d8c263c96b6e30375d09351306a12b6d529 glibc-arc-2018.09-release.tar.gz
|
||||
sha256 8cd0fed7993c4e0b9ac8401fbe2a99bc11fe233d1e49957db5b766e973169221 glibc-arc-2019.03-rc1.tar.gz
|
||||
|
||||
# Hashes for license files
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
@ -5,11 +5,14 @@
|
||||
################################################################################
|
||||
|
||||
ifeq ($(BR2_arc),y)
|
||||
GLIBC_VERSION = arc-2018.09-release
|
||||
GLIBC_VERSION = arc-2019.03-rc1
|
||||
GLIBC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,glibc,$(GLIBC_VERSION))
|
||||
else ifeq ($(BR2_RISCV_32),y)
|
||||
GLIBC_VERSION = 06983fe52cfe8e4779035c27e8cc5d2caab31531
|
||||
GLIBC_SITE = $(call github,riscv,riscv-glibc,$(GLIBC_VERSION))
|
||||
else ifeq ($(BR2_csky),y)
|
||||
GLIBC_VERSION = 7630ed2fa60caea98f500e4a7a51b88f9bf1e176
|
||||
GLIBC_SITE = $(call github,c-sky,glibc,$(GLIBC_VERSION))
|
||||
else
|
||||
# Generate version string using:
|
||||
# git describe --match 'glibc-*' --abbrev=40 origin/release/MAJOR.MINOR/master | cut -d '-' -f 2-
|
||||
|
@ -1,2 +1,6 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 gmp-6.1.2.tar.xz
|
||||
|
||||
# Locally calculated
|
||||
sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSERv3
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYINGv2
|
||||
|
@ -1,2 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e gperf-3.0.4.tar.gz
|
||||
|
||||
# Locally calculated
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
|
@ -0,0 +1,59 @@
|
||||
From 02d21faebec245e1526449fb54e7078914d75db7 Mon Sep 17 00:00:00 2001
|
||||
From: "Gary E. Miller" <gem@rellim.com>
|
||||
Date: Thu, 1 Nov 2018 15:49:01 -0700
|
||||
Subject: SConstruct: Do not crash when not building python man pages.
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://git.savannah.gnu.org/cgit/gpsd.git/commit/?id=02d21faebec245e1526449fb54e7078914d75db7]
|
||||
---
|
||||
SConstruct | 13 +++++++++----
|
||||
1 file changed, 9 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/SConstruct b/SConstruct
|
||||
index 0fc3614..0226cd2 100644
|
||||
--- a/SConstruct
|
||||
+++ b/SConstruct
|
||||
@@ -1751,14 +1751,19 @@ if tiocmiwait:
|
||||
"ppscheck.8": "ppscheck.xml",
|
||||
})
|
||||
|
||||
-all_manpages = list(base_manpages.keys()) + list(python_manpages.keys())
|
||||
+all_manpages = list(base_manpages.keys())
|
||||
+if python_manpages:
|
||||
+ all_manpages += list(python_manpages.keys())
|
||||
|
||||
man_env = env.Clone()
|
||||
if man_env.GetOption('silent'):
|
||||
man_env['SPAWN'] = filtered_spawn # Suppress stderr chatter
|
||||
manpage_targets = []
|
||||
if manbuilder:
|
||||
- items = list(base_manpages.items()) + list(python_manpages.items())
|
||||
+ items = list(base_manpages.items())
|
||||
+ if python_manpages:
|
||||
+ items += list(python_manpages.items())
|
||||
+
|
||||
for (man, xml) in items:
|
||||
manpage_targets.append(man_env.Man(source=xml, target=man))
|
||||
|
||||
@@ -1907,7 +1912,7 @@ if qt_env:
|
||||
|
||||
|
||||
maninstall = []
|
||||
-for manpage in list(base_manpages.keys()) + list(python_manpages.keys()):
|
||||
+for manpage in all_manpages:
|
||||
if not manbuilder and not os.path.exists(manpage):
|
||||
continue
|
||||
section = manpage.split(".")[1]
|
||||
@@ -2517,7 +2522,7 @@ if os.path.exists("gpsd.c") and os.path.exists(".gitignore"):
|
||||
if ".gitignore" in distfiles:
|
||||
distfiles.remove(".gitignore")
|
||||
distfiles += generated_sources
|
||||
- distfiles += list(base_manpages.keys()) + list(python_manpages.keys())
|
||||
+ distfiles += all_manpages
|
||||
if "packaging/rpm/gpsd.spec" not in distfiles:
|
||||
distfiles.append("packaging/rpm/gpsd.spec")
|
||||
|
||||
--
|
||||
cgit v1.0-41-gc330
|
||||
|
@ -1,49 +0,0 @@
|
||||
From 21a752e827bc9e14de4b4c26aef4d0db7403a5b7 Mon Sep 17 00:00:00 2001
|
||||
From: Baruch Siach <baruch@tkos.co.il>
|
||||
Date: Tue, 9 Oct 2018 15:22:46 +0300
|
||||
Subject: [PATCH] driver_greis: fix build with reconfigure disabled
|
||||
|
||||
Unhide the definition of greis_parse_input and greis_event_hook since
|
||||
they are used unconditionally.
|
||||
|
||||
Fixes the following build failure:
|
||||
|
||||
driver_greis.c:969:25: error: 'greis_parse_input' undeclared here (not in a function); did you mean 'generic_parse_input'?
|
||||
.parse_packet = greis_parse_input,
|
||||
^~~~~~~~~~~~~~~~~
|
||||
generic_parse_input
|
||||
driver_greis.c:973:25: error: 'greis_event_hook' undeclared here (not in a function)
|
||||
.event_hook = greis_event_hook,
|
||||
^~~~~~~~~~~~~~~~
|
||||
|
||||
Cc: Gregory Fong <gregory.fong@virginorbit.com>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: http://lists.nongnu.org/archive/html/gpsd-dev/2018-10/msg00012.html
|
||||
|
||||
driver_greis.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/driver_greis.c b/driver_greis.c
|
||||
index 9eb148fc76cd..222bd9daf020 100644
|
||||
--- a/driver_greis.c
|
||||
+++ b/driver_greis.c
|
||||
@@ -797,7 +797,6 @@ static ssize_t greis_control_send(struct gps_device_t *session,
|
||||
}
|
||||
#endif /* CONTROLSEND_ENABLE */
|
||||
|
||||
-#ifdef RECONFIGURE_ENABLE
|
||||
static void greis_event_hook(struct gps_device_t *session, event_t event)
|
||||
{
|
||||
if (session->context->readonly)
|
||||
@@ -870,6 +869,7 @@ static gps_mask_t greis_parse_input(struct gps_device_t *session)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+#ifdef RECONFIGURE_ENABLE
|
||||
/**
|
||||
* Set port operating mode, speed, parity, stopbits etc. here.
|
||||
* Note: parity is passed as 'N'/'E'/'O', but you should program
|
||||
--
|
||||
2.19.1
|
||||
|
@ -0,0 +1,38 @@
|
||||
From d685ab05952d7eadf012fc054032f0190cf2abda Mon Sep 17 00:00:00 2001
|
||||
From: "Gary E. Miller" <gem@rellim.com>
|
||||
Date: Fri, 26 Oct 2018 10:12:40 -0700
|
||||
Subject: driver_ubx: Save UBX-RXM-RAWX data in rawdate_t.
|
||||
|
||||
A step in getting u-blox 8 raw data into the new RAW JSON message.
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved (and backported to keep only C99-style loop fix) from:
|
||||
https://git.savannah.gnu.org/cgit/gpsd.git/commit/driver_ubx.c?id=d685ab05952d7eadf012fc054032f0190cf2abda]
|
||||
---
|
||||
driver_ubx.c | 29 ++++++++++++++++++++++++++---
|
||||
1 file changed, 26 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/driver_ubx.c b/driver_ubx.c
|
||||
index 585b2b9..0dccddf 100644
|
||||
--- a/driver_ubx.c
|
||||
+++ b/driver_ubx.c
|
||||
@@ -813,6 +813,7 @@ static gps_mask_t ubx_rxm_rawx(struct gps_device_t *session,
|
||||
int8_t leapS;
|
||||
uint8_t numMeas;
|
||||
uint8_t recStat;
|
||||
+ int i;
|
||||
|
||||
if (16 > data_len) {
|
||||
gpsd_log(&session->context->errout, LOG_WARN,
|
||||
@@ -830,6 +831,6 @@ static gps_mask_t ubx_rxm_rawx(struct gps_device_t *session,
|
||||
"UBX_RXM_RAWX: rcvTow %f week %u leapS %d numMeas %u recStat %d\n",
|
||||
rcvTow, week, leapS, numMeas, recStat);
|
||||
|
||||
- for (int i = 0; i < numMeas; i++) {
|
||||
+ for (i = 0; i < numMeas; i++) {
|
||||
int off = 32 * i;
|
||||
double prMes = getled64((const char *)buf, off + 16);
|
||||
double cpMes = getled64((const char *)buf, off + 24);
|
||||
--
|
||||
cgit v1.0-41-gc330
|
||||
|
@ -222,6 +222,11 @@ config BR2_PACKAGE_GPSD_SIRF
|
||||
help
|
||||
SiRF binary support
|
||||
|
||||
config BR2_PACKAGE_GPSD_SKYTRAQ
|
||||
bool "Skytraq"
|
||||
help
|
||||
Skytraq support
|
||||
|
||||
config BR2_PACKAGE_GPSD_SUPERSTAR2
|
||||
bool "SuperStarII"
|
||||
help
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 48521f5158f5fda4c88a6f75e8bfc1ee67e999e3fc095e4a06cb8c2af56712f4 gpsd-3.18.tar.gz
|
||||
sha256 5cb1e6d880ec9a52c62492dd0e3d77451b7c7ad625895bd652f6354215aec23e gpsd-3.18.1.tar.gz
|
||||
sha256 71ff85d18bf063954cfc4251678d0e772223e21f80febbd99d5524c90f73f832 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GPSD_VERSION = 3.18
|
||||
GPSD_VERSION = 3.18.1
|
||||
GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd
|
||||
GPSD_LICENSE = BSD-3-Clause
|
||||
GPSD_LICENSE_FILES = COPYING
|
||||
@ -144,6 +144,9 @@ endif
|
||||
ifneq ($(BR2_PACKAGE_GPSD_SIRF),y)
|
||||
GPSD_SCONS_OPTS += sirf=no
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_GPSD_SKYTRAQ),y)
|
||||
GPSD_SCONS_OPTS += skytraq=no
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_GPSD_SUPERSTAR2),y)
|
||||
GPSD_SCONS_OPTS += superstar2=no
|
||||
endif
|
||||
|
@ -46,6 +46,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD
|
||||
help
|
||||
Audio filters plugin
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY
|
||||
bool "audiolatency"
|
||||
help
|
||||
Audio latency plugin
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX
|
||||
bool "audiomixmatrix"
|
||||
help
|
||||
@ -212,6 +217,11 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM
|
||||
help
|
||||
PNM plugin
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY
|
||||
bool "proxy"
|
||||
help
|
||||
Proxy plugin
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE
|
||||
bool "rawparse"
|
||||
help
|
||||
@ -298,6 +308,20 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER
|
||||
bool "assrender"
|
||||
select BR2_PACKAGE_LIBASS
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ
|
||||
bool "bluez"
|
||||
depends on !BR2_STATIC_LIBS # bluez_utils
|
||||
depends on BR2_USE_WCHAR # bluez_utils
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils
|
||||
depends on BR2_USE_MMU # bluez_utils
|
||||
select BR2_PACKAGE_BLUEZ_UTILS
|
||||
help
|
||||
Bluetooth audio A2DP/AVDTP sink, AVDTP source plugin
|
||||
|
||||
comment "bluez plugin needs a toolchain w/ wchar, threads, dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2
|
||||
bool "bz2"
|
||||
select BR2_PACKAGE_BZIP2
|
||||
|
@ -83,7 +83,7 @@ GST1_PLUGINS_BAD_DEPENDENCIES += orc
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y)
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BLUEZ),y)
|
||||
GST1_PLUGINS_BAD_DEPENDENCIES += bluez_utils
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez
|
||||
else
|
||||
@ -132,6 +132,12 @@ else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOLATENCY),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiolatency
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiolatency
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXMATRIX),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixmatrix
|
||||
else
|
||||
@ -344,6 +350,12 @@ else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-pnm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PROXY),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-proxy
|
||||
else
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --disable-proxy
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y)
|
||||
GST1_PLUGINS_BAD_CONF_OPTS += --enable-rawparse
|
||||
else
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user