Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
commit
fd99eb5016
@ -180,6 +180,7 @@ freescale_imx6sxsabresd_defconfig: { extends: .defconfig }
|
||||
freescale_imx7dsabresd_defconfig: { extends: .defconfig }
|
||||
freescale_imx8mmevk_defconfig: { extends: .defconfig }
|
||||
freescale_imx8mqevk_defconfig: { extends: .defconfig }
|
||||
freescale_imx8qmmek_defconfig: { extends: .defconfig }
|
||||
freescale_imx8qxpmek_defconfig: { extends: .defconfig }
|
||||
freescale_p1025twr_defconfig: { extends: .defconfig }
|
||||
freescale_t1040d4rdb_defconfig: { extends: .defconfig }
|
||||
|
13
DEVELOPERS
13
DEVELOPERS
@ -31,6 +31,7 @@ F: package/audit/
|
||||
F: package/busybox/
|
||||
F: package/checkpolicy/
|
||||
F: package/cppdb/
|
||||
F: package/gobject-introspection/
|
||||
F: package/gstreamer1/gstreamer1/
|
||||
F: package/gstreamer1/gstreamer1-mm/
|
||||
F: package/gstreamer1/gst1-plugins-bad/
|
||||
@ -53,6 +54,7 @@ F: package/openjdk/
|
||||
F: package/openjdk-bin/
|
||||
F: package/php/
|
||||
F: package/policycoreutils/
|
||||
F: package/prelink-cross/
|
||||
F: package/polkit/
|
||||
F: package/python3/
|
||||
F: package/python-aioredis/
|
||||
@ -503,6 +505,7 @@ F: package/skeleton-init-systemd/
|
||||
F: package/skeleton-init-sysv/
|
||||
F: package/skeleton/
|
||||
F: package/sysvinit/
|
||||
F: package/udev-gentoo-scripts/
|
||||
F: package/util-linux/
|
||||
F: package/tpm2-abrmd/
|
||||
F: package/tpm2-tools/
|
||||
@ -823,6 +826,7 @@ F: package/libmaxminddb/
|
||||
F: package/openzwave/
|
||||
|
||||
N: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
F: package/bearssl/
|
||||
F: package/boinc/
|
||||
F: package/cairo/
|
||||
F: package/duktape/
|
||||
@ -1167,6 +1171,7 @@ F: package/python-async-lru/
|
||||
F: package/python-async-timeout/
|
||||
F: package/python-brotli/
|
||||
F: package/python-cchardet/
|
||||
F: package/python-flatbuffers/
|
||||
F: package/python-frozenlist/
|
||||
F: package/python-janus/
|
||||
F: package/python-logstash/
|
||||
@ -1218,6 +1223,9 @@ F: package/quota/
|
||||
N: Jason Pruitt <jrspruitt@gmail.com>
|
||||
F: package/librtlsdr/
|
||||
|
||||
N: Jean Burgat <jeanburgat33@gmail.com>
|
||||
F: package/openfpgaloader/
|
||||
|
||||
N: Jens Kleintje <scooby22@web.de>
|
||||
F: package/gcnano-binaries/
|
||||
|
||||
@ -1508,6 +1516,10 @@ F: package/python-simplejson/
|
||||
F: package/python-versiontools/
|
||||
F: package/wilc1000-firmware/
|
||||
|
||||
N: Maeva Manuel <maeva.manuel@oss.nxp.com>
|
||||
F: board/freescale/imx8qmmek/
|
||||
F: configs/freescale_imx8qmmek_defconfig
|
||||
|
||||
N: Mahyar Koshkouei <mahyar.koshkouei@gmail.com>
|
||||
F: package/ffmpeg/
|
||||
F: package/mpv/
|
||||
@ -2558,6 +2570,7 @@ F: package/keyutils/
|
||||
F: package/libbsd/
|
||||
F: package/libedit/
|
||||
F: package/libgsm/
|
||||
F: package/libiberty/
|
||||
F: package/libinput/
|
||||
F: package/libiscsi/
|
||||
F: package/libpri/
|
||||
|
76
board/freescale/imx8qmmek/readme.txt
Normal file
76
board/freescale/imx8qmmek/readme.txt
Normal file
@ -0,0 +1,76 @@
|
||||
***************************
|
||||
Freescale i.MX8QM MEK board
|
||||
***************************
|
||||
|
||||
This file documents the Buildroot support for the NXP i.MX8QM MEK board.
|
||||
|
||||
You will find a reference to the board on nxp.com:
|
||||
https://www.nxp.com/design/development-boards/i.mx-evaluation-and-development-boards/i.mx-8quadmax-multisensory-enablement-kit-mek:MCIMX8QM-CPU
|
||||
|
||||
You can also find the get started guide here:
|
||||
https://www.nxp.com/document/guide/get-started-with-the-i.mx-8quadmax-mek:GS-iMX-8QM-MEK
|
||||
|
||||
Build
|
||||
=====
|
||||
|
||||
First, configure Buildroot for the i.MX8QM MEK board:
|
||||
|
||||
$ make freescale_imx8qmmek_defconfig
|
||||
|
||||
Build all components:
|
||||
|
||||
$ make
|
||||
|
||||
You will find in output/images/ the following files:
|
||||
- ahab-container.img
|
||||
- bl31.bin
|
||||
- boot.vfat
|
||||
- fsl-imx8qm-mek.dtb
|
||||
- Image
|
||||
- imx8-boot-sd.bin
|
||||
- mkimg.commit
|
||||
- mx8qm-mek-scfw-tcm.bin
|
||||
- mx8qm-val-scfw-tcm.bin
|
||||
- mx8qm-a0-ddr4-scfw-tcm.bin
|
||||
- mx8qm-a0-mek-scfw-tcm.bin
|
||||
- mx8qm-a0-val-scfw-tcm.bin
|
||||
- mx8qm-ddr4-scfw-tcm.bin
|
||||
- rootfs.ext2
|
||||
- rootfs.ext4
|
||||
- rootfs.tar
|
||||
- sdcard.img
|
||||
- u-boot-atf.bin
|
||||
- u-boot.bin
|
||||
- u-boot-hash.bin
|
||||
|
||||
Create a bootable SD card
|
||||
=========================
|
||||
|
||||
To determine the device associated to the SD card have a look in the
|
||||
/proc/partitions file:
|
||||
|
||||
cat /proc/partitions
|
||||
|
||||
Buildroot prepares a bootable "sdcard.img" image in the output/images/
|
||||
directory, ready to be dumped on a SD card. Launch the following
|
||||
command as root:
|
||||
|
||||
dd if=output/images/sdcard.img of=/dev/<your-sd-device>
|
||||
|
||||
*** WARNING! This will destroy all the card content. Use with care! ***
|
||||
|
||||
For details about the medium image layout, see the definition in
|
||||
board/freescale/common/imx/genimage.cfg.template_imx8.
|
||||
|
||||
Boot the i.MX8QM MEK board
|
||||
==========================
|
||||
|
||||
To boot your newly created system:
|
||||
- insert the SD card in the SD slot of the board;
|
||||
- Configure the boot switch as follows:
|
||||
SW2: OFF OFF ON ON OFF OFF
|
||||
- put a micro USB cable into the Debug USB Port and connect using a terminal
|
||||
emulator at 115200 bps, 8n1;
|
||||
- power on the board.
|
||||
|
||||
Enjoy!
|
@ -1,3 +1,3 @@
|
||||
# locally computed
|
||||
sha256 bc82f1e63663cafb7976b324d8a01263510cfd816063dc89e0ccffb9763fb1dd opensbi-0.5.tar.gz
|
||||
sha256 46a93afd5465eba094ddba40015e754bf09f9e80e0702c00013d6bdb3ecd0a72 opensbi-0.6.tar.gz
|
||||
sha256 82d13fb1bf6bb162629deeea9eb9c117e74548d3b707e478967691fe79a68e21 COPYING.BSD
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
OPENSBI_VERSION = 0.5
|
||||
OPENSBI_VERSION = 0.6
|
||||
OPENSBI_SITE = $(call github,riscv,opensbi,v$(OPENSBI_VERSION))
|
||||
OPENSBI_LICENSE = BSD-2-Clause
|
||||
OPENSBI_LICENSE_FILES = COPYING.BSD
|
||||
|
38
configs/freescale_imx8qmmek_defconfig
Normal file
38
configs/freescale_imx8qmmek_defconfig
Normal file
@ -0,0 +1,38 @@
|
||||
BR2_aarch64=y
|
||||
BR2_ARM_FPU_VFPV4=y
|
||||
BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_14=y
|
||||
BR2_ROOTFS_POST_IMAGE_SCRIPT="board/freescale/common/imx/imx8-bootloader-prepare.sh board/freescale/common/imx/post-image.sh"
|
||||
BR2_ROOTFS_POST_SCRIPT_ARGS="${UBOOT_DIR}/arch/arm/dts/fsl-imx8qm-mek.dtb"
|
||||
BR2_LINUX_KERNEL=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_GIT=y
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/linux-imx"
|
||||
BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
|
||||
BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y
|
||||
BR2_LINUX_KERNEL_DTS_SUPPORT=y
|
||||
BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/fsl-imx8qm-mek"
|
||||
BR2_PACKAGE_FREESCALE_IMX=y
|
||||
BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8=y
|
||||
BR2_PACKAGE_FIRMWARE_IMX=y
|
||||
BR2_PACKAGE_IMX_SC_FIRMWARE=y
|
||||
BR2_TARGET_ROOTFS_EXT2=y
|
||||
BR2_TARGET_ROOTFS_EXT2_4=y
|
||||
BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
|
||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
|
||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_GIT=y
|
||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/imx-atf"
|
||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
|
||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8qm"
|
||||
BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y
|
||||
BR2_TARGET_UBOOT=y
|
||||
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_GIT=y
|
||||
BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://source.codeaurora.org/external/imx/uboot-imx"
|
||||
BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="rel_imx_4.14.98_2.0.0_ga"
|
||||
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="imx8qm_mek"
|
||||
BR2_TARGET_UBOOT_NEEDS_DTC=y
|
||||
BR2_PACKAGE_HOST_DOSFSTOOLS=y
|
||||
BR2_PACKAGE_HOST_GENIMAGE=y
|
||||
BR2_PACKAGE_HOST_IMX_MKIMAGE=y
|
||||
BR2_PACKAGE_HOST_MTOOLS=y
|
||||
BR2_PACKAGE_HOST_UBOOT_TOOLS=y
|
||||
BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT=y
|
@ -499,6 +499,7 @@ endmenu
|
||||
source "package/ofono/Config.in"
|
||||
source "package/on2-8170-modules/Config.in"
|
||||
source "package/open2300/Config.in"
|
||||
source "package/openfpgaloader/Config.in"
|
||||
source "package/openipmi/Config.in"
|
||||
source "package/openocd/Config.in"
|
||||
source "package/openpowerlink/Config.in"
|
||||
@ -555,6 +556,7 @@ endmenu
|
||||
source "package/ubus/Config.in"
|
||||
source "package/uccp420wlan/Config.in"
|
||||
source "package/udev/Config.in"
|
||||
source "package/udev-gentoo-scripts/Config.in"
|
||||
source "package/udisks/Config.in"
|
||||
source "package/uhubctl/Config.in"
|
||||
source "package/umtprd/Config.in"
|
||||
@ -940,6 +942,7 @@ menu "External python modules"
|
||||
source "package/python-flask-jsonrpc/Config.in"
|
||||
source "package/python-flask-login/Config.in"
|
||||
source "package/python-flask-sqlalchemy/Config.in"
|
||||
source "package/python-flatbuffers/Config.in"
|
||||
source "package/python-flup/Config.in"
|
||||
source "package/python-frozenlist/Config.in"
|
||||
source "package/python-functools32/Config.in"
|
||||
@ -1275,6 +1278,7 @@ menu "Compression and decompression"
|
||||
endmenu
|
||||
|
||||
menu "Crypto"
|
||||
source "package/bearssl/Config.in"
|
||||
source "package/beecrypt/Config.in"
|
||||
source "package/botan/Config.in"
|
||||
source "package/ca-certificates/Config.in"
|
||||
@ -1770,6 +1774,7 @@ menu "Other"
|
||||
source "package/glibmm/Config.in"
|
||||
source "package/glm/Config.in"
|
||||
source "package/gmp/Config.in"
|
||||
source "package/gobject-introspection/Config.in"
|
||||
source "package/gsl/Config.in"
|
||||
source "package/gtest/Config.in"
|
||||
source "package/jemalloc/Config.in"
|
||||
|
@ -1,7 +1,7 @@
|
||||
# From http://sourceforge.net/projects/arma/files/?source=navbar
|
||||
md5 5ef71763bd429a3d481499878351f3be armadillo-7.900.1.tar.xz
|
||||
sha1 8118faf1c6a7a39c55a1103a1f90e85e613cc377 armadillo-7.900.1.tar.xz
|
||||
md5 12c3b63c301d414659d7592ff58a71cb armadillo-9.850.1.tar.xz
|
||||
sha1 0a2d3ef140fd8587867def7359fe45f9df4a925a armadillo-9.850.1.tar.xz
|
||||
# Locally computed:
|
||||
sha256 33eec7013990b5477ccc5ad3abc68bc2326c7a7a2790014d625cfcf37c0e07d3 armadillo-7.900.1.tar.xz
|
||||
sha256 d4c389b9597a5731500ad7a2656c11a6031757aaaadbcafdea5cc8ac0fd2c01f armadillo-9.850.1.tar.xz
|
||||
# License files, locally calculated
|
||||
sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt
|
||||
sha256 3ddf9be5c28fe27dad143a5dc76eea25222ad1dd68934a047064e56ed2fa40c5 LICENSE.txt
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ARMADILLO_VERSION = 7.900.1
|
||||
ARMADILLO_VERSION = 9.850.1
|
||||
ARMADILLO_SOURCE = armadillo-$(ARMADILLO_VERSION).tar.xz
|
||||
ARMADILLO_SITE = https://downloads.sourceforge.net/project/arma
|
||||
ARMADILLO_DEPENDENCIES = clapack
|
||||
|
@ -1,48 +0,0 @@
|
||||
From e111def44a7df4624a4aa3f85fe98054bffb6b4f Mon Sep 17 00:00:00 2001
|
||||
From: Trent Lloyd <trent@lloyd.id.au>
|
||||
Date: Sat, 22 Dec 2018 09:06:07 +0800
|
||||
Subject: [PATCH] Drop legacy unicast queries from address not on local link
|
||||
|
||||
When handling legacy unicast queries, ensure that the source IP is
|
||||
inside a subnet on the local link, otherwise drop the packet.
|
||||
|
||||
Fixes #145
|
||||
Fixes #203
|
||||
CVE-2017-6519
|
||||
CVE-2018-100084
|
||||
|
||||
Backported from: e111def44a7df4624a4aa3f85fe98054bffb6b4f
|
||||
Signed-off-by: Artem Panfilov <panfilov.artyom@gmail.com>
|
||||
---
|
||||
avahi-core/server.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/avahi-core/server.c b/avahi-core/server.c
|
||||
index a2cb19a8..a2580e38 100644
|
||||
--- a/avahi-core/server.c
|
||||
+++ b/avahi-core/server.c
|
||||
@@ -930,6 +930,7 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
|
||||
|
||||
if (avahi_dns_packet_is_query(p)) {
|
||||
int legacy_unicast = 0;
|
||||
+ char t[AVAHI_ADDRESS_STR_MAX];
|
||||
|
||||
/* For queries EDNS0 might allow ARCOUNT != 0. We ignore the
|
||||
* AR section completely here, so far. Until the day we add
|
||||
@@ -947,6 +948,13 @@ static void dispatch_packet(AvahiServer *s, AvahiDnsPacket *p, const AvahiAddres
|
||||
legacy_unicast = 1;
|
||||
}
|
||||
|
||||
+ if (!is_mdns_mcast_address(dst_address) &&
|
||||
+ !avahi_interface_address_on_link(i, src_address)) {
|
||||
+
|
||||
+ avahi_log_debug("Received non-local unicast query from host %s on interface '%s.%i'.", avahi_address_snprint(t, sizeof(t), src_address), i->hardware->name, i->protocol);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
if (legacy_unicast)
|
||||
reflect_legacy_unicast_query_packet(s, p, i, src_address, port);
|
||||
|
||||
--
|
||||
2.19.1
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 57a99b5dfe7fdae794e3d1ee7a62973a368e91e414bd0dfa5d84434de5b14804 avahi-0.7.tar.gz
|
||||
sha256 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda avahi-0.8.tar.gz
|
||||
sha256 a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861 LICENSE
|
||||
|
@ -4,62 +4,13 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AVAHI_VERSION = 0.7
|
||||
AVAHI_VERSION = 0.8
|
||||
AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION)
|
||||
AVAHI_LICENSE = LGPL-2.1+
|
||||
AVAHI_LICENSE_FILES = LICENSE
|
||||
AVAHI_INSTALL_STAGING = YES
|
||||
|
||||
AVAHI_CONF_ENV = \
|
||||
ac_cv_func_strtod=yes \
|
||||
ac_fsusage_space=yes \
|
||||
fu_cv_sys_stat_statfs2_bsize=yes \
|
||||
ac_cv_func_closedir_void=no \
|
||||
ac_cv_func_getloadavg=no \
|
||||
ac_cv_lib_util_getloadavg=no \
|
||||
ac_cv_lib_getloadavg_getloadavg=no \
|
||||
ac_cv_func_getgroups=yes \
|
||||
ac_cv_func_getgroups_works=yes \
|
||||
ac_cv_func_chown_works=yes \
|
||||
ac_cv_have_decl_euidaccess=no \
|
||||
ac_cv_func_euidaccess=no \
|
||||
ac_cv_have_decl_strnlen=yes \
|
||||
ac_cv_func_strnlen_working=yes \
|
||||
ac_cv_func_lstat_dereferences_slashed_symlink=yes \
|
||||
ac_cv_func_lstat_empty_string_bug=no \
|
||||
ac_cv_func_stat_empty_string_bug=no \
|
||||
vb_cv_func_rename_trailing_slash_bug=no \
|
||||
ac_cv_have_decl_nanosleep=yes \
|
||||
jm_cv_func_nanosleep_works=yes \
|
||||
gl_cv_func_working_utimes=yes \
|
||||
ac_cv_func_utime_null=yes \
|
||||
ac_cv_have_decl_strerror_r=yes \
|
||||
ac_cv_func_strerror_r_char_p=no \
|
||||
jm_cv_func_svid_putenv=yes \
|
||||
ac_cv_func_getcwd_null=yes \
|
||||
ac_cv_func_getdelim=yes \
|
||||
ac_cv_func_mkstemp=yes \
|
||||
utils_cv_func_mkstemp_limitations=no \
|
||||
utils_cv_func_mkdir_trailing_slash_bug=no \
|
||||
jm_cv_func_gettimeofday_clobber=no \
|
||||
am_cv_func_working_getline=yes \
|
||||
gl_cv_func_working_readdir=yes \
|
||||
jm_ac_cv_func_link_follows_symlink=no \
|
||||
utils_cv_localtime_cache=no \
|
||||
ac_cv_struct_st_mtim_nsec=no \
|
||||
gl_cv_func_tzset_clobber=no \
|
||||
gl_cv_func_getcwd_null=yes \
|
||||
gl_cv_func_getcwd_path_max=yes \
|
||||
ac_cv_func_fnmatch_gnu=yes \
|
||||
am_getline_needs_run_time_check=no \
|
||||
am_cv_func_working_getline=yes \
|
||||
gl_cv_func_mkdir_trailing_slash_bug=no \
|
||||
gl_cv_func_mkstemp_limitations=no \
|
||||
ac_cv_func_working_mktime=yes \
|
||||
jm_cv_func_working_re_compile_pattern=yes \
|
||||
ac_use_included_regex=no \
|
||||
avahi_cv_sys_cxx_works=yes \
|
||||
DATADIRNAME=share
|
||||
AVAHI_CONF_ENV = DATADIRNAME=share
|
||||
|
||||
# Note: even if we have Gtk2 and Gtk3 support in Buildroot, we
|
||||
# explicitly disable support for them, in order to avoid the following
|
||||
@ -74,6 +25,7 @@ AVAHI_CONF_ENV = \
|
||||
AVAHI_CONF_OPTS = \
|
||||
--disable-qt3 \
|
||||
--disable-qt4 \
|
||||
--disable-qt5 \
|
||||
--disable-gtk \
|
||||
--disable-gtk3 \
|
||||
--disable-gdbm \
|
||||
@ -89,9 +41,7 @@ AVAHI_CONF_OPTS = \
|
||||
--with-autoipd-user=avahi \
|
||||
--with-autoipd-group=avahi
|
||||
|
||||
AVAHI_DEPENDENCIES = \
|
||||
host-intltool host-pkgconf \
|
||||
$(TARGET_NLS_DEPENDENCIES)
|
||||
AVAHI_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
AVAHI_CFLAGS = $(TARGET_CFLAGS)
|
||||
|
||||
@ -130,6 +80,12 @@ else
|
||||
AVAHI_CONF_OPTS += --disable-dbus
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBEVENT),y)
|
||||
AVAHI_DEPENDENCIES += libevent
|
||||
else
|
||||
AVAHI_CONF_OPTS += --disable-libevent
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
|
||||
AVAHI_DEPENDENCIES += libglib2
|
||||
else
|
||||
|
@ -1,45 +0,0 @@
|
||||
From 9b39a985bcd6cd34f0820f3680f145d46c0e56bd Mon Sep 17 00:00:00 2001
|
||||
From: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||
Date: Sun, 8 Dec 2019 01:55:59 +0100
|
||||
Subject: [PATCH] Allow avro C to be built on musl based systems.
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
The type `ssize_t` is defined in sys/types.h, and nowhere else
|
||||
in the musl standard C library, so it should be included for the
|
||||
compilation to succeed.
|
||||
|
||||
This fixes several errors like:
|
||||
|
||||
In file included from src/generic.c:29:0:
|
||||
src/generic.c: In function ‘avro_generic_value_new’:
|
||||
src/avro_generic_internal.h:63:39:
|
||||
error: ‘ssize_t’ undeclared (first use in this function);
|
||||
did you mean ‘size_t’?
|
||||
|
||||
Signed-off-by: Titouan Christophe <titouan.christophe@railnova.eu>
|
||||
[yann.morin.1998@free.fr:
|
||||
- backported from upstream 9b39a98, adapted to the release tarball
|
||||
]
|
||||
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||
---
|
||||
src/avro_generic_internal.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/avro_generic_internal.h b/src/avro_generic_internal.h
|
||||
index 709403c0..9843ed65 100644
|
||||
--- a/src/avro_generic_internal.h
|
||||
+++ b/src/avro_generic_internal.h
|
||||
@@ -24,6 +24,8 @@ extern "C" {
|
||||
#define CLOSE_EXTERN
|
||||
#endif
|
||||
|
||||
+#include <sys/types.h>
|
||||
+
|
||||
#include "avro/generic.h"
|
||||
#include "avro/schema.h"
|
||||
#include "avro/value.h"
|
||||
--
|
||||
2.20.1
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://www-eu.apache.org/dist/avro/avro-1.9.1/c/avro-c-1.9.1.tar.gz.sha512
|
||||
sha512 68b1f44f870c9b6f0b2380da9e34d91148ff4398cb300f4bdd4e3e1ad00820acd9084b73232b00d4cd4935fb992b41dc65afdafcbea14a3d87259608688df904 avro-c-1.9.1.tar.gz
|
||||
# From https://www-eu.apache.org/dist/avro/avro-1.9.2/c/avro-c-1.9.2.tar.gz.sha512
|
||||
sha512 1bc4bb22c88b70235e8e0280dbb7aeee7aa3f6cb7ff78a1aa5a7a6a1aca5522e8cfc89064096eace1c07a50e98f2397abd3620de1a29f9e5103b6f4c84316927 avro-c-1.9.2.tar.gz
|
||||
|
||||
# License files
|
||||
sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE
|
||||
sha256 d62488d6ba17132e92c23c03c80bfedc848267f96ab36489fec860f76cf6819a LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AVRO_C_VERSION = 1.9.1
|
||||
AVRO_C_VERSION = 1.9.2
|
||||
AVRO_C_SITE = https://www-eu.apache.org/dist/avro/avro-$(AVRO_C_VERSION)/c
|
||||
AVRO_C_LICENSE = Apache-2.0
|
||||
AVRO_C_LICENSE_FILES = LICENSE
|
||||
|
@ -1,49 +1,37 @@
|
||||
From c0b3dbb43aa3a38c47311556c85eadc6072e2d68 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Tue, 14 Feb 2017 22:02:26 +0100
|
||||
Subject: [PATCH] Fix Libs.private flags for mbedtls
|
||||
From b7f14a800bbdad193f45695bc5b8c5173f3882ba Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 10 Feb 2019 17:51:05 +0100
|
||||
Subject: [PATCH] CMakeLists.txt: fix mbedtls libraries in bctoolbox.pc
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Static linking with bctoolbox fails when using pkg-config as the
|
||||
generated bctoolbox.pc file only consists of an '-L' string without any
|
||||
search path or libraries flags.
|
||||
|
||||
That's because of an typo in `mbedtls_library_path`. However,
|
||||
`mbedtls_library_path` contains a string of the mbedtls libraries
|
||||
concatenated by an ';' which cannot be parsed by pkg-config.
|
||||
|
||||
Therefore, use `MBEDTLS_LIBRARY` instead of `MBEDTLS_LIBRARIES` to get
|
||||
the library path.
|
||||
|
||||
Furthermore, add the three mbedtls libraries *mbedtls*, *mbedcrypto*, and
|
||||
*mbedx509* to `LIBS_PRIVATE` so these libraries are added to the
|
||||
`Libs.private` field of bctoolbox.pc.
|
||||
|
||||
Upstream status: Pending
|
||||
bctoolbox.pc should not contain the full libraries path, path should be
|
||||
given by -L and library names by -l
|
||||
So sent back the fix already suggested by Jörg Krause in
|
||||
https://github.com/BelledonneCommunications/bctoolbox/pull/4
|
||||
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status:
|
||||
https://github.com/BelledonneCommunications/bctoolbox/pull/7]
|
||||
---
|
||||
CMakeLists.txt | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
CMakeLists.txt | 5 ++---
|
||||
1 file changed, 2 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index ed7aa00..4127f0e 100644
|
||||
index 29f3eb6..b2f26c2 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -103,8 +103,8 @@ else()
|
||||
@@ -101,9 +101,8 @@ else()
|
||||
endif()
|
||||
|
||||
if(MBEDTLS_FOUND)
|
||||
- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH)
|
||||
- set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}")
|
||||
- string(REPLACE ";" " " MBEDTLS_LIBRARIES_STR "${MBEDTLS_LIBRARIES}")
|
||||
- set(LIBS_PRIVATE "${LIBS_PRIVATE} ${MBEDTLS_LIBRARIES_STR}")
|
||||
+ get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH)
|
||||
+ set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path} -lmbedtls -lmbedcrypto -lmbedx509")
|
||||
endif()
|
||||
if(POLARSSL_FOUND)
|
||||
get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH)
|
||||
--
|
||||
2.11.1
|
||||
|
||||
|
@ -2,6 +2,8 @@ config BR2_PACKAGE_BCTOOLBOX
|
||||
bool "bctoolbox"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 # exception_ptr
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
help
|
||||
Utilities library used by Belledonne Communications
|
||||
softwares like belle-sip, mediastreamer2 and linphone.
|
||||
@ -12,3 +14,6 @@ config BR2_PACKAGE_BCTOOLBOX
|
||||
|
||||
comment "bctoolbox needs a toolchain w/ C++, threads"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
comment "bctoolbox needs a toolchain not affected by GCC bug 64735"
|
||||
depends on BR2_TOOLCHAIN_HAS_GCC_BUG_64735
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 da7df7ff359a9829e9e6ef98dfe9fead0cf735b8a4a5da1b1047f467dee1b2a9 bctoolbox-0.4.0.tar.gz
|
||||
sha256 d8501e3793c10abbf913759d7a0e5f6eb3140af6bacf5e2bdcd532049bde69c0 bctoolbox-4.3.1.tar.gz
|
||||
sha256 849dd903d98f12a964466ccfbaf3a1de1f94ad0ebd49a59d12f8ce4506f9f647 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BCTOOLBOX_VERSION = 0.4.0
|
||||
BCTOOLBOX_VERSION = 4.3.1
|
||||
BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION))
|
||||
BCTOOLBOX_LICENSE = GPL-2.0+
|
||||
BCTOOLBOX_LICENSE_FILES = COPYING
|
||||
@ -20,6 +20,11 @@ BCTOOLBOX_CONF_OPTS = \
|
||||
-DGIT_EXECUTABLE=OFF \
|
||||
-DCMAKE_SKIP_RPATH=ON
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
||||
BCTOOLBOX_DEPENDENCIES += libiconv
|
||||
BCTOOLBOX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -liconv"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_MBEDTLS),y)
|
||||
BCTOOLBOX_DEPENDENCIES += mbedtls
|
||||
BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON
|
||||
|
7
package/bearssl/Config.in
Normal file
7
package/bearssl/Config.in
Normal file
@ -0,0 +1,7 @@
|
||||
config BR2_PACKAGE_BEARSSL
|
||||
bool "bearssl"
|
||||
help
|
||||
BearSSL is an implementation of the SSL/TLS protocol
|
||||
(RFC 5246) written in C.
|
||||
|
||||
https://bearssl.org
|
3
package/bearssl/bearssl.hash
Normal file
3
package/bearssl/bearssl.hash
Normal file
@ -0,0 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 6705bba1714961b41a728dfc5debbe348d2966c117649392f8c8139efc83ff14 bearssl-0.6.tar.gz
|
||||
sha256 771bf18c8633ea69ec9b07d2e604c4b99b7bef41b0f5ce6385d24df4448f61ca LICENSE.txt
|
42
package/bearssl/bearssl.mk
Normal file
42
package/bearssl/bearssl.mk
Normal file
@ -0,0 +1,42 @@
|
||||
################################################################################
|
||||
#
|
||||
# bearssl
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BEARSSL_VERSION = 0.6
|
||||
BEARSSL_SITE = https://bearssl.org
|
||||
BEARSSL_LICENSE = MIT
|
||||
BEARSSL_LICENSE_FILES = LICENSE.txt
|
||||
BEARSSL_INSTALL_STAGING = YES
|
||||
|
||||
BEARSSL_MAKE_OPTS = \
|
||||
$(TARGET_CONFIGURE_OPTS) \
|
||||
LDDLL=$(TARGET_CC)
|
||||
|
||||
ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
|
||||
BEARSSL_TARGETS += dll
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y)
|
||||
BEARSSL_TARGETS += lib
|
||||
endif
|
||||
|
||||
define BEARSSL_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) $(BEARSSL_MAKE_OPTS) -C $(@D) \
|
||||
$(BEARSSL_TARGETS)
|
||||
endef
|
||||
|
||||
define BEARSSL_INSTALL_STAGING_CMDS
|
||||
mkdir -p $(STAGING_DIR)/usr/include
|
||||
cp -dpfr $(@D)/inc/*.h $(STAGING_DIR)/usr/include
|
||||
mkdir -p $(STAGING_DIR)/usr/lib
|
||||
cp -dpfr $(@D)/build/lib* $(STAGING_DIR)/usr/lib
|
||||
endef
|
||||
|
||||
define BEARSSL_INSTALL_TARGET_CMDS
|
||||
mkdir -p $(TARGET_DIR)/usr/lib
|
||||
cp -dpfr $(@D)/build/lib* $(TARGET_DIR)/usr/lib
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
@ -1,4 +1,3 @@
|
||||
# From https://botan.randombit.net/releases/sha256sums.txt
|
||||
sha256 f7874da2aeb8c018fd77df40b2137879bf90b66f5589490c991e83fb3e8094be Botan-2.11.0.tar.xz
|
||||
# Locally computed
|
||||
sha256 161011a9be56a6e825c06257005055a148056b5c756f75a0b99dae0883fcab7a license.txt
|
||||
sha256 f57ae42a41e1091bca58f44f41addebd9a390b651603952c881ec89d50187e90 Botan-2.13.0.tar.xz
|
||||
sha256 fb7f0322d36fba55ca17d77bc203a9f09a40daa8a249b75cf8887aba36cec9d0 license.txt
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
BOTAN_VERSION = 2.11.0
|
||||
BOTAN_VERSION = 2.13.0
|
||||
BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tar.xz
|
||||
BOTAN_SITE = http://botan.randombit.net/releases
|
||||
BOTAN_LICENSE = BSD-2-Clause
|
||||
|
@ -1,30 +0,0 @@
|
||||
From 68f4b4f5b220f256b17ad2f084d61fe89f3632ae Mon Sep 17 00:00:00 2001
|
||||
From: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
Date: Tue, 19 Apr 2016 08:38:38 -0300
|
||||
Subject: [PATCH] nat: fix build failure
|
||||
|
||||
_GNU_SOURCE needs to be defined so that O_CLOEXEC symbols can be found in
|
||||
system header files.
|
||||
|
||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
||||
---
|
||||
Status: submitted upstream
|
||||
|
||||
src/nat.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/nat.c b/src/nat.c
|
||||
index 33ae6df..62e21d4 100644
|
||||
--- a/src/nat.c
|
||||
+++ b/src/nat.c
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
+#define _GNU_SOURCE
|
||||
#include <errno.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
--
|
||||
2.7.3
|
||||
|
@ -8,7 +8,6 @@ config BR2_PACKAGE_CONNMAN
|
||||
depends on !BR2_TOOLCHAIN_USES_MUSL # missing res_ninit()
|
||||
select BR2_PACKAGE_DBUS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_IPTABLES
|
||||
help
|
||||
The Connection Manager (ConnMan) project provides a daemon
|
||||
for managing internet connections within embedded devices
|
||||
@ -18,6 +17,27 @@ config BR2_PACKAGE_CONNMAN
|
||||
|
||||
if BR2_PACKAGE_CONNMAN
|
||||
|
||||
choice
|
||||
prompt "Firewall type"
|
||||
default BR2_PACKAGE_CONNMAN_IPTABLES
|
||||
help
|
||||
Select which firewall type is used.
|
||||
|
||||
config BR2_PACKAGE_CONNMAN_IPTABLES
|
||||
bool "iptables"
|
||||
select BR2_PACKAGE_IPTABLES
|
||||
help
|
||||
Use iptables as firewall.
|
||||
|
||||
config BR2_PACKAGE_CONNMAN_NFTABLES
|
||||
bool "nftables"
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
|
||||
select BR2_PACKAGE_NFTABLES
|
||||
help
|
||||
Use nftables as firewall.
|
||||
endchoice
|
||||
|
||||
config BR2_PACKAGE_CONNMAN_ETHERNET
|
||||
bool "enable Ethernet support"
|
||||
default y
|
||||
|
@ -1,4 +1,4 @@
|
||||
# From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc
|
||||
sha256 6ce29b3eb0bb16a7387bc609c39455fd13064bdcde5a4d185fab3a0c71946e16 connman-1.37.tar.xz
|
||||
sha256 cb30aca97c2f79ccaed8802aa2909ac5100a3969de74c0af8a9d73b85fc4932b connman-1.38.tar.xz
|
||||
# Locally computed
|
||||
sha256 b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259 COPYING
|
||||
|
@ -4,29 +4,78 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CONNMAN_VERSION = 1.37
|
||||
CONNMAN_VERSION = 1.38
|
||||
CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
|
||||
CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
|
||||
CONNMAN_DEPENDENCIES = libglib2 dbus iptables
|
||||
CONNMAN_INSTALL_STAGING = YES
|
||||
CONNMAN_LICENSE = GPL-2.0
|
||||
CONNMAN_LICENSE_FILES = COPYING
|
||||
CONNMAN_CONF_OPTS += \
|
||||
--with-dbusconfdir=/etc \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \
|
||||
$(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system)
|
||||
|
||||
CONNMAN_DEPENDENCIES += \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono) \
|
||||
$(if $(BR2_PACKAGE_CONNMAN_WISPR),gnutls)
|
||||
CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc
|
||||
|
||||
ifeq ($(BR2_INIT_SYSTEMD),y)
|
||||
CONNMAN_CONF_OPTS += --with-systemdunitdir=/usr/lib/systemd/system
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CONNMAN_BLUETOOTH),y)
|
||||
CONNMAN_CONF_OPTS += --enable-bluetooth
|
||||
else
|
||||
CONNMAN_CONF_OPTS += --disable-bluetooth
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CONNMAN_DEBUG),y)
|
||||
CONNMAN_CONF_OPTS += --enable-debug
|
||||
else
|
||||
CONNMAN_CONF_OPTS += --disable-debug
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CONNMAN_ETHERNET),y)
|
||||
CONNMAN_CONF_OPTS += --enable-ethernet
|
||||
else
|
||||
CONNMAN_CONF_OPTS += --disable-ethernet
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CONNMAN_IPTABLES),y)
|
||||
CONNMAN_CONF_OPTS += --with-firewall=iptables
|
||||
CONNMAN_DEPENDENCIES += iptables
|
||||
else ifeq ($(BR2_PACKAGE_CONNMAN_NFTABLES),y)
|
||||
CONNMAN_CONF_OPTS += --with-firewall=nftables
|
||||
CONNMAN_DEPENDENCIES += nftables
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CONNMAN_LOOPBACK),y)
|
||||
CONNMAN_CONF_OPTS += --enable-loopback
|
||||
else
|
||||
CONNMAN_CONF_OPTS += --disable-loopback
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CONNMAN_NEARD),y)
|
||||
CONNMAN_CONF_OPTS += --enable-neard
|
||||
CONNMAN_DEPENDENCIES += neard
|
||||
else
|
||||
CONNMAN_CONF_OPTS += --disable-neard
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CONNMAN_OFONO),y)
|
||||
CONNMAN_CONF_OPTS += --enable-ofono
|
||||
CONNMAN_DEPENDENCIES += ofono
|
||||
else
|
||||
CONNMAN_CONF_OPTS += --disable-ofono
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CONNMAN_WIFI),y)
|
||||
CONNMAN_CONF_OPTS += --enable-wifi
|
||||
else
|
||||
CONNMAN_CONF_OPTS += --disable-wifi
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CONNMAN_WISPR),y)
|
||||
CONNMAN_CONF_OPTS += --enable-wispr
|
||||
CONNMAN_DEPENDENCIES += gnutls
|
||||
else
|
||||
CONNMAN_CONF_OPTS += --disable-wispr
|
||||
endif
|
||||
|
||||
define CONNMAN_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman
|
||||
|
@ -17,7 +17,7 @@ CUTELYST_CONF_OPTS += \
|
||||
-DPLUGIN_VIEW_GRANTLEE=OFF
|
||||
|
||||
# Qt 5.8 needs atomics, which on various architectures are in -latomic
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC)$(BR2_PACKAGE_QT5_VERSION_LATEST),yy)
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
CUTELYST_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic"
|
||||
endif
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 e07d156ce6e3d93ac1b69fa9bf8695038e6e5edfb2c80c91a1098d1477478ecb drbd-utils-9.11.0.tar.gz
|
||||
sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING
|
||||
sha256 16a6d000aac7f746419839a2c2afcb71fa8779fe0b5898e967767791cb8f4bc7 drbd-utils-9.12.0.tar.gz
|
||||
sha256 1ca3e8f71b7de618968e7ea9fe47822d9e704dc476aef8544033abedec355225 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
DRBD_UTILS_VERSION = 9.11.0
|
||||
DRBD_UTILS_VERSION = 9.12.0
|
||||
DRBD_UTILS_SITE = http://www.linbit.com/downloads/drbd/utils
|
||||
DRBD_UTILS_LICENSE = GPL-2.0+
|
||||
DRBD_UTILS_LICENSE_FILES = COPYING
|
||||
|
@ -5,6 +5,7 @@ config BR2_PACKAGE_EUDEV
|
||||
depends on BR2_USE_WCHAR # needs C99 compiler
|
||||
depends on !BR2_STATIC_LIBS # kmod
|
||||
select BR2_PACKAGE_HAS_UDEV
|
||||
select BR2_PACKAGE_UDEV_GENTOO_SCRIPTS if BR2_INIT_OPENRC
|
||||
select BR2_PACKAGE_UTIL_LINUX
|
||||
select BR2_PACKAGE_UTIL_LINUX_LIBBLKID
|
||||
select BR2_PACKAGE_KMOD
|
||||
|
@ -48,6 +48,12 @@ define EUDEV_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -D -m 0755 package/eudev/S10udev $(TARGET_DIR)/etc/init.d/S10udev
|
||||
endef
|
||||
|
||||
# Avoid installing S10udev with openrc, as the service is started by a unit
|
||||
# from the udev-gentoo-scripts package.
|
||||
define EUDEV_INSTALL_INIT_OPENRC
|
||||
@:
|
||||
endef
|
||||
|
||||
# Required by default rules for input devices
|
||||
define EUDEV_USERS
|
||||
- - input -1 * - - - Input device group
|
||||
|
@ -45,6 +45,14 @@ define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
|
||||
cp $(@D)/firmware/hdmi/cadence/signed_hdmi_imx8m.bin \
|
||||
$(BINARIES_DIR)/signed_hdmi_imx8m.bin
|
||||
endef
|
||||
else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8),y)
|
||||
FIRMWARE_IMX_INSTALL_IMAGES = YES
|
||||
define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
|
||||
# SECO firmware is needed when generating imx8-boot-sd.bin which
|
||||
# is done in post-image script.
|
||||
cp $(@D)/firmware/seco/mx8qm-ahab-container.img \
|
||||
$(BINARIES_DIR)/ahab-container.img
|
||||
endef
|
||||
else ifeq ($(BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX8X),y)
|
||||
FIRMWARE_IMX_INSTALL_IMAGES = YES
|
||||
define FIRMWARE_IMX_INSTALL_IMAGES_CMDS
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 444d6a8a82102e09e935540c64a731021de36db03e1e74181f41ca6f39aa6474 fswebcam-20140113.tar.xz
|
||||
sha256 5702771cee6e3fa0f2bbbb72ecf3e5a253ff458c1f648f7e7c0d477e39f0ec80 fswebcam-e9f8094b6a3d1a49f99b2abec4e6ab4df33e2e33.tar.gz
|
||||
sha256 204d8eff92f95aac4df6c8122bc1505f468f3a901e5a4cc08940e0ede1938994 LICENSE
|
||||
|
@ -4,9 +4,8 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FSWEBCAM_VERSION = 20140113
|
||||
FSWEBCAM_SOURCE = fswebcam-$(FSWEBCAM_VERSION).tar.xz
|
||||
FSWEBCAM_SITE = http://www.firestorm.cx/fswebcam/files
|
||||
FSWEBCAM_VERSION = e9f8094b6a3d1a49f99b2abec4e6ab4df33e2e33
|
||||
FSWEBCAM_SITE = $(call github,fsphil,fswebcam,$(FSWEBCAM_VERSION))
|
||||
FSWEBCAM_LICENSE = GPL-2.0
|
||||
FSWEBCAM_LICENSE_FILES = LICENSE
|
||||
|
||||
|
@ -35,7 +35,9 @@ endif
|
||||
# For the host variant, we really want to build with XML support,
|
||||
# which is needed to read XML descriptions of target architectures. We
|
||||
# also need ncurses.
|
||||
HOST_GDB_DEPENDENCIES = host-expat host-ncurses
|
||||
# As for libiberty, gdb may use a system-installed one if present, so
|
||||
# we must ensure ours is installed first.
|
||||
HOST_GDB_DEPENDENCIES = host-expat host-libiberty host-ncurses
|
||||
|
||||
# Disable building documentation
|
||||
GDB_MAKE_OPTS += MAKEINFO=true
|
||||
|
@ -0,0 +1,109 @@
|
||||
From 601e6e56f44b91d957bb643662455f52540f336a Mon Sep 17 00:00:00 2001
|
||||
From: Corey Minyard <cminyard@mvista.com>
|
||||
Date: Tue, 25 Feb 2020 16:08:40 -0600
|
||||
Subject: [PATCH] filter: Rename some variables to tr_stdxxx
|
||||
|
||||
stdout and stderr can be macros, don't use the names directly.
|
||||
|
||||
Signed-off-by: Corey Minyard <cminyard@mvista.com>
|
||||
[james.hilliard1@gmail.com: backport from upstream commit
|
||||
601e6e56f44b91d957bb643662455f52540f336a]
|
||||
Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
|
||||
---
|
||||
lib/gensio_filter_trace.c | 28 ++++++++++++++--------------
|
||||
1 file changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/lib/gensio_filter_trace.c b/lib/gensio_filter_trace.c
|
||||
index d39d58b..abe2db6 100644
|
||||
--- a/lib/gensio_filter_trace.c
|
||||
+++ b/lib/gensio_filter_trace.c
|
||||
@@ -32,8 +32,8 @@ struct trace_filter {
|
||||
enum trace_dir dir;
|
||||
bool raw;
|
||||
char *filename;
|
||||
- bool stdout;
|
||||
- bool stderr;
|
||||
+ bool tr_stdout;
|
||||
+ bool tr_stderr;
|
||||
|
||||
FILE *tr;
|
||||
};
|
||||
@@ -82,9 +82,9 @@ trace_try_connect(struct gensio_filter *filter, struct timeval *timeout)
|
||||
{
|
||||
struct trace_filter *tfilter = filter_to_trace(filter);
|
||||
|
||||
- if (tfilter->stdout) {
|
||||
+ if (tfilter->tr_stdout) {
|
||||
tfilter->tr = stdout;
|
||||
- } else if (tfilter->stderr) {
|
||||
+ } else if (tfilter->tr_stderr) {
|
||||
tfilter->tr = stderr;
|
||||
} else if (tfilter->filename) {
|
||||
tfilter->tr = fopen(tfilter->filename, "a+");
|
||||
@@ -99,7 +99,7 @@ trace_try_disconnect(struct gensio_filter *filter, struct timeval *timeout)
|
||||
{
|
||||
struct trace_filter *tfilter = filter_to_trace(filter);
|
||||
|
||||
- if (!tfilter->stdout && !tfilter->stderr && tfilter->tr)
|
||||
+ if (!tfilter->tr_stdout && !tfilter->tr_stderr && tfilter->tr)
|
||||
fclose(tfilter->tr);
|
||||
tfilter->tr = NULL;
|
||||
return 0;
|
||||
@@ -331,12 +331,12 @@ static int gensio_trace_filter_func(struct gensio_filter *filter, int op,
|
||||
|
||||
static struct gensio_filter *
|
||||
gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir,
|
||||
- bool raw, const char *filename, bool stdout,
|
||||
- bool stderr)
|
||||
+ bool raw, const char *filename, bool tr_stdout,
|
||||
+ bool tr_stderr)
|
||||
{
|
||||
struct trace_filter *tfilter;
|
||||
|
||||
- if (!filename && !stdout && !stderr)
|
||||
+ if (!filename && !tr_stdout && !tr_stderr)
|
||||
dir = TRACE_NONE;
|
||||
|
||||
tfilter = o->zalloc(o, sizeof(*tfilter));
|
||||
@@ -351,8 +351,8 @@ gensio_trace_filter_raw_alloc(struct gensio_os_funcs *o, enum trace_dir dir,
|
||||
if (!tfilter->filename)
|
||||
goto out_nomem;
|
||||
}
|
||||
- tfilter->stdout = stdout;
|
||||
- tfilter->stderr = stderr;
|
||||
+ tfilter->tr_stdout = tr_stdout;
|
||||
+ tfilter->tr_stderr = tr_stderr;
|
||||
|
||||
tfilter->lock = o->alloc_lock(o);
|
||||
if (!tfilter->lock)
|
||||
@@ -385,7 +385,7 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o,
|
||||
{
|
||||
struct gensio_filter *filter;
|
||||
int dir = TRACE_NONE;
|
||||
- bool raw = false, stdout = false, stderr = false;
|
||||
+ bool raw = false, tr_stdout = false, tr_stderr = false;
|
||||
const char *filename = NULL;
|
||||
unsigned int i;
|
||||
|
||||
@@ -396,15 +396,15 @@ gensio_trace_filter_alloc(struct gensio_os_funcs *o,
|
||||
continue;
|
||||
if (gensio_check_keyvalue(args[i], "file", &filename) > 0)
|
||||
continue;
|
||||
- if (gensio_check_keybool(args[i], "stdout", &stdout) > 0)
|
||||
+ if (gensio_check_keybool(args[i], "stdout", &tr_stdout) > 0)
|
||||
continue;
|
||||
- if (gensio_check_keybool(args[i], "stderr", &stderr) > 0)
|
||||
+ if (gensio_check_keybool(args[i], "stderr", &tr_stderr) > 0)
|
||||
continue;
|
||||
return GE_INVAL;
|
||||
}
|
||||
|
||||
filter = gensio_trace_filter_raw_alloc(o, dir, raw, filename,
|
||||
- stdout, stderr);
|
||||
+ tr_stdout, tr_stderr);
|
||||
if (!filter)
|
||||
return GE_NOMEM;
|
||||
|
||||
--
|
||||
2.20.1
|
||||
|
@ -1,29 +0,0 @@
|
||||
From f63b15e690581d898da56ef2540b6199f5728e58 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 11 Feb 2020 19:14:53 +0100
|
||||
Subject: [PATCH] tests/Makefile.am: don't add -lpthread
|
||||
|
||||
Don't add -lpthread unconditionally to oomtest_LDADD to avoid a build
|
||||
failure without threads, it will be added to LIBS by configure.ac if
|
||||
needed
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/cminyard/gensio/commit/f63b15e690581d898da56ef2540b6199f5728e58]
|
||||
---
|
||||
tests/Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/tests/Makefile.am b/tests/Makefile.am
|
||||
index a280acc..b4335c5 100644
|
||||
--- a/tests/Makefile.am
|
||||
+++ b/tests/Makefile.am
|
||||
@@ -127,7 +127,7 @@ test_fuzz: test_fuzz_certauth test_fuzz_mux test_fuzz_ssl test_fuzz_telnet \
|
||||
|
||||
oomtest_SOURCES = oomtest.c
|
||||
|
||||
-oomtest_LDADD = $(top_builddir)/lib/libgensio.la $(OPENSSL_LIBS) -lpthread
|
||||
+oomtest_LDADD = $(top_builddir)/lib/libgensio.la $(OPENSSL_LIBS)
|
||||
|
||||
noinst_PROGRAMS = oomtest
|
||||
|
@ -1,7 +1,7 @@
|
||||
# From https://sourceforge.net/projects/ser2net/files/ser2net/
|
||||
md5 53c027dfaaf374f57d5f36a6250fc018 gensio-1.5.1.tar.gz
|
||||
sha1 8329d7828016e643f60b8b3e70564d32cd03008f gensio-1.5.1.tar.gz
|
||||
md5 d6b0665266f738973b13450c53d83032 gensio-1.5.3.tar.gz
|
||||
sha1 8d041babe8d29f8acb48c6cb0fa543e6f9f63238 gensio-1.5.3.tar.gz
|
||||
# Locally computed:
|
||||
sha256 c1ed28f5bd72185dba666a900d29afbecba58727d6c0dde4a182143273fc1e6b gensio-1.5.1.tar.gz
|
||||
sha256 f5097add3f269594e7a81016af93c147e8f5e8312f27f3d0bfbeeb3aad1ace53 gensio-1.5.3.tar.gz
|
||||
sha256 501f3108e6c03e5a0a5585ebaaa369171aead5319cd0a7a4dc1f66211c1f09f1 COPYING
|
||||
sha256 dcac7d447dd81ab96d28dce00a07a6486e623f7ded94e2a2a8e83312405cdf89 COPYING.LIB
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GENSIO_VERSION = 1.5.1
|
||||
GENSIO_VERSION = 1.5.3
|
||||
GENSIO_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net
|
||||
GENSIO_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (tools)
|
||||
GENSIO_LICENSE_FILES = COPYING.LIB COPYING
|
||||
|
@ -8,10 +8,9 @@ Originally written by Anthony Viallard
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
|
||||
|
||||
diff -rup a/configure.in b/configure.in
|
||||
--- a/configure.in 2016-09-07 05:14:29.000000000 +0100
|
||||
+++ b/configure.in 2016-12-01 12:09:31.487464774 +0000
|
||||
@@ -818,6 +818,16 @@ if test "$with_cwdrc" = yes; then
|
||||
--- a/configure.ac 2019-11-27 23:52:29.000000000 +0100
|
||||
+++ b/configure.ac 2020-02-13 10:24:50.801842269 +0100
|
||||
@@ -755,6 +755,16 @@ if test "$with_cwdrc" = yes; then
|
||||
[ Define if you want to read .gnuplot from current directory (SECURITY RISK!).])
|
||||
fi
|
||||
|
||||
@ -25,12 +24,12 @@ diff -rup a/configure.in b/configure.in
|
||||
+AC_ARG_ENABLE(demo,dnl
|
||||
+[ --disable-demo do not build demo files])
|
||||
+
|
||||
dnl Sort help/subtopic tables by row or column
|
||||
AC_ARG_WITH(row-help,dnl
|
||||
[ --with-row-help format help and subtopic tables by row (default)
|
||||
@@ -1303,6 +1313,24 @@ fi
|
||||
dnl No configuration option for this one yet
|
||||
AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported])
|
||||
dnl Disable experimental support for nonlinear axes
|
||||
AC_ARG_WITH(nonlinear-axes,dnl
|
||||
[ --without-nonlinear-axes disable support for nonlinear axes])
|
||||
@@ -1236,6 +1246,24 @@ if test -n "${DIST_CONTACT}"; then
|
||||
AC_DEFINE_UNQUOTED([DIST_CONTACT],["$DIST_CONTACT"],[Contact address for modified and binary distributed gnuplot versions])
|
||||
fi
|
||||
|
||||
+dnl build doc files
|
||||
+if test "$enable_doc" != no; then
|
||||
@ -53,15 +52,14 @@ diff -rup a/configure.in b/configure.in
|
||||
dnl Substitute variables
|
||||
AC_SUBST(PACKAGE)
|
||||
AC_SUBST(VERSION_MAJOR)
|
||||
diff -rup a/Makefile.am b/Makefile.am
|
||||
--- a/Makefile.am 2014-05-30 17:38:08.000000000 +0100
|
||||
+++ b/Makefile.am 2016-12-01 12:09:31.488464794 +0000
|
||||
--- a/Makefile.am 2019-11-19 22:57:18.000000000 +0100
|
||||
+++ b/Makefile.am 2020-02-13 10:17:55.753012739 +0100
|
||||
@@ -1,7 +1,7 @@
|
||||
## Process this file with automake to produce Makefile.in -*-Makefile-*-
|
||||
AUTOMAKE_OPTIONS = foreign
|
||||
|
||||
-SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share
|
||||
+SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share
|
||||
-SUBDIRS = config m4 term src docs man demo tutorial share
|
||||
+SUBDIRS = config m4 term src $(DOCSUBDIR) man $(DEMOSUBDIR) tutorial share
|
||||
|
||||
EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
|
||||
Makefile.maint PATCHLEVEL PGPKEYS PORTING README RELEASE_NOTES \
|
||||
EXTRA_DIST = BUGS Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \
|
||||
Makefile.maint PATCHLEVEL PGPKEYS README RELEASE_NOTES \
|
||||
|
@ -1,27 +0,0 @@
|
||||
Fix usage of gdlib-config
|
||||
|
||||
gnuplot configure.in script properly takes care of finding
|
||||
gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config
|
||||
instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG
|
||||
has defined. Which means that whenever a gdlib-config binary not in
|
||||
the PATH is being used, it does not use it.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/configure.in
|
||||
===================================================================
|
||||
--- a/configure.in
|
||||
+++ b/configure.in
|
||||
@@ -537,9 +537,9 @@
|
||||
if test "$with_gd" != no; then
|
||||
AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config])
|
||||
if test -n "$GDLIB_CONFIG"; then
|
||||
- libgd_CPPFLAGS=`gdlib-config --cflags`
|
||||
- libgd_LDFLAGS=`gdlib-config --ldflags`
|
||||
- libgd_LIBS=`gdlib-config --libs`
|
||||
+ libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags`
|
||||
+ libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags`
|
||||
+ libgd_LIBS=`$GDLIB_CONFIG --libs`
|
||||
elif test -d "$with_gd"; then
|
||||
libgd_CPPFLAGS="-I$with_gd/include"
|
||||
libgd_LDFLAGS="-L$with_gd/lib"
|
@ -1,6 +1,6 @@
|
||||
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.6/
|
||||
md5 8ec46520a86a61163a701b00404faf1a gnuplot-5.0.6.tar.gz
|
||||
sha1 f7b8948166b22e5bd658d5cf7579716f4821dba0 gnuplot-5.0.6.tar.gz
|
||||
# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.2.8/
|
||||
md5 2df8767c7399bee57a96296d46b4d5fb gnuplot-5.2.8.tar.gz
|
||||
sha1 dc018b1e0a31b770d4635958badff13498babc4d gnuplot-5.2.8.tar.gz
|
||||
# Locally computed
|
||||
sha256 5bbe4713e555c2e103b7d4ffd45fca69551fff09cf5c3f9cb17428aaacc9b460 gnuplot-5.0.6.tar.gz
|
||||
sha256 60a6764ccf404a1668c140f11cc1f699290ab70daa1151bb58fed6139a28ac37 gnuplot-5.2.8.tar.gz
|
||||
sha256 895928ec0735cca1c8cec42656c7e314a065d0242813bb8693c0c1bf61fd4e4d Copyright
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GNUPLOT_VERSION = 5.0.6
|
||||
GNUPLOT_VERSION = 5.2.8
|
||||
GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION)
|
||||
GNUPLOT_LICENSE = gnuplot license (open source)
|
||||
GNUPLOT_LICENSE_FILES = Copyright
|
||||
|
@ -0,0 +1,33 @@
|
||||
From 3a9d1e5ee0aae56fafec0beba2014c19e4ff310c Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 23 Mar 2016 17:07:28 +0200
|
||||
Subject: [PATCH] Revert an incomplete upstream attempt at cross-compile support
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
common.mk | 4 ----
|
||||
giscanner/gdumpparser.py | 6 ------
|
||||
2 files changed, 10 deletions(-)
|
||||
|
||||
diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py
|
||||
index 1134f33..9bdc2bc 100644
|
||||
--- a/giscanner/gdumpparser.py
|
||||
+++ b/giscanner/gdumpparser.py
|
||||
@@ -156,12 +156,6 @@ blob containing data gleaned from GObject's primitive introspection."""
|
||||
out_path = os.path.join(self._binary.tmpdir, 'dump.xml')
|
||||
|
||||
args = []
|
||||
-
|
||||
- # Prepend the launcher command and arguments, if defined
|
||||
- launcher = os.environ.get('GI_CROSS_LAUNCHER')
|
||||
- if launcher:
|
||||
- args.extend(launcher.split())
|
||||
-
|
||||
args.extend(self._binary.args)
|
||||
args.append('--introspect-dump=%s,%s' % (in_path, out_path))
|
||||
|
||||
--
|
||||
2.7.0
|
||||
|
@ -0,0 +1,163 @@
|
||||
From 2b3bce1526b538dc2c7fa223eaf9808858aa1b06 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 15 Nov 2018 15:10:05 +0100
|
||||
Subject: [PATCH] add cross-compilation support to meson
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
gir/meson.build | 62 ++++++++++++++++++++++++++++++++++-------------
|
||||
meson.build | 4 ++-
|
||||
meson_options.txt | 20 +++++++++++++++
|
||||
3 files changed, 68 insertions(+), 18 deletions(-)
|
||||
|
||||
diff --git a/gir/meson.build b/gir/meson.build
|
||||
index 85ae575..327c134 100644
|
||||
--- a/gir/meson.build
|
||||
+++ b/gir/meson.build
|
||||
@@ -36,16 +36,29 @@ gir_files = [
|
||||
typelibdir = join_paths(get_option('libdir'), 'girepository-1.0')
|
||||
install_data(gir_files, install_dir: girdir)
|
||||
|
||||
-scanner_command = [
|
||||
- python,
|
||||
- girscanner,
|
||||
- '--output=@OUTPUT@',
|
||||
- '--no-libtool',
|
||||
- '--quiet',
|
||||
- '--reparse-validate',
|
||||
- '--add-include-path', join_paths(meson.current_build_dir()),
|
||||
- '--add-include-path', join_paths(meson.current_source_dir()),
|
||||
-]
|
||||
+if get_option('enable-host-gi')
|
||||
+ scanner_command = [
|
||||
+ 'g-ir-scanner',
|
||||
+ '--output=@OUTPUT@',
|
||||
+ '--no-libtool',
|
||||
+ '--quiet',
|
||||
+ '--reparse-validate',
|
||||
+ '--add-include-path', join_paths(meson.current_build_dir()),
|
||||
+ '--add-include-path', join_paths(meson.current_source_dir()),
|
||||
+ ]
|
||||
+else
|
||||
+ scanner_command = [
|
||||
+ python,
|
||||
+ girscanner,
|
||||
+ '--output=@OUTPUT@',
|
||||
+ '--no-libtool',
|
||||
+ '--quiet',
|
||||
+ '--reparse-validate',
|
||||
+ '--add-include-path', join_paths(meson.current_build_dir()),
|
||||
+ '--add-include-path', join_paths(meson.current_source_dir()),
|
||||
+ ]
|
||||
+endif
|
||||
+
|
||||
|
||||
dep_type = glib_dep.type_name()
|
||||
if dep_type == 'internal'
|
||||
@@ -58,6 +71,12 @@ if dep_type == 'internal'
|
||||
'--extra-library=glib-2.0', '--extra-library=gobject-2.0']
|
||||
endif
|
||||
|
||||
+if get_option('enable-gi-cross-wrapper') != ''
|
||||
+ scanner_command += ['--use-binary-wrapper=' + get_option('enable-gi-cross-wrapper')]
|
||||
+endif
|
||||
+if get_option('enable-gi-ldd-wrapper') != ''
|
||||
+ scanner_command += ['--use-ldd-wrapper=' + get_option('enable-gi-ldd-wrapper')]
|
||||
+endif
|
||||
# Take a glob and print to newlines
|
||||
globber = '''
|
||||
from glob import glob
|
||||
@@ -84,8 +103,8 @@ glib_command = scanner_command + [
|
||||
|
||||
if dep_type == 'pkgconfig'
|
||||
glib_command += ['--external-library', '--pkg=glib-2.0']
|
||||
- glib_libdir = glib_dep.get_pkgconfig_variable('libdir')
|
||||
- glib_incdir = join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
|
||||
+ glib_libdir = get_option('pkgconfig-sysroot-path') + glib_dep.get_pkgconfig_variable('libdir')
|
||||
+ glib_incdir = get_option('pkgconfig-sysroot-path') + join_paths(glib_dep.get_pkgconfig_variable('includedir'), 'glib-2.0')
|
||||
glib_libincdir = join_paths(glib_libdir, 'glib-2.0', 'include')
|
||||
glib_files += join_paths(glib_incdir, 'gobject', 'glib-types.h')
|
||||
glib_files += join_paths(glib_libincdir, 'glibconfig.h')
|
||||
@@ -339,7 +358,7 @@ endforeach
|
||||
if giounix_dep.found()
|
||||
if dep_type == 'pkgconfig'
|
||||
gio_command += ['--pkg=gio-unix-2.0']
|
||||
- giounix_includedir = join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
|
||||
+ giounix_includedir = get_option('pkgconfig-sysroot-path') + join_paths(giounix_dep.get_pkgconfig_variable('includedir'), 'gio-unix-2.0')
|
||||
# Get the installed gio-unix header list
|
||||
ret = run_command(python, '-c', globber.format(join_paths(giounix_includedir, 'gio', '*.h')))
|
||||
if ret.returncode() != 0
|
||||
@@ -422,15 +441,24 @@ gir_files += custom_target('gir-girepository',
|
||||
)
|
||||
|
||||
typelibs = []
|
||||
+if get_option('enable-gi-cross-wrapper') != ''
|
||||
+ gircompiler_command = [get_option('enable-gi-cross-wrapper'), gircompiler.full_path(), '-o', '@OUTPUT@', '@INPUT@',
|
||||
+ '--includedir', meson.current_build_dir(),
|
||||
+ '--includedir', meson.current_source_dir(),
|
||||
+ ]
|
||||
+else
|
||||
+ gircompiler_command = [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
|
||||
+ '--includedir', meson.current_build_dir(),
|
||||
+ '--includedir', meson.current_source_dir(),
|
||||
+ ]
|
||||
+endif
|
||||
+
|
||||
foreach gir : gir_files
|
||||
typelibs += custom_target('generate-typelib-@0@'.format(gir).underscorify(),
|
||||
input: gir,
|
||||
output: '@BASENAME@.typelib',
|
||||
depends: [gobject_gir, ],
|
||||
- command: [gircompiler, '-o', '@OUTPUT@', '@INPUT@',
|
||||
- '--includedir', meson.current_build_dir(),
|
||||
- '--includedir', meson.current_source_dir(),
|
||||
- ],
|
||||
+ command: gircompiler_command,
|
||||
install: true,
|
||||
install_dir: typelibdir,
|
||||
)
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 95bbd2b..f7baefd 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -163,7 +163,9 @@ endif
|
||||
subdir('girepository')
|
||||
subdir('tools')
|
||||
subdir('giscanner')
|
||||
-subdir('gir')
|
||||
+if get_option('enable-introspection-data') == true
|
||||
+ subdir('gir')
|
||||
+endif
|
||||
subdir('examples')
|
||||
subdir('docs')
|
||||
subdir('tests')
|
||||
diff --git a/meson_options.txt b/meson_options.txt
|
||||
index 445a68a..a325511 100644
|
||||
--- a/meson_options.txt
|
||||
+++ b/meson_options.txt
|
||||
@@ -25,3 +25,23 @@ option('python', type: 'string', value: 'python3',
|
||||
option('gir_dir_prefix', type: 'string',
|
||||
description: 'Intermediate prefix for gir installation under ${prefix}'
|
||||
)
|
||||
+
|
||||
+option('enable-host-gi', type: 'boolean', value : false,
|
||||
+ description: 'Use gobject introspection tools installed in the host system (useful when cross-compiling)'
|
||||
+)
|
||||
+
|
||||
+option('enable-gi-cross-wrapper', type: 'string',
|
||||
+ description: 'Use a wrapper to run gicompiler and binaries produced by giscanner (useful when cross-compiling)'
|
||||
+)
|
||||
+
|
||||
+option('enable-gi-ldd-wrapper', type: 'string',
|
||||
+ description: 'Use a ldd wrapper instead of system ldd command in giscanner (useful when cross-compiling)'
|
||||
+)
|
||||
+
|
||||
+option('enable-introspection-data', type: 'boolean', value : true,
|
||||
+ description: 'Build introspection data (.gir and .typelib files) in addition to library and tools'
|
||||
+)
|
||||
+
|
||||
+option('pkgconfig-sysroot-path', type: 'string',
|
||||
+ description: 'Specify a sysroot path to prepend to pkgconfig output (useful when cross-compiling)'
|
||||
+)
|
29
package/gobject-introspection/0003-disable-tests.patch
Normal file
29
package/gobject-introspection/0003-disable-tests.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 473b4288d8f4e891d0d21f7b60ef8053c5cd7af9 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Duskett <aduskett@gmail.com>
|
||||
Date: Mon, 3 Feb 2020 10:07:15 -0800
|
||||
Subject: [PATCH] disable tests
|
||||
|
||||
If introspection data on the host is not built, meson throws the error:
|
||||
"Unknown variable "typelibs". Because tests are not required, removing
|
||||
the subdir tests alltogether fixes this issue.
|
||||
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
meson.build | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index a5e825f..981e936 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -171,7 +171,6 @@ subdir('giscanner')
|
||||
subdir('gir')
|
||||
subdir('examples')
|
||||
subdir('docs')
|
||||
-subdir('tests')
|
||||
|
||||
install_data('Makefile.introspection', install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'))
|
||||
install_data('m4/introspection.m4', install_dir: join_paths(get_option('datadir'), 'aclocal'))
|
||||
--
|
||||
2.24.1
|
||||
|
@ -0,0 +1,52 @@
|
||||
From 704b888d0abfb01067352c40156f49f655691c7c Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Mon, 19 Oct 2015 18:26:40 +0300
|
||||
Subject: [PATCH] giscanner: add --use-binary-wrapper option
|
||||
|
||||
With this option, giscanner will use a wrapper executable to run
|
||||
binaries it's producing, instead of running them directly. This
|
||||
is useful when binaries are cross-compiled and cannot be run directly,
|
||||
but they can be run using for example QEMU emulation.
|
||||
|
||||
Upstream-Status: Pending [review on oe-core list]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
giscanner/scannermain.py | 14 ++++++++++++++
|
||||
1 file changed, 14 insertions(+)
|
||||
|
||||
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
|
||||
index 633496f..d684cd0 100755
|
||||
--- a/giscanner/scannermain.py
|
||||
+++ b/giscanner/scannermain.py
|
||||
@@ -120,6 +120,9 @@ def _get_option_parser():
|
||||
parser.add_option("", "--program",
|
||||
action="store", dest="program", default=None,
|
||||
help="program to execute")
|
||||
+ parser.add_option("", "--use-binary-wrapper",
|
||||
+ action="store", dest="wrapper", default=None,
|
||||
+ help="wrapper to use for running programs (useful when cross-compiling)")
|
||||
parser.add_option("", "--program-arg",
|
||||
action="append", dest="program_args", default=[],
|
||||
help="extra arguments to program")
|
||||
@@ -417,6 +420,17 @@ def create_binary(transformer, options, args):
|
||||
gdump_parser.get_error_quark_functions())
|
||||
|
||||
shlibs = resolve_shlibs(options, binary, options.libraries)
|
||||
+ if options.wrapper:
|
||||
+ # The wrapper needs the binary itself, not the libtool wrapper script,
|
||||
+ # so we check if libtool has sneaked the binary into .libs subdirectory
|
||||
+ # and adjust the path accordingly
|
||||
+ import os.path
|
||||
+ dir_name, binary_name = os.path.split(binary.args[0])
|
||||
+ libtool_binary = os.path.join(dir_name, '.libs', binary_name)
|
||||
+ if os.path.exists(libtool_binary):
|
||||
+ binary.args[0] = libtool_binary
|
||||
+ # Then prepend the wrapper to the command line to execute
|
||||
+ binary.args = [options.wrapper] + binary.args
|
||||
gdump_parser.set_introspection_binary(binary)
|
||||
gdump_parser.parse()
|
||||
return shlibs
|
||||
--
|
||||
2.7.0
|
||||
|
@ -0,0 +1,48 @@
|
||||
From d4ad57fd4a32c4f0d2f0522a3090ef940746431b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Oct 2015 16:28:46 +0200
|
||||
Subject: [PATCH] giscanner: add a --use-ldd-wrapper option
|
||||
|
||||
This is useful in cross-compile environments where system's ldd
|
||||
command does not work on binaries built for a different architecture
|
||||
|
||||
Upstream-Status: Pending [review in oe-core]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
giscanner/scannermain.py | 3 +++
|
||||
giscanner/shlibs.py | 4 +++-
|
||||
2 files changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
|
||||
index d684cd0..1b3b369 100755
|
||||
--- a/giscanner/scannermain.py
|
||||
+++ b/giscanner/scannermain.py
|
||||
@@ -123,6 +123,9 @@ def _get_option_parser():
|
||||
parser.add_option("", "--use-binary-wrapper",
|
||||
action="store", dest="wrapper", default=None,
|
||||
help="wrapper to use for running programs (useful when cross-compiling)")
|
||||
+ parser.add_option("", "--use-ldd-wrapper",
|
||||
+ action="store", dest="ldd_wrapper", default=None,
|
||||
+ help="wrapper to use instead of ldd (useful when cross-compiling)")
|
||||
parser.add_option("", "--program-arg",
|
||||
action="append", dest="program_args", default=[],
|
||||
help="extra arguments to program")
|
||||
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
|
||||
index c93d20c..c5b5942 100644
|
||||
--- a/giscanner/shlibs.py
|
||||
+++ b/giscanner/shlibs.py
|
||||
@@ -97,7 +97,9 @@ def _resolve_non_libtool(options, binary, libraries):
|
||||
args.extend(libtool)
|
||||
args.append('--mode=execute')
|
||||
platform_system = platform.system()
|
||||
- if platform_system == 'Darwin':
|
||||
+ if options.ldd_wrapper:
|
||||
+ args.extend([options.ldd_wrapper, binary.args[0]])
|
||||
+ elif platform_system == 'Darwin':
|
||||
args.extend(['otool', '-L', binary.args[0]])
|
||||
else:
|
||||
args.extend(['ldd', binary.args[0]])
|
||||
--
|
||||
2.7.0
|
||||
|
@ -0,0 +1,73 @@
|
||||
From 3a9b3d8179b7eb9d2cc93da31578945bc03a45c3 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 27 Apr 2018 12:56:15 -0400
|
||||
Subject: [PATCH] giscanner: add a --lib-dirs-envvar option
|
||||
|
||||
By default LD_LIBRARY_PATH is set to the list of target library paths;
|
||||
this breaks down in cross-compilation environment, as we need to run a
|
||||
native emulation wrapper rather than the target binary itself. This patch
|
||||
allows exporting those paths to a different environment variable
|
||||
which can be picked up and used by the wrapper.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
giscanner/ccompiler.py | 4 ++--
|
||||
giscanner/dumper.py | 3 ++-
|
||||
giscanner/scannermain.py | 3 +++
|
||||
3 files changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
|
||||
index d10327c..6cf25d5 100644
|
||||
--- a/giscanner/ccompiler.py
|
||||
+++ b/giscanner/ccompiler.py
|
||||
@@ -174,7 +174,7 @@ class CCompiler(object):
|
||||
|
||||
self._cflags_no_deprecation_warnings = "-Wno-deprecated-declarations"
|
||||
|
||||
- def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths):
|
||||
+ def get_internal_link_flags(self, args, libtool, libraries, extra_libraries, libpaths, lib_dirs_envvar):
|
||||
# An "internal" link is where the library to be introspected
|
||||
# is being built in the current directory.
|
||||
|
||||
@@ -184,7 +184,7 @@ class CCompiler(object):
|
||||
if os.name == 'nt':
|
||||
runtime_path_envvar = ['LIB', 'PATH']
|
||||
else:
|
||||
- runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH']
|
||||
+ runtime_path_envvar = ['LD_LIBRARY_PATH', 'DYLD_FALLBACK_LIBRARY_PATH'] if not lib_dirs_envvar else [lib_dirs_envvar]
|
||||
# Search the current directory first
|
||||
# (This flag is not supported nor needed for Visual C++)
|
||||
args.append('-L.')
|
||||
diff --git a/giscanner/dumper.py b/giscanner/dumper.py
|
||||
index 3c7220b..0abd565 100644
|
||||
--- a/giscanner/dumper.py
|
||||
+++ b/giscanner/dumper.py
|
||||
@@ -244,7 +244,8 @@ class DumpCompiler(object):
|
||||
libtool,
|
||||
self._options.libraries,
|
||||
self._options.extra_libraries,
|
||||
- self._options.library_paths)
|
||||
+ self._options.library_paths,
|
||||
+ self._options.lib_dirs_envvar)
|
||||
args.extend(pkg_config_libs)
|
||||
|
||||
else:
|
||||
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
|
||||
index d262785..51c9570 100755
|
||||
--- a/giscanner/scannermain.py
|
||||
+++ b/giscanner/scannermain.py
|
||||
@@ -126,6 +126,9 @@ def _get_option_parser():
|
||||
parser.add_option("", "--use-ldd-wrapper",
|
||||
action="store", dest="ldd_wrapper", default=None,
|
||||
help="wrapper to use instead of ldd (useful when cross-compiling)")
|
||||
+ parser.add_option("", "--lib-dirs-envvar",
|
||||
+ action="store", dest="lib_dirs_envvar", default=None,
|
||||
+ help="environment variable to write a list of library directories to (for running the transient binary), instead of standard LD_LIBRARY_PATH")
|
||||
parser.add_option("", "--program-arg",
|
||||
action="append", dest="program_args", default=[],
|
||||
help="extra arguments to program")
|
||||
--
|
||||
2.14.3
|
||||
|
@ -0,0 +1,29 @@
|
||||
From 72a427bc50daee8f1ded0e9221e53dbbf2a80f08 Mon Sep 17 00:00:00 2001
|
||||
From: Adam Duskett <aduskett@gmail.com>
|
||||
Date: Wed, 14 Mar 2018 12:07:10 -0400
|
||||
Subject: [PATCH] Add rpath links to ccompiler
|
||||
|
||||
This patch allows gobject-introspection to process extra paths passed to the
|
||||
compiler via the GIR_EXTRA_LIBS_PATH variable.
|
||||
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
giscanner/ccompiler.py | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/giscanner/ccompiler.py b/giscanner/ccompiler.py
|
||||
index a8bd5b1..51bb9bc 100644
|
||||
--- a/giscanner/ccompiler.py
|
||||
+++ b/giscanner/ccompiler.py
|
||||
@@ -229,6 +229,8 @@ class CCompiler(object):
|
||||
|
||||
for envvar in runtime_path_envvar:
|
||||
if envvar in os.environ:
|
||||
+ for envvar_path in os.environ[envvar].split(':'):
|
||||
+ args.append("-Wl,-rpath-link," + envvar_path)
|
||||
os.environ[envvar] = \
|
||||
os.pathsep.join(runtime_paths + [os.environ[envvar]])
|
||||
else:
|
||||
--
|
||||
2.14.3
|
||||
|
@ -0,0 +1,28 @@
|
||||
From f742da8b3913f4818d3f419117076afe62f4dbf4 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Wed, 5 Sep 2018 16:46:52 +0200
|
||||
Subject: [PATCH] giscanner: ignore error return codes from ldd-wrapper
|
||||
|
||||
prelink-rtld, which we use instead of ldd returns 127 when it can't find a library.
|
||||
It is not an error per se, but it breaks subprocess.check_output().
|
||||
|
||||
Upstream-Status: Inappropriate [oe-core specific]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Signed-off-by: Adam Duskett <aduskett@gmail.com>
|
||||
---
|
||||
giscanner/shlibs.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
|
||||
index d67df95..80352a6 100644
|
||||
--- a/giscanner/shlibs.py
|
||||
+++ b/giscanner/shlibs.py
|
||||
@@ -102,7 +102,7 @@ def _resolve_non_libtool(options, binary, libraries):
|
||||
args.extend(['otool', '-L', binary.args[0]])
|
||||
else:
|
||||
args.extend(['ldd', binary.args[0]])
|
||||
- output = subprocess.check_output(args)
|
||||
+ output = subprocess.run(args, check=False, stdout=subprocess.PIPE).stdout
|
||||
if isinstance(output, bytes):
|
||||
output = output.decode("utf-8", "replace")
|
||||
|
42
package/gobject-introspection/Config.in
Normal file
42
package/gobject-introspection/Config.in
Normal file
@ -0,0 +1,42 @@
|
||||
config BR2_PACKAGE_GOBJECT_INTROSPECTION
|
||||
bool "gobject-introspection"
|
||||
depends on BR2_USE_MMU # python3, libglib2
|
||||
depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
|
||||
# While gcc 4.8 might be compatible with gobject-introspection,
|
||||
# The autobuilders use some toolchains from codesourcery which
|
||||
# have gcc 4.8 and a very old version of glibc, which will cause
|
||||
# compile errors with locale.c. As such, require 4.9 until this
|
||||
# can be verified.
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
# gobject-introspection does not require python3 to run on the
|
||||
# target; however, because the tools run in a qemu wrapper, a
|
||||
# cross-compiled python3 must be installed to staging. As there
|
||||
# is no current mechanism to tell Buildroot only to install
|
||||
# python to staging, then python must also be installed
|
||||
# unconditionally to the target when building
|
||||
# gobject-introspection.
|
||||
depends on BR2_PACKAGE_PYTHON3
|
||||
select BR2_PACKAGE_HOST_QEMU
|
||||
select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE
|
||||
select BR2_PACKAGE_LIBFFI
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
select BR2_PACKAGE_ZLIB
|
||||
help
|
||||
GObject introspection is a middleware layer between C
|
||||
libraries (using GObject) and language bindings. The C library
|
||||
can be scanned at compile time and generate a metadata file,
|
||||
in addition to the actual native C library. Then at runtime,
|
||||
language bindings can read this metadata and automatically
|
||||
provide bindings to call into the C library.
|
||||
|
||||
https://wiki.gnome.org/action/show/Projects/GObjectIntrospection
|
||||
|
||||
comment "gobject-introspection needs python3"
|
||||
depends on !BR2_PACKAGE_PYTHON3
|
||||
|
||||
comment "gobject-introspection needs a glibc toolchain, gcc >= 4.9"
|
||||
depends on BR2_USE_MMU
|
||||
depends on BR2_PACKAGE_HOST_QEMU_ARCH_SUPPORTS
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
|
3
package/gobject-introspection/g-ir-compiler.in
Normal file
3
package/gobject-introspection/g-ir-compiler.in
Normal file
@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
$(dirname $0)/g-ir-scanner-qemuwrapper $(dirname $0)/g-ir-compiler.real "$@"
|
3
package/gobject-introspection/g-ir-scanner-lddwrapper.in
Normal file
3
package/gobject-introspection/g-ir-scanner-lddwrapper.in
Normal file
@ -0,0 +1,3 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
${HOST_DIR}/sbin/prelink-rtld --root=$(dirname $0)/../../ "$@"
|
17
package/gobject-introspection/g-ir-scanner-qemuwrapper.in
Normal file
17
package/gobject-introspection/g-ir-scanner-qemuwrapper.in
Normal file
@ -0,0 +1,17 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
# Pass -r to qemu-user as to trick glibc into not errorings out if the host kernel
|
||||
# is older than the target kernel.
|
||||
# Use a modules directory which does not exist so we don't load random things
|
||||
# which may then get deleted (or their dependencies) and potentially segfault
|
||||
GIO_MODULE_DIR=$(dirname $0)/../lib/gio/modules-dummy \
|
||||
@QEMU_USER@ -r @TOOLCHAIN_HEADERS_VERSION@ \
|
||||
-L $(dirname $0)/../../ \
|
||||
-E LD_LIBRARY_PATH=${GIR_EXTRA_LIBS_PATH}:.libs:$(dirname $0)/../lib:$(dirname $0)/../../lib \
|
||||
"$@"
|
||||
|
||||
if [[ $? -ne 0 ]]; then
|
||||
echo "If the above error message is about missing .so libraries, then setting up GIR_EXTRA_LIBS_PATH in the .mk file should help."
|
||||
echo 'Typically like this: PKG_MAKE_ENV += GIR_EXTRA_LIBS_PATH="$(@D)/.libs"'
|
||||
exit 1
|
||||
fi
|
8
package/gobject-introspection/g-ir-scanner.in
Normal file
8
package/gobject-introspection/g-ir-scanner.in
Normal file
@ -0,0 +1,8 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
export GI_SCANNER_DISABLE_CACHE=1
|
||||
${HOST_DIR}/bin/g-ir-scanner \
|
||||
--lib-dirs-envvar=GIR_EXTRA_LIBS_PATH \
|
||||
--use-binary-wrapper=$(dirname $0)/g-ir-scanner-qemuwrapper \
|
||||
--use-ldd-wrapper=$(dirname $0)/g-ir-scanner-lddwrapper \
|
||||
--add-include-path=$(dirname $0)/../share/gir-1.0 "$@"
|
4
package/gobject-introspection/gobject-introspection.hash
Normal file
4
package/gobject-introspection/gobject-introspection.hash
Normal file
@ -0,0 +1,4 @@
|
||||
#From http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/1.62/gobject-introspection-1.62.0.sha256sum
|
||||
sha256 b1ee7ed257fdbc008702bdff0ff3e78a660e7e602efa8f211dc89b9d1e7d90a2 gobject-introspection-1.62.0.tar.xz
|
||||
sha256 d245807f90032872d1438d741ed21e2490e1175dc8aa3afa5ddb6c8e529b58e5 COPYING.LGPL
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING.GPL
|
133
package/gobject-introspection/gobject-introspection.mk
Normal file
133
package/gobject-introspection/gobject-introspection.mk
Normal file
@ -0,0 +1,133 @@
|
||||
################################################################################
|
||||
#
|
||||
# gobject-introspection
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GOBJECT_INTROSPECTION_VERSION_MAJOR = 1.62
|
||||
GOBJECT_INTROSPECTION_VERSION = $(GOBJECT_INTROSPECTION_VERSION_MAJOR).0
|
||||
GOBJECT_INTROSPECTION_SITE = http://ftp.gnome.org/pub/GNOME/sources/gobject-introspection/$(GOBJECT_INTROSPECTION_VERSION_MAJOR)
|
||||
GOBJECT_INTROSPECTION_SOURCE = gobject-introspection-$(GOBJECT_INTROSPECTION_VERSION).tar.xz
|
||||
GOBJECT_INTROSPECTION_INSTALL_STAGING = YES
|
||||
GOBJECT_INTROSPECTION_AUTORECONF = YES
|
||||
GOBJECT_INTROSPECTION_LICENSE = LGPL-2.0+, GPL-2.0+, BSD-2-Clause
|
||||
GOBJECT_INTROSPECTION_LICENSE_FILES = COPYING.LGPL COPYING.GPL giscanner/scannerlexer.l
|
||||
|
||||
GOBJECT_INTROSPECTION_DEPENDENCIES = \
|
||||
host-autoconf-archive \
|
||||
host-gobject-introspection \
|
||||
host-prelink-cross \
|
||||
host-qemu \
|
||||
libffi \
|
||||
libglib2 \
|
||||
python3 \
|
||||
zlib
|
||||
|
||||
HOST_GOBJECT_INTROSPECTION_DEPENDENCIES = \
|
||||
host-bison \
|
||||
host-flex \
|
||||
host-libglib2 \
|
||||
host-python3
|
||||
|
||||
# g-ir-scanner will default to /usr/bin/ld for linking if this is not set.
|
||||
GOBJECT_INTROSPECTION_NINJA_ENV += \
|
||||
CC="$(TARGET_CC)"
|
||||
|
||||
# Disable introspection data on the host, as it is not needed and
|
||||
# the package will attempt to use the systems libglib2 which will fail
|
||||
# if the systems libglib2 version is older than 2.60.
|
||||
HOST_GOBJECT_INTROSPECTION_CONF_OPTS = \
|
||||
-Denable-introspection-data=false
|
||||
|
||||
# Use the host gi-scanner to prevent the scanner from generating incorrect
|
||||
# elf classes.
|
||||
GOBJECT_INTROSPECTION_CONF_OPTS = \
|
||||
-Denable-host-gi=true \
|
||||
-Denable-gi-cross-wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper" \
|
||||
-Denable-gi-ldd-wrapper="$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper" \
|
||||
-Denable-introspection-data=true
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO),y)
|
||||
GOBJECT_INTROSPECTION_DEPENDENCIES += cairo
|
||||
GOBJECT_INTROSPECTION_CONF_OPTS += -Dcairo=true
|
||||
endif
|
||||
|
||||
# GI_SCANNER_DISABLE_CACHE=1 prevents g-ir-scanner from writing cache data to ${HOME}
|
||||
GOBJECT_INTROSPECTION_CONF_ENV = \
|
||||
GI_SCANNER_DISABLE_CACHE=1
|
||||
|
||||
HOST_GOBJECT_INTROSPECTION_CONF_ENV = \
|
||||
GI_SCANNER_DISABLE_CACHE=1
|
||||
|
||||
# Make sure g-ir-tool-template uses the host python.
|
||||
define GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
|
||||
$(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in
|
||||
endef
|
||||
HOST_GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_FIX_TOOLTEMPLATE_PYTHON_PATH
|
||||
|
||||
# Perform the following:
|
||||
# - Just as above, Ensure that g-ir-tool-template.in uses the host python.
|
||||
# - Install all of the wrappers needed to build gobject-introspection.
|
||||
# - Create a safe modules directory which does not exist so we don't load random things
|
||||
# which may then get deleted (or their dependencies) and potentially segfault
|
||||
define GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
|
||||
$(SED) '1s%#!.*%#!$(HOST_DIR)/bin/python%' $(@D)/tools/g-ir-tool-template.in
|
||||
|
||||
$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-lddwrapper.in \
|
||||
$(STAGING_DIR)/usr/bin/g-ir-scanner-lddwrapper
|
||||
|
||||
$(INSTALL) -D -m 755 $(GOBJECT_INTROSPECTION_PKGDIR)/g-ir-scanner-qemuwrapper.in \
|
||||
$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
|
||||
$(SED) "s%@QEMU_USER@%$(QEMU_USER)%g" \
|
||||
$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
|
||||
$(SED) "s%@TOOLCHAIN_HEADERS_VERSION@%$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)%g" \
|
||||
$(STAGING_DIR)/usr/bin/g-ir-scanner-qemuwrapper
|
||||
|
||||
# Use a modules directory which does not exist so we don't load random things
|
||||
# which may then get deleted (or their dependencies) and potentially segfault
|
||||
mkdir -p $(STAGING_DIR)/usr/lib/gio/modules-dummy
|
||||
endef
|
||||
GOBJECT_INTROSPECTION_PRE_CONFIGURE_HOOKS += GOBJECT_INTROSPECTION_INSTALL_PRE_WRAPPERS
|
||||
|
||||
# Move the real compiler and scanner to .real, and replace them with the wrappers.
|
||||
# Using .real has the following advantages:
|
||||
# - There is no need to change the logic for other packages.
|
||||
# - The wrappers call the .real files using qemu.
|
||||
define GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
|
||||
# Move the real binaries to their names.real, then replace them with
|
||||
# the wrappers.
|
||||
$(foreach w,g-ir-compiler g-ir-scanner,
|
||||
mv $(STAGING_DIR)/usr/bin/$(w) $(STAGING_DIR)/usr/bin/$(w).real
|
||||
$(INSTALL) -D -m 755 \
|
||||
$(GOBJECT_INTROSPECTION_PKGDIR)/$(w).in $(STAGING_DIR)/usr/bin/$(w)
|
||||
)
|
||||
# Gobject-introspection installs Makefile.introspection in
|
||||
# $(STAGING_DIR)/usr/share which is needed for autotools-based programs to
|
||||
# build .gir and .typelib files. Unfortuantly, gobject-introspection-1.0.pc
|
||||
# uses $(prefix)/share as the directory, which
|
||||
# causes the host /usr/share being used instead of $(STAGING_DIR)/usr/share.
|
||||
# Change datarootdir to $(libdir)/../share which will prefix $(STAGING_DIR)
|
||||
# to the correct location.
|
||||
$(SED) "s%datarootdir=.*%datarootdir=\$${libdir}/../share%g" \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
|
||||
|
||||
# By default, girdir and typelibdir use datadir and libdir as their prefix,
|
||||
# of which pkg-config appends the sysroot directory. This results in files
|
||||
# being installed in $(STAGING_DIR)/$(STAGING_DIR)/path/to/files.
|
||||
# Changing the prefix to exec_prefix prevents this error.
|
||||
$(SED) "s%girdir=.*%girdir=\$${exec_prefix}/share/gir-1.0%g" \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
|
||||
|
||||
$(SED) "s%typelibdir=.*%typelibdir=\$${exec_prefix}/lib/girepository-1.0%g" \
|
||||
$(STAGING_DIR)/usr/lib/pkgconfig/gobject-introspection-1.0.pc
|
||||
endef
|
||||
GOBJECT_INTROSPECTION_POST_INSTALL_STAGING_HOOKS += GOBJECT_INTROSPECTION_INSTALL_WRAPPERS
|
||||
|
||||
# Only .typelib files are needed to run.
|
||||
define GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
|
||||
find $(TARGET_DIR)/usr/share \( -iname "*.gir" -o -iname \*.rnc \) -delete
|
||||
endef
|
||||
GOBJECT_INTROSPECTION_TARGET_FINALIZE_HOOKS += GOBJECT_INTROSPECTION_REMOVE_DEVELOPMENT_FILES
|
||||
|
||||
$(eval $(meson-package))
|
||||
$(eval $(host-meson-package))
|
@ -10,6 +10,12 @@ menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE
|
||||
|
||||
if BR2_PACKAGE_GST1_PLUGINS_BASE
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS
|
||||
bool "install tools"
|
||||
help
|
||||
Install the gst-discoverer, gst-device-monitor and gst-play
|
||||
tools.
|
||||
|
||||
comment "dependency-less plugins"
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER
|
||||
|
@ -26,6 +26,12 @@ GST1_PLUGINS_BASE_CONF_OPTS += \
|
||||
-Dlibvisual=disabled \
|
||||
-Diso-codes=disabled
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_INSTALL_TOOLS),y)
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += -Dtools=enabled
|
||||
else
|
||||
GST1_PLUGINS_BASE_CONF_OPTS += -Dtools=disabled
|
||||
endif
|
||||
|
||||
GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
GST1_PLUGINS_BASE_LDFLAGS = $(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)
|
||||
|
@ -279,7 +279,6 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL
|
||||
bool "qmlgl (qt5)"
|
||||
depends on BR2_PACKAGE_QT5
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative
|
||||
depends on BR2_PACKAGE_QT5_GL_AVAILABLE || BR2_PACKAGE_QT5_VERSION_LATEST # qt5declarative-quick
|
||||
select BR2_PACKAGE_QT5BASE_WIDGETS
|
||||
select BR2_PACKAGE_QT5DECLARATIVE
|
||||
select BR2_PACKAGE_QT5DECLARATIVE_QUICK
|
||||
@ -287,11 +286,6 @@ config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_QMLGL
|
||||
help
|
||||
QT5 plugin which includes elements qmlglsrc and qmlglsink
|
||||
|
||||
comment "qmlgl (qt5) plugin needs an OpenGL-capable Qt5 backend"
|
||||
depends on BR2_PACKAGE_QT5
|
||||
depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE
|
||||
depends on !BR2_PACKAGE_QT5_GL_AVAILABLE && !BR2_PACKAGE_QT5_VERSION_LATEST
|
||||
|
||||
config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHOUT2
|
||||
bool "shout2"
|
||||
select BR2_PACKAGE_LIBSHOUT
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 fd0474c33b411593b9dc8197f3799d37d68455c11a9ee3994ec993a96388ec06 i2pd-2.29.0.tar.gz
|
||||
sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE
|
||||
sha256 25915cbd33a9f53c89ddf7fbd68fccc5ffc89ab40d4445ccc813da74fae154f2 i2pd-2.30.0.tar.gz
|
||||
sha256 d147a6acdaf8ec9f6513802ef6cad4a4afcdb5ab6b98d9f6bb26d2b7f4cf454c LICENSE
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
I2PD_VERSION = 2.29.0
|
||||
I2PD_VERSION = 2.30.0
|
||||
I2PD_SITE = $(call github,PurpleI2P,i2pd,$(I2PD_VERSION))
|
||||
I2PD_LICENSE = BSD-3-Clause
|
||||
I2PD_LICENSE_FILES = LICENSE
|
||||
|
@ -3,7 +3,6 @@ config BR2_PACKAGE_INADYN
|
||||
depends on BR2_USE_MMU # Uses fork()
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
select BR2_PACKAGE_LIBCONFUSE
|
||||
select BR2_PACKAGE_LIBITE
|
||||
help
|
||||
INADYN is a free DynDNS client. It gives the possibility
|
||||
to have your own fixed hostname registered on the internet,
|
||||
|
@ -1,5 +1,6 @@
|
||||
# From https://github.com/troglobit/inadyn/releases/download/v2.5/inadyn-2.5.tar.xz.md5
|
||||
md5 8a864d5186e54d24de2d7554fc01b3ec inadyn-2.5.tar.xz
|
||||
# From https://github.com/troglobit/inadyn/releases/download/v2.6/inadyn-2.6.tar.xz.md5
|
||||
md5 62ec986b73d24b1b755bf0ed3efe54f2 inadyn-2.6.tar.xz
|
||||
|
||||
# Locally computed
|
||||
sha256 4a9ad208671f62912428413da0282450b2d2c4da38f3c95c4ac975d048c41fcd inadyn-2.5.tar.xz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
sha256 9f4198764abbd2798472b349d8867e86b4692c76ee304f1f9c607f67c9b582a4 inadyn-2.6.tar.xz
|
||||
sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING
|
||||
|
@ -4,12 +4,12 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
INADYN_VERSION = 2.5
|
||||
INADYN_VERSION = 2.6
|
||||
INADYN_SITE = https://github.com/troglobit/inadyn/releases/download/v$(INADYN_VERSION)
|
||||
INADYN_SOURCE = inadyn-$(INADYN_VERSION).tar.xz
|
||||
INADYN_LICENSE = GPL-2.0+
|
||||
INADYN_LICENSE_FILES = COPYING
|
||||
INADYN_DEPENDENCIES = host-pkgconf libconfuse libite
|
||||
INADYN_DEPENDENCIES = host-pkgconf libconfuse
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
INADYN_CONF_OPTS += --enable-openssl
|
||||
|
@ -1,6 +1,6 @@
|
||||
# From http://ipset.netfilter.org/ipset-7.5.tar.bz2.md5sum.txt
|
||||
md5 1f3156c68f6fa6de03d8f3ca0539fb78 ipset-7.5.tar.bz2
|
||||
# From http://ipset.netfilter.org/ipset-7.6.tar.bz2.md5sum.txt
|
||||
md5 e107b679c3256af795261cece864d6d9 ipset-7.6.tar.bz2
|
||||
# Calculated based on the hash above
|
||||
sha256 a57aee54ab6ffe9e04603a464bbf69d66db976500bb04dd04fd3fbd6efb36a0b ipset-7.5.tar.bz2
|
||||
sha256 0e7d44caa9c153d96a9b5f12644fbe35a632537a5a7f653792b72e53d9d5c2db ipset-7.6.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
IPSET_VERSION = 7.5
|
||||
IPSET_VERSION = 7.6
|
||||
IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2
|
||||
IPSET_SITE = http://ipset.netfilter.org
|
||||
IPSET_DEPENDENCIES = libmnl host-pkgconf
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 6eb115c8db3a071b970d7ba985ea5e2425e1e716952186f9a4fe329a2e2bb1ca kexec-lite-18ec88310c4134eca2f9e3c417cd09f5914bf633.tar.gz
|
||||
sha256 1027c69721e8ee21614273a540e1dd505370d8d814845c0adaf838496105a35d kexec-lite-6b0130b3c1ea489e061cda2805e6f8b68dc96a76.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KEXEC_LITE_VERSION = 18ec88310c4134eca2f9e3c417cd09f5914bf633
|
||||
KEXEC_LITE_VERSION = 6b0130b3c1ea489e061cda2805e6f8b68dc96a76
|
||||
KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION))
|
||||
KEXEC_LITE_LICENSE = GPL-2.0+
|
||||
KEXEC_LITE_LICENSE_FILES = COPYING
|
||||
|
@ -1,7 +1,6 @@
|
||||
menuconfig BR2_PACKAGE_KF5
|
||||
bool "KF5"
|
||||
depends on BR2_PACKAGE_QT5
|
||||
depends on BR2_PACKAGE_QT5_VERSION_LATEST
|
||||
help
|
||||
This option enables the KF5 KDE Frameworks. Sub-options
|
||||
allow to select which modules should be built.
|
||||
|
@ -1,75 +0,0 @@
|
||||
From 55a0a0aac503f5012ff2df7af37107544c757f19 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Tue, 22 Oct 2019 09:56:32 +0200
|
||||
Subject: [PATCH kmod] Do not check for undefined symbols when building the
|
||||
Python modules
|
||||
|
||||
kmod's configure.ac uses the -Wl,--no-undefined linker flag to verify
|
||||
at link time that all symbols of shared libraries are available, and
|
||||
that there are no undefined symbols.
|
||||
|
||||
This make perfect sense for regular shared libraries. However, for
|
||||
Python extensions, which will be dlopen()ed inside the Python
|
||||
interpreter, it makes less sense.
|
||||
|
||||
Since Python 3.8, there is a change in python-config script and
|
||||
Python's pkg-config file: it no longer links Python extensions with
|
||||
the libpython library. See
|
||||
https://docs.python.org/dev/whatsnew/3.8.html#debug-build-uses-the-same-abi-as-release-build
|
||||
which states:
|
||||
|
||||
On the other hand, pkg-config python3.8 --libs no longer contains
|
||||
-lpython3.8. C extensions must not be linked to libpython (except on
|
||||
Android and Cygwin, whose cases are handled by the script); this
|
||||
change is backward incompatible on purpose. (Contributed by Victor
|
||||
Stinner in bpo-36721.)
|
||||
|
||||
So, when linking the kmod Python extensions, it currently fails with
|
||||
numerous unresolved symbols, that were previously provided by
|
||||
libpython:
|
||||
|
||||
/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__Pyx_PyObject_GetAttrStr':
|
||||
list.c:(.text.__Pyx_PyObject_GetAttrStr+0x48): undefined reference to `PyObject_GetAttr'
|
||||
/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModListItem':
|
||||
list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModListItem+0x78): undefined reference to `PyObject_CallFinalizerFromDealloc'
|
||||
/home/test/autobuild/run/instance-3/output-1/host/opt/ext-toolchain/bin/../lib/gcc/powerpc64-buildroot-linux-gnu/7.4.0/../../../../powerpc64-buildroot-linux-gnu/bin/ld: libkmod/python/kmod/.libs/list_la-list.o: in function `__pyx_tp_dealloc_4kmod_4list_ModList':
|
||||
list.c:(.text.__pyx_tp_dealloc_4kmod_4list_ModList+0x30): undefined reference to `PyErr_Fetch'
|
||||
|
||||
[Complete log at http://autobuild.buildroot.net/results/79a/79a5a0398723e8cfea0d0aa3dec5f7649aee4c63/build-end.log]
|
||||
|
||||
Linking with libpython is no longer recommended: those symbols should
|
||||
remain unresolved in the Python extensions, as they wil be properly
|
||||
resolved when the Python extension gets loaded into the Python
|
||||
interpreter.
|
||||
|
||||
Since we want to keep -Wl,--no-undefined globally in kmod, we leave
|
||||
the configure.ac file unchanged, and instead, specifically in the
|
||||
LDFLAGS used to build the Python extensions, we override
|
||||
-Wl,--no-undefined with -Wl,-z,undefs. Ideally, -Wl,--no-undefined is
|
||||
the same as -Wl,-z,defs, and the effect of these options can be
|
||||
canceled on the linker command line by a following -Wl,-z,undefs (see
|
||||
the ld man page for details).
|
||||
|
||||
Upstream: https://lore.kernel.org/linux-modules/20191024174710.9441-1-thomas.petazzoni@bootlin.com/
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Cc: Victor Stinner <victor.stinner@gmail.com>
|
||||
---
|
||||
Makefile.am | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index c5c2f06..8e9c90d 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -173,7 +173,7 @@ CPYTHON_MODULE_CFLAGS = \
|
||||
$(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \
|
||||
$(PYTHON_NOWARN) $(PYTHON_CFLAGS) \
|
||||
-fvisibility=default
|
||||
-CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared
|
||||
+CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs
|
||||
|
||||
if BUILD_PYTHON
|
||||
pkgpyexec_LTLIBRARIES = \
|
||||
--
|
||||
2.21.0
|
||||
|
@ -1,43 +0,0 @@
|
||||
From 7a55f18e14f606500fdeab6bc116ec74f3e5b1c3 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sat, 16 Nov 2019 17:40:32 +0100
|
||||
Subject: [PATCH] Makefile.am: filter -Wl,--no-undefined
|
||||
|
||||
Commit 1d14ef82f4a3be741bcdf6b1c6d51ce9dce43567 does not completely fix
|
||||
the build with python 3.8 as we still get link failure due to
|
||||
'-z undefs' being ignored by some versions of ld:
|
||||
|
||||
/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/mips-linux-gnu/5.3.0/../../../../mips-linux-gnu/bin/ld: warning: -z undefs ignored.
|
||||
|
||||
/home/naourr/work/instance-1/output-1/host/opt/ext-toolchain/bin/../lib/gcc/aarch64_be-linux-gnu/7.3.1/../../../../aarch64_be-linux-gnu/bin/ld: warning: -z undefs ignored.
|
||||
|
||||
So filter -Wl,--no-undefined to fix the issue
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/e9645d9969481b09f507f6e0d0b35faaa283eb60
|
||||
- http://autobuild.buildroot.org/results/06a6d865b6b7d8ebd793bde214f4a4c40e0962e1
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
Makefile.am | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 8e9c90d..47505c1 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -173,7 +173,10 @@ CPYTHON_MODULE_CFLAGS = \
|
||||
$(AM_CFLAGS) -DCPYTHON_COMPILING_IN_PYPY=0 \
|
||||
$(PYTHON_NOWARN) $(PYTHON_CFLAGS) \
|
||||
-fvisibility=default
|
||||
-CPYTHON_MODULE_LDFLAGS = $(AM_LDFLAGS) -module -avoid-version -shared -Wl,-z,undefs
|
||||
+# Filter -Wl,--no-undefined to fix build with python 3.8
|
||||
+comma = ,
|
||||
+CPYTHON_MODULE_LDFLAGS = $(subst -Wl$(comma)--no-undefined,,$(AM_LDFLAGS))
|
||||
+CPYTHON_MODULE_LDFLAGS += -module -avoid-version -shared
|
||||
|
||||
if BUILD_PYTHON
|
||||
pkgpyexec_LTLIBRARIES = \
|
||||
--
|
||||
2.24.0
|
||||
|
@ -1,6 +1,6 @@
|
||||
# From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc
|
||||
sha256 57bb22c8bb56435991f6b0810a042b0a65e2f1e217551efa58235b7034cdbb9d kmod-26.tar.xz
|
||||
sha256 c1d3fbf16ca24b95f334c1de1b46f17bbe5a10b0e81e72668bdc922ebffbbc0c kmod-27.tar.xz
|
||||
|
||||
# Locally calculated
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 libkmod/COPYING
|
||||
sha256 6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3 COPYING
|
||||
|
@ -4,12 +4,10 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
KMOD_VERSION = 26
|
||||
KMOD_VERSION = 27
|
||||
KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz
|
||||
KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod
|
||||
KMOD_INSTALL_STAGING = YES
|
||||
# 0002-Do-not-check-for-undefined-symbols-when-building-the.patch
|
||||
KMOD_AUTORECONF = YES
|
||||
KMOD_DEPENDENCIES = host-pkgconf
|
||||
HOST_KMOD_DEPENDENCIES = host-pkgconf
|
||||
|
||||
|
@ -1,10 +1,6 @@
|
||||
config BR2_PACKAGE_KODI_VISUALISATION_FISHBMC
|
||||
bool "kodi-visualisation-fishbmc"
|
||||
depends on BR2_PACKAGE_HAS_LIBGL
|
||||
help
|
||||
Fische visualiser for Kodi
|
||||
|
||||
https://github.com/notspiff/visualization.fishbmc
|
||||
|
||||
comment "kodi-visualisation-fishbmc needs OpenGL"
|
||||
depends on !BR2_PACKAGE_HAS_LIBGL
|
||||
https://github.com/xbmc/visualization.fishbmc
|
||||
|
@ -35,13 +35,7 @@ KVM_UNIT_TESTS_CONF_OPTS =\
|
||||
# compiler. However, for x86-64, we use the host compiler, as
|
||||
# kvm-unit-tests builds 32 bit code, which Buildroot toolchains for
|
||||
# x86-64 cannot do.
|
||||
ifeq ($(BR2_x86_64),y)
|
||||
# Arch Linux adds -fstack-protector even when building with -ffreestanding, but
|
||||
# it doesn't link with the stack-protector library when -nostdlib is passed,
|
||||
# which leads to a link error. Therefore, disable it explicitly to work around
|
||||
# this bug in Arch Linux. https://bugs.archlinux.org/task/64270
|
||||
KVM_UNIT_TESTS_MAKE_OPTS += EXTRA_CFLAGS=-fno-stack-protector
|
||||
else
|
||||
ifeq ($(BR2_x86_64),)
|
||||
KVM_UNIT_TESTS_CONF_OPTS += --cross-prefix="$(TARGET_CROSS)"
|
||||
endif
|
||||
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 f2628b248f714d7bbd6a536553bc3782602c68ca1b129017985dd70cc3515278 libcpprestsdk-2.10.14.tar.gz
|
||||
sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt
|
||||
sha256 1c027a53457e87b0b3a475e5c8045b94400c475898c8bd51b0fbd218b99a7f7b libcpprestsdk-2.10.15.tar.gz
|
||||
sha256 5c191789f502ac87df83b57008d2fc3e47fbf31315381b5bc4309f6602d0fe97 license.txt
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBCPPRESTSDK_VERSION = 2.10.14
|
||||
LIBCPPRESTSDK_VERSION = 2.10.15
|
||||
LIBCPPRESTSDK_SITE = $(call github,Microsoft,cpprestsdk,v$(LIBCPPRESTSDK_VERSION))
|
||||
LIBCPPRESTSDK_LICENSE = MIT
|
||||
LIBCPPRESTSDK_LICENSE_FILES = license.txt
|
||||
|
@ -1,62 +0,0 @@
|
||||
configure: use pkg-config to find openssl
|
||||
|
||||
The current check is broken for static linking, since the openssl
|
||||
libs need to be linked against libz, which is missing in the link
|
||||
command when doing a static build:
|
||||
http://autobuild.buildroot.net/results/787/787cd9992b00d8008641af208f5fb7c4afb40b06/build-end.log
|
||||
|
||||
Instead of trying convoluted tests to decide what additional libs
|
||||
are required, just delegate this job to pkg-config.
|
||||
|
||||
At the same time, fix a few legacy, deprecated constructs in favour
|
||||
of their new counterparts.
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
---
|
||||
Upstream status: submitted, but no public mailing list (sent to the
|
||||
mail documented in: http://www.antisip.com/doc/exosip2/index.html )
|
||||
|
||||
diff -durN libeXosip2-3.6.0.orig/configure.in libeXosip2-3.6.0/configure.in
|
||||
--- libeXosip2-3.6.0.orig/configure.in 2014-06-22 23:58:26.549487427 +0200
|
||||
+++ libeXosip2-3.6.0/configure.in 2014-06-22 23:59:12.822008499 +0200
|
||||
@@ -44,7 +44,7 @@
|
||||
AC_CONFIG_AUX_DIR(scripts)
|
||||
AC_CONFIG_HEADERS(config.h)
|
||||
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
|
||||
-AM_ACLOCAL_INCLUDE(scripts)
|
||||
+AC_CONFIG_MACRO_DIR([scripts])
|
||||
|
||||
AC_CANONICAL_HOST
|
||||
|
||||
@@ -371,13 +371,15 @@
|
||||
|
||||
AC_ARG_ENABLE(openssl,
|
||||
[ --enable-openssl enable support for openssl],
|
||||
- enable_openssl=$enableval,enable_openssl="yes")
|
||||
+ enable_openssl=$enableval,enable_openssl="auto")
|
||||
|
||||
-if test "$enable_openssl" = "yes" ; then
|
||||
- AC_CHECK_HEADERS(openssl/ssl.h)
|
||||
- AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"])
|
||||
- AC_CHECK_LIB(crypto,X509_get_issuer_name,[EXOSIP_LIB="$EXOSIP_LIB -lcrypto"])
|
||||
-fi
|
||||
+AS_IF([test "$enable_openssl" = "yes" -o "$enable_openssl" = "auto"],
|
||||
+ [PKG_CHECK_MODULES([SSL], [openssl],
|
||||
+ [EXOSIP_LIB="$EXOSIP_LIB $SSL_LIBS"],
|
||||
+ [AS_IF([test "$enable_openssl" = "yes"],
|
||||
+ [AC_MSG_ERROR([can not find openssl])])
|
||||
+ ])
|
||||
+ ])
|
||||
|
||||
AC_ARG_ENABLE(srvrec,
|
||||
[ --enable-srvrec enable support for SRV records DNS queries (yes) ],
|
||||
diff -durN build/libeXosip2-3.6.0.orig/Makefile.am build/libeXosip2-3.6.0/Makefile.am
|
||||
--- libeXosip2-3.6.0.orig/Makefile.am 2014-06-23 00:14:25.328226745 +0200
|
||||
+++ libeXosip2-3.6.0/Makefile.am 2014-06-23 00:14:38.296371236 +0200
|
||||
@@ -1,4 +1,4 @@
|
||||
-
|
||||
+ACLOCAL_AMFLAGS = -I scripts
|
||||
EXTRA_DIST = README autogen.sh
|
||||
|
||||
SUBDIRS = scripts platform src include tools help
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 91da1a084c9ab663afe04b493342e075ad59ac54a1af011c7f2ba4543a923564 libeXosip2-3.6.0.tar.gz
|
||||
sha256 21420c00bf8e0895ff36161766beec12b7e6f1d371030c389dba845e271272e2 libexosip2-5.1.1.tar.gz
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
|
@ -4,7 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBEXOSIP2_VERSION = 3.6.0
|
||||
LIBEXOSIP2_VERSION = 5.1.1
|
||||
# Since version 5.0, letter 'X' in library's name is in lower case
|
||||
LIBEXOSIP2_SOURCE = libexosip2-$(LIBEXOSIP2_VERSION).tar.gz
|
||||
LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip
|
||||
LIBEXOSIP2_INSTALL_STAGING = YES
|
||||
LIBEXOSIP2_LICENSE = GPL-2.0+
|
||||
@ -12,9 +14,6 @@ LIBEXOSIP2_LICENSE_FILES = COPYING
|
||||
|
||||
LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2
|
||||
|
||||
# We are touching configure.in and Makefile.am with one of our patches
|
||||
LIBEXOSIP2_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_arc),y)
|
||||
# toolchain __arc__ define conflicts with libeXosip2 source
|
||||
LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__"
|
||||
|
@ -1,44 +0,0 @@
|
||||
From 93f6bc2b97a2b76a5e725d63d4b6c2dfe7baf63b Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Sun, 11 Oct 2015 13:33:19 +0200
|
||||
Subject: [PATCH] configure: add '--disable-runtime-tests' option
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
[Rebased libevdev-1.6.0]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
configure.ac | 11 +++++++++--
|
||||
1 file changed, 9 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 5161d93..2b3bb26 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -76,7 +76,14 @@ else
|
||||
AC_MSG_WARN([check not found - skipping building unit tests])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"])
|
||||
-AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x$HAVE_CHECK" = "xyes"])
|
||||
+
|
||||
+AC_ARG_ENABLE([runtime-tests],
|
||||
+ AS_HELP_STRING([--disable-runtime-tests], [Disable runtime tests]))
|
||||
+AS_IF([test "x$enable_runtime_tests" != "xno"],
|
||||
+ [enable_runtime_tests=yes],
|
||||
+ [enable_runtime_tests=no])
|
||||
+
|
||||
+AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x${enable_runtime_tests}x$HAVE_CHECK" = "xyesxyes"])
|
||||
AM_CONDITIONAL(ENABLE_STATIC_LINK_TEST, [test "x$enable_static" = "xyes"])
|
||||
|
||||
with_cflags=""
|
||||
@@ -162,7 +169,7 @@ AC_MSG_RESULT([
|
||||
Libdir ${libdir}
|
||||
|
||||
Build documentation ${have_doxygen}
|
||||
- Enable unit-tests ${HAVE_CHECK}
|
||||
+ Enable unit-tests ${HAVE_CHECK} (runtime-tests: ${enable_runtime_tests})
|
||||
Enable profiling ${enable_gcov}
|
||||
Static library symbol check ${static_symbol_leaks_test}
|
||||
])
|
||||
--
|
||||
2.19.1
|
||||
|
@ -0,0 +1,54 @@
|
||||
From 83eb5bbac775d46b74e7f99fbd243d53f0118b37 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Mon, 2 Mar 2020 15:43:14 +0100
|
||||
Subject: [PATCH] meson.build: use local include path for tools
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Fixes the following compile failure with old toolchains and meson
|
||||
build (autotools build not affected):
|
||||
|
||||
../tools/mouse-dpi-tool.c: In function ‘handle_event’:
|
||||
../tools/mouse-dpi-tool.c:115:13: error: ‘const struct input_event’ has no member named ‘input_event_sec’
|
||||
m->us = ev->input_event_sec * 1000000 + ev->input_event_usec;
|
||||
^
|
||||
../tools/mouse-dpi-tool.c:115:45: error: ‘const struct input_event’ has no member named ‘input_event_usec’
|
||||
m->us = ev->input_event_sec * 1000000 + ev->input_event_usec;
|
||||
^
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
meson.build | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 4831f8e..5500a83 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -102,18 +102,22 @@ install_man(manpage)
|
||||
# tools
|
||||
executable('libevdev-events',
|
||||
sources: ['tools/libevdev-events.c'],
|
||||
+ include_directories: [includes_include],
|
||||
dependencies: dep_libevdev,
|
||||
install: false)
|
||||
executable('touchpad-edge-detector',
|
||||
sources: ['tools/touchpad-edge-detector.c'],
|
||||
+ include_directories: [includes_include],
|
||||
dependencies: [dep_libevdev, dep_lm],
|
||||
install: true)
|
||||
executable('mouse-dpi-tool',
|
||||
sources: ['tools/mouse-dpi-tool.c'],
|
||||
+ include_directories: [includes_include],
|
||||
dependencies: dep_libevdev,
|
||||
install: true)
|
||||
executable('libevdev-tweak-device',
|
||||
sources: ['tools/libevdev-tweak-device.c'],
|
||||
+ include_directories: [includes_include],
|
||||
dependencies: dep_libevdev,
|
||||
install: true)
|
||||
|
||||
--
|
||||
2.25.1
|
||||
|
@ -1,8 +1,8 @@
|
||||
# From https://lists.freedesktop.org/archives/input-tools/2019-August/001521.html
|
||||
md5 879631080be18526737e33b63d848039 libevdev-1.8.0.tar.xz
|
||||
sha1 4392d28fb91a5f6eb404aab531526f5fa0bbe73d libevdev-1.8.0.tar.xz
|
||||
sha256 20d3cae4efd277f485abdf8f2a7c46588e539998b5a08c2c4d368218379d4211 libevdev-1.8.0.tar.xz
|
||||
sha512 8d285632f4fe87c01e81f94e514bec4e37fed4bc44d6d38b9297dba1114e42f6ed8d143fc05f3d0e8d51b08b659e34481dc4c65f60421c54e2f3e11efbafdeb4 libevdev-1.8.0.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/input-tools/2020-March/001530.html
|
||||
md5 13c3f0911f9326d4b9fa103365f84421 libevdev-1.9.0.tar.xz
|
||||
sha1 ab5040ee88dd4cb49a75da72e8fded91b282c108 libevdev-1.9.0.tar.xz
|
||||
sha256 e7e18a64264f2dea19b6c50a481f8c062529d42919ccda0bc861495bce28eb9e libevdev-1.9.0.tar.xz
|
||||
sha512 6e7589b5776437ac23fbf65b3194fb1dd3a68a294696145060cdd97bcdeb9b04f355f2be028dc1a5efe98ef2cafca15e4f61115edf5d62591e3a8944dc95942a libevdev-1.9.0.tar.xz
|
||||
|
||||
# Hash for license files:
|
||||
sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING
|
||||
sha256 f063d1279b31e73007e1c54493391818b4cb5f9162d590120397e0347b932137 COPYING
|
||||
|
@ -4,20 +4,19 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBEVDEV_VERSION = 1.8.0
|
||||
LIBEVDEV_VERSION = 1.9.0
|
||||
LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev
|
||||
LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz
|
||||
LIBEVDEV_LICENSE = X11
|
||||
LIBEVDEV_LICENSE_FILES = COPYING
|
||||
|
||||
# patch touches configure.ac
|
||||
LIBEVDEV_AUTORECONF = YES
|
||||
|
||||
# Uses PKG_CHECK_MODULES() in configure.ac
|
||||
LIBEVDEV_DEPENDENCIES = host-pkgconf host-python
|
||||
LIBEVDEV_DEPENDENCIES = $(BR2_PYTHON3_HOST_DEPENDENCY)
|
||||
|
||||
LIBEVDEV_INSTALL_STAGING = YES
|
||||
|
||||
LIBEVDEV_CONF_OPTS += --disable-runtime-tests
|
||||
LIBEVDEV_CONF_OPTS += \
|
||||
-Dtests=disabled \
|
||||
-Ddocumentation=disabled \
|
||||
-Dcoverity=false
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(meson-package))
|
||||
|
5
package/libiberty/libiberty.hash
Normal file
5
package/libiberty/libiberty.hash
Normal file
@ -0,0 +1,5 @@
|
||||
# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum
|
||||
sha512 d326408f12a03d9a61a9de56584c2af12f81c2e50d2d7e835d51565df8314df01575724afa1e43bd0db45cfc9916b41519b67dfce03232aa4978704492a6994a binutils-2.32.tar.xz
|
||||
|
||||
# Locally computed, same as binutils.hash
|
||||
sha256 56bdea73b6145ef6ac5259b3da390b981d840c24cb03b8e1cbc678de7ecfa18d COPYING.LIB
|
32
package/libiberty/libiberty.mk
Normal file
32
package/libiberty/libiberty.mk
Normal file
@ -0,0 +1,32 @@
|
||||
################################################################################
|
||||
#
|
||||
# libiberty
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBIBERTY_VERSION = 2.32
|
||||
LIBIBERTY_SOURCE = binutils-$(LIBIBERTY_VERSION).tar.xz
|
||||
LIBIBERTY_SITE = $(BR2_GNU_MIRROR)/binutils
|
||||
HOST_LIBIBERTY_DL_SUBDIR = binutils
|
||||
|
||||
# We're only building libiberty here, not the full binutils suite
|
||||
LIBIBERTY_LICENSE = LGPL-2.1+
|
||||
LIBIBERTY_LICENSE_FILES = COPYING.LIB
|
||||
|
||||
LIBIBERTY_SUBDIR = libiberty
|
||||
|
||||
# We explicitly disable multilib, as we do in binutils.
|
||||
# By default, libiberty installs nothing, so we must force it.
|
||||
HOST_LIBIBERTY_CONF_OPTS = \
|
||||
--disable-multilib \
|
||||
--enable-install-libiberty
|
||||
|
||||
# Some packages (e.g. host-gdb) will pick this library and build shared
|
||||
# objects with it. But libiberty does not honour the --enable-shared and
|
||||
# --disable-static flags; it only ever builds a static library no matter
|
||||
# what. So we must force -fPIC in build flags.
|
||||
HOST_LIBIBERTY_CONF_ENV = \
|
||||
CFLAGS="$(HOST_CFLAGS) -fPIC" \
|
||||
LDFLAGS="$(HOST_LDFLAGS) -fPIC"
|
||||
|
||||
$(eval $(host-autotools-package))
|
@ -1,44 +0,0 @@
|
||||
From 5090603d01779bb1717fb0c50953330e8770550f Mon Sep 17 00:00:00 2001
|
||||
From: Pierre-Jean Texier <pjtexier@koncepto.io>
|
||||
Date: Sun, 23 Jun 2019 14:11:37 +0200
|
||||
Subject: [PATCH] fix install of binaries with a static only library
|
||||
|
||||
Define CMAKE_INSTALL_RPATH only if ENABLE_SHARED is set otherwise the
|
||||
following issue occured:
|
||||
|
||||
CMake Error at iiod/cmake_install.cmake:45 (file):
|
||||
file RPATH_CHANGE could not write new RPATH:
|
||||
|
||||
/usr/lib
|
||||
|
||||
to the file:
|
||||
|
||||
/home/pjtexier/<path>/usr/sbin/iiod
|
||||
|
||||
No valid ELF RPATH or RUNPATH entry exists in the file; File does not have
|
||||
a valid ELF identification.
|
||||
Call Stack (most recent call first):
|
||||
cmake_install.cmake:50 (include)
|
||||
|
||||
Signed-off-by: Pierre-Jean Texier <pjtexier@koncepto.io>
|
||||
[Upstream status: https://github.com/analogdevicesinc/libiio/pull/283]
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d9b7ea1..634e553 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -15,7 +15,7 @@ endif()
|
||||
|
||||
set(CMAKE_INSTALL_DOCDIR "" CACHE PATH "documentation root (DATAROOTDIR/doc/${PROJECT_NAME}${LIBIIO_VERSION_MAJOR}-doc)")
|
||||
include(GNUInstallDirs)
|
||||
-if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
+if(ENABLE_SHARED AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux")
|
||||
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
|
||||
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
|
||||
endif()
|
||||
--
|
||||
2.7.4
|
||||
|
@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 bc2c5299974b65cfe9aa4a06d8c74d7651594e026bce416db48a2c5aa7ba2554 libiio-0.18.tar.gz
|
||||
sha256 81c414d5c47b715d9bc9275b9fabbfd9e9483e60c035f3001b5977932049595d libiio-0.19.tar.gz
|
||||
sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBIIO_VERSION = 0.18
|
||||
LIBIIO_VERSION = 0.19
|
||||
LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION))
|
||||
LIBIIO_INSTALL_STAGING = YES
|
||||
LIBIIO_LICENSE = LGPL-2.1+
|
||||
|
@ -1,7 +1,8 @@
|
||||
# From https://github.com/troglobit/libite/releases/download/v2.1.0/libite-2.1.0.tar.xz.md5
|
||||
md5 701aa509f27ee35156bc53601e69fa74 libite-2.1.0.tar.xz
|
||||
# From https://github.com/troglobit/libite/releases/download/v2.1.2/libite-2.1.2.tar.xz.md5
|
||||
md5 3c23186dec3f3ae135ec4e8b58581f4e libite-2.1.2.tar.xz
|
||||
|
||||
# Locally calculated
|
||||
sha256 cf56e720146243749e0af5763d4a84eef738e20f2bef2d867497fefc39dee991 libite-2.1.0.tar.xz
|
||||
sha256 0e97ab27b60e20a7ddb8e9638189ad159124e51d2c12e12735b05423df224da5 LICENSE
|
||||
sha256 9e0fb98d251dddf5ba81a355f6b4d89835ec53bc5d7f5fcd2c866b54ec5ccec8 src/chomp.c
|
||||
sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d src/pidfile.c
|
||||
sha256 7a16825c6d02040767ccb9f3faed4bf0e6841857a46cc4cb9e9f36b78a6c7cb3 libite-2.1.2.tar.xz
|
||||
sha256 dc6eae50f69af0e848fd6957cdf48895563b4d15fdde7c9d20ae2bfdefbc2b83 LICENSE
|
||||
sha256 89053891d46d04a21d4a492f68038703e179986baffa458201810f4222b57427 src/chomp.c
|
||||
sha256 a7d29c148e057fae11a87febc3a51970a26433c35a08fc710be689394442d32d src/pidfile.c
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBITE_VERSION = 2.1.0
|
||||
LIBITE_VERSION = 2.1.2
|
||||
LIBITE_SOURCE = libite-$(LIBITE_VERSION).tar.xz
|
||||
LIBITE_SITE = https://github.com/troglobit/libite/releases/download/v$(LIBITE_VERSION)
|
||||
LIBITE_LICENSE = MIT, X11, ISC, BSD-2-Clause
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Locally computed:
|
||||
sha256 ac2708a409b09f1f6f1786a8a9e39c36619aa8d6f285ea943daa7a48ea36d3e8 libmbim-1.20.4.tar.xz
|
||||
sha256 5c0778eb1cd12c3604523134e55183f5147b0cae71150e875b583768f7aa1f38 libmbim-1.22.0.tar.xz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING.LIB
|
||||
|
@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
LIBMBIM_VERSION = 1.20.4
|
||||
LIBMBIM_VERSION = 1.22.0
|
||||
LIBMBIM_SITE = https://www.freedesktop.org/software/libmbim
|
||||
LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz
|
||||
LIBMBIM_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (programs)
|
||||
|
@ -22,9 +22,7 @@ LIBMEDIAART_CONF_OPTS += \
|
||||
--disable-qt
|
||||
else ifeq ($(BR2_PACKAGE_LIBMEDIAART_BACKEND_QT),y)
|
||||
# qt5 needs c++11 (since qt-5.7)
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y)
|
||||
LIBMEDIAART_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11"
|
||||
endif
|
||||
LIBMEDIAART_DEPENDENCIES += qt5base
|
||||
LIBMEDIAART_CONF_OPTS += \
|
||||
--disable-gdkpixbuf \
|
||||
|
@ -1,30 +0,0 @@
|
||||
From 7e0793e15e21f68337e130c67b031ca38edf055f Mon Sep 17 00:00:00 2001
|
||||
From: Aymeric Moizard <amoizard@gmail.com>
|
||||
Date: Mon, 5 Sep 2016 15:01:53 +0200
|
||||
Subject: [PATCH] * fix bug report: sr #109133: Heap buffer overflow in
|
||||
utility function *osip_clrncpy* https://savannah.gnu.org/support/?109133
|
||||
|
||||
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
|
||||
---
|
||||
src/osipparser2/osip_port.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/osipparser2/osip_port.c b/src/osipparser2/osip_port.c
|
||||
index 0e64147..d8941b0 100644
|
||||
--- a/src/osipparser2/osip_port.c
|
||||
+++ b/src/osipparser2/osip_port.c
|
||||
@@ -1291,8 +1291,10 @@ osip_clrncpy (char *dst, const char *src, size_t len)
|
||||
char *p;
|
||||
size_t spaceless_length;
|
||||
|
||||
- if (src == NULL)
|
||||
+ if (src == NULL || len == 0) {
|
||||
+ *dst = '\0';
|
||||
return NULL;
|
||||
+ }
|
||||
|
||||
/* find the start of relevant text */
|
||||
pbeg = src;
|
||||
--
|
||||
2.11.0
|
||||
|
@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd libosip2-3.6.0.tar.gz
|
||||
sha256 61bb28317221a630e47f65389d5ff3e4693996d3128e9e0d5d1399e4feebf64d libosip2-5.1.1.tar.gz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 8d9e95ed0e48df46dc758eb0d86df611f771eab4eed94bebb77dca87f1c897de COPYING
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user