mirror of
https://github.com/godotengine/buildroot.git
synced 2026-01-11 14:10:13 +03:00
Compare commits
103 Commits
2019.02-rc
...
2019.02
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b9674056fb | ||
|
|
1f551e92dc | ||
|
|
bb271e9d18 | ||
|
|
940e7deab0 | ||
|
|
d059acad12 | ||
|
|
a946657b6e | ||
|
|
a55aca6a3d | ||
|
|
b20f8a893f | ||
|
|
d987412147 | ||
|
|
ce76a98902 | ||
|
|
c0928b7c0e | ||
|
|
f7a2870dd1 | ||
|
|
d0b169363b | ||
|
|
23fd8458fd | ||
|
|
408b48b5c5 | ||
|
|
bdfea8428f | ||
|
|
f13b843e71 | ||
|
|
a21212fb7c | ||
|
|
7b2dd942d0 | ||
|
|
c110e48cec | ||
|
|
d69d9db3ce | ||
|
|
2eb31511f5 | ||
|
|
3e15083f18 | ||
|
|
cbf1d861fa | ||
|
|
905e976a6a | ||
|
|
c12b32ba46 | ||
|
|
759c9623aa | ||
|
|
55f45e6833 | ||
|
|
4b2fff01c0 | ||
|
|
d8605e4bb0 | ||
|
|
b5c1639a83 | ||
|
|
a669c0f2f5 | ||
|
|
3e4b82b996 | ||
|
|
da6bcf9e86 | ||
|
|
d7c92f7e12 | ||
|
|
82c67d3050 | ||
|
|
ae7ba64501 | ||
|
|
cd70bde797 | ||
|
|
f88bf61b29 | ||
|
|
dd6e3c8f1a | ||
|
|
50610dccfa | ||
|
|
a7bcd202d7 | ||
|
|
292c5a0ecd | ||
|
|
ff50cc8b05 | ||
|
|
a6c9317243 | ||
|
|
234525e782 | ||
|
|
d42220921c | ||
|
|
ea5cf87d56 | ||
|
|
fc9f9cd76f | ||
|
|
98cb0faa4c | ||
|
|
108c831230 | ||
|
|
e2c21905ff | ||
|
|
d76dce1f43 | ||
|
|
2a358818e9 | ||
|
|
40005b9a0d | ||
|
|
c8b32ce8ac | ||
|
|
2a01a32819 | ||
|
|
3e4b32691b | ||
|
|
26d0729789 | ||
|
|
6327a8f0d6 | ||
|
|
12f644e2c5 | ||
|
|
872561cd5b | ||
|
|
51bb23652f | ||
|
|
4c24006b0e | ||
|
|
da304a832b | ||
|
|
aa813cd9ac | ||
|
|
d5f4b3621d | ||
|
|
858d2e9a27 | ||
|
|
74693e09ae | ||
|
|
6bc9ded5dd | ||
|
|
2fb86873db | ||
|
|
77c057939d | ||
|
|
1f2d3000c4 | ||
|
|
040ab81555 | ||
|
|
0737f48c5f | ||
|
|
623afa9c0c | ||
|
|
d04a1efcb5 | ||
|
|
a2fee08208 | ||
|
|
85b3d8006b | ||
|
|
ed5aa81b51 | ||
|
|
3ae8dab9e9 | ||
|
|
63739c5c25 | ||
|
|
dd97b055b1 | ||
|
|
8f9009e5bd | ||
|
|
90b73b2ae5 | ||
|
|
597b529927 | ||
|
|
4c80a4d350 | ||
|
|
3105754bc3 | ||
|
|
da588c5f3c | ||
|
|
c4211a7d64 | ||
|
|
c05cc5de86 | ||
|
|
653f86c0e9 | ||
|
|
92f34e8fe2 | ||
|
|
78596e3851 | ||
|
|
71e449d3a5 | ||
|
|
640153775b | ||
|
|
3a52848f82 | ||
|
|
506cdeb2d0 | ||
|
|
4b29c68ea2 | ||
|
|
e4bbdeec9d | ||
|
|
2135e869a0 | ||
|
|
17c7b93379 | ||
|
|
9d2166c97d |
@@ -276,7 +276,6 @@ warpboard_defconfig: { extends: .defconfig }
|
||||
zynq_microzed_defconfig: { extends: .defconfig }
|
||||
zynq_zc706_defconfig: { extends: .defconfig }
|
||||
zynq_zed_defconfig: { extends: .defconfig }
|
||||
zynq_zybo_defconfig: { extends: .defconfig }
|
||||
zynqmp_zcu106_defconfig: { extends: .defconfig }
|
||||
tests.boot.test_atf.TestATFAllwinner: { extends: .runtime_test }
|
||||
tests.boot.test_atf.TestATFMarvell: { extends: .runtime_test }
|
||||
|
||||
114
CHANGES
114
CHANGES
@@ -1,3 +1,65 @@
|
||||
2019.02, released March 4th, 2019
|
||||
|
||||
Minor fixes.
|
||||
|
||||
Libressl support added for Qt 5.6 as a replacement for
|
||||
openssl, as 5.6 is not compatible with openssl 1.1.x.
|
||||
|
||||
Updated/fixed packages: cutelyst, devmem2, gqrx,
|
||||
gst-plugins-bad, libraw, libsoxr, qt5base, runc, systemd, tor
|
||||
|
||||
2019.02-rc3, released March 1st, 2019
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
Openssl support dropped from Qt 5.6, as it isn't compatible
|
||||
with openssl 1.1.x.
|
||||
|
||||
Toolchain: GCC 8.x updated to 8.3.0, fixing a number of
|
||||
issues.
|
||||
|
||||
Dependencies: Require CMake 3.8 or newer to fix compilation
|
||||
issue with certain packages. If not available, host-cmake will
|
||||
instead be built.
|
||||
|
||||
Printvars: Fix performance regression since 2018.02
|
||||
|
||||
Scanypi: Correctly handle underscores in python package names.
|
||||
|
||||
Updated/fixed packages: botan, clamav, cryptopp, i2pd,
|
||||
ibrcommon, iproute2, libcpprestsdk, libssh, lua-curl,
|
||||
luaexpat, qt5base, runc, stress-ng, syslinux, systemd,
|
||||
upmpdcli, zbar
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#9966: util-linux-2.30/.stamp_built' failed
|
||||
#11696: possible typo in board/pc/post-build.sh
|
||||
|
||||
2019.02-rc2, released February 23th, 2019
|
||||
|
||||
Fixes all over the tree.
|
||||
|
||||
Removed zynq_zybo defconfig, as it hasn't seen any update
|
||||
since it was added in 2016, and uses a U-Boot version not
|
||||
compatible with openssl-1.1.x.
|
||||
|
||||
Linux: Ignore user supplied downloadable hashes, as no hash
|
||||
checksums are available for those.
|
||||
|
||||
Updated/fixed packages: bind, cryptopp, docker-containerd,
|
||||
dtc, efivar, gdb, imagemagick, ipmiutil, libcpprestsdk,
|
||||
libcurl, libgpiod, libid3tag, libv4l, log4cplus, luvi,
|
||||
madplay, mender, mosquitto, poco, postgresql, proftpd,
|
||||
pulseaudio, python-django, qemu, qt5base, qwt, rabbitmq-c,
|
||||
reaver, safeclip, stress-ng, swupdate, syslog-ng, systemd,
|
||||
tor, unzip, xenomai
|
||||
|
||||
Issues resolved (http://bugs.uclibc.org):
|
||||
|
||||
#11501: compile sdl2 with enable wayland
|
||||
#11681: .. unable to initialize decompress status for section..
|
||||
|
||||
2019.02-rc1, released February 13th, 2019
|
||||
|
||||
Fixes all over the tree and new features.
|
||||
@@ -148,6 +210,36 @@
|
||||
#11656: Custom device tree and u-boot boot.scr not integrated..
|
||||
#11666: Touchscreen with (Py)Qt5 should use tslib instead of evdev
|
||||
|
||||
2018.11.3, Released February 23th, 2019
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
Ensure the PLATFORM and OS environment variables are not set,
|
||||
as they cause build issues for some packages.
|
||||
|
||||
The package list infrastructure now correctly handles packages
|
||||
installing files with old mtime.
|
||||
|
||||
Linux: Skip hash checks for user supplied downloadable
|
||||
patches, as no hash checksums are available for those.
|
||||
|
||||
scanpypi: protect against zip-slip vulnerability in zip/tar
|
||||
handling
|
||||
|
||||
Download: fixes for SSH/SCP support
|
||||
|
||||
SDK: Fix handling of relative symlinks (targets starting with
|
||||
'.' or '..')
|
||||
|
||||
Updated/fixed packages: bind, dhcpcd, docker-compose,
|
||||
docker-containerd, docker-engine, dovecot, dovecot-pigeonhole,
|
||||
dtc, efivar, ghostscript, gnuradio, imagemagick, jpeg-turbo,
|
||||
libarchive, libb64, libcurl, libgeotiff, libgpiod, libid3tag,
|
||||
libupnp18, log4cplus, madplay, meson, mosquitto, openssh, php,
|
||||
poco, postgresql, proftpd, pulseaudio, python, python-django,
|
||||
python3, qt5base, reaver, runc, sg3_utils, sqlcipher,
|
||||
swupdate, systemd, unzip, webkitgtk, xenomai
|
||||
|
||||
2018.11.2, Released January 30th, 2019
|
||||
|
||||
Important / security related fixes.
|
||||
@@ -929,6 +1021,28 @@
|
||||
#10961: Grub2 fails to build for x86_64 when BR2_SSP_ALL is
|
||||
enabled
|
||||
|
||||
2018.02.11, Released February 23th, 2019
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
Ensure the PLATFORM and OS environment variables are not set,
|
||||
as they cause build issues for some packages.
|
||||
|
||||
The package list infrastructure now correctly handles packages
|
||||
installing files with old mtime.
|
||||
|
||||
Linux: Skip hash checks for user supplied downloadable
|
||||
patches, as no hash checksums are available for those.
|
||||
|
||||
scanpypi: protect against zip-slip vulnerability in zip/tar
|
||||
handling
|
||||
|
||||
Updated/fixed packages: bind, dhcpcd, dovecot, ghostscript,
|
||||
gnuradio, imagemagick, jpeg-turbo, libarchive, libb64,
|
||||
libcurl, libid3tag, madplay, mosquitto, openssh, php,
|
||||
postgresql, proftpd, python, python-django, python3, qt5base,
|
||||
sqlcipher, swupdate, systemd, unzip, webkitgtk
|
||||
|
||||
2018.02.10, Released January 31th, 2019
|
||||
|
||||
Important / security related fixes.
|
||||
|
||||
@@ -49,8 +49,11 @@ F: package/libressl/
|
||||
F: package/libselinux/
|
||||
F: package/libsemanage/
|
||||
F: package/libsepol/
|
||||
F: package/libwebsockets/
|
||||
F: package/nginx-naxsi/
|
||||
F: package/php/
|
||||
F: package/policycoreutils/
|
||||
F: package/python3/
|
||||
F: package/python-flask-sqlalchemy/
|
||||
F: package/python-mutagen/
|
||||
F: package/python-pip/
|
||||
@@ -63,6 +66,7 @@ F: package/selinux-python/
|
||||
F: package/semodule-utils/
|
||||
F: package/setools/
|
||||
F: package/sngrep/
|
||||
F: package/systemd/
|
||||
|
||||
N: Adrian Perez de Castro <aperez@igalia.com>
|
||||
F: package/brotli/
|
||||
@@ -865,7 +869,7 @@ F: package/qt5/qt5webengine/
|
||||
F: package/qt5/qt5webkit/
|
||||
F: package/qt5/qt5webkit-examples/
|
||||
|
||||
N: Gary Bisson <gary.bisson@boundarydevices.com>
|
||||
N: Gary Bisson <bisson.gary@gmail.com>
|
||||
F: board/boundarydevices/
|
||||
F: configs/nitrogen*
|
||||
F: package/freescale-imx/
|
||||
|
||||
4
Makefile
4
Makefile
@@ -92,9 +92,9 @@ all:
|
||||
.PHONY: all
|
||||
|
||||
# Set and export the version string
|
||||
export BR2_VERSION := 2019.02-rc1
|
||||
export BR2_VERSION := 2019.02
|
||||
# Actual time the release is cut (for reproducible builds)
|
||||
BR2_VERSION_EPOCH = 1550044800
|
||||
BR2_VERSION_EPOCH = 1551735000
|
||||
|
||||
# Save running make version since it's clobbered by the make package
|
||||
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
image boot.vfat {
|
||||
vfat {
|
||||
files = {
|
||||
"BOOT.BIN",
|
||||
"uEnv.txt",
|
||||
"system.bit",
|
||||
"zynq-zybo.dtb",
|
||||
"u-boot-dtb.img",
|
||||
"uImage"
|
||||
}
|
||||
}
|
||||
size = 32M
|
||||
}
|
||||
|
||||
image sdcard.img {
|
||||
hdimage {
|
||||
}
|
||||
|
||||
partition boot {
|
||||
partition-type = 0xC
|
||||
bootable = "true"
|
||||
image = "boot.vfat"
|
||||
}
|
||||
|
||||
partition rootfs {
|
||||
partition-type = 0x83
|
||||
image = "rootfs.ext4"
|
||||
}
|
||||
}
|
||||
@@ -1,18 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
BOARD_DIR="$(dirname $0)"
|
||||
GENIMAGE_CFG="${BOARD_DIR}/genimage.cfg"
|
||||
GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
|
||||
OUTPUT_DIR="${O}/images"
|
||||
|
||||
rm -rf "${GENIMAGE_TMP}"
|
||||
|
||||
cp board/digilent/zybo/uEnv.txt ${BINARIES_DIR}
|
||||
cp board/digilent/zybo/system.bit ${BINARIES_DIR}
|
||||
|
||||
genimage \
|
||||
--rootpath "${TARGET_DIR}" \
|
||||
--tmppath "${GENIMAGE_TMP}" \
|
||||
--inputpath "${BINARIES_DIR}" \
|
||||
--outputpath "${BINARIES_DIR}" \
|
||||
--config "${GENIMAGE_CFG}"
|
||||
@@ -1,76 +0,0 @@
|
||||
Digilent Zybo
|
||||
=============
|
||||
|
||||
This is the Buildroot board support for the Digilent Zybo. The Zybo is
|
||||
a development board based on the Xilinx Zynq-7000 based All-Programmable
|
||||
System-On-Chip.
|
||||
|
||||
Zybo information including schematics, reference designs, and manuals are
|
||||
available from http://store.digilentinc.com/zybo-zynq-7000-arm-fpga-soc-trainer-board/ .
|
||||
|
||||
If you want a custom FPGA bitstream to be loaded by U-Boot, copy it as
|
||||
system.bit in board/digilent/zybo/.
|
||||
|
||||
Steps to create a working system for Zybo:
|
||||
|
||||
1) make zynq_zybo_defconfig
|
||||
2) make
|
||||
3) write your SD Card with the sdcard.img file using dd by doing
|
||||
$ sudo dd if=output/images/sdcard.img of=/dev/sdX
|
||||
4) insert the SD Card and power up your Zybo
|
||||
5) Expect serial console on the second USB serial port exposed by the board
|
||||
|
||||
The expected output:
|
||||
|
||||
U-Boot SPL 2016.05 (May 20 2016 - 16:16:24)
|
||||
mmc boot
|
||||
Trying to boot from MMC1
|
||||
reading system.dtb
|
||||
spl_load_image_fat_os: error reading image system.dtb, err - -1
|
||||
reading u-boot-dtb.img
|
||||
reading u-boot-dtb.img
|
||||
|
||||
|
||||
U-Boot 2016.05 (May 20 2016 - 16:16:24 +0200)
|
||||
|
||||
Model: Zynq ZYBO Development Board
|
||||
Board: Xilinx Zynq
|
||||
I2C: ready
|
||||
DRAM: ECC disabled 512 MiB
|
||||
MMC: sdhci@e0100000: 0
|
||||
SF: Detected S25FL128S_64K with page size 256 Bytes, erase size 64 KiB, total 16 MiB
|
||||
In: serial@e0001000
|
||||
Out: serial@e0001000
|
||||
Err: serial@e0001000
|
||||
Model: Zynq ZYBO Development Board
|
||||
Board: Xilinx Zynq
|
||||
Net: ZYNQ GEM: e000b000, phyaddr 0, interface rgmii-id
|
||||
I2C EEPROM MAC address read failed
|
||||
|
||||
Warning: ethernet@e000b000 (eth0) using random MAC address - 56:64:dd:a7:6d:94
|
||||
eth0: ethernet@e000b000
|
||||
...
|
||||
|
||||
Resulting system
|
||||
----------------
|
||||
Once the build process is finished you will have an image called "sdcard.img"
|
||||
in the output/images/ directory.
|
||||
|
||||
The first partition is a FAT32 partition created at the beginning of the SD Card
|
||||
that contains the following files :
|
||||
/BOOT.BIN
|
||||
/zynq-zybo.dtb
|
||||
/uEnv.txt
|
||||
/system.bit
|
||||
/uImage
|
||||
/u-boot-dtb.img
|
||||
|
||||
The second partition is an ext4 partition that contains the root filesystem.
|
||||
|
||||
You can alter the booting procedure by modifying the uEnv.txt file
|
||||
in first partition of the SD card. It is a plain text file in format
|
||||
<key>=<value> one per line:
|
||||
|
||||
kernel_image=myimage
|
||||
modeboot=myboot
|
||||
myboot=...
|
||||
@@ -1,5 +0,0 @@
|
||||
bootargs=root=/dev/mmcblk0p2 rootwait rw rootfstype=ext4
|
||||
fpga_image=system.bit
|
||||
fpgaboot=if fatload mmc 0 0x1000000 ${fpga_image}; then echo Booting FPGA from ${fpga_image}; fpga info 0 && fpga loadb 0 0x1000000 $filesize; else echo FPGA image ${fpga_image} was not found, skipping...; fi;
|
||||
kernel_image=uImage
|
||||
sdboot=echo Booting from SD...; run fpgaboot; fatload mmc 0 0x1000000 ${kernel_image} && fatload mmc 0 0x2000000 zynq-zybo.dtb && bootm 0x1000000 - 0x2000000
|
||||
@@ -0,0 +1,45 @@
|
||||
From 44a1b42e561b9a257209300e2860b901b100cc17 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Santos <casantos@datacom.com.br>
|
||||
Date: Tue, 26 Feb 2019 08:07:22 -0300
|
||||
Subject: [PATCH] Fix build with gnu-efi version 3.0.9
|
||||
|
||||
Adapt a patch already applied upstream to prevent multiple definitions
|
||||
of 'memset' and 'memcpy'.
|
||||
|
||||
Signed-off-by: Carlos Santos <casantos@datacom.com.br>
|
||||
(adapted from commit 363d61c4f112b972649b19d67e96b9321f738f00)
|
||||
---
|
||||
mk/lib.mk | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mk/lib.mk b/mk/lib.mk
|
||||
index ceb95bd0..c9b6eaf3 100644
|
||||
--- a/mk/lib.mk
|
||||
+++ b/mk/lib.mk
|
||||
@@ -186,9 +186,9 @@ MINLIBOBJS = \
|
||||
# $(LIBVESA_OBJS)
|
||||
|
||||
CORELIBOBJS = \
|
||||
- memcpy.o memset.o memcmp.o printf.o strncmp.o vfprintf.o \
|
||||
+ memcmp.o printf.o strncmp.o vfprintf.o \
|
||||
strlen.o vsnprintf.o snprintf.o stpcpy.o strcmp.o strdup.o \
|
||||
- strcpy.o strncpy.o setjmp.o fopen.o fread.o fread2.o puts.o \
|
||||
+ strcpy.o strncpy.o fopen.o fread.o fread2.o puts.o \
|
||||
strtoul.o strntoumax.o strcasecmp.o \
|
||||
sprintf.o strlcat.o strchr.o strlcpy.o strncasecmp.o ctypes.o \
|
||||
fputs.o fwrite2.o fwrite.o fgetc.o fclose.o lmalloc.o \
|
||||
@@ -203,6 +203,11 @@ CORELIBOBJS = \
|
||||
$(LIBENTRY_OBJS) \
|
||||
$(LIBMODULE_OBJS)
|
||||
|
||||
+ifndef EFI_BUILD
|
||||
+# For EFI, these are part of gnu-efi
|
||||
+CORELIBOBJS += setjmp.o memcpy.o memset.o
|
||||
+endif
|
||||
+
|
||||
LDFLAGS = -m elf_$(ARCH) --hash-style=gnu -T $(com32)/lib/$(ARCH)/elf.ld
|
||||
|
||||
.SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss
|
||||
--
|
||||
2.14.5
|
||||
|
||||
@@ -20,7 +20,7 @@ BR2_LINUX_KERNEL_INTREE_DTS_NAME="imx23-evk"
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BOARDNAME="mx23evk"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2016.09.01"
|
||||
BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2019.01"
|
||||
BR2_TARGET_UBOOT_FORMAT_SD=y
|
||||
|
||||
# Filesystem
|
||||
|
||||
@@ -2,8 +2,8 @@ BR2_aarch64=y
|
||||
BR2_cortex_a53=y
|
||||
BR2_ARM_FPU_VFPV4=y
|
||||
|
||||
# Linux headers same as kernel, a 4.18 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_18=y
|
||||
# Linux headers same as kernel, a 4.19 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
|
||||
|
||||
# Firmware
|
||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
|
||||
|
||||
@@ -2,8 +2,8 @@ BR2_aarch64=y
|
||||
BR2_cortex_a53=y
|
||||
BR2_ARM_FPU_VFPV4=y
|
||||
|
||||
# Linux headers same as kernel, a 4.18 series
|
||||
BR2_KERNEL_HEADERS_4_18=y
|
||||
# Linux headers same as kernel, a 4.19 series
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_19=y
|
||||
|
||||
# Firmware
|
||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
|
||||
|
||||
@@ -12,6 +12,7 @@ BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="rockchip/rk3328-rock64"
|
||||
BR2_LINUX_KERNEL_INSTALL_TARGET=y
|
||||
BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_ROOTFS_EXT2_SIZE="128M"
|
||||
|
||||
@@ -1,30 +0,0 @@
|
||||
BR2_arm=y
|
||||
BR2_cortex_a9=y
|
||||
BR2_ARM_ENABLE_NEON=y
|
||||
BR2_ARM_ENABLE_VFP=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_6=y
|
||||
BR2_TARGET_GENERIC_GETTY_PORT="ttyPS0"
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/digilent/zybo/post-image.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.6.4"
|
||||
BR2_LINUX_KERNEL_DEFCONFIG="multi_v7"
|
||||
BR2_LINUX_KERNEL_UIMAGE=y
|
||||
BR2_LINUX_KERNEL_UIMAGE_LOADADDR="0x8000"
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="zynq-zybo"
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
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="2016.05"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="zynq_zybo"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
|
||||
BR2_TARGET_UBOOT_FORMAT_DTB_IMG=y
|
||||
BR2_TARGET_UBOOT_SPL=y
|
||||
BR2_TARGET_UBOOT_ZYNQ_IMAGE=y
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
@@ -8,108 +8,108 @@
|
||||
<div class="panel-heading">Download</div>
|
||||
<div class="panel-body">
|
||||
|
||||
<h3 style="text-align: center;">Latest long term support release: <b>2018.02.10</b></h3>
|
||||
<h3 style="text-align: center;">Latest stable / long term support release: <b>2018.02.11</b></h3>
|
||||
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2018.02.10.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2018.02.10.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2018.02.10.tar.gz">buildroot-2018.02.10.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.02.10.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2019.02.tar.gz">buildroot-2019.02.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2018.02.10.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2018.02.10.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2018.02.10.tar.bz2">buildroot-2018.02.10.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.02.10.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2019.02.tar.bz2">buildroot-2019.02.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2018.11.2</b></h3>
|
||||
<!--
|
||||
<h3 style="text-align: center;">Latest stable release: <b>2018.11.3</b></h3>
|
||||
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2018.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2018.11.2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<h3><a href="/downloads/buildroot-2018.11.2.tar.gz">buildroot-2018.11.2.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.11.2.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2018.11.3.tar.gz">buildroot-2018.11.3.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.11.3.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2018.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2018.11.2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2018.11.2.tar.bz2">buildroot-2018.11.2.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.11.2.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2018.11.3.tar.bz2">buildroot-2018.11.3.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2018.11.3.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2019.02-rc1</b></h3>
|
||||
<h3 style="text-align: center;">Latest release candidate: <b>2019.02-rc3</b></h3>
|
||||
<div class="row mt centered">
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2019.02-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2019.02-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2019.02-rc1.tar.gz">buildroot-2019.02-rc1.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02-rc1.tar.gz.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2019.02-rc3.tar.gz">buildroot-2019.02-rc3.tar.gz</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02-rc3.tar.gz.sign">PGP signature</a></p>
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
|
||||
<div class="flipper">
|
||||
<div class="front">
|
||||
<a href="/downloads/buildroot-2019.02-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
<div class="back">
|
||||
<a href="/downloads/buildroot-2019.02-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<h3><a href="/downloads/buildroot-2019.02-rc1.tar.bz2">buildroot-2019.02-rc1.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02-rc1.tar.bz2.sign">PGP signature</a></p>
|
||||
<h3><a href="/downloads/buildroot-2019.02-rc3.tar.bz2">buildroot-2019.02-rc3.tar.bz2</a></h3>
|
||||
<p><a href="/downloads/buildroot-2019.02-rc3.tar.bz2.sign">PGP signature</a></p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
-->
|
||||
This and earlier releases (and their PGP signatures) can always be downloaded from
|
||||
<a href="/downloads/">http://buildroot.net/downloads/</a>.
|
||||
</div>
|
||||
|
||||
@@ -9,6 +9,109 @@
|
||||
<h2>News</h2>
|
||||
<ul class="timeline">
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2019.02 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>4 March 2019</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The stable 2019.02 release is out - Thanks to everyone
|
||||
contributing and testing the release candidates. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2019.02">CHANGES</a>
|
||||
file for more details
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2019.02.tar.bz2">2019.02 release</a>.</p>
|
||||
|
||||
<p>Notice that this is a long term support release which will be
|
||||
supported with security and other important fixes until March 2020.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2019.02-rc3 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>1 March 2019</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>Another week, another release candidate with more cleanups
|
||||
and build fixes. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2019.02-rc3">CHANGES</a>
|
||||
file for details.</p>
|
||||
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2019.02-rc3.tar.bz2">2019.02-rc3
|
||||
release candidate</a>, and report any problems found to the
|
||||
<a href="support.html">mailing list</a> or
|
||||
<a href="https://bugs.buildroot.org">bug tracker</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2018.11.3 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>23 February 2019</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The 2018.11.3 bugfix release is out, fixing a number of important /
|
||||
security related issues discovered since the 2018.11.2 release. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.11.3">CHANGES</a>
|
||||
file for more details, read the
|
||||
<a href="http://lists.busybox.net/pipermail/buildroot/2019-February/243960.html">announcement</a>
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2018.11.3.tar.bz2">2018.11.3 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2018.02.11 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>23 February 2019</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>The 2018.02.11 bugfix release is out, fixing a number of important /
|
||||
security related issues discovered since the 2018.02.10 release. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2018.02.11">CHANGES</a>
|
||||
file for more details, read the
|
||||
<a href="http://lists.busybox.net/pipermail/buildroot/2019-February/243944.html">announcement</a>
|
||||
and go to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2018.02.11.tar.bz2">2018.02.11 release</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li>
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
<div class="timeline-heading">
|
||||
<h4 class="timeline-title">2019.02-rc2 released</h4>
|
||||
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>23 February 2019</small></p>
|
||||
</div>
|
||||
<div class="timeline-body">
|
||||
<p>Another week, another release candidate with more cleanups
|
||||
and build fixes. See the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2019.02-rc2">CHANGES</a>
|
||||
file for details.</p>
|
||||
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
<a href="/downloads/buildroot-2019.02-rc2.tar.bz2">2019.02-rc2
|
||||
release candidate</a>, and report any problems found to the
|
||||
<a href="support.html">mailing list</a> or
|
||||
<a href="https://bugs.buildroot.org">bug tracker</a>.</p>
|
||||
</div>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
<li class="timeline-inverted">
|
||||
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
|
||||
<div class="timeline-panel">
|
||||
@@ -20,7 +123,8 @@
|
||||
<p>We have a new release candidate! Lots of changes all over the
|
||||
tree, see the
|
||||
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2019.02-rc1">CHANGES</a>
|
||||
file for details.
|
||||
file for details and read the
|
||||
<a href="http://lists.busybox.net/pipermail/buildroot/2019-February/243205.html">announcement</a>.
|
||||
</p>
|
||||
|
||||
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
|
||||
|
||||
@@ -122,7 +122,7 @@ endif
|
||||
|
||||
config BR2_LINUX_KERNEL_VERSION
|
||||
string
|
||||
default "4.19.18" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "4.19.25" if BR2_LINUX_KERNEL_LATEST_VERSION
|
||||
default "v4.4.171-cip30" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
|
||||
default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
|
||||
if BR2_LINUX_KERNEL_CUSTOM_VERSION
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
|
||||
sha256 ff8d96974a947a6332b3a2dda461c1b2df8175b56fa4ab9398224e6e1800e214 linux-4.20.5.tar.xz
|
||||
sha256 5ffdc068f9bf768b7cd5a8a2271d1370c2326e967848b13e21dfdbb1ef0ff3f1 linux-4.19.18.tar.xz
|
||||
sha256 110daeae1a416b7e0ec8dce5e86d67552deeb4567f696c3869389be239f0ecb5 linux-4.14.96.tar.xz
|
||||
sha256 9066929ec2550794ae107350a5f3c5b648438aa915cfc62bac5b7a54b9d7731a linux-4.9.153.tar.xz
|
||||
sha256 fb4d16b3c1e508dfa0344e406caeb25286d1c258421d8891b5580323e4e639fb linux-4.4.172.tar.xz
|
||||
sha256 1cf544308195250805e0731c716691bea4c1ed29e03e6f9ae5be6dc16785a504 linux-4.20.12.tar.xz
|
||||
sha256 7ec71d90d6e96e6f741676d157ac06f30c75be4eaf1649143a3c8b7d4f919731 linux-4.19.25.tar.xz
|
||||
sha256 7aa43e34e4c9e5965da29cef5ae196e06006f8c0d1d65fd755a2f197f0796a11 linux-4.14.103.tar.xz
|
||||
sha256 c09af067af62d299f5e33c279968de58c88fb7c59bd05e8f3bb460f611f60515 linux-4.9.160.tar.xz
|
||||
sha256 27da5401aa691762f3361c143f453877f499c02ea6c9c743b09538cb1af1c75d linux-4.4.176.tar.xz
|
||||
|
||||
@@ -55,6 +55,9 @@ endif
|
||||
|
||||
LINUX_PATCHES = $(call qstrip,$(BR2_LINUX_KERNEL_PATCH))
|
||||
|
||||
# We have no way to know the hashes for user-supplied patches.
|
||||
BR_NO_CHECK_HASH_FOR += $(notdir $(LINUX_PATCHES))
|
||||
|
||||
# We rely on the generic package infrastructure to download and apply
|
||||
# remote patches (downloaded from ftp, http or https). For local
|
||||
# patches, we can't rely on that infrastructure, because there might
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Verified from https://ftp.isc.org/isc/bind9/9.11.5/bind-9.11.5.tar.gz.asc
|
||||
# Verified from https://ftp.isc.org/isc/bind9/9.11.5-P4/bind-9.11.5-P4.tar.gz.asc
|
||||
# with key BE0E9748B718253A28BB89FFF1B11BF05CF02E57
|
||||
sha256 a4cae11dad954bdd4eb592178f875bfec09fcc7e29fe0f6b7a4e5b5c6bc61322 bind-9.11.5.tar.gz
|
||||
sha256 336f3c40e37a1a13690efb4c63e20908faa4c40498cc02f3579fb67d3a1933a5 COPYRIGHT
|
||||
sha256 7e8c08192bcbaeb6e9f2391a70e67583b027b90e8c4bc1605da6eb126edde434 bind-9.11.5-P4.tar.gz
|
||||
sha256 cd02c93b8dcda794f55dfd1231828d69633072a98eee4874f9cf732d22d9dcde COPYRIGHT
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BIND_VERSION = 9.11.5
|
||||
BIND_SITE = http://ftp.isc.org/isc/bind9/$(BIND_VERSION)
|
||||
BIND_VERSION = 9.11.5-P4
|
||||
BIND_SITE = https://ftp.isc.org/isc/bind9/$(BIND_VERSION)
|
||||
# bind does not support parallel builds.
|
||||
BIND_MAKE = $(MAKE1)
|
||||
BIND_INSTALL_STAGING = YES
|
||||
|
||||
@@ -17,9 +17,16 @@ BOTAN_CONF_OPTS = \
|
||||
--os=linux \
|
||||
--cc=gcc \
|
||||
--cc-bin="$(TARGET_CXX)" \
|
||||
--ldflags="$(BOTAN_LDFLAGS)" \
|
||||
--prefix=/usr \
|
||||
--without-documentation
|
||||
|
||||
BOTAN_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
BOTAN_LDFLAGS += -latomic
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_SHARED_LIBS),y)
|
||||
BOTAN_CONF_OPTS += \
|
||||
--disable-static-library \
|
||||
|
||||
@@ -22,6 +22,10 @@ CLAMAV_CONF_ENV = \
|
||||
ac_cv_c_mmap_private=yes \
|
||||
have_cv_ipv6=yes
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
CLAMAV_CONF_ENV += LIBS=-latomic
|
||||
endif
|
||||
|
||||
# UCLIBC_HAS_FTS is disabled, therefore disable fanotify (missing fts.h)
|
||||
CLAMAV_CONF_OPTS = \
|
||||
--with-dbdir=/var/lib/clamav \
|
||||
|
||||
40
package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch
Normal file
40
package/cryptopp/0001-config.h-avx2-depends-on-gcc-4.9.patch
Normal file
@@ -0,0 +1,40 @@
|
||||
From c484938fb4a57430a2e47334f753b1d771aa0f1b Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 21 Feb 2019 20:26:24 +0100
|
||||
Subject: [PATCH] config.h: avx2 depends on gcc 4.9
|
||||
|
||||
Build of cryptopp on x86 with gcc 4.8 fails on:
|
||||
chacha_avx.cpp: In function 'void CryptoPP::ChaCha_OperateKeystream_AVX2(const word32*, const byte*, CryptoPP::byte*, unsigned int)':
|
||||
chacha_avx.cpp:98:85: error: '_mm256_broadcastsi128_si256' was not declared in this scope
|
||||
|
||||
This is due to the fact that _mm256_broadcastsi128_si256 has been added
|
||||
only in gcc 4.9:
|
||||
https://github.com/gcc-mirror/gcc/commit/78e8d5ffbf0ba5031b736d2c6fc6a44605047cbc
|
||||
|
||||
So bump CRYPTOPP_GCC_VERSION from 4.7 to 4.9 for AVX2 support
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/195e40b34344f773da51a3fbff9d8e76c517eed1
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/weidai11/cryptopp/pull/809]
|
||||
---
|
||||
config.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/config.h b/config.h
|
||||
index eccba009..4516d2b3 100644
|
||||
--- a/config.h
|
||||
+++ b/config.h
|
||||
@@ -591,7 +591,7 @@ NAMESPACE_END
|
||||
// Requires Binutils 2.24
|
||||
#if !defined(CRYPTOPP_DISABLE_AVX2) && defined(CRYPTOPP_AVX_AVAILABLE) && \
|
||||
(defined(__AVX2__) || (CRYPTOPP_MSC_VERSION >= 1800) || (__SUNPRO_CC >= 0x5130) || \
|
||||
- (CRYPTOPP_GCC_VERSION >= 40700) || (__INTEL_COMPILER >= 1400) || \
|
||||
+ (CRYPTOPP_GCC_VERSION >= 40900) || (__INTEL_COMPILER >= 1400) || \
|
||||
(CRYPTOPP_LLVM_CLANG_VERSION >= 30100) || (CRYPTOPP_APPLE_CLANG_VERSION >= 40600))
|
||||
#define CRYPTOPP_AVX2_AVAILABLE 1
|
||||
#endif
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -4,7 +4,6 @@ config BR2_PACKAGE_CUTELYST
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3
|
||||
select BR2_PACKAGE_OPENSSL
|
||||
select BR2_PACKAGE_QT5BASE_GUI
|
||||
help
|
||||
A C++ Web Framework built on top of Qt, using
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 d088e6dbbb9a1ef03b4481d44746a2b086724842f5ee85abe8095e2eb6fe0da4 cutelyst-2.5.2.tar.gz
|
||||
sha256 f87c2f04b148a50f5df13aa5d75b45bf20e56be2e2cd6e17c2aef5231db4b467 cutelyst-2.7.0.tar.gz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CUTELYST_VERSION = 2.5.2
|
||||
CUTELYST_VERSION = 2.7.0
|
||||
CUTELYST_SITE = https://github.com/cutelyst/cutelyst/archive/v$(CUTELYST_VERSION)
|
||||
CUTELYST_INSTALL_STAGING = YES
|
||||
CUTELYST_SUPPORTS_IN_SOURCE_BUILD = NO
|
||||
|
||||
@@ -4,4 +4,4 @@ config BR2_PACKAGE_DEVMEM2
|
||||
help
|
||||
Simple program to read/write from/to any location in memory.
|
||||
|
||||
http://free-electrons.com/pub/mirror/devmem2.c
|
||||
http://bootlin.com/pub/mirror/devmem2.c
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DEVMEM2_SITE = http://free-electrons.com/pub/mirror
|
||||
DEVMEM2_SITE = http://bootlin.com/pub/mirror
|
||||
DEVMEM2_SOURCE = devmem2.c
|
||||
DEVMEM2_VERSION = 1
|
||||
DEVMEM2_LICENSE = GPL-2.0+
|
||||
|
||||
@@ -3,7 +3,9 @@ config BR2_PACKAGE_DOCKER_CONTAINERD
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_PACKAGE_TOOLCHAIN_USES_UCLIBC # runc
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # runc
|
||||
depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # runc
|
||||
depends on BR2_USE_MMU # util-linux
|
||||
select BR2_PACKAGE_RUNC # runtime dependency
|
||||
select BR2_PACKAGE_UTIL_LINUX # runtime dependency
|
||||
@@ -32,4 +34,6 @@ comment "docker-containerd needs a glibc or musl toolchain w/ threads"
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
|
||||
|
||||
@@ -3,7 +3,9 @@ config BR2_PACKAGE_DOCKER_ENGINE
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 # docker-containerd -> runc
|
||||
depends on !BR2_TOOLCHAIN_USES_UCLIBC # docker-containerd -> runc
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM # docker-containerd -> runc
|
||||
depends on BR2_USE_MMU # docker-containerd
|
||||
select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency
|
||||
select BR2_PACKAGE_DOCKER_PROXY # runtime dependency
|
||||
@@ -50,8 +52,10 @@ config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS
|
||||
|
||||
endif
|
||||
|
||||
comment "docker-engine needs a glibc or musl toolchain w/ threads"
|
||||
comment "docker-engine needs a glibc or musl toolchain w/ threads, headers >= 3.11"
|
||||
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
|
||||
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_11 || BR2_TOOLCHAIN_USES_UCLIBC
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From b1f8b84489c96465b63485b884238b61d31ca84d Mon Sep 17 00:00:00 2001
|
||||
From 086283ed7f1886de05407bc75dd4c070c78a6f50 Mon Sep 17 00:00:00 2001
|
||||
From: Lothar Felten <lothar.felten@gmail.com>
|
||||
Date: Mon, 8 Oct 2018 13:29:44 +0200
|
||||
Subject: [PATCH 1/1] Fix include guards for older kernel/u-boot sources
|
||||
Subject: [PATCH] Fix include guards for older kernel/u-boot sources
|
||||
|
||||
Linux kernels before 4.17 and U-Boot versions before 2018.07 use libfdt
|
||||
include guards with leading underscores.
|
||||
@@ -12,11 +12,27 @@ This patch handles both include guard types and allows the compilation
|
||||
of older Linux kernel and u-boot sources.
|
||||
|
||||
Signed-off-by: Lothar Felten <lothar.felten@gmail.com>
|
||||
[ThomasDS: also update fdt.h which has the same issue, seen on U-Boot
|
||||
2011.03]
|
||||
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
||||
---
|
||||
libfdt/fdt.h | 4 ++++
|
||||
libfdt/libfdt.h | 4 ++++
|
||||
libfdt/libfdt_env.h | 4 ++++
|
||||
2 files changed, 8 insertions(+)
|
||||
3 files changed, 12 insertions(+)
|
||||
|
||||
diff --git a/libfdt/fdt.h b/libfdt/fdt.h
|
||||
index 74961f9..2904f48 100644
|
||||
--- a/libfdt/fdt.h
|
||||
+++ b/libfdt/fdt.h
|
||||
@@ -1,3 +1,7 @@
|
||||
+#ifdef _FDT_H
|
||||
+#warning "Please consider updating your kernel and/or u-boot version"
|
||||
+#define FDT_H
|
||||
+#endif
|
||||
#ifndef FDT_H
|
||||
#define FDT_H
|
||||
/*
|
||||
diff --git a/libfdt/libfdt.h b/libfdt/libfdt.h
|
||||
index 830b77e..bef4566 100644
|
||||
--- a/libfdt/libfdt.h
|
||||
@@ -42,5 +58,5 @@ index eb20538..6a61e6a 100644
|
||||
#define LIBFDT_ENV_H
|
||||
/*
|
||||
--
|
||||
2.11.0
|
||||
2.19.2
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@ config BR2_PACKAGE_EFIBOOTMGR
|
||||
depends on !BR2_STATIC_LIBS # efivar
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_8 # efivar
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
|
||||
select BR2_PACKAGE_EFIVAR
|
||||
select BR2_PACKAGE_POPT
|
||||
@@ -15,9 +16,10 @@ config BR2_PACKAGE_EFIBOOTMGR
|
||||
|
||||
https://github.com/rhboot/efibootmgr
|
||||
|
||||
comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9"
|
||||
comment "efibootmgr needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9, host gcc >= 4.8"
|
||||
depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS
|
||||
depends on BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_8
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
|
||||
|
||||
@@ -17,14 +17,17 @@ config BR2_PACKAGE_EFIVAR
|
||||
# toolchains.
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
# needs __builtin_bswap16
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_8
|
||||
help
|
||||
Tools and libraries to manipulate EFI variables
|
||||
|
||||
https://github.com/rhboot/efivar
|
||||
|
||||
comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9"
|
||||
comment "efivar needs a toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9, host gcc >= 4.8"
|
||||
depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS
|
||||
depends on BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_8
|
||||
depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From 6765eecde2ed8d4be0fc217408b9e9b92a840aff Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Tue, 4 Sep 2018 00:39:32 -0700
|
||||
Subject: [PATCH] gcc: xtensa: fix NAND code in xtensa_expand_atomic
|
||||
|
||||
NAND is ~(a1 & a2), but xtensa_expand_atomic does ~a1 & a2.
|
||||
That fixes libatomic tests atomic-op-{1,2}.
|
||||
|
||||
gcc/
|
||||
2018-09-04 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* config/xtensa/xtensa.c (xtensa_expand_atomic): Reorder AND and
|
||||
XOR operations in NAND case.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Backported from: r264087
|
||||
---
|
||||
gcc/config/xtensa/xtensa.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c
|
||||
index 7cfe64d42895..080bb4ad765d 100644
|
||||
--- a/gcc/config/xtensa/xtensa.c
|
||||
+++ b/gcc/config/xtensa/xtensa.c
|
||||
@@ -1614,9 +1614,9 @@ xtensa_expand_atomic (enum rtx_code code, rtx target, rtx mem, rtx val,
|
||||
break;
|
||||
|
||||
case MULT: /* NAND */
|
||||
- tmp = expand_simple_binop (SImode, XOR, old, ac.modemask,
|
||||
+ tmp = expand_simple_binop (SImode, AND, old, val,
|
||||
NULL_RTX, 1, OPTAB_DIRECT);
|
||||
- tmp = expand_simple_binop (SImode, AND, tmp, val,
|
||||
+ tmp = expand_simple_binop (SImode, XOR, tmp, ac.modemask,
|
||||
new_rtx, 1, OPTAB_DIRECT);
|
||||
break;
|
||||
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,41 +0,0 @@
|
||||
From 960a2552f7b418134cdf7a31e96023a3811b98dd Mon Sep 17 00:00:00 2001
|
||||
From: Max Filippov <jcmvbkbc@gmail.com>
|
||||
Date: Sun, 4 Nov 2018 23:55:59 -0800
|
||||
Subject: [PATCH] gcc: xtensa: don't force PIC for uclinux target
|
||||
|
||||
xtensa-uclinux uses bFLT executable file format that cannot relocate
|
||||
fields representing offsets from data to code. C++ objects built as PIC
|
||||
use offsets to encode FDE structures. As a result C++ exception handling
|
||||
doesn't work correctly on xtensa-uclinux. Don't use PIC by default on
|
||||
xtensa-uclinux.
|
||||
|
||||
gcc/
|
||||
2018-11-05 Max Filippov <jcmvbkbc@gmail.com>
|
||||
|
||||
* config/xtensa/uclinux.h (XTENSA_ALWAYS_PIC): Change to 0.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Backported from: r265823
|
||||
|
||||
gcc/config/xtensa/uclinux.h | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h
|
||||
index ba26187c8f7a..c7743df9d97c 100644
|
||||
--- a/gcc/config/xtensa/uclinux.h
|
||||
+++ b/gcc/config/xtensa/uclinux.h
|
||||
@@ -59,8 +59,8 @@ along with GCC; see the file COPYING3. If not see
|
||||
#undef LOCAL_LABEL_PREFIX
|
||||
#define LOCAL_LABEL_PREFIX "."
|
||||
|
||||
-/* Always enable "-fpic" for Xtensa Linux. */
|
||||
-#define XTENSA_ALWAYS_PIC 1
|
||||
+/* Don't enable "-fpic" for Xtensa uclinux. */
|
||||
+#define XTENSA_ALWAYS_PIC 0
|
||||
|
||||
#undef TARGET_LIBC_HAS_FUNCTION
|
||||
#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -84,7 +84,7 @@ config BR2_GCC_VERSION
|
||||
default "5.5.0" if BR2_GCC_VERSION_5_X
|
||||
default "6.5.0" if BR2_GCC_VERSION_6_X
|
||||
default "7.4.0" if BR2_GCC_VERSION_7_X
|
||||
default "8.2.0" if BR2_GCC_VERSION_8_X
|
||||
default "8.3.0" if BR2_GCC_VERSION_8_X
|
||||
default "arc-2018.09-release" if BR2_GCC_VERSION_ARC
|
||||
default "or1k-musl-5.4.0-20170218" if BR2_GCC_VERSION_OR1K
|
||||
|
||||
|
||||
@@ -6,8 +6,8 @@ sha512 670ff52c2ae12c7852c12987e91798c5aa8bd6daf21f0d6e0cd57a4aa59cc4f06a837fe7
|
||||
sha512 ce046f9a50050fd54b870aab764f7db187fe7ea92eb4aaffb7c3689ca623755604e231f2af97ef795f41c406bb80c797dd69957cfdd51dfa2ba60813f72b7eac gcc-6.5.0.tar.xz
|
||||
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-7.4.0/sha512.sum
|
||||
sha512 8864d8e4b97c2e1a4f17422f6e68120172ebefeab97b1757734f7185ca68a6b9a89011c6833c03fa454c17b0ac35b15e1d284881e6971035948ac6100f3aa45e gcc-7.4.0.tar.xz
|
||||
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.2.0/sha512.sum
|
||||
sha512 64898a165f67e136d802a92e7633bf1b06c85266027e52127ea025bf5fc2291b5e858288aac0bdba246e6cdf7c6ec88bc8e0e7f3f6f1985f4297710cafde56ed gcc-8.2.0.tar.xz
|
||||
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-8.3.0/sha512.sum
|
||||
sha512 1811337ae3add9680cec64968a2509d085b6dc5b6783fc1e8c295e3e47416196fd1a3ad8dfe7e10be2276b4f62c357659ce2902f239f60a8648548231b4b5802 gcc-8.3.0.tar.xz
|
||||
|
||||
# Locally calculated (fetched from Github)
|
||||
sha512 4d12c3ac27b9de9c533be3b8964cf23d21bf6933b5073183e1affe714b0ff33f9d6169e3b55a5c505d7dae33c9bb4f8b0d110461e3a124182d8c8d51b66b8e45 gcc-arc-2018.09-release.tar.gz
|
||||
|
||||
@@ -139,6 +139,11 @@ ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
|
||||
GDB_CONF_OPTS += --disable-build-with-cxx
|
||||
endif
|
||||
|
||||
# inprocess-agent can't be built statically
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
GDB_CONF_OPTS += --disable-inprocess-agent
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GDB_TUI),y)
|
||||
GDB_CONF_OPTS += --enable-tui
|
||||
else
|
||||
|
||||
@@ -42,6 +42,7 @@ HOST_GO_ROOT = $(HOST_DIR)/lib/go
|
||||
# For the convienience of target packages.
|
||||
HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH)
|
||||
HOST_GO_TARGET_ENV = \
|
||||
GO111MODULE=off \
|
||||
GOARCH=$(GO_GOARCH) \
|
||||
GOROOT="$(HOST_GO_ROOT)" \
|
||||
CC="$(TARGET_CC)" \
|
||||
@@ -61,6 +62,7 @@ endif
|
||||
# The go build system is not compatible with ccache, so use
|
||||
# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685.
|
||||
HOST_GO_MAKE_ENV = \
|
||||
GO111MODULE=off \
|
||||
GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \
|
||||
GOROOT_FINAL=$(HOST_GO_ROOT) \
|
||||
GOROOT="$(@D)" \
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
comment "gqrx needs a toolchain w/ C++, threads, wchar, dynamic library"
|
||||
depends on BR2_USE_MMU # gnuradio
|
||||
depends on !BR2_PACKAGE_PYTHON3 # gnuradio
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
!BR2_USE_WCHAR || !BR2_STATIC_LIBS
|
||||
|
||||
@@ -14,6 +15,7 @@ config BR2_PACKAGE_GQRX
|
||||
depends on BR2_INSTALL_LIBSTDCPP # boost
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # boost
|
||||
depends on BR2_USE_WCHAR # boost
|
||||
depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_ATOMIC
|
||||
depends on BR2_PACKAGE_QT5
|
||||
depends on !BR2_PACKAGE_PYTHON3
|
||||
select BR2_PACKAGE_BOOST
|
||||
|
||||
@@ -12,4 +12,10 @@ GQRX_DEPENDENCIES = boost gnuradio gr-osmosdr qt5base qt5svg
|
||||
|
||||
GQRX_CONF_OPTS = -DLINUX_AUDIO_BACKEND=Gr-audio
|
||||
|
||||
# gqrx can use __atomic builtins, so we need to link with
|
||||
# libatomic when available
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
GQRX_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
@@ -12,7 +12,8 @@ GST_PLUGINS_BAD_LICENSE = LGPL-2.1+, GPL-2.0+
|
||||
GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING
|
||||
|
||||
GST_PLUGINS_BAD_CONF_OPTS = \
|
||||
--disable-examples
|
||||
--disable-examples \
|
||||
--disable-spandsp
|
||||
|
||||
GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer
|
||||
|
||||
|
||||
@@ -21,6 +21,10 @@ I2PD_CONF_OPTS += -DWITH_GUI=OFF
|
||||
# build failure when cross-compiling.
|
||||
I2PD_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
I2PD_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
I2PD_CONF_OPTS += -DWITH_STATIC=ON
|
||||
else
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
From 8118c43a53271ba2dd31ce3913a3cd21bc7dcca7 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 16 Feb 2019 11:58:34 +0100
|
||||
Subject: [PATCH] ibrcommon/ssl/gcm: fix static build with openssl
|
||||
|
||||
gf_mul is already defined in libcrypto (openssl) so rename it into
|
||||
ibrdtn_gf_mul to fix following build failure:
|
||||
|
||||
/home/buildroot/autobuild/instance-3/output/host/bin/../arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libcrypto.a(f_impl.o): In function `gf_mul':
|
||||
f_impl.c:(.text+0x0): multiple definition of `gf_mul'
|
||||
/home/buildroot/autobuild/instance-3/output/host/arm-buildroot-uclinux-uclibcgnueabi/sysroot/usr/lib/libibrcommon.a(gf128mul.o):gf128mul.cpp:(.text+0x30): first defined here
|
||||
collect2: error: ld returned 1 exit status
|
||||
Makefile:560: recipe for target 'dtnd' failed
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/1d3b4b6cf043a3e185ce758b617a0a18c3d36cdb
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/ibrdtn/ibrdtn/pull/269]
|
||||
---
|
||||
ibrcommon/ibrcommon/ssl/gcm/gcm.cpp | 10 +++++-----
|
||||
ibrcommon/ibrcommon/ssl/gcm/gf128mul.cpp | 2 +-
|
||||
ibrcommon/ibrcommon/ssl/gcm/gf128mul.h | 2 +-
|
||||
3 files changed, 7 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/ibrcommon/ssl/gcm/gcm.cpp b/ibrcommon/ssl/gcm/gcm.cpp
|
||||
index 8a5745b4..6097b43e 100644
|
||||
--- a/ibrcommon/ssl/gcm/gcm.cpp
|
||||
+++ b/ibrcommon/ssl/gcm/gcm.cpp
|
||||
@@ -89,7 +89,7 @@ ret_type gcm_init_and_key( /* initialise mode and set key
|
||||
#elif defined( TABLES_256 )
|
||||
#define gf_mul_hh(a, ctx, scr) gf_mul_256(a, ctx->gf_t256, scr)
|
||||
#else
|
||||
-#define gf_mul_hh(a, ctx, scr) gf_mul(a, ui8_ptr(ctx->ghash_h))
|
||||
+#define gf_mul_hh(a, ctx, scr) ibrdtn_gf_mul(a, ui8_ptr(ctx->ghash_h))
|
||||
#endif
|
||||
|
||||
ret_type gcm_init_message( /* initialise a new message */
|
||||
@@ -334,9 +334,9 @@ ret_type gcm_compute_tag( /* compute authentication tag
|
||||
memcpy(tbuf, ctx->ghash_h, BLOCK_SIZE);
|
||||
for( ; ; )
|
||||
{
|
||||
- if(ln & 1) gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
|
||||
+ if(ln & 1) ibrdtn_gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
|
||||
if(!(ln >>= 1)) break;
|
||||
- gf_mul(tbuf, tbuf);
|
||||
+ ibrdtn_gf_mul(tbuf, tbuf);
|
||||
}
|
||||
}
|
||||
#else /* this one seems slower on x86 and x86_64 :-( */
|
||||
@@ -348,12 +348,12 @@ ret_type gcm_compute_tag( /* compute authentication tag
|
||||
tbuf[0] = 0x80;
|
||||
while(i)
|
||||
{
|
||||
- gf_mul(tbuf, tbuf);
|
||||
+ ibrdtn_gf_mul(tbuf, tbuf);
|
||||
if(i & ln)
|
||||
gf_mul_hh(tbuf, ctx, scratch);
|
||||
i >>= 1;
|
||||
}
|
||||
- gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
|
||||
+ ibrdtn_gf_mul(ui8_ptr(ctx->hdr_ghv), tbuf);
|
||||
}
|
||||
#endif
|
||||
i = BLOCK_SIZE; ln = (uint_32t)(ctx->txt_acnt << 3);
|
||||
diff --git a/ibrcommon/ssl/gcm/gf128mul.cpp b/ibrcommon/ssl/gcm/gf128mul.cpp
|
||||
index a553a044..d0c460c3 100644
|
||||
--- a/ibrcommon/ssl/gcm/gf128mul.cpp
|
||||
+++ b/ibrcommon/ssl/gcm/gf128mul.cpp
|
||||
@@ -103,7 +103,7 @@
|
||||
|
||||
const unsigned short gf_tab[256] = gf_dat(xda);
|
||||
|
||||
-void gf_mul(void *a, const void* b)
|
||||
+void ibrdtn_gf_mul(void *a, const void* b)
|
||||
{ uint_32t r[GF_BYTE_LEN >> 2], p[8][GF_BYTE_LEN >> 2];
|
||||
int i;
|
||||
|
||||
diff --git a/ibrcommon/ssl/gcm/gf128mul.h b/ibrcommon/ssl/gcm/gf128mul.h
|
||||
index 4645c7fe..65fba54b 100644
|
||||
--- a/ibrcommon/ssl/gcm/gf128mul.h
|
||||
+++ b/ibrcommon/ssl/gcm/gf128mul.h
|
||||
@@ -619,7 +619,7 @@ gf_inline void mul_x(void *r, const void *x)
|
||||
|
||||
/* A slow generic version of gf_mul (a = a * b) */
|
||||
|
||||
-void gf_mul(void *a, const void* b);
|
||||
+void ibrdtn_gf_mul(void *a, const void* b);
|
||||
|
||||
/* This version uses 64k bytes of table space on the stack.
|
||||
A 16 byte buffer has to be multiplied by a 16 byte key
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -9,8 +9,8 @@ config BR2_PACKAGE_IMAGEMAGICK
|
||||
JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF.
|
||||
Use ImageMagick to translate, flip, mirror, rotate, scale,
|
||||
shear and transform images, adjust image colors, apply various
|
||||
special effects, or draw text,
|
||||
lines, polygons, ellipses and Bézier curves.
|
||||
special effects, or draw text, lines, polygons, ellipses and
|
||||
Bézier curves.
|
||||
|
||||
http://www.imagemagick.org/
|
||||
|
||||
|
||||
@@ -18,7 +18,7 @@ ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx)
|
||||
# tests against distro libcrypto so it might get a false positive when
|
||||
# the openssl version is old, so force it off
|
||||
# SKIP_MD2 can be used only if ALLOW_GNU is defined.
|
||||
IPMIUTIL_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DALLOW_GNU -DSKIP_MD2"
|
||||
IPMIUTIL_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DALLOW_GNU -DSKIP_MD2 -DSSL11"
|
||||
IPMIUTIL_DEPENDENCIES += openssl
|
||||
else
|
||||
IPMIUTIL_CONF_OPTS += --disable-lanplus
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
From 9700927a008a803ac119bdf816bdc1baa69d705c Mon Sep 17 00:00:00 2001
|
||||
From: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
||||
Date: Wed, 20 Feb 2019 15:41:51 +0100
|
||||
Subject: [PATCH] ss: fix compilation under glibc < 2.18
|
||||
|
||||
Commit c759116a0b2b6da8df9687b0a40ac69050132c77 introduced support for
|
||||
AF_VSOCK. This define is only provided since glibc version 2.18, so
|
||||
compilation fails when using older toolchains.
|
||||
|
||||
Provide the necessary definitions if needed.
|
||||
|
||||
Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
|
||||
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||||
---
|
||||
misc/ss.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/misc/ss.c b/misc/ss.c
|
||||
index 9e821faf..766fdc5f 100644
|
||||
--- a/misc/ss.c
|
||||
+++ b/misc/ss.c
|
||||
@@ -51,6 +51,14 @@
|
||||
#include <linux/tipc_netlink.h>
|
||||
#include <linux/tipc_sockets_diag.h>
|
||||
|
||||
+/* AF_VSOCK/PF_VSOCK is only provided since glibc 2.18 */
|
||||
+#ifndef PF_VSOCK
|
||||
+#define PF_VSOCK 40
|
||||
+#endif
|
||||
+#ifndef AF_VSOCK
|
||||
+#define AF_VSOCK PF_VSOCK
|
||||
+#endif
|
||||
+
|
||||
#define MAGIC_SEQ 123456
|
||||
#define BUF_CHUNK (1024 * 1024)
|
||||
#define LEN_ALIGN(x) (((x) + 1) & ~1)
|
||||
--
|
||||
2.19.2
|
||||
|
||||
@@ -67,11 +67,12 @@ comment "MQTT transport needs a toolchain w/ threads and dynamic library support
|
||||
|
||||
config BR2_PACKAGE_JANUS_GATEWAY_RABBITMQ
|
||||
bool "RabbitMQ"
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
select BR2_PACKAGE_RABBITMQ_C
|
||||
|
||||
comment "RabbitMQ transport needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
comment "RabbitMQ transport needs a toolchain w/ dynamic library, threads"
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_JANUS_GATEWAY_REST
|
||||
bool "REST (HTTP/HTTPS)"
|
||||
|
||||
@@ -1,85 +0,0 @@
|
||||
From e8b6b7adc138a66f8d47396a2e707366d3771028 Mon Sep 17 00:00:00 2001
|
||||
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
Date: Mon, 31 Dec 2018 18:42:09 +0100
|
||||
Subject: [PATCH] buildsystem: relax requirement on cmake version
|
||||
|
||||
Commit 73cc5089 (Using target_compile_features to specify C++ 11
|
||||
standard) bumped the required cmake version, from 3.0 to 3.8, so
|
||||
as to get the definition of target_compile_features().
|
||||
|
||||
However, target_compile_features() was introduced in cmake-3.1:
|
||||
https://cmake.org/cmake/help/v3.1/command/target_compile_features.html
|
||||
|
||||
And using cmake-3.1 is indeed sufficient to properly build.
|
||||
|
||||
As such, relax the minimum required version down to cmake-3.1,
|
||||
so we can build on oldish, entreprise-grade distributions that
|
||||
only have cmake-3.1 (or at least, don't have up to cmake-3.8).
|
||||
|
||||
Reported-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
---
|
||||
Upstream status: MR pending
|
||||
https://github.com/nlohmann/json/pull/1409
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
benchmarks/CMakeLists.txt | 2 +-
|
||||
test/cmake_add_subdirectory/project/CMakeLists.txt | 2 +-
|
||||
test/cmake_import/project/CMakeLists.txt | 2 +-
|
||||
test/cmake_import_minver/project/CMakeLists.txt | 2 +-
|
||||
5 files changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 409f5bff..da6f08e7 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
|
||||
##
|
||||
## PROJECT
|
||||
diff --git a/benchmarks/CMakeLists.txt b/benchmarks/CMakeLists.txt
|
||||
index a53812c1..dd3f3027 100644
|
||||
--- a/benchmarks/CMakeLists.txt
|
||||
+++ b/benchmarks/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
project(JSON_Benchmarks LANGUAGES CXX)
|
||||
|
||||
# set compiler flags
|
||||
diff --git a/test/cmake_add_subdirectory/project/CMakeLists.txt b/test/cmake_add_subdirectory/project/CMakeLists.txt
|
||||
index 2c5be183..21357b68 100644
|
||||
--- a/test/cmake_add_subdirectory/project/CMakeLists.txt
|
||||
+++ b/test/cmake_add_subdirectory/project/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
|
||||
project(DummyImport CXX)
|
||||
|
||||
diff --git a/test/cmake_import/project/CMakeLists.txt b/test/cmake_import/project/CMakeLists.txt
|
||||
index d268d72c..fe892fc1 100644
|
||||
--- a/test/cmake_import/project/CMakeLists.txt
|
||||
+++ b/test/cmake_import/project/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
|
||||
project(DummyImport CXX)
|
||||
|
||||
diff --git a/test/cmake_import_minver/project/CMakeLists.txt b/test/cmake_import_minver/project/CMakeLists.txt
|
||||
index eeef3296..29056bdc 100644
|
||||
--- a/test/cmake_import_minver/project/CMakeLists.txt
|
||||
+++ b/test/cmake_import_minver/project/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.8)
|
||||
+cmake_minimum_required(VERSION 3.1)
|
||||
|
||||
project(DummyImportMinVer CXX)
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -10,6 +10,10 @@ LIBCPPRESTSDK_LICENSE = MIT
|
||||
LIBCPPRESTSDK_LICENSE_FILES = license.txt
|
||||
LIBCPPRESTSDK_SUBDIR = Release
|
||||
LIBCPPRESTSDK_DEPENDENCIES += host-pkgconf boost openssl zlib
|
||||
LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON
|
||||
LIBCPPRESTSDK_CONF_OPTS = -DWERROR=OFF -DCPPREST_EXCLUDE_WEBSOCKETS=ON -DBUILD_SAMPLES=OFF
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
LIBCPPRESTSDK_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
|
||||
endif
|
||||
|
||||
$(eval $(cmake-package))
|
||||
|
||||
@@ -46,7 +46,7 @@ LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)
|
||||
LIBCURL_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr \
|
||||
--with-ca-path=/etc/ssl/certs
|
||||
else
|
||||
LIBCURL_CONF_OPTS += -without-ssl
|
||||
LIBCURL_CONF_OPTS += --without-ssl
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCURL_GNUTLS),y)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From https://www.kernel.org/pub/software/libs/libgpiod/sha256sums.asc
|
||||
sha256 b6b9079c933f7c8524815437937dda6b795a16141bca202a9eec70ba5844b5ba libgpiod-1.2.tar.xz
|
||||
sha256 736d8b511ad247c2acb01b592f2bbe5e757e14e1d8347b2d80683081ab4b31b8 libgpiod-1.2.1.tar.xz
|
||||
# Hash for license file
|
||||
sha256 ce64d5f7b49ea6d80fdb6d4cdee6839d1a94274f7493dc797c3b55b65ec8e9ed COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBGPIOD_VERSION = 1.2
|
||||
LIBGPIOD_VERSION = 1.2.1
|
||||
LIBGPIOD_SOURCE = libgpiod-$(LIBGPIOD_VERSION).tar.xz
|
||||
LIBGPIOD_SITE = https://www.kernel.org/pub/software/libs/libgpiod
|
||||
LIBGPIOD_LICENSE = LGPL-2.1+
|
||||
|
||||
@@ -8,4 +8,5 @@ Description: ID3 tag reading library
|
||||
Version: 0.15.1b
|
||||
Requires:
|
||||
Libs: -L${libdir} -lid3tag
|
||||
Libs.private: -lz
|
||||
Cflags: -I${includedir}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated
|
||||
sha256 7cf724a40a0d8915869498f51062a952167e4f5bae2b6920542c9e0e079a471d LibRaw-0.18.11.tar.gz
|
||||
sha256 400d47969292291d297873a06fb0535ccce70728117463927ddd9452aa849644 LibRaw-0.19.2.tar.gz
|
||||
sha256 eea173a556abac0370461e57e12aab266894ea6be3874c2be05fd87871f75449 LICENSE.LGPL
|
||||
sha256 0e3098d2d54a12434715f6679ea408d57da5e8d613c385c58ecc6fe5d30cc81f LICENSE.CDDL
|
||||
sha256 7fe7564c5d48c5d353d7c1966dcddada3791586a4c2eedbc68ad56e96955e75d README
|
||||
sha256 eee0055723d3483ef3ee7920e2178177b14a334c2a622be4101bcfb05d21407e README.md
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBRAW_VERSION = 0.18.11
|
||||
LIBRAW_VERSION = 0.19.2
|
||||
LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz
|
||||
LIBRAW_SITE = http://www.libraw.org/data
|
||||
LIBRAW_INSTALL_STAGING = YES
|
||||
@@ -14,7 +14,7 @@ LIBRAW_CONF_OPTS += \
|
||||
--disable-demosaic-pack-gpl2 \
|
||||
--disable-demosaic-pack-gpl3
|
||||
LIBRAW_LICENSE = LGPL-2.1 or CDDL-1.0
|
||||
LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README
|
||||
LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL README.md
|
||||
LIBRAW_DEPENDENCIES = host-pkgconf
|
||||
LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS)
|
||||
LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)"
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
From 7d2d1039f303b6322ecb72eebae39b699fd28d19 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Fri, 22 Feb 2019 01:31:11 +0100
|
||||
Subject: [PATCH] Add Libs.private in soxr.pc.in for static linking
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
If libsoxr is build statically against libavutil other applications
|
||||
needs to know that they must link with `-lavutil` when building in a
|
||||
static context.
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
src/soxr.pc.in | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ee48f6c..714bd4d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -139,6 +139,7 @@ if (WITH_AVFFT OR (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm" AND SIMD32_FOUND AND WI
|
||||
if (AVUTIL_FOUND)
|
||||
include_directories (${AVUTIL_INCLUDE_DIRS})
|
||||
set (LIBS ${LIBS} ${AVUTIL_LIBRARIES})
|
||||
+ set (PKGCONF_LIBS_PRIV ${PKGCONF_LIBS_PRIV} -lavutil)
|
||||
endif ()
|
||||
endif ()
|
||||
|
||||
diff --git a/src/soxr.pc.in b/src/soxr.pc.in
|
||||
index 69d225b..6c530a6 100644
|
||||
--- a/src/soxr.pc.in
|
||||
+++ b/src/soxr.pc.in
|
||||
@@ -2,4 +2,5 @@ Name: ${PROJECT_NAME}
|
||||
Description: ${DESCRIPTION_SUMMARY}
|
||||
Version: ${PROJECT_VERSION}
|
||||
Libs: -L${LIB_INSTALL_DIR} -l${PROJECT_NAME}
|
||||
+Libs.private: ${PKGCONF_LIBS_PRIV}
|
||||
Cflags: -I${INCLUDE_INSTALL_DIR}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,33 +0,0 @@
|
||||
From 8c1edfc22f8b714062b149e3d80ab4357a1a4e49 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 22 Nov 2018 19:10:03 +0100
|
||||
Subject: [PATCH] soxr.pc.in: add avutil libraries
|
||||
|
||||
Add ${AVUTIL_LIBRARIES} to soxr.pc.in so applications such as
|
||||
shairport-sync will know that they must link with -lavutil when
|
||||
building statically
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/839c0ce6475accc1de7e8a180d4358edb6750c64
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://sourceforge.net/p/soxr/code/merge-requests/2]
|
||||
[Thomas: move to Libs.private.]
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
src/soxr.pc.in | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/soxr.pc.in b/src/soxr.pc.in
|
||||
index 69d225b..ed212a8 100644
|
||||
--- a/src/soxr.pc.in
|
||||
+++ b/src/soxr.pc.in
|
||||
@@ -2,4 +2,5 @@ Name: ${PROJECT_NAME}
|
||||
Description: ${DESCRIPTION_SUMMARY}
|
||||
Version: ${PROJECT_VERSION}
|
||||
Libs: -L${LIB_INSTALL_DIR} -l${PROJECT_NAME}
|
||||
+Libs.private: ${AVUTIL_LIBRARIES}
|
||||
Cflags: -I${INCLUDE_INSTALL_DIR}
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From c95bf48d0ef26ccf2135e09f0b2f8d0e54bd88e9 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@cryptomilk.org>
|
||||
Date: Fri, 7 Dec 2018 12:07:13 +0100
|
||||
Subject: [PATCH] connect: Fix size type for i an j in ssh_select()
|
||||
|
||||
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
|
||||
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
|
||||
---
|
||||
Upstream status: commit 58113d489eecf
|
||||
|
||||
src/connect.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/connect.c b/src/connect.c
|
||||
index 6c09c3f638ba..7ff7513fb3e8 100644
|
||||
--- a/src/connect.c
|
||||
+++ b/src/connect.c
|
||||
@@ -476,7 +476,7 @@ int ssh_select(ssh_channel *channels, ssh_channel *outchannels, socket_t maxfd,
|
||||
fd_set *readfds, struct timeval *timeout) {
|
||||
fd_set origfds;
|
||||
socket_t fd;
|
||||
- int i,j;
|
||||
+ size_t i, j;
|
||||
int rc;
|
||||
int base_tm, tm;
|
||||
struct ssh_timestamp ts;
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
# https://www.libssh.org/files/0.8/libssh-0.8.6.tar.xz.asc
|
||||
# https://www.libssh.org/files/0.8/libssh-0.8.7.tar.xz.asc
|
||||
# with key 8DFF53E18F2ABC8D8F3C92237EE0FC4DCC014E3D
|
||||
sha256 1046b95632a07fc00b1ea70ee683072d0c8a23f544f4535440b727812002fd01 libssh-0.8.6.tar.xz
|
||||
sha256 43304ca22f0ba0b654e14b574a39816bc70212fdea5858a6637cc26cade3d592 libssh-0.8.7.tar.xz
|
||||
sha256 1656186e951db1c010a8485481fa94587f7e53a26d24976bef97945ad0c4df5a COPYING
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
LIBSSH_VERSION_MAJOR = 0.8
|
||||
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).6
|
||||
LIBSSH_VERSION = $(LIBSSH_VERSION_MAJOR).7
|
||||
LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
|
||||
LIBSSH_SITE = https://www.libssh.org/files/$(LIBSSH_VERSION_MAJOR)
|
||||
LIBSSH_LICENSE = LGPL-2.1
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# Locally calculated after checking signature
|
||||
# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.2.tar.bz2.asc
|
||||
sha256 6c3208c9a1c73455d30bae83096d161e57bec5008594f270a2a67df8c86d8e47 v4l-utils-1.16.2.tar.bz2
|
||||
# https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.16.3.tar.bz2.asc
|
||||
sha256 7c5c0d49c130cf65d384f28e9f3a53c5f7d17bf18740c48c40810e0fbbed5b54 v4l-utils-1.16.3.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 391e4da1c54a422a78d83be7bf84b2dfb8bacdd8ad256fa4374e128655584a8a COPYING
|
||||
sha256 5a7f623a50e384aaf6d2ced068339ddf93d0a50d3a0ecbe86f125b07804ecc78 COPYING.libv4l
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBV4L_VERSION = 1.16.2
|
||||
LIBV4L_VERSION = 1.16.3
|
||||
LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2
|
||||
LIBV4L_SITE = https://linuxtv.org/downloads/v4l-utils
|
||||
LIBV4L_INSTALL_STAGING = YES
|
||||
|
||||
@@ -287,11 +287,11 @@ endchoice
|
||||
|
||||
config BR2_DEFAULT_KERNEL_HEADERS
|
||||
string
|
||||
default "4.4.172" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.153" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.96" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.19.18" if BR2_KERNEL_HEADERS_4_19
|
||||
default "4.20.5" if BR2_KERNEL_HEADERS_4_20
|
||||
default "4.4.176" if BR2_KERNEL_HEADERS_4_4
|
||||
default "4.9.160" if BR2_KERNEL_HEADERS_4_9
|
||||
default "4.14.103" if BR2_KERNEL_HEADERS_4_14
|
||||
default "4.19.25" if BR2_KERNEL_HEADERS_4_19
|
||||
default "4.20.12" if BR2_KERNEL_HEADERS_4_20
|
||||
default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
|
||||
default "custom" if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
|
||||
default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
|
||||
|
||||
@@ -11,4 +11,8 @@ LOG4CPLUS_LICENSE = Apache-2.0, BSD-2-Clause, BSD-like (threadpool)
|
||||
LOG4CPLUS_LICENSE_FILES = LICENSE
|
||||
LOG4CPLUS_INSTALL_STAGING = YES
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
LOG4CPLUS_CONF_ENV += LIBS='-latomic'
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -0,0 +1,40 @@
|
||||
From 28ac0c5e642c9f7e3091a60268745f7cab4cc92b Mon Sep 17 00:00:00 2001
|
||||
From: Francois Perrad <francois.perrad@gadz.org>
|
||||
Date: Sat, 23 Feb 2019 15:23:26 +0100
|
||||
Subject: [PATCH] add variant definition of lcurl_url_t
|
||||
|
||||
like in lceasy.h
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
---
|
||||
src/lcurlapi.h | 9 +++++++++
|
||||
1 file changed, 9 insertions(+)
|
||||
|
||||
diff --git a/Lua-cURLv3-0.3.9/src/lcurlapi.h b/Lua-cURLv3-0.3.9/src/lcurlapi.h
|
||||
index 4dd4672..862c94f 100644
|
||||
--- a/Lua-cURLv3-0.3.9/src/lcurlapi.h
|
||||
+++ b/Lua-cURLv3-0.3.9/src/lcurlapi.h
|
||||
@@ -19,11 +19,20 @@
|
||||
|
||||
#if LCURL_CURL_VER_GE(7,62,0)
|
||||
|
||||
+#if LCURL_CC_SUPPORT_FORWARD_TYPEDEF
|
||||
typedef struct lcurl_url_tag {
|
||||
CURLU *url;
|
||||
|
||||
int err_mode;
|
||||
}lcurl_url_t;
|
||||
+#else
|
||||
+struct lcurl_url_tag {
|
||||
+ CURLU *url;
|
||||
+
|
||||
+ int err_mode;
|
||||
+};
|
||||
+#define lcurl_url_t struct lcurl_url_tag
|
||||
+#endif
|
||||
|
||||
int lcurl_url_create(lua_State *L, int error_mode);
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
40
package/luaexpat/0001-restore-getcurrentbytecount.patch
Normal file
40
package/luaexpat/0001-restore-getcurrentbytecount.patch
Normal file
@@ -0,0 +1,40 @@
|
||||
From 77cb691f781918908dfe34785f00a5ff75d5cc20 Mon Sep 17 00:00:00 2001
|
||||
From: Francois Perrad <francois.perrad@gadz.org>
|
||||
Date: Sat, 16 Feb 2019 15:56:00 +0100
|
||||
Subject: [PATCH] restore getcurrentbytecount
|
||||
|
||||
see https://github.com/tomasguisasola/luaexpat/issues/3
|
||||
|
||||
Fetch from: https://github.com/tomasguisasola/luaexpat/commit/0926f2d705109b7d35b721344264b39c1169e0de
|
||||
|
||||
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
|
||||
---
|
||||
src/lxplib.c | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/luaexpat-1.3.3/src/lxplib.c b/luaexpat-1.3.3/src/lxplib.c
|
||||
index 7726913..35bec3c 100644
|
||||
--- a/luaexpat-1.3.3/src/lxplib.c
|
||||
+++ b/luaexpat-1.3.3/src/lxplib.c
|
||||
@@ -538,11 +538,18 @@ static int lxp_stop (lua_State *L) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
+static int lxp_getcurrentbytecount (lua_State* L) {
|
||||
+ lxp_userdata *xpu = checkparser(L, 1);
|
||||
+ lua_pushinteger(L, XML_GetCurrentByteCount(xpu->parser));
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
static const luaL_Reg lxp_meths[] = {
|
||||
{"parse", lxp_parse},
|
||||
{"close", lxp_close},
|
||||
{"__gc", parser_gc},
|
||||
{"pos", lxp_pos},
|
||||
+ {"getcurrentbytecount", lxp_getcurrentbytecount},
|
||||
{"setencoding", lxp_setencoding},
|
||||
{"getcallbacks", getcallbacks},
|
||||
{"getbase", getbase},
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@@ -1,61 +0,0 @@
|
||||
From 7f9fcbd827295df72b15466fd3c47589d52117b9 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Wed, 31 Oct 2018 18:22:31 +0100
|
||||
Subject: [PATCH] Add missing define for luaL_newlib for Lua 5.1
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Since commit c286f3b741d0968fd1c49c28da83bc723468ecba, which bumped the
|
||||
library luv to version 1.22.0-1, building luvi fails.
|
||||
|
||||
The reason for this error is, that instead of defining Lua 5.3 API itself,
|
||||
luv now [1] uses lua-compat-5.3 [1,2] for providing a Lua 5.3 API.
|
||||
|
||||
Unfortunately, upstreams "luv.h" now exposes "compat-5.3.h" directly, causing
|
||||
redefinition errors when building luvi 2.7.6 (as well as latest release 2.8.0)
|
||||
with luv 1.22.0-1. Instead, "compat-5.3.h" should only be included in "luv.c",
|
||||
which is addressed in patching luv (Patch: "Do not include compat-5.3.h in luv
|
||||
header file").
|
||||
|
||||
Patching luv reveals an issue in luvi itself, as it is using the Lua 5.3 API,
|
||||
without defining the Lua 5.3 itself, nor using lua-compat-5.3. Instead, it was
|
||||
using the definition provided by the "luv.h" file in luv versions before 1.22.0.
|
||||
|
||||
Correctly, luvi should define the necessary Lua 5.3 itself, which is done by
|
||||
this patch, by providing a definition for `luaL_newlib`.
|
||||
|
||||
Note, that this patch is not upstreamable, as upstream already switched to
|
||||
using lua-compat-5.3 [3,4]. However, backporting this patch set is to much of a
|
||||
burden, so we keep it simple, by just defining `luaL_newlib`.
|
||||
|
||||
[1] https://github.com/luvit/luv/commit/34ada3e1d75796d2295ec54f3f20b3e2abf93406
|
||||
[2] https://github.com/keplerproject/lua-compat-5.3
|
||||
[3] https://github.com/luvit/luvi/commit/3a444d183d2fde91b6c2f3798b37881cdaa29691
|
||||
[4] https://github.com/luvit/luvi/commit/0376894bae7c1c3bee42ddad65e824da9cccdada
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
src/luvi.h | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/luvi.h b/src/luvi.h
|
||||
index e7558b3..ceca2b9 100644
|
||||
--- a/src/luvi.h
|
||||
+++ b/src/luvi.h
|
||||
@@ -52,6 +52,12 @@ int luaopen_lpeg(lua_State* L);
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#if LUA_VERSION_NUM < 502
|
||||
+#ifndef luaL_newlib
|
||||
+# define luaL_newlib(L,l) (lua_newtable(L), luaL_register(L,NULL,l))
|
||||
+#endif
|
||||
+#endif
|
||||
+
|
||||
#if (LUA_VERSION_NUM >= 502)
|
||||
# undef luaL_register
|
||||
# define luaL_register(L,n,f) \
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
From 1ea2c1e372ab59b9a633a51f0dcefc24328528f1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Mon, 10 Sep 2018 08:18:38 +0200
|
||||
Subject: [PATCH] luvi executable needs to export symbols
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Using CMake 3.12 running luvi fails with:
|
||||
|
||||
```
|
||||
[string "return require('init')(...)"]:1: module 'init' not found:
|
||||
no field package.preload['init']
|
||||
no file './init.lua'
|
||||
no file '/usr/share/luajit-2.0.5/init.lua'
|
||||
no file '/usr/local/share/lua/5.1/init.lua'
|
||||
no file '/usr/local/share/lua/5.1/init/init.lua'
|
||||
no file '/usr/share/lua/5.1/init.lua'
|
||||
no file '/usr/share/lua/5.1/init/init.lua'
|
||||
no file './init.so'
|
||||
no file '/usr/local/lib/lua/5.1/init.so'
|
||||
no file '/usr/lib/lua/5.1/init.so'
|
||||
no file '/usr/local/lib/lua/5.1/loadall.so'
|
||||
```
|
||||
|
||||
Looking at link.txt for the luvi executable shows that `-rdynamic` is
|
||||
not set anymore in CMake 3.12. This has the effect, that symbols are
|
||||
missing in the `.dynsym` section.
|
||||
|
||||
Therefore, set `ENABLE_EXPORTS` to true which set `-rdynamic` explicitly.
|
||||
|
||||
Upstream status: b8781653dcb8815a3019a77baf4f3b7f7a255ebe
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
---
|
||||
CMakeLists.txt | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index e141f8e..8219d0b 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -158,6 +158,7 @@ if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
|
||||
endif()
|
||||
|
||||
target_link_libraries(luvi ${LUVI_LIBRARIES} ${EXTRA_LIBS} ${CMAKE_THREAD_LIBS_INIT})
|
||||
+set_target_properties(luvi PROPERTIES ENABLE_EXPORTS ON)
|
||||
|
||||
###############################################################################
|
||||
## Installation Targets
|
||||
--
|
||||
2.19.1
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 ce9a1fb762e61267618ddea9ea129170fd543bb918c382b71cb35985d0024c42 luvi-src-v2.7.6.tar.gz
|
||||
sha256 81e898dc67b8166222716f763d8d0e0307132edc999167259d28ad0b54e20a7f luvi-src-v2.9.0.tar.gz
|
||||
sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt
|
||||
|
||||
@@ -4,9 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
# we keep version 2.7.6 because 2.8.0 causes build errors and only
|
||||
# contains updates to submodules we do not need
|
||||
LUVI_VERSION = v2.7.6
|
||||
LUVI_VERSION = v2.9.0
|
||||
LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz
|
||||
LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION)
|
||||
LUVI_LICENSE = Apache-2.0
|
||||
|
||||
@@ -1,109 +0,0 @@
|
||||
From ce661985c098635965573aac8fc983a72f60d396 Mon Sep 17 00:00:00 2001
|
||||
From: Romain Naour <romain.naour@gmail.com>
|
||||
Date: Tue, 30 May 2017 16:42:34 +0200
|
||||
Subject: [PATCH] buildroot-libtool-v1.5.patch
|
||||
|
||||
Apply buildroot-libtool-v1.5.patch rebased on libtool 1.5.2 used
|
||||
in madplay and fixing all conflicts.
|
||||
|
||||
Signed-off-by: Romain Naour <romain.naour@gmail.com>
|
||||
---
|
||||
ltmain.sh | 40 ++++++++++++++++++++++++++++++----------
|
||||
1 file changed, 30 insertions(+), 10 deletions(-)
|
||||
|
||||
diff --git a/ltmain.sh b/ltmain.sh
|
||||
index 4b9f940..0b71220 100644
|
||||
--- a/ltmain.sh
|
||||
+++ b/ltmain.sh
|
||||
@@ -164,6 +164,11 @@ do
|
||||
arg="$1"
|
||||
shift
|
||||
|
||||
+ # Make -static behave as -all-static
|
||||
+ case $arg in
|
||||
+ -static) arg="-all-static" ;;
|
||||
+ esac
|
||||
+
|
||||
case $arg in
|
||||
-*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
|
||||
*) optarg= ;;
|
||||
@@ -549,8 +554,9 @@ if test -z "$show_help"; then
|
||||
# line option must be used.
|
||||
if test -z "$tagname"; then
|
||||
$echo "$modename: unable to infer tagged configuration"
|
||||
- $echo "$modename: specify a tag with \`--tag'" 1>&2
|
||||
- exit 1
|
||||
+ $echo "$modename: defaulting to \`CC'"
|
||||
+ $echo "$modename: if this is not correct, specify a tag with \`--tag'"
|
||||
+# exit 1
|
||||
# else
|
||||
# $echo "$modename: using $tagname tagged configuration"
|
||||
fi
|
||||
@@ -1228,7 +1234,8 @@ EOF
|
||||
prevarg="$arg"
|
||||
|
||||
case $arg in
|
||||
- -all-static)
|
||||
+ # Make -static behave like -all-static
|
||||
+ -all-static | -static)
|
||||
if test -n "$link_static_flag"; then
|
||||
compile_command="$compile_command $link_static_flag"
|
||||
finalize_command="$finalize_command $link_static_flag"
|
||||
@@ -2135,8 +2142,14 @@ EOF
|
||||
absdir="$abs_ladir"
|
||||
libdir="$abs_ladir"
|
||||
else
|
||||
- dir="$libdir"
|
||||
- absdir="$libdir"
|
||||
+ # Adding 'libdir' from the .la file to our library search paths
|
||||
+ # breaks crosscompilation horribly. We cheat here and don't add
|
||||
+ # it, instead adding the path where we found the .la. -CL
|
||||
+ dir="$abs_ladir"
|
||||
+ absdir="$abs_ladir"
|
||||
+ libdir="$abs_ladir"
|
||||
+ #dir="$libdir"
|
||||
+ #absdir="$libdir"
|
||||
fi
|
||||
else
|
||||
dir="$ladir/$objdir"
|
||||
@@ -2261,7 +2274,7 @@ EOF
|
||||
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
|
||||
if test "$installed" = no; then
|
||||
notinst_deplibs="$notinst_deplibs $lib"
|
||||
- need_relink=yes
|
||||
+ need_relink=no
|
||||
fi
|
||||
# This is a shared library
|
||||
|
||||
@@ -5146,6 +5159,10 @@ fi\
|
||||
# Replace all uninstalled libtool libraries with the installed ones
|
||||
newdependency_libs=
|
||||
for deplib in $dependency_libs; do
|
||||
+ # Replacing uninstalled with installed can easily break crosscompilation,
|
||||
+ # since the installed path is generally the wrong architecture. -CL
|
||||
+ newdependency_libs="$newdependency_libs $deplib"
|
||||
+ continue
|
||||
case $deplib in
|
||||
*.la)
|
||||
name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
|
||||
@@ -5464,10 +5481,13 @@ relink_command=\"$relink_command\""
|
||||
# At present, this check doesn't affect windows .dll's that
|
||||
# are installed into $libdir/../bin (currently, that works fine)
|
||||
# but it's something to keep an eye on.
|
||||
- if test "$inst_prefix_dir" = "$destdir"; then
|
||||
- $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
||||
- exit 1
|
||||
- fi
|
||||
+ #
|
||||
+ # This breaks install into our staging area. -PB
|
||||
+ #
|
||||
+ # if test "$inst_prefix_dir" = "$destdir"; then
|
||||
+ # $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
|
||||
+ # exit 1
|
||||
+ # fi
|
||||
|
||||
if test -n "$inst_prefix_dir"; then
|
||||
# Stick the inst_prefix_dir data into the link command.
|
||||
--
|
||||
2.9.4
|
||||
|
||||
16
package/madplay/0002-configure-ac-automake-foreign.patch
Normal file
16
package/madplay/0002-configure-ac-automake-foreign.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
configure.ac: don't require GNU-specific files when running automake
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
diff -durN madplay-0.15.2b-orig/configure.ac madplay-0.15.2b/configure.ac
|
||||
--- madplay-0.15.2b-orig/configure.ac 2019-02-14 21:34:01.507212449 +0100
|
||||
+++ madplay-0.15.2b/configure.ac 2019-02-14 21:34:23.439336353 +0100
|
||||
@@ -26,7 +26,7 @@
|
||||
|
||||
AC_CONFIG_SRCDIR([madplay.c])
|
||||
|
||||
-AM_INIT_AUTOMAKE
|
||||
+AM_INIT_AUTOMAKE([foreign])
|
||||
|
||||
AM_CONFIG_HEADER([config.h])
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
configure.ac: use pkg-config to find id3tag
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
|
||||
diff -durN madplay-0.15.2b-orig/configure.ac madplay-0.15.2b/configure.ac
|
||||
--- madplay-0.15.2b-orig/configure.ac 2019-02-14 21:34:01.507212449 +0100
|
||||
+++ madplay-0.15.2b/configure.ac 2019-02-15 23:24:00.079876087 +0100
|
||||
@@ -182,12 +182,13 @@
|
||||
*** environment variable to specify its installed location, e.g. -L<dir>.])
|
||||
])
|
||||
|
||||
-AC_CHECK_LIB(id3tag, id3_tag_parse, :, [
|
||||
+PKG_CHECK_MODULES(ID3TAG, id3tag, [
|
||||
+ CFLAGS="$CFLAGS $ID3TAG_CFLAGS" LIBS="$LIBS $ID3TAG_LIBS"], [
|
||||
AC_MSG_ERROR([libid3tag was not found
|
||||
*** You must first install libid3tag before you can build this package.
|
||||
*** If libid3tag is already installed, you may need to use the LDFLAGS
|
||||
*** environment variable to specify its installed location, e.g. -L<dir>.])
|
||||
-], [-lz])
|
||||
+])
|
||||
|
||||
AC_FUNC_VPRINTF
|
||||
AC_CHECK_FUNCS(madvise localeconv)
|
||||
@@ -1,2 +1,4 @@
|
||||
# Locally computed:
|
||||
sha256 5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0 madplay-0.15.2b.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 915bfd70548f31d11f9b4ffb21f343d1196af96c79d6aaac5663ea46c39dd3a3 COPYRIGHT
|
||||
|
||||
@@ -8,14 +8,18 @@ MADPLAY_VERSION = 0.15.2b
|
||||
MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION)
|
||||
MADPLAY_LICENSE = GPL-2.0+
|
||||
MADPLAY_LICENSE_FILES = COPYING COPYRIGHT
|
||||
MADPLAY_LIBTOOL_PATCH = NO
|
||||
MADPLAY_DEPENDENCIES = libmad libid3tag $(TARGET_NLS_DEPENDENCIES)
|
||||
MADPLAY_DEPENDENCIES = host-pkgconf libmad libid3tag $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
# Force autoreconf to be able to use a more recent libtool script, that
|
||||
# is able to properly behave in the face of a missing C++ compiler.
|
||||
# Also 0003-configure-ac-use-pkg-config-to-find-id3tag.patch
|
||||
MADPLAY_AUTORECONF = YES
|
||||
|
||||
# Check if ALSA is built, then we should configure after alsa-lib so
|
||||
# ./configure can find alsa-lib.
|
||||
ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y)
|
||||
MADPLAY_CONF_OPTS += --with-alsa
|
||||
MADPLAY_DEPENDENCIES += host-pkgconf alsa-lib
|
||||
MADPLAY_DEPENDENCIES += alsa-lib
|
||||
MADPLAY_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs alsa`"
|
||||
endif
|
||||
|
||||
|
||||
@@ -24,7 +24,7 @@ start() {
|
||||
printf "Starting mender service: "
|
||||
umask 077
|
||||
|
||||
start-stop-daemon -S -q -p /var/run/mender.pid \
|
||||
start-stop-daemon -S -q -b -m -p /var/run/mender.pid \
|
||||
--exec /usr/bin/mender -- -daemon
|
||||
[ $? = 0 ] && echo "OK" || echo "FAIL"
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally computed:
|
||||
sha256 caee18d1b8446df0cbb9a9c5a1c040d7eb1924332da94c3489494443a8077eb8 mender-1.7.0.tar.gz
|
||||
sha256 caee18d1b8446df0cbb9a9c5a1c040d7eb1924332da94c3489494443a8077eb8 1.7.0.tar.gz
|
||||
|
||||
# Apache-2.0 license, locally computed
|
||||
sha256 98ed35b5a138f58164b5c0dbccd9d7f01ef4d84b9dba01e896f0a3241c50c0f7 LICENSE
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
################################################################################
|
||||
|
||||
MENDER_VERSION = 1.7.0
|
||||
MENDER_SITE = $(call github,mendersoftware,mender,$(MENDER_VERSION))
|
||||
MENDER_SITE = https://github.com/mendersoftware/mender/archive
|
||||
MENDER_SOURCE = $(MENDER_VERSION).tar.gz
|
||||
MENDER_LICENSE = Apache-2.0, BSD-2-Clause, BSD-3-Clause, ISC, MIT, OLDAP-2.8
|
||||
|
||||
# Vendor license paths generated with:
|
||||
@@ -56,6 +57,7 @@ define MENDER_INSTALL_CONFIG_FILES
|
||||
$(INSTALL) -D -m 0755 package/mender/device_type \
|
||||
$(TARGET_DIR)/etc/mender/device_type
|
||||
|
||||
mkdir -p $(TARGET_DIR)/var/lib
|
||||
ln -snf /var/run/mender $(TARGET_DIR)/var/lib/mender
|
||||
endef
|
||||
|
||||
|
||||
@@ -1,27 +0,0 @@
|
||||
From 9378016b19521aa6c281f475267c5cb67ea967d1 Mon Sep 17 00:00:00 2001
|
||||
From: "Roger A. Light" <roger@atchoo.org>
|
||||
Date: Fri, 8 Feb 2019 21:34:08 +0000
|
||||
Subject: [PATCH] Fix build failure when using WITH_ADNS=yes
|
||||
|
||||
[Peter: drop ChangeLog.txt modification]
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
src/bridge.c | 2 +-
|
||||
1 files changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/bridge.c b/src/bridge.c
|
||||
index 6e4b94f..d9611f0 100644
|
||||
--- a/src/bridge.c
|
||||
+++ b/src/bridge.c
|
||||
@@ -228,7 +228,7 @@ int bridge__connect_step3(struct mosquitto_db *db, struct mosquitto *context)
|
||||
{
|
||||
int rc;
|
||||
|
||||
- rc = net__socket_connect_step3(context, context->bridge->addresses[context->bridge->cur_address].address, context->bridge->addresses[context->bridge->cur_address].port, NULL, false);
|
||||
+ rc = net__socket_connect_step3(context, context->bridge->addresses[context->bridge->cur_address].address);
|
||||
if(rc > 0){
|
||||
if(rc == MOSQ_ERR_TLS){
|
||||
net__socket_close(db, context);
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,35 +0,0 @@
|
||||
From 04e89450c0aeb0e6fdff58aca3cffce10b29fb98 Mon Sep 17 00:00:00 2001
|
||||
From: "Roger A. Light" <roger@atchoo.org>
|
||||
Date: Sat, 9 Feb 2019 13:52:09 +0000
|
||||
Subject: [PATCH] Don't require C99 compiler.
|
||||
|
||||
[Peter: drop ChangeLog.txt modification]
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
src/persist.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/persist.c b/src/persist.c
|
||||
index 2f40086..13b34d2 100644
|
||||
--- a/src/persist.c
|
||||
+++ b/src/persist.c
|
||||
@@ -720,6 +720,7 @@ static int persist__msg_store_chunk_restore(struct mosquitto_db *db, FILE *db_fp
|
||||
struct mosquitto_msg_store *stored = NULL;
|
||||
struct mosquitto_msg_store_load *load;
|
||||
char *err;
|
||||
+ int i;
|
||||
|
||||
payload.ptr = NULL;
|
||||
|
||||
@@ -749,7 +750,7 @@ static int persist__msg_store_chunk_restore(struct mosquitto_db *db, FILE *db_fp
|
||||
read_e(db_fptr, &i16temp, sizeof(uint16_t));
|
||||
source_port = ntohs(i16temp);
|
||||
if(source_port){
|
||||
- for(int i=0; i<db->config->listener_count; i++){
|
||||
+ for(i=0; i<db->config->listener_count; i++){
|
||||
if(db->config->listeners[i].port == source_port){
|
||||
source.listener = &db->config->listeners[i];
|
||||
break;
|
||||
--
|
||||
2.11.0
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking gpg signature
|
||||
sha256 d5bdc13cc668350026376d57fc14de10aaee029f6840707677637d15e0751a40 mosquitto-1.5.6.tar.gz
|
||||
sha256 d4024c3388502d50be4192991e90d66dfb344376104df3f63846c9f201779955 mosquitto-1.5.7.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 cc77e25bafd40637b7084f04086d606f0a200051b61806f97c93405926670bc1 LICENSE.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
MOSQUITTO_VERSION = 1.5.6
|
||||
MOSQUITTO_VERSION = 1.5.7
|
||||
MOSQUITTO_SITE = https://mosquitto.org/files/source
|
||||
MOSQUITTO_LICENSE = EPL-1.0 or EDLv1.0
|
||||
MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10
|
||||
|
||||
@@ -637,14 +637,17 @@ $(2)_FINAL_ALL_DEPENDENCIES = \
|
||||
$$($(2)_FINAL_DOWNLOAD_DEPENDENCIES) \
|
||||
$$($(2)_FINAL_EXTRACT_DEPENDENCIES) \
|
||||
$$($(2)_FINAL_PATCH_DEPENDENCIES))
|
||||
$(2)_FINAL_RECURSIVE_DEPENDENCIES = \
|
||||
$$(sort \
|
||||
$$(foreach p,\
|
||||
$$($(2)_FINAL_ALL_DEPENDENCIES),\
|
||||
$$(p)\
|
||||
$$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES)\
|
||||
)\
|
||||
)
|
||||
$(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \
|
||||
$$(if $$(filter undefined,$$(origin $(2)_FINAL_RECURSIVE_DEPENDENCIES__X)), \
|
||||
$$(eval $(2)_FINAL_RECURSIVE_DEPENDENCIES__X := \
|
||||
$$(foreach p, \
|
||||
$$($(2)_FINAL_ALL_DEPENDENCIES), \
|
||||
$$(p) \
|
||||
$$($$(call UPPERCASE,$$(p))_FINAL_RECURSIVE_DEPENDENCIES) \
|
||||
) \
|
||||
) \
|
||||
) \
|
||||
$$($(2)_FINAL_RECURSIVE_DEPENDENCIES__X))
|
||||
|
||||
$(2)_INSTALL_STAGING ?= NO
|
||||
$(2)_INSTALL_IMAGES ?= NO
|
||||
|
||||
@@ -64,7 +64,7 @@ define $(2)_CONFIGURE_CMDS
|
||||
rm -rf $$($$(PKG)_SRCDIR)/build
|
||||
mkdir -p $$($$(PKG)_SRCDIR)/build
|
||||
sed -e "s%@TARGET_CROSS@%$$(TARGET_CROSS)%g" \
|
||||
-e "s%@TARGET_ARCH@%$$(ARCH)%g" \
|
||||
-e "s%@TARGET_ARCH@%$$(HOST_MESON_TARGET_CPU_FAMILY)%g" \
|
||||
-e "s%@TARGET_CPU@%$$(GCC_TARGET_CPU)%g" \
|
||||
-e "s%@TARGET_ENDIAN@%$$(call LOWERCASE,$$(BR2_ENDIAN))%g" \
|
||||
-e "s%@TARGET_CFLAGS@%$$(HOST_MESON_SED_CFLAGS)%g" \
|
||||
|
||||
@@ -6,7 +6,7 @@ config BR2_PACKAGE_POCO
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
depends on !(BR2_arc || BR2_microblaze || BR2_mipsel \
|
||||
|| BR2_or1k || BR2_xtensa)
|
||||
|| BR2_or1k || BR2_riscv || BR2_xtensa)
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_PCRE
|
||||
help
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://ftp.postgresql.org/pub/source/v11.1/postgresql-11.1.tar.bz2.md5
|
||||
md5 5e45f6d5b859cc76b5d62f1e328e9711 postgresql-11.1.tar.bz2
|
||||
# From https://ftp.postgresql.org/pub/source/v11.1/postgresql-11.1.tar.bz2.sha256
|
||||
sha256 90815e812874831e9a4bf6e1136bf73bc2c5a0464ef142e2dfea40cda206db08 postgresql-11.1.tar.bz2
|
||||
# From https://ftp.postgresql.org/pub/source/v11.2/postgresql-11.2.tar.bz2.md5
|
||||
md5 19d43be679cb0d55363feb8926af3a0f postgresql-11.2.tar.bz2
|
||||
# From https://ftp.postgresql.org/pub/source/v11.2/postgresql-11.2.tar.bz2.sha256
|
||||
sha256 2676b9ce09c21978032070b6794696e0aa5a476e3d21d60afc036dc0a9c09405 postgresql-11.2.tar.bz2
|
||||
|
||||
# License file, Locally calculated
|
||||
sha256 24cfc70cf16b3a23242c49ffce39510683bdd48cbedb8a46fe03976ee5f5c21e COPYRIGHT
|
||||
sha256 c4c86d683970b22b9fab53320ee1b3a30ef4e8223122b4fb6be53ea62ecee8b3 COPYRIGHT
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
POSTGRESQL_VERSION = 11.1
|
||||
POSTGRESQL_VERSION = 11.2
|
||||
POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2
|
||||
POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION)
|
||||
POSTGRESQL_LICENSE = PostgreSQL
|
||||
|
||||
@@ -22,7 +22,8 @@ PROFTPD_CONF_OPTS = \
|
||||
--disable-dso \
|
||||
--enable-sendfile \
|
||||
--enable-shadow \
|
||||
--with-gnu-ld
|
||||
--with-gnu-ld \
|
||||
--without-openssl-cmdline
|
||||
|
||||
ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y)
|
||||
PROFTPD_MODULES += mod_rewrite
|
||||
|
||||
@@ -7,12 +7,19 @@
|
||||
start() {
|
||||
printf "Starting pulseaudio: "
|
||||
umask 077
|
||||
/usr/bin/pulseaudio --system --daemonize
|
||||
/usr/bin/pulseaudio \
|
||||
--system \
|
||||
--daemonize \
|
||||
--disallow-module-loading \
|
||||
--disallow-exit \
|
||||
--exit-idle-time=-1 \
|
||||
--use-pid-file \
|
||||
--disable-shm
|
||||
echo "OK"
|
||||
}
|
||||
stop() {
|
||||
printf "Stopping pulseaudio: "
|
||||
pulseaudio --kill
|
||||
PULSE_RUNTIME_PATH=/var/run/pulse /usr/bin/pulseaudio --kill
|
||||
echo "OK"
|
||||
}
|
||||
restart() {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# md5, sha256 from https://pypi.org/pypi/django/json
|
||||
md5 9309c48c8b92503b8969a7603a97e2a1 Django-2.1.5.tar.gz
|
||||
sha256 d6393918da830530a9516bbbcbf7f1214c3d733738779f06b0f649f49cc698c3 Django-2.1.5.tar.gz
|
||||
md5 a042e6ba117d2e01950d842cceb5eee0 Django-2.1.7.tar.gz
|
||||
sha256 939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963 Django-2.1.7.tar.gz
|
||||
# Locally computed sha256 checksums
|
||||
sha256 b846415d1b514e9c1dff14a22deb906d794bc546ca6129f950a18cd091e2a669 LICENSE
|
||||
|
||||
@@ -4,10 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_DJANGO_VERSION = 2.1.5
|
||||
PYTHON_DJANGO_VERSION = 2.1.7
|
||||
PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz
|
||||
# The official Django site has an unpractical URL
|
||||
PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/5c/7f/4c750e09b246621e5e90fa08f93dec1b991f5c203b0ff615d62a891c8f41
|
||||
PYTHON_DJANGO_SITE = https://files.pythonhosted.org/packages/7e/ae/29c28f6afddae0e305326078f31372f03d7f2e6d6210c9963843196ce67e
|
||||
PYTHON_DJANGO_LICENSE = BSD-3-Clause
|
||||
PYTHON_DJANGO_LICENSE_FILES = LICENSE
|
||||
PYTHON_DJANGO_SETUP_TYPE = setuptools
|
||||
|
||||
@@ -25,9 +25,9 @@ PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source
|
||||
PYTHON_PYQT5_QTDETAIL_TYPE = shared
|
||||
|
||||
# Turn off features that aren't available in current qt configuration
|
||||
PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL)
|
||||
PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL)
|
||||
PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL)
|
||||
PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENSSL),,PyQt_SSL)
|
||||
|
||||
define PYTHON_PYQT5_QTDETAIL
|
||||
echo $(1) >> $(2)/qtdetail.out
|
||||
|
||||
60
package/qemu/0002-configure-improve-usbfs-check.patch
Normal file
60
package/qemu/0002-configure-improve-usbfs-check.patch
Normal file
@@ -0,0 +1,60 @@
|
||||
From 9672cccd64c446369b5649fe23d575917638be46 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Tue, 5 Feb 2019 15:07:43 +0100
|
||||
Subject: [PATCH] configure: improve usbfs check
|
||||
|
||||
The current check to test if usbfs support should be compiled or not
|
||||
solely relies on the presence of <linux/usbdevice_fs.h>, without
|
||||
actually checking that all definition used by Qemu are provided by
|
||||
this header file.
|
||||
|
||||
With sufficiently old kernel headers, <linux/usbdevice_fs.h> may be
|
||||
present, but some of the definitions needed by Qemu may not be
|
||||
available.
|
||||
|
||||
This commit improves the check by building a small program that
|
||||
actually tests whether the necessary definitions are available.
|
||||
|
||||
In addition, it fixes a bug where have_usbfs was set to "yes"
|
||||
regardless of the result of the test.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
configure | 19 +++++++++++++++++--
|
||||
1 file changed, 17 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 3d89870d99..799c8e3b08 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -4266,10 +4266,25 @@ fi
|
||||
# check for usbfs
|
||||
have_usbfs=no
|
||||
if test "$linux_user" = "yes"; then
|
||||
- if check_include linux/usbdevice_fs.h; then
|
||||
+ cat > $TMPC << EOF
|
||||
+#include <linux/usbdevice_fs.h>
|
||||
+
|
||||
+#ifndef USBDEVFS_GET_CAPABILITIES
|
||||
+#error "USBDEVFS_GET_CAPABILITIES undefined"
|
||||
+#endif
|
||||
+
|
||||
+#ifndef USBDEVFS_DISCONNECT_CLAIM
|
||||
+#error "USBDEVFS_DISCONNECT_CLAIM undefined"
|
||||
+#endif
|
||||
+
|
||||
+int main(void)
|
||||
+{
|
||||
+ return 0;
|
||||
+}
|
||||
+EOF
|
||||
+ if compile_prog "" ""; then
|
||||
have_usbfs=yes
|
||||
fi
|
||||
- have_usbfs=yes
|
||||
fi
|
||||
|
||||
# check for fallocate
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
From 982801a21c3abad7025a7110275a49e200bc460f Mon Sep 17 00:00:00 2001
|
||||
From: Stefan O'Rear <stefanor@cox.net>
|
||||
Date: Thu, 17 Nov 2016 09:54:33 -0800
|
||||
Subject: [PATCH] double-conversion: enable for riscv
|
||||
|
||||
Original double conversion patch [1] 'Add support for RISC-V' ported
|
||||
to qtbase-5.11.3.
|
||||
|
||||
[1] Upstream: https://github.com/google/double-conversion/commit/8316ed5bf405835558a476e528d8e1d0adf69dd9
|
||||
|
||||
Change-Id: Id88a356940f4d61dbcec3741a74db695e47af3f0
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/3rdparty/double-conversion/include/double-conversion/utils.h | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/3rdparty/double-conversion/include/double-conversion/utils.h b/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
||||
index 485f680180..a736b14d1e 100644
|
||||
--- a/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
||||
+++ b/src/3rdparty/double-conversion/include/double-conversion/utils.h
|
||||
@@ -66,6 +66,7 @@
|
||||
defined(__SH4__) || defined(__alpha__) || \
|
||||
defined(_MIPS_ARCH_MIPS32R2) || \
|
||||
defined(__AARCH64EL__) || defined(__AARCH64EB__) || \
|
||||
+ defined(__riscv) || \
|
||||
defined(__or1k__) || \
|
||||
defined(__microblaze__)
|
||||
#define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
From 62588f2d8267c67c2337004e83e80695280db9eb Mon Sep 17 00:00:00 2001
|
||||
From: James Grant <jamesg@zaltys.org>
|
||||
Date: Sun, 3 Mar 2019 17:29:29 +1300
|
||||
Subject: [PATCH 1/1] libressl - add -fpermissive gcc flag to allow
|
||||
compilation.
|
||||
|
||||
Workaround for 'const BIO_METHOD *' vs. 'BIO_METHOD *' changes to BIO_new() and BIO_s_mem() function signatures.
|
||||
|
||||
Signed-off-by: James Grant <jamesg@zaltys.org>
|
||||
---
|
||||
src/network/ssl/ssl.pri | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri
|
||||
index 29c47cd7..f0aad448 100644
|
||||
--- a/src/network/ssl/ssl.pri
|
||||
+++ b/src/network/ssl/ssl.pri
|
||||
@@ -77,7 +77,7 @@ android:!android-no-sdk: SOURCES += ssl/qsslsocket_openssl_android.cpp
|
||||
LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE
|
||||
}
|
||||
|
||||
- QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS
|
||||
+ QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS -fpermissive
|
||||
LIBS_PRIVATE += $$OPENSSL_LIBS
|
||||
win32: LIBS_PRIVATE += -lcrypt32
|
||||
}
|
||||
--
|
||||
2.18.1
|
||||
|
||||
@@ -286,6 +286,12 @@ comment "icu support needs a toolchain w/ gcc >= 4.8, host gcc >= 4.8"
|
||||
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || \
|
||||
!BR2_HOST_GCC_AT_LEAST_4_8
|
||||
|
||||
config BR2_PACKAGE_QT5BASE_OPENSSL
|
||||
bool
|
||||
# No OpenSSL 1.1.x support in Qt 5.6.x
|
||||
default y if BR2_PACKAGE_QT5_VERSION_5_6 && BR2_PACKAGE_LIBRESSL
|
||||
default y if BR2_PACKAGE_QT5_VERSION_LATEST && BR2_PACKAGE_OPENSSL
|
||||
|
||||
config BR2_PACKAGE_QT5BASE_TSLIB
|
||||
bool "Enable Tslib support"
|
||||
select BR2_PACKAGE_TSLIB
|
||||
|
||||
@@ -33,7 +33,24 @@ else
|
||||
QT5BASE_DEPENDENCIES += pcre2
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
|
||||
ifeq ($(BR2_X86_CPU_HAS_SSE2),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sse2
|
||||
else ifeq ($(BR2_X86_CPU_HAS_SSE3),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sse3
|
||||
else ifeq ($(BR2_X86_CPU_HAS_SSSE3),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-ssse3
|
||||
else ifeq ($(BR2_X86_CPU_HAS_SSE4),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sse4.1
|
||||
else ifeq ($(BR2_X86_CPU_HAS_SSE42),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-sse4.2
|
||||
else ifeq ($(BR2_X86_CPU_HAS_AVX),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-avx
|
||||
else ifeq ($(BR2_X86_CPU_HAS_AVX2),)
|
||||
QT5BASE_CONFIGURE_OPTS += -no-avx2
|
||||
else
|
||||
# no buildroot BR2_X86_CPU_HAS_AVX512 option yet for qt configure
|
||||
# option '-no-avx512' (available for latest only)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBDRM),y)
|
||||
QT5BASE_CONFIGURE_OPTS += -kms
|
||||
@@ -171,8 +188,15 @@ else
|
||||
QT5BASE_CONFIGURE_OPTS += -no-eglfs
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
# No OpenSSL 1.1.x support in Qt 5.6.x
|
||||
# LibreSSL works with shared linkage only and -fpermissive patch
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBRESSL),-openssl-linked,-no-openssl)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBRESSL),openssl)
|
||||
else
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl)
|
||||
endif
|
||||
|
||||
QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig)
|
||||
QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig)
|
||||
@@ -277,6 +301,9 @@ define QT5BASE_CONFIGURE_HOSTCC
|
||||
$(SED) 's,^QMAKE_CXX\s*=.*,QMAKE_CXX = $(HOSTCXX),' $(@D)/mkspecs/common/g++-base.conf
|
||||
endef
|
||||
|
||||
# Must be last so can override all options set by Buildroot
|
||||
QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS))
|
||||
|
||||
define QT5BASE_CONFIGURE_CMDS
|
||||
mkdir -p $(@D)/mkspecs/devices/linux-buildroot-g++/
|
||||
sed 's/@EGLFS_DEVICE@/$(QT5BASE_EGLFS_DEVICE)/g' \
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user