mirror of
https://github.com/PartialVolume/shredos.x86_64.git
synced 2026-02-20 09:35:26 +00:00
Upgrade buildroot to 2023.05 (from 2021.08.2), kernel is upgraded to 6.3 (from 5.13.19).
This commit is contained in:
@@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 f822f7dd8cfb0b1744a62d653c6efe933578ae1789ec60a088509a38bca4b4fc 4th-3.62.5-unix.tar.gz
|
||||
sha256 f96ea74cdb2aadfdc3bebf8d6d2cf7b8976b5d56c1237387479bffaecede9fe3 4th-3.64.1-unix.tar.gz
|
||||
sha256 8c6111b645a02219579ea66e84aa8e78a0ed4f4dd80857ffb91bcda5528717d4 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
4TH_VERSION = 3.62.5
|
||||
4TH_VERSION = 3.64.1
|
||||
4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz
|
||||
4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION)
|
||||
4TH_LICENSE = GPL-3.0+, LGPL-3.0+
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -2,22 +2,27 @@ menu "Host utilities"
|
||||
|
||||
source "package/abootimg/Config.in.host"
|
||||
source "package/aespipe/Config.in.host"
|
||||
source "package/agent-proxy/Config.in.host"
|
||||
source "package/android-tools/Config.in.host"
|
||||
source "package/asn1c/Config.in.host"
|
||||
source "package/babeltrace2/Config.in.host"
|
||||
source "package/bmap-tools/Config.in.host"
|
||||
source "package/bootgen/Config.in.host"
|
||||
source "package/btrfs-progs/Config.in.host"
|
||||
source "package/cbootimage/Config.in.host"
|
||||
source "package/checkpolicy/Config.in.host"
|
||||
source "package/checksec/Config.in.host"
|
||||
source "package/cmake/Config.in.host"
|
||||
source "package/cramfs/Config.in.host"
|
||||
source "package/crudini/Config.in.host"
|
||||
source "package/cryptsetup/Config.in.host"
|
||||
source "package/dbus-python/Config.in.host"
|
||||
source "package/delve/Config.in.host"
|
||||
source "package/dfu-util/Config.in.host"
|
||||
source "package/dos2unix/Config.in.host"
|
||||
source "package/dosfstools/Config.in.host"
|
||||
source "package/doxygen/Config.in.host"
|
||||
source "package/dracut/Config.in.host"
|
||||
source "package/dtc/Config.in.host"
|
||||
source "package/e2fsprogs/Config.in.host"
|
||||
source "package/e2tools/Config.in.host"
|
||||
@@ -28,6 +33,7 @@ menu "Host utilities"
|
||||
source "package/f2fs-tools/Config.in.host"
|
||||
source "package/faketime/Config.in.host"
|
||||
source "package/fatcat/Config.in.host"
|
||||
source "package/firmware-utils/Config.in.host"
|
||||
source "package/fwup/Config.in.host"
|
||||
source "package/genext2fs/Config.in.host"
|
||||
source "package/genimage/Config.in.host"
|
||||
@@ -48,26 +54,34 @@ menu "Host utilities"
|
||||
source "package/lld/Config.in.host"
|
||||
source "package/lpc3250loader/Config.in.host"
|
||||
source "package/lttng-babeltrace/Config.in.host"
|
||||
source "package/lzma-alone/Config.in.host"
|
||||
source "package/mender-artifact/Config.in.host"
|
||||
source "package/meson-tools/Config.in.host"
|
||||
source "package/mfgtools/Config.in.host"
|
||||
source "package/mkpasswd/Config.in.host"
|
||||
source "package/moby-buildkit/Config.in.host"
|
||||
source "package/mosquitto/Config.in.host"
|
||||
source "package/mtd/Config.in.host"
|
||||
source "package/mtools/Config.in.host"
|
||||
source "package/mxsldr/Config.in.host"
|
||||
source "package/nodejs/Config.in.host"
|
||||
source "package/odb/Config.in.host"
|
||||
source "package/omap-u-boot-utils/Config.in.host"
|
||||
source "package/openocd/Config.in.host"
|
||||
source "package/opkg-utils/Config.in.host"
|
||||
source "package/pahole/Config.in.host"
|
||||
source "package/parted/Config.in.host"
|
||||
source "package/patchelf/Config.in.host"
|
||||
source "package/pigz/Config.in.host"
|
||||
source "package/pkgconf/Config.in.host"
|
||||
source "package/pru-software-support/Config.in.host"
|
||||
source "package/pwgen/Config.in.host"
|
||||
source "package/python/Config.in.host"
|
||||
source "package/python-cython/Config.in.host"
|
||||
source "package/python-greenlet/Config.in.host"
|
||||
source "package/python-iniparse/Config.in.host"
|
||||
source "package/python-kflash/Config.in.host"
|
||||
source "package/python-lxml/Config.in.host"
|
||||
source "package/python-pyyaml/Config.in.host"
|
||||
source "package/python-six/Config.in.host"
|
||||
source "package/python-xlrd/Config.in.host"
|
||||
source "package/python3/Config.in.host"
|
||||
@@ -75,10 +89,14 @@ menu "Host utilities"
|
||||
source "package/qoriq-rcw/Config.in.host"
|
||||
source "package/raspberrypi-usbboot/Config.in.host"
|
||||
source "package/rauc/Config.in.host"
|
||||
source "package/riscv-isa-sim/Config.in.host"
|
||||
source "package/runc/Config.in.host"
|
||||
source "package/rustc/Config.in.host"
|
||||
source "package/s6-rc/Config.in.host"
|
||||
source "package/sam-ba/Config.in.host"
|
||||
source "package/sdbusplus/Config.in.host"
|
||||
source "package/sentry-cli/Config.in.host"
|
||||
source "package/sloci-image/Config.in.host"
|
||||
source "package/squashfs/Config.in.host"
|
||||
source "package/sunxi-tools/Config.in.host"
|
||||
source "package/swig/Config.in.host"
|
||||
@@ -88,6 +106,7 @@ menu "Host utilities"
|
||||
source "package/uboot-tools/Config.in.host"
|
||||
source "package/util-linux/Config.in.host"
|
||||
source "package/utp_com/Config.in.host"
|
||||
source "package/uuu/Config.in.host"
|
||||
source "package/vboot-utils/Config.in.host"
|
||||
source "package/xorriso/Config.in.host"
|
||||
source "package/zip/Config.in.host"
|
||||
|
||||
@@ -39,8 +39,9 @@ endif
|
||||
# Compute GNU_TARGET_NAME
|
||||
GNU_TARGET_NAME = $(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI)
|
||||
|
||||
# FLAT binary format needs uclinux
|
||||
ifeq ($(BR2_BINFMT_FLAT),y)
|
||||
# FLAT binary format needs uclinux, except RISC-V 64-bits which needs
|
||||
# the regular linux name.
|
||||
ifeq ($(BR2_BINFMT_FLAT):$(BR2_RISCV_64),y:)
|
||||
TARGET_OS = uclinux
|
||||
else
|
||||
TARGET_OS = linux
|
||||
@@ -50,8 +51,12 @@ ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y)
|
||||
LIBC = uclibc
|
||||
else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y)
|
||||
LIBC = musl
|
||||
else
|
||||
else ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y)
|
||||
LIBC = gnu
|
||||
else ifeq ($(BR_BUILDING),y)
|
||||
# This happens if there is a bug in Buildroot that allows an
|
||||
# architecture configuration that isn't supported by any library.
|
||||
$(error No C library enabled, this is not possible.)
|
||||
endif
|
||||
|
||||
# The ABI suffix is a bit special on ARM, as it needs to be
|
||||
@@ -70,15 +75,6 @@ ABI := $(ABI)hf
|
||||
endif
|
||||
endif
|
||||
|
||||
# For C-SKY abiv1 & abiv2
|
||||
ifeq ($(BR2_csky),y)
|
||||
ifeq ($(BR2_ck610),y)
|
||||
ABI = abiv1
|
||||
else
|
||||
ABI = abiv2
|
||||
endif
|
||||
endif
|
||||
|
||||
# For FSL PowerPC there's SPE
|
||||
ifeq ($(BR2_powerpc_SPE),y)
|
||||
ABI = spe
|
||||
@@ -164,6 +160,8 @@ ifeq ($(BR2_FORTIFY_SOURCE_1),y)
|
||||
TARGET_HARDENED += -D_FORTIFY_SOURCE=1
|
||||
else ifeq ($(BR2_FORTIFY_SOURCE_2),y)
|
||||
TARGET_HARDENED += -D_FORTIFY_SOURCE=2
|
||||
else ifeq ($(BR2_FORTIFY_SOURCE_3),y)
|
||||
TARGET_HARDENED += -D_FORTIFY_SOURCE=3
|
||||
endif
|
||||
|
||||
TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
|
||||
@@ -178,13 +176,22 @@ TARGET_CXXFLAGS += -fno-dwarf2-cfi-asm
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_BINFMT_FLAT),y)
|
||||
TARGET_CFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
|
||||
ifeq ($(BR2_RISCV_64),y)
|
||||
TARGET_CFLAGS += -fPIC
|
||||
endif
|
||||
ifeq ($(BR2_BINFMT_FLAT_ONE),y)
|
||||
ELF2FLT_FLAGS = $(if $($(PKG)_FLAT_STACKSIZE),\
|
||||
-Wl$(comma)-elf2flt="-r -s$($(PKG)_FLAT_STACKSIZE)",\
|
||||
-Wl$(comma)-elf2flt=-r)
|
||||
else
|
||||
ELF2FLT_FLAGS = $(if $($(PKG)_FLAT_STACKSIZE),\
|
||||
-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
|
||||
-Wl$(comma)-elf2flt)
|
||||
TARGET_CXXFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
|
||||
-Wl$(comma)-elf2flt)
|
||||
TARGET_FCFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\
|
||||
-Wl$(comma)-elf2flt)
|
||||
TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt)
|
||||
endif
|
||||
TARGET_CFLAGS += $(ELF2FLT_FLAGS)
|
||||
TARGET_CXXFLAGS += $(ELF2FLT_FLAGS)
|
||||
TARGET_FCFLAGS += $(ELF2FLT_FLAGS)
|
||||
TARGET_LDFLAGS += $(ELF2FLT_FLAGS)
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_BINFMT_FLAT_SHARED),y)
|
||||
@@ -200,16 +207,23 @@ else
|
||||
TARGET_CROSS = $(HOST_DIR)/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)-
|
||||
endif
|
||||
|
||||
# gcc-4.7 and later ships with wrappers that will automatically pass
|
||||
# arguments to the binutils tools. Those are paths to necessary linker
|
||||
# plugins.
|
||||
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_7),y)
|
||||
TARGET_GCC_WRAPPERS_PREFIX = gcc-
|
||||
endif
|
||||
|
||||
# Define TARGET_xx variables for all common binutils/gcc
|
||||
TARGET_AR = $(TARGET_CROSS)ar
|
||||
TARGET_AR = $(TARGET_CROSS)$(TARGET_GCC_WRAPPERS_PREFIX)ar
|
||||
TARGET_AS = $(TARGET_CROSS)as
|
||||
TARGET_CC = $(TARGET_CROSS)gcc
|
||||
TARGET_CPP = $(TARGET_CROSS)cpp
|
||||
TARGET_CXX = $(TARGET_CROSS)g++
|
||||
TARGET_FC = $(TARGET_CROSS)gfortran
|
||||
TARGET_LD = $(TARGET_CROSS)ld
|
||||
TARGET_NM = $(TARGET_CROSS)nm
|
||||
TARGET_RANLIB = $(TARGET_CROSS)ranlib
|
||||
TARGET_NM = $(TARGET_CROSS)$(TARGET_GCC_WRAPPERS_PREFIX)nm
|
||||
TARGET_RANLIB = $(TARGET_CROSS)$(TARGET_GCC_WRAPPERS_PREFIX)ranlib
|
||||
TARGET_READELF = $(TARGET_CROSS)readelf
|
||||
TARGET_OBJCOPY = $(TARGET_CROSS)objcopy
|
||||
TARGET_OBJDUMP = $(TARGET_CROSS)objdump
|
||||
@@ -412,9 +426,8 @@ else ifeq ($(BR2_SHARED_STATIC_LIBS),y)
|
||||
SHARED_STATIC_LIBS_OPTS = --enable-static --enable-shared
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_COMPILER_PARANOID_UNSAFE_PATH),y)
|
||||
# Used by our binutils patches.
|
||||
export BR_COMPILER_PARANOID_UNSAFE_PATH=enabled
|
||||
endif
|
||||
|
||||
include package/pkg-download.mk
|
||||
include package/pkg-autotools.mk
|
||||
@@ -431,3 +444,4 @@ include package/pkg-waf.mk
|
||||
include package/pkg-golang.mk
|
||||
include package/pkg-meson.mk
|
||||
include package/pkg-qmake.mk
|
||||
include package/pkg-cargo.mk
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 f377da42a57d982cfc22fa75c5a69febdc3e4c1ef43cd0ceaec42e14067e2f37 abootimg-1ebeb393252ab5aeed62e34bc439b6728444f06e-br1.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE
|
||||
sha256 f377da42a57d982cfc22fa75c5a69febdc3e4c1ef43cd0ceaec42e14067e2f37 abootimg-1ebeb393252ab5aeed62e34bc439b6728444f06e-br1.tar.gz
|
||||
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 LICENSE
|
||||
|
||||
@@ -27,7 +27,7 @@ define HOST_ABOOTIMG_BUILD_CMDS
|
||||
endef
|
||||
|
||||
define HOST_ABOOTIMG_INSTALL_CMDS
|
||||
$(INSTALL) -m 0755 $(@D)/abootimg $(HOST_DIR)/usr/bin/abootimg
|
||||
$(INSTALL) -m 0755 $(@D)/abootimg $(HOST_DIR)/bin/abootimg
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
@@ -0,0 +1,52 @@
|
||||
From e06cadc3b95a577e6a8bbc94f93dd063710c73a1 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Sun, 3 Apr 2022 15:25:49 +0200
|
||||
Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl
|
||||
|
||||
Fix the following build failure with libressl:
|
||||
|
||||
/home/autobuild/autobuild/instance-10/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:174:7: error: 'BIO_get_init' was not declared in this scope; did you mean 'BIO_set_init'?
|
||||
174 | if (BIO_get_init(pBIO) == 0 || p_stream == 0 || buf == 0 || len <= 0)
|
||||
| ^~~~~~~~~~~~
|
||||
| BIO_set_init
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/386afa88ac9e5e3bb65dddeabf610bb1e9bc4285
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Retrieved from:
|
||||
https://github.com/DOCGroup/ACE_TAO/commit/e06cadc3b95a577e6a8bbc94f93dd063710c73a1]
|
||||
---
|
||||
ACE/ace/SSL/SSL_Asynch_BIO.cpp | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
|
||||
index a657d8a14e6f7..64aa14c6ab9a7 100644
|
||||
--- a/ace/SSL/SSL_Asynch_BIO.cpp
|
||||
+++ b/ace/SSL/SSL_Asynch_BIO.cpp
|
||||
@@ -41,7 +41,7 @@ extern "C"
|
||||
|
||||
#define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK )
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
static BIO_METHOD methods_ACE =
|
||||
{
|
||||
BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER,
|
||||
@@ -68,14 +68,14 @@ static BIO_METHOD methods_ACE =
|
||||
#else
|
||||
static BIO_METHOD* methods_ACE;
|
||||
# define BIO_set_num(b, val)
|
||||
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
|
||||
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
BIO *
|
||||
ACE_SSL_make_BIO (void * ssl_asynch_stream)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
BIO * const pBIO = BIO_new (&methods_ACE);
|
||||
#else
|
||||
if (!methods_ACE)
|
||||
@@ -0,0 +1,56 @@
|
||||
From 82b139f921ddb549c1bd236030bbc86e314852b3 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Tue, 21 Feb 2023 14:20:11 +0100
|
||||
Subject: [PATCH] ACE/ace/SSL/SSL_Asynch_BIO.cpp: fix build with libressl >=
|
||||
3.5.0
|
||||
|
||||
Fix the following build failure with libressl >= 3.5.0:
|
||||
|
||||
/tmp/instance-17/output-1/build/ace-7.0.6/ace/SSL/SSL_Asynch_BIO.cpp:45:19: error: variable 'BIO_METHOD methods_ACE' has initializer but incomplete type
|
||||
45 | static BIO_METHOD methods_ACE =
|
||||
| ^~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/7f40d6dde03134238151c248fbbd66e4713546cb
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
[Upstream status: https://github.com/DOCGroup/ACE_TAO/pull/2053]
|
||||
---
|
||||
ACE/ace/SSL/SSL_Asynch_BIO.cpp | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/ace/SSL/SSL_Asynch_BIO.cpp b/ace/SSL/SSL_Asynch_BIO.cpp
|
||||
index 0faa775fc0..5543598873 100644
|
||||
--- a/ace/SSL/SSL_Asynch_BIO.cpp
|
||||
+++ b/ace/SSL/SSL_Asynch_BIO.cpp
|
||||
@@ -41,7 +41,8 @@ extern "C"
|
||||
|
||||
#define BIO_TYPE_ACE ( 21 | BIO_TYPE_SOURCE_SINK )
|
||||
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
|
||||
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
|
||||
static BIO_METHOD methods_ACE =
|
||||
{
|
||||
BIO_TYPE_ACE, // BIO_TYPE_PROXY_SERVER,
|
||||
@@ -68,14 +69,15 @@ static BIO_METHOD methods_ACE =
|
||||
#else
|
||||
static BIO_METHOD* methods_ACE;
|
||||
# define BIO_set_num(b, val)
|
||||
-#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) */
|
||||
+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L || (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) */
|
||||
|
||||
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
|
||||
|
||||
BIO *
|
||||
ACE_SSL_make_BIO (void * ssl_asynch_stream)
|
||||
{
|
||||
-#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)
|
||||
+#if OPENSSL_VERSION_NUMBER < 0x10100000L || \
|
||||
+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L)
|
||||
BIO * const pBIO = BIO_new (&methods_ACE);
|
||||
#else
|
||||
if (!methods_ACE)
|
||||
--
|
||||
2.39.0
|
||||
|
||||
16
package/ace/Config.in
Normal file
16
package/ace/Config.in
Normal file
@@ -0,0 +1,16 @@
|
||||
config BR2_PACKAGE_ACE
|
||||
bool "ace"
|
||||
depends on BR2_TOOLCHAIN_USES_GLIBC
|
||||
depends on !BR2_STATIC_LIBS
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
|
||||
help
|
||||
The ADAPTIVE Communication Environment (ACE(TM))
|
||||
An OO Network Programming Toolkit in C++.
|
||||
|
||||
http://www.dre.vanderbilt.edu/~schmidt/ACE.html
|
||||
|
||||
comment "ACE needs a glibc toolchain, dynamic library, C++, gcc >= 4.8"
|
||||
depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \
|
||||
!BR2_INSTALL_LIBSTDCPP || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
|
||||
6
package/ace/ace.hash
Normal file
6
package/ace/ace.hash
Normal file
@@ -0,0 +1,6 @@
|
||||
# From https://download.dre.vanderbilt.edu/previous_versions/ACE-7.0.6.tar.bz2.md5:
|
||||
md5 d1656851619aff15365270ccf2d56c6e ACE-7.0.6.tar.bz2
|
||||
|
||||
# Locally Computed:
|
||||
sha256 4a0cd7da4851f769fddfcf33f663eba4afad824efeff9f59f134c4640ee80216 ACE-7.0.6.tar.bz2
|
||||
sha256 687bf9d16119e0caf6fb5c18214928fd6ea0da10df91e906255b7613af8061d8 COPYING
|
||||
75
package/ace/ace.mk
Normal file
75
package/ace/ace.mk
Normal file
@@ -0,0 +1,75 @@
|
||||
################################################################################
|
||||
#
|
||||
# ace
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ACE_VERSION = 7.0.6
|
||||
ACE_SOURCE = ACE-$(ACE_VERSION).tar.bz2
|
||||
ACE_SITE = http://download.dre.vanderbilt.edu/previous_versions
|
||||
ACE_LICENSE = DOC
|
||||
ACE_LICENSE_FILES = COPYING
|
||||
ACE_INSTALL_STAGING = YES
|
||||
ACE_CPE_ID_VENDOR = vanderbilt
|
||||
ACE_CPE_ID_PRODUCT = adaptive_communication_environment
|
||||
|
||||
# Note: We are excluding examples, apps and tests
|
||||
# Only compiling ACE libraries (no TAO)
|
||||
ACE_LIBRARIES = ace ACEXML Kokyu netsvcs protocols/ace
|
||||
|
||||
ACE_CPPFLAGS = $(TARGET_CPPFLAGS) -std=c++11
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_101915),y)
|
||||
ACE_CPPFLAGS += -O0
|
||||
endif
|
||||
|
||||
# ACE uses DEFFLAGS as C++ pre-processor flags, and CCFLAGS as the C++ flags.
|
||||
# Ace passes the pre-processor flags after the C++ flags, so we pass our
|
||||
# C++ flags as pre-processor flags, via DEFFLAGS.
|
||||
ACE_MAKE_OPTS = \
|
||||
ACE_ROOT="$(@D)" \
|
||||
DEFFLAGS="$(ACE_CPPFLAGS)"
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
ACE_LIBRARIES += ace/SSL
|
||||
ACE_DEPENDENCIES += openssl
|
||||
define ACE_CONFIGURE_SSL
|
||||
echo "ssl = 1" >> $(@D)/include/makeinclude/platform_macros.GNU
|
||||
endef
|
||||
endif
|
||||
|
||||
# configure the target build
|
||||
# refer: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix
|
||||
define ACE_CONFIGURE_CMDS
|
||||
# create a config file
|
||||
echo ' #include "ace/config-linux.h" ' >> $(@D)/ace/config.h
|
||||
|
||||
# Create platform/compiler-specific Makefile configurations
|
||||
$(INSTALL) -m 0644 package/ace/platform_macros.GNU $(@D)/include/makeinclude/
|
||||
|
||||
$(ACE_CONFIGURE_SSL)
|
||||
endef
|
||||
|
||||
define ACE_BUILD_CMDS
|
||||
$(foreach lib,$(ACE_LIBRARIES), \
|
||||
$(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/$(lib) \
|
||||
$(ACE_MAKE_OPTS) all
|
||||
)
|
||||
endef
|
||||
|
||||
define ACE_LIBRARIES_INSTALL
|
||||
mkdir -p $(1)/usr/share/ace
|
||||
$(foreach lib,$(ACE_LIBRARIES), \
|
||||
$(MAKE) -C $(@D)/$(lib) $(ACE_MAKE_OPTS) DESTDIR=$(1) install
|
||||
)
|
||||
endef
|
||||
|
||||
define ACE_INSTALL_TARGET_CMDS
|
||||
$(call ACE_LIBRARIES_INSTALL,$(TARGET_DIR))
|
||||
endef
|
||||
|
||||
define ACE_INSTALL_STAGING_CMDS
|
||||
$(call ACE_LIBRARIES_INSTALL,$(STAGING_DIR))
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
14
package/ace/platform_macros.GNU
Normal file
14
package/ace/platform_macros.GNU
Normal file
@@ -0,0 +1,14 @@
|
||||
# help: http://www.dre.vanderbilt.edu/~schmidt/DOC_ROOT/ACE/ACE-INSTALL.html#unix
|
||||
|
||||
# create a platform macros file
|
||||
include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU
|
||||
|
||||
# disable RPATH
|
||||
install_rpath = 0
|
||||
|
||||
# set the installation prefix
|
||||
INSTALL_PREFIX = /usr
|
||||
|
||||
# fix link error with ARM EABI tools
|
||||
# http://list.isis.vanderbilt.edu/pipermail/ace-users/2008-January/002742.html
|
||||
no_hidden_visibility = 1
|
||||
@@ -1,3 +1,3 @@
|
||||
# locally computed hash
|
||||
sha256 8a49904744a8159b7f325ed941b56968ba37a0371c634036628064f97538de4b acpica-unix2-20200717.tar.gz
|
||||
sha256 cb17c679d3291eba1a70a1336062fb07eec2e839b0821b443b24f41de18c5218 source/include/acpi.h
|
||||
sha256 1ccda5c6a08a90b145777df635eb09f995b3472b3128f375009c5a6b01a04c7a acpica-unix2-20220331.tar.gz
|
||||
sha256 40d8e351f8dfdf5340ec76ac28f0c201b825077d7060bb3686ca1112cb26985d source/include/acpi.h
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ACPICA_VERSION = 20200717
|
||||
ACPICA_VERSION = 20220331
|
||||
ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz
|
||||
ACPICA_SITE = https://acpica.org/sites/acpica/files
|
||||
ACPICA_LICENSE = BSD-3-Clause or GPL-2.0
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
Add missing MSG_CMSG_CLOEXEC
|
||||
|
||||
Unpatched uClibc toolchains, even using the latest 0.9.33.2, do not
|
||||
have the MSG_CMSG_CLOEXEC definition. Even though the Buildroot
|
||||
internal toolchain backend has a uClibc patch to provide it, it
|
||||
doesn't apply to external toolchains. This patch provides the
|
||||
definition of MSG_CMSG_CLOEXEC.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/libnetlink.h
|
||||
===================================================================
|
||||
--- a/libnetlink.h
|
||||
+++ b/libnetlink.h
|
||||
@@ -7,6 +7,10 @@
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
|
||||
+#ifndef MSG_CMSG_CLOEXEC
|
||||
+#define MSG_CMSG_CLOEXEC 0x40000000
|
||||
+#endif
|
||||
+
|
||||
struct rtnl_handle
|
||||
{
|
||||
int fd;
|
||||
Index: b/kacpimon/libnetlink.h
|
||||
===================================================================
|
||||
--- a/kacpimon/libnetlink.h
|
||||
+++ b/kacpimon/libnetlink.h
|
||||
@@ -7,6 +7,10 @@
|
||||
#include <linux/netlink.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
|
||||
+#ifndef MSG_CMSG_CLOEXEC
|
||||
+#define MSG_CMSG_CLOEXEC 0x40000000
|
||||
+#endif
|
||||
+
|
||||
struct rtnl_handle
|
||||
{
|
||||
int fd;
|
||||
@@ -1,7 +1,7 @@
|
||||
# From https://sourceforge.net/projects/acpid2/files/
|
||||
md5 248995264b9d1cd8bdb923d5b190fd44 acpid-2.0.32.tar.xz
|
||||
sha1 a194e99c5b596186c7865e7ddfec55dea6d7fc73 acpid-2.0.32.tar.xz
|
||||
md5 988c2e3fd5ba0ea4492d3ba7273af295 acpid-2.0.34.tar.xz
|
||||
sha1 9322112027e4aa5a8d1b97ec64ef1d150ff0f4fc acpid-2.0.34.tar.xz
|
||||
|
||||
# Locally computed
|
||||
sha256 f2d2d30b3edc3234bd82f6f7186699a6aa3c85c8d20bc4e30e9b3c68a1ed157e acpid-2.0.32.tar.xz
|
||||
sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING
|
||||
sha256 2d095c8cfcbc847caec746d62cdc8d0bff1ec1bc72ef7c674c721e04da6ab333 acpid-2.0.34.tar.xz
|
||||
sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ACPID_VERSION = 2.0.32
|
||||
ACPID_VERSION = 2.0.34
|
||||
ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz
|
||||
ACPID_SITE = http://downloads.sourceforge.net/project/acpid2
|
||||
ACPID_LICENSE = GPL-2.0+
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# locally computed hash
|
||||
sha256 004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f acpitool-0.5.1.tar.bz2
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f acpitool-0.5.1.tar.bz2
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
config BR2_PACKAGE_ACSCCID
|
||||
bool "acsccid"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite, libusb
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # libusb, pcsc-lite
|
||||
depends on BR2_USE_MMU # pcsc-lite
|
||||
depends on !BR2_STATIC_LIBS # pcsc-lite
|
||||
select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
|
||||
|
||||
@@ -1,5 +1,10 @@
|
||||
config BR2_PACKAGE_ADWAITA_ICON_THEME
|
||||
bool "adwaita icon theme"
|
||||
depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3
|
||||
# host-libgtk3 -> host-librsvg -> host-pango -> host-harfbuzz
|
||||
depends on BR2_HOST_GCC_AT_LEAST_4_9
|
||||
help
|
||||
Adwaita icon theme
|
||||
|
||||
comment "adwaita icon theme needs host gcc >= 4.9"
|
||||
depends on !BR2_HOST_GCC_AT_LEAST_4_9
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.sha256sum
|
||||
# From https://download.gnome.org/sources/adwaita-icon-theme/3.27/adwaita-icon-theme-3.27.2.sha256sum
|
||||
sha256 a594e7440971f860cc61b1b8291be15ffc1b8dd06a9f11485a5a7faf189bcf6b adwaita-icon-theme-3.37.2.tar.xz
|
||||
# locally computed
|
||||
sha256 51f83b2b4e9ed2beebc9b8eed2ecad29314a58ed8c5184b22ad8f9df703d3ce5 COPYING
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
ADWAITA_ICON_THEME_VERSION_MAJOR = 3.37
|
||||
ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).2
|
||||
ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR)
|
||||
ADWAITA_ICON_THEME_SITE = https://download.gnome.org/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR)
|
||||
ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz
|
||||
ADWAITA_ICON_THEME_INSTALL_STAGING = YES
|
||||
ADWAITA_ICON_THEME_LICENSE = LGPL-3.0 or CC-BY-SA-3.0
|
||||
|
||||
@@ -5,7 +5,8 @@
|
||||
################################################################################
|
||||
|
||||
AER_INJECT_VERSION = 9bd5e2c7886fca72f139cd8402488a2235957d41
|
||||
AER_INJECT_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git
|
||||
AER_INJECT_SITE = https://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git
|
||||
AER_INJECT_SITE_METHOD = git
|
||||
AER_INJECT_LICENSE = GPL-2.0
|
||||
AER_INJECT_LICENSE_FILES = README
|
||||
AER_INJECT_DEPENDENCIES = host-flex host-bison
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://sourceforge.net/projects/loop-aes/files/aespipe/v2.4f/
|
||||
sha1 2c23e1a6be298cf4f173f06b1123e4ecd5e9a202 aespipe-v2.4f.tar.bz2
|
||||
md5 ed05c62c1954110f009bedda4bc1562f aespipe-v2.4f.tar.bz2
|
||||
sha1 2c23e1a6be298cf4f173f06b1123e4ecd5e9a202 aespipe-v2.4f.tar.bz2
|
||||
md5 ed05c62c1954110f009bedda4bc1562f aespipe-v2.4f.tar.bz2
|
||||
# Locally computed:
|
||||
sha256 b135e1659f58dc9be5e3c88923cd03d2a936096ab8cd7f2b3af4cb7a844cef96 aespipe-v2.4f.tar.bz2
|
||||
sha256 b135e1659f58dc9be5e3c88923cd03d2a936096ab8cd7f2b3af4cb7a844cef96 aespipe-v2.4f.tar.bz2
|
||||
|
||||
11
package/agent-proxy/Config.in.host
Normal file
11
package/agent-proxy/Config.in.host
Normal file
@@ -0,0 +1,11 @@
|
||||
config BR2_PACKAGE_HOST_AGENT_PROXY
|
||||
bool "host agent-proxy"
|
||||
help
|
||||
This is a simple, small proxy which was intended for use
|
||||
with kgdb, or gdbserver type connections where you want to
|
||||
share a text console and a debug session.
|
||||
|
||||
The idea is that you use the agent-proxy to connect to a
|
||||
serial port directly or to a remote terminal server.
|
||||
|
||||
git://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git
|
||||
3
package/agent-proxy/agent-proxy.hash
Normal file
3
package/agent-proxy/agent-proxy.hash
Normal file
@@ -0,0 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 b1667b36074c10ebd6dd1f89eda75d5877bc8e06ecf2919f18e75a7a5a9de19b agent-proxy-1.97.tar.gz
|
||||
sha256 e6d6a009505e345fe949e1310334fcb0747f28dae2856759de102ab66b722cb4 COPYING
|
||||
20
package/agent-proxy/agent-proxy.mk
Normal file
20
package/agent-proxy/agent-proxy.mk
Normal file
@@ -0,0 +1,20 @@
|
||||
################################################################################
|
||||
#
|
||||
# agent-proxy
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AGENT_PROXY_VERSION = 1.97
|
||||
AGENT_PROXY_SITE = https://git.kernel.org/pub/scm/utils/kernel/kgdb/agent-proxy.git/snapshot
|
||||
AGENT_PROXY_LICENSE = GPL-2.0
|
||||
AGENT_PROXY_LICENSE_FILES = COPYING
|
||||
|
||||
define HOST_AGENT_PROXY_BUILD_CMDS
|
||||
$(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)
|
||||
endef
|
||||
|
||||
define HOST_AGENT_PROXY_INSTALL_CMDS
|
||||
$(INSTALL) -D -m 0755 $(@D)/agent-proxy $(HOST_DIR)/bin/agent-proxy
|
||||
endef
|
||||
|
||||
$(eval $(host-generic-package))
|
||||
@@ -1,102 +0,0 @@
|
||||
From 2a0fe384eec254643ca2176ccfcbbd036a5aad06 Mon Sep 17 00:00:00 2001
|
||||
From: Luca Ceresoli <luca@lucaceresoli.net>
|
||||
Date: Tue, 14 Jul 2020 10:30:10 +0200
|
||||
Subject: [PATCH] Fix build when SNMPv3 is disabled
|
||||
|
||||
agentpp has ifdefs to disable v3 code when SNMPv3 is disabled. However it
|
||||
is missing one and it has a few ones in excess. Fix them.
|
||||
|
||||
Upstream is aware, says "will fix in later version", but thinks to make v3
|
||||
mandatory. See discussion at
|
||||
https://forum.snmp.app/t/agent-compile-fails-if-snmp-has-disable-snmpv3/326
|
||||
|
||||
Upstream status: none, upstream is not welcoming contributions.
|
||||
|
||||
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
|
||||
---
|
||||
include/agent_pp/notification_log_mib.h | 4 ++--
|
||||
include/agent_pp/notification_originator.h | 2 ++
|
||||
include/agent_pp/snmp_community_mib.h | 4 ++--
|
||||
src/notification_originator.cpp | 2 ++
|
||||
4 files changed, 8 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/agent_pp/notification_log_mib.h b/include/agent_pp/notification_log_mib.h
|
||||
index ddac05e515d9..8fd8cfec32ca 100644
|
||||
--- a/include/agent_pp/notification_log_mib.h
|
||||
+++ b/include/agent_pp/notification_log_mib.h
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
//--AgentGen BEGIN=_BEGIN
|
||||
#include <agent_pp/agent++.h>
|
||||
-#ifdef _SNMPv3
|
||||
+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific
|
||||
#include <agent_pp/mib_complex_entry.h>
|
||||
//--AgentGen END
|
||||
|
||||
@@ -688,6 +688,6 @@ protected:
|
||||
*/
|
||||
|
||||
|
||||
-#endif
|
||||
+// #endif // _SNMPv3
|
||||
|
||||
|
||||
diff --git a/include/agent_pp/notification_originator.h b/include/agent_pp/notification_originator.h
|
||||
index 95e8b4e1836d..6f50cd52625b 100644
|
||||
--- a/include/agent_pp/notification_originator.h
|
||||
+++ b/include/agent_pp/notification_originator.h
|
||||
@@ -307,7 +307,9 @@ class AGENTPP_DECL NotificationOriginator: public NotificationSender {
|
||||
*/
|
||||
virtual nlmLogEntry* get_nlm_log_entry();
|
||||
|
||||
+#ifdef _SNMPv3
|
||||
virtual v3MP* get_v3mp();
|
||||
+#endif
|
||||
|
||||
protected:
|
||||
|
||||
diff --git a/include/agent_pp/snmp_community_mib.h b/include/agent_pp/snmp_community_mib.h
|
||||
index 7d5c4558f36d..d9eb2b4a87ec 100644
|
||||
--- a/include/agent_pp/snmp_community_mib.h
|
||||
+++ b/include/agent_pp/snmp_community_mib.h
|
||||
@@ -49,7 +49,7 @@ namespace Agentpp {
|
||||
#define oidSnmpTrapAddress "1.3.6.1.6.3.18.1.3.0"
|
||||
#define oidSnmpTrapCommunity "1.3.6.1.6.3.18.1.4.0"
|
||||
|
||||
-#ifdef _SNMPv3
|
||||
+// #ifdef _SNMPv3 // This file deos not look SNMPv3-specific
|
||||
|
||||
/**
|
||||
* snmpCommunityName
|
||||
@@ -346,7 +346,7 @@ class AGENTPP_DECL snmp_community_mib: public MibGroup
|
||||
static void add_public();
|
||||
static void add_public(Mib* mib);
|
||||
};
|
||||
-#endif
|
||||
+// #endif // _SNMPv3
|
||||
|
||||
#ifdef AGENTPP_NAMESPACE
|
||||
}
|
||||
diff --git a/src/notification_originator.cpp b/src/notification_originator.cpp
|
||||
index d7d566869998..39ddbe08cdeb 100644
|
||||
--- a/src/notification_originator.cpp
|
||||
+++ b/src/notification_originator.cpp
|
||||
@@ -237,6 +237,7 @@ nlmLogEntry* NotificationOriginator::get_nlm_log_entry() {
|
||||
return nlmLogEntry::instance;
|
||||
}
|
||||
|
||||
+#ifdef _SNMPv3
|
||||
v3MP* NotificationOriginator::get_v3mp() {
|
||||
if (mib) {
|
||||
return mib->get_request_list()->get_v3mp();
|
||||
@@ -244,6 +245,7 @@ v3MP* NotificationOriginator::get_v3mp() {
|
||||
return v3MP::I;
|
||||
}
|
||||
}
|
||||
+#endif
|
||||
|
||||
|
||||
bool NotificationOriginator::check_access(ListCursor<MibTableRow>& cur,
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@@ -16,7 +16,7 @@ config BR2_PACKAGE_AGENTPP
|
||||
|
||||
SNMPv3 support is enabled if SNMP++ enables it.
|
||||
|
||||
http://www.agentpp.com/agentpp3_5/agentpp3_5.html
|
||||
https://www.agentpp.com/api/cpp/agent_pp.html
|
||||
|
||||
comment "agent++ needs a toolchain w/ threads, C++, dynamic library"
|
||||
depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed:
|
||||
sha256 9b45123df45e803198a1181540b37a4ccd0e63c68df6e826702e2ba49167edac agent++-4.3.1.tar.gz
|
||||
sha256 e09dc2d40277d468c18f1539ad18f43e0c3a95b10fad8a02184e9ace8bac0d67 agent++-4.6.0.tar.gz
|
||||
sha256 1eb85fc97224598dad1852b5d6483bbcf0aa8608790dcc657a5a2a761ae9c8c6 LICENSE-2_0.txt
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AGENTPP_VERSION = 4.3.1
|
||||
AGENTPP_VERSION = 4.6.0
|
||||
AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz
|
||||
AGENTPP_SITE = http://www.agentpp.com/download
|
||||
AGENTPP_LICENSE = Apache-2.0
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
From d4496006ac1e0c99908108b998ae39afb0658733 Mon Sep 17 00:00:00 2001
|
||||
From: Joseph Benden <joe@benden.us>
|
||||
Date: Tue, 7 Jul 2020 11:42:40 -0700
|
||||
Subject: [PATCH] Expand __packed definition.
|
||||
|
||||
Signed-off-by: Joseph Benden <joe@benden.us>
|
||||
[Retrieved from:
|
||||
https://github.com/aircrack-ng/aircrack-ng/commit/d4496006ac1e0c99908108b998ae39afb0658733]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
lib/radiotap/radiotap.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/lib/radiotap/radiotap.h b/lib/radiotap/radiotap.h
|
||||
index 57f784b8d..bb5a41dfc 100644
|
||||
--- a/lib/radiotap/radiotap.h
|
||||
+++ b/lib/radiotap/radiotap.h
|
||||
@@ -56,7 +56,7 @@ struct ieee80211_radiotap_header {
|
||||
* @it_present: (first) present word
|
||||
*/
|
||||
uint32_t it_present;
|
||||
-} __packed;
|
||||
+} __attribute__((__packed__));
|
||||
|
||||
/* version is always 0 */
|
||||
#define PKTHDR_RADIOTAP_VERSION 0
|
||||
@@ -1,74 +0,0 @@
|
||||
From f6f1396807607f5649d20631db517cfca3a1f5c4 Mon Sep 17 00:00:00 2001
|
||||
From: Joseph Benden <joe@benden.us>
|
||||
Date: Tue, 7 Jul 2020 11:44:40 -0700
|
||||
Subject: [PATCH] Fix duplicated symbols.
|
||||
|
||||
Signed-off-by: Joseph Benden <joe@benden.us>
|
||||
[Retrieved from:
|
||||
https://github.com/aircrack-ng/aircrack-ng/commit/f6f1396807607f5649d20631db517cfca3a1f5c4]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/airodump-ng/airodump-ng.c | 2 --
|
||||
src/airventriloquist-ng/airventriloquist-ng.c | 6 +++---
|
||||
src/tkiptun-ng/tkiptun-ng.c | 4 ++--
|
||||
3 files changed, 5 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/src/airodump-ng/airodump-ng.c b/src/airodump-ng/airodump-ng.c
|
||||
index 3ae6994dd..e72bc88e2 100644
|
||||
--- a/src/airodump-ng/airodump-ng.c
|
||||
+++ b/src/airodump-ng/airodump-ng.c
|
||||
@@ -92,8 +92,6 @@
|
||||
#include "radiotap/radiotap_iter.h"
|
||||
|
||||
struct devices dev;
|
||||
-uint8_t h80211[4096] __attribute__((aligned(16)));
|
||||
-uint8_t tmpbuf[4096] __attribute__((aligned(16)));
|
||||
|
||||
static const unsigned char llcnull[] = {0, 0, 0, 0};
|
||||
|
||||
diff --git a/src/airventriloquist-ng/airventriloquist-ng.c b/src/airventriloquist-ng/airventriloquist-ng.c
|
||||
index ac6b7647e..267d95540 100644
|
||||
--- a/src/airventriloquist-ng/airventriloquist-ng.c
|
||||
+++ b/src/airventriloquist-ng/airventriloquist-ng.c
|
||||
@@ -173,7 +173,7 @@ static struct local_options
|
||||
} lopt;
|
||||
|
||||
struct devices dev;
|
||||
-struct wif *_wi_in, *_wi_out;
|
||||
+extern struct wif *_wi_in, *_wi_out;
|
||||
|
||||
struct ARP_req
|
||||
{
|
||||
@@ -195,8 +195,8 @@ struct APt
|
||||
};
|
||||
|
||||
unsigned long nb_pkt_sent;
|
||||
-u_int8_t h80211[4096];
|
||||
-static u_int8_t tmpbuf[4096];
|
||||
+extern u_int8_t h80211[4096];
|
||||
+extern u_int8_t tmpbuf[4096];
|
||||
|
||||
static int tcp_test(const char * ip_str, const short port)
|
||||
{
|
||||
diff --git a/src/tkiptun-ng/tkiptun-ng.c b/src/tkiptun-ng/tkiptun-ng.c
|
||||
index dc67f5d58..43db0bc23 100644
|
||||
--- a/src/tkiptun-ng/tkiptun-ng.c
|
||||
+++ b/src/tkiptun-ng/tkiptun-ng.c
|
||||
@@ -267,7 +267,7 @@ static struct local_options
|
||||
|
||||
// unused, but needed for link
|
||||
struct devices dev;
|
||||
-struct wif *_wi_in, *_wi_out;
|
||||
+extern struct wif *_wi_in, *_wi_out;
|
||||
|
||||
struct ARP_req
|
||||
{
|
||||
@@ -289,7 +289,7 @@ struct APt
|
||||
};
|
||||
|
||||
unsigned long nb_pkt_sent;
|
||||
-unsigned char h80211[4096];
|
||||
+extern unsigned char h80211[4096];
|
||||
static unsigned char srcbuf[4096];
|
||||
static char strbuf[512];
|
||||
static int alarmed;
|
||||
@@ -1,6 +1,6 @@
|
||||
# From http://www.aircrack-ng.org/downloads.html
|
||||
sha1 ffeb4816476e7b329dc0c154f1aa4a30ad171beb aircrack-ng-1.6.tar.gz
|
||||
md5 22ddc85549b51ed0da0931d01ef215e5 aircrack-ng-1.6.tar.gz
|
||||
sha1 bd43a35281c9c81d958b95aa76b4404c29f904ff aircrack-ng-1.7.tar.gz
|
||||
md5 a918ea7146f91d8c799fb770c38f4bec aircrack-ng-1.7.tar.gz
|
||||
|
||||
# Hash for license file:
|
||||
sha256 fc51fd3a97223f2fd47b057202d4a6b0daaedf23b5a1f5ff8723c192fc1e021d LICENSE
|
||||
sha256 fc51fd3a97223f2fd47b057202d4a6b0daaedf23b5a1f5ff8723c192fc1e021d LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
AIRCRACK_NG_VERSION = 1.6
|
||||
AIRCRACK_NG_VERSION = 1.7
|
||||
AIRCRACK_NG_SITE = http://download.aircrack-ng.org
|
||||
AIRCRACK_NG_LICENSE = GPL-2.0+
|
||||
AIRCRACK_NG_LICENSE_FILES = LICENSE
|
||||
@@ -69,7 +69,7 @@ endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SQLITE),y)
|
||||
AIRCRACK_NG_DEPENDENCIES += sqlite
|
||||
AIRCRACK_NG_CONF_OPTS += --with-sqlite3
|
||||
AIRCRACK_NG_CONF_OPTS += --with-sqlite3=$(STAGING_DIR)/usr
|
||||
else
|
||||
AIRCRACK_NG_CONF_OPTS += --without-sqlite3
|
||||
endif
|
||||
|
||||
@@ -0,0 +1,36 @@
|
||||
From 4cb9681ab99db3d8e330ac789e17ec69583aecd4 Mon Sep 17 00:00:00 2001
|
||||
From: Herve Codina <herve.codina@bootlin.com>
|
||||
Date: Thu, 28 Oct 2021 18:39:18 +0200
|
||||
Subject: [PATCH] toolchains: remove --hash-style management
|
||||
|
||||
Using an external toolchain, with an external configuration given
|
||||
using TARGET_GLOBAL_XXXX variables, having '--hash-style=both'
|
||||
in Alchemy toolchains can lead to compilation failure.
|
||||
|
||||
This patch simply removes all --hash-style settings.
|
||||
|
||||
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
|
||||
---
|
||||
toolchains/linux/eglibc/flags.mk | 9 +--------
|
||||
1 file changed, 1 insertion(+), 8 deletions(-)
|
||||
|
||||
diff --git a/toolchains/linux/eglibc/flags.mk b/toolchains/linux/eglibc/flags.mk
|
||||
index 95c0a46..4474729 100644
|
||||
--- a/toolchains/linux/eglibc/flags.mk
|
||||
+++ b/toolchains/linux/eglibc/flags.mk
|
||||
@@ -11,11 +11,4 @@ TARGET_GLOBAL_LDLIBS += -pthread -lrt
|
||||
TARGET_GLOBAL_CFLAGS += -funwind-tables
|
||||
|
||||
# Enable link optimization for binutils's ld.
|
||||
-# gnu hash not supported by mips ABI
|
||||
-ifeq ("$(TARGET_ARCH)","mips")
|
||||
- TARGET_GLOBAL_LDFLAGS += -Wl,-O1
|
||||
-else ifeq ("$(TARGET_ARCH)","mips64")
|
||||
- TARGET_GLOBAL_LDFLAGS += -Wl,-O1
|
||||
-else
|
||||
- TARGET_GLOBAL_LDFLAGS += -Wl,-O1,--hash-style=both
|
||||
-endif
|
||||
+TARGET_GLOBAL_LDFLAGS += -Wl,-O1
|
||||
--
|
||||
2.31.1
|
||||
|
||||
4
package/alchemy/alchemy.hash
Normal file
4
package/alchemy/alchemy.hash
Normal file
@@ -0,0 +1,4 @@
|
||||
# Locally computed:
|
||||
sha256 346c06b9317691a9371d878b850e61f8bcec4f20132ac95340b9d2571be25ee8 alchemy-d95b3c38cd37814a1b98d0bbf813de7adaaecfbc.tar.gz
|
||||
sha256 542f44eecd9f8806ec1ae285201e442ab547c82d9f8c70e44c977d6332a2bea0 COPYING
|
||||
sha256 49872815ee3de163f07a83737c996e77a5bffa186d06b1e3bb969bfb68c251df README
|
||||
71
package/alchemy/alchemy.mk
Normal file
71
package/alchemy/alchemy.mk
Normal file
@@ -0,0 +1,71 @@
|
||||
################################################################################
|
||||
#
|
||||
# alchemy
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALCHEMY_VERSION = d95b3c38cd37814a1b98d0bbf813de7adaaecfbc
|
||||
ALCHEMY_SITE = $(call github,Parrot-Developers,alchemy,$(ALCHEMY_VERSION))
|
||||
ALCHEMY_LICENSE = BSD-3-Clause (Alchemy), GPL-2.0 (kconfig)
|
||||
ALCHEMY_LICENSE_FILES = COPYING README
|
||||
HOST_ALCHEMY_DEPENDENCIES = host-pkgconf host-python3
|
||||
|
||||
ALCHEMY_HOME = $(HOST_DIR)/opt/alchemy
|
||||
ALCHEMY_SDK_BASEDIR = $(STAGING_DIR)/usr/lib/alchemy/sdk
|
||||
|
||||
define HOST_ALCHEMY_INSTALL_CMDS
|
||||
mkdir -p $(ALCHEMY_HOME)
|
||||
cp -rf $(@D)/* $(ALCHEMY_HOME)
|
||||
cp $(HOST_ALCHEMY_PKGDIR)/atom.mk.in $(ALCHEMY_HOME)/atom.mk.in
|
||||
endef
|
||||
|
||||
$(eval $(host-generic-package))
|
||||
|
||||
# Variables used by other packages
|
||||
|
||||
ALCHEMY_MAKE = $(ALCHEMY_HOME)/scripts/alchemake
|
||||
|
||||
# TARGET_ARCH is set to 'xxx' to avoid Alchemy managing the architecture.
|
||||
# When Alchemy manages the architecture, it can add some flags to CFGLAGS and
|
||||
# can lead to incorrect result with the toolchain provided in TARGET_CROSS.
|
||||
# 'xxx' is an unknown architecture for Alchemy. Using this value is a simple
|
||||
# way to disable the Alchemy architecture management.
|
||||
ALCHEMY_TARGET_ENV = \
|
||||
$(TARGET_MAKE_ENV) \
|
||||
ALCHEMY_HOME=$(ALCHEMY_HOME) \
|
||||
ALCHEMY_WORKSPACE_DIR="$(@D)" \
|
||||
ALCHEMY_TARGET_OUT=alchemy-out \
|
||||
PKGCONFIG_BIN=$(PKG_CONFIG_HOST_BINARY) \
|
||||
TARGET_OS=linux \
|
||||
TARGET_OS_FLAVOUR=buildroot \
|
||||
TARGET_CROSS="$(TARGET_CROSS)" \
|
||||
TARGET_ARCH=xxx \
|
||||
TARGET_GLOBAL_CXXFLAGS="$(TARGET_CXXFLAGS)" \
|
||||
TARGET_GLOBAL_LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
TARGET_GLOBAL_FFLAGS="$(TARGET_FCFLAGS)" \
|
||||
TARGET_GLOBAL_FCFLAGS="$(TARGET_FCFLAGS)"
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
ALCHEMY_TARGET_ENV += \
|
||||
TARGET_FORCE_STATIC=1 \
|
||||
TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS)"
|
||||
else
|
||||
ALCHEMY_TARGET_ENV += \
|
||||
TARGET_GLOBAL_CFLAGS="$(TARGET_CFLAGS) -fPIC"
|
||||
endif
|
||||
|
||||
# Install an Alchemy SDK file.
|
||||
# This macro can be used by Alchemy packages
|
||||
# $1: Alchemy module name
|
||||
# $2: Alchemy module file name
|
||||
# $3: Alchemy module libraries this module depends on
|
||||
define ALCHEMY_INSTALL_LIB_SDK_FILE
|
||||
$(INSTALL) -m 0644 -D \
|
||||
$(ALCHEMY_HOME)/atom.mk.in \
|
||||
$(ALCHEMY_SDK_BASEDIR)/$($(PKG)_NAME)/atom.mk
|
||||
$(SED) 's#@STAGING_DIR@#$(STAGING_DIR)#' \
|
||||
-e 's#@MODULE@#$(strip $(1))#' \
|
||||
-e 's#@MODULE_FILENAME@#$(strip $(2))#' \
|
||||
-e 's#@LIBRARIES@#$(strip $(3))#' \
|
||||
$(ALCHEMY_SDK_BASEDIR)/$($(PKG)_NAME)/atom.mk
|
||||
endef
|
||||
8
package/alchemy/atom.mk.in
Normal file
8
package/alchemy/atom.mk.in
Normal file
@@ -0,0 +1,8 @@
|
||||
LOCAL_PATH := $(call my-dir)
|
||||
include $(CLEAR_VARS)
|
||||
LOCAL_MODULE := @MODULE@
|
||||
LOCAL_SDK := @STAGING_DIR@
|
||||
LOCAL_DESTDIR := usr/lib
|
||||
LOCAL_MODULE_FILENAME := @MODULE_FILENAME@
|
||||
LOCAL_LIBRARIES := @LIBRARIES@
|
||||
include $(BUILD_LIBRARY)
|
||||
20
package/alfred/Config.in
Normal file
20
package/alfred/Config.in
Normal file
@@ -0,0 +1,20 @@
|
||||
config BR2_PACKAGE_ALFRED
|
||||
bool "alfred"
|
||||
depends on !BR2_STATIC_LIBS # dlopen()
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libnl
|
||||
select BR2_PACKAGE_LIBNL
|
||||
help
|
||||
Alfred is a user space daemon for distributing arbitrary
|
||||
local information over the mesh/network in a decentralized
|
||||
fashion.
|
||||
|
||||
This data can be anything which appears to be useful -
|
||||
originally designed to replace the batman-adv visualization
|
||||
(vis), you may distribute hostnames, phone books,
|
||||
administration information, DNS information, the local
|
||||
weather forecast ...
|
||||
|
||||
https://www.open-mesh.org/projects/alfred/wiki
|
||||
|
||||
comment "alfred needs a toolchain w/ dynamic library, threads"
|
||||
depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
5
package/alfred/alfred.hash
Normal file
5
package/alfred/alfred.hash
Normal file
@@ -0,0 +1,5 @@
|
||||
# From https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2022.1.tar.gz.sha1
|
||||
sha1 14e916bda706ccff510f2ea00bb3143c582c9ff2 alfred-2022.1.tar.gz
|
||||
# Locally computed
|
||||
sha256 3a0ac2bb26e0cb3f2732d4873669a0a22e9825e8f9a8e7abac986363f275097f alfred-2022.1.tar.gz
|
||||
sha256 cecbf53d1148e13256ac29f8b900655b7fc8dc12d59939a95bc2323ea1747025 LICENSES/preferred/GPL-2.0
|
||||
25
package/alfred/alfred.mk
Normal file
25
package/alfred/alfred.mk
Normal file
@@ -0,0 +1,25 @@
|
||||
################################################################################
|
||||
#
|
||||
# alfred
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALFRED_VERSION = 2022.1
|
||||
ALFRED_SITE = https://downloads.open-mesh.org/batman/stable/sources/alfred
|
||||
ALFRED_LICENSE = GPL-2.0
|
||||
ALFRED_LICENSE_FILES = LICENSES/preferred/GPL-2.0
|
||||
ALFRED_DEPENDENCIES = libnl
|
||||
|
||||
define ALFRED_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \
|
||||
$(MAKE) -C $(@D) \
|
||||
CONFIG_ALFRED_CAPABILITIES=n \
|
||||
CONFIG_ALFRED_GPSD=n
|
||||
endef
|
||||
|
||||
define ALFRED_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -m 0755 -D $(@D)/alfred $(TARGET_DIR)/usr/bin/alfred
|
||||
$(INSTALL) -m 0755 -D $(@D)/vis/batadv-vis $(TARGET_DIR)/usr/bin/batadv-vis
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
@@ -10,7 +10,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
[Jörg: update patch for 1.1.6]
|
||||
Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
|
||||
Upstream: http://mailman.alsa-project.org/pipermail/alsa-devel/2018-November/141376.html
|
||||
[Bernd: update patch for 1.2.4]
|
||||
[Bernd: update patch for 1.2.4 & 1.2.7]
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
---
|
||||
configure.ac | 2 ++
|
||||
@@ -21,9 +21,9 @@ diff --git a/configure.ac b/configure.ac
|
||||
index cce195ae..0c852434 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -51,6 +51,8 @@ dnl Checks for library functions.
|
||||
AC_PROG_GCC_TRADITIONAL
|
||||
@@ -52,6 +52,8 @@ dnl Checks for library functions.
|
||||
AC_CHECK_FUNCS([uselocale])
|
||||
AC_CHECK_FUNCS([eaccess])
|
||||
|
||||
+AC_CHECK_FUNC([fork])
|
||||
+
|
||||
|
||||
@@ -1,43 +0,0 @@
|
||||
From 3fbaea3ff390d4c09adbf5d6ae62fb7b5f3f24f5 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Mon, 28 Jun 2021 12:08:53 +0200
|
||||
Subject: [PATCH] fix build with --disable-ucm
|
||||
|
||||
Link: https://mailman.alsa-project.org/pipermail/alsa-devel/2021-June/186729.html
|
||||
Reported-by: Michael Forney <mforney@mforney.org>
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
Upstream: f4f29d42be8b8ad60ea4c5697374adad4bfe6868
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
---
|
||||
include/local.h | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/include/local.h b/include/local.h
|
||||
index 4e7d88a0..7cfcec53 100644
|
||||
--- a/include/local.h
|
||||
+++ b/include/local.h
|
||||
@@ -374,6 +374,8 @@ int _snd_config_load_with_include(snd_config_t *config, snd_input_t *in,
|
||||
void *INTERNAL(snd_dlopen)(const char *name, int mode, char *errbuf, size_t errbuflen);
|
||||
#endif
|
||||
|
||||
+#ifdef BUILD_UCM
|
||||
+
|
||||
const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name);
|
||||
|
||||
static inline int _snd_is_ucm_device(const char *name)
|
||||
@@ -381,4 +383,12 @@ static inline int _snd_is_ucm_device(const char *name)
|
||||
return name && name[0] == '_' && name[1] == 'u' && name[2] == 'c' && name[3] == 'm';
|
||||
}
|
||||
|
||||
+#else
|
||||
+
|
||||
+static inline const char *uc_mgr_alibcfg_by_device(snd_config_t **config, const char *name) { return NULL; }
|
||||
+static inline int _snd_is_ucm_device(const char *name) { return 0; }
|
||||
+
|
||||
+
|
||||
+#endif
|
||||
+
|
||||
#endif
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
From 81e7923fbfad45b2f353a4d6e3053af51f5f7d0b Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Kysela <perex@perex.cz>
|
||||
Date: Tue, 15 Jun 2021 23:21:42 +0200
|
||||
Subject: [PATCH] control: empty - fix the static build
|
||||
|
||||
Reported-by: Jan Palus <atler@pld-linux.org>
|
||||
Fixes: https://github.com/alsa-project/alsa-lib/issues/157
|
||||
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/alsa-project/alsa-lib/commit/81e7923fbfad45b2f353a4d6e3053af51f5f7d0b]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/control/control_empty.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/control/control_empty.c b/src/control/control_empty.c
|
||||
index 49d1026c..c9b048c1 100644
|
||||
--- a/src/control/control_empty.c
|
||||
+++ b/src/control/control_empty.c
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
#ifndef PIC
|
||||
/* entry for static linking */
|
||||
-const char *_snd_module_ctl_empty = "";
|
||||
+const char *_snd_module_control_empty = "";
|
||||
#endif
|
||||
|
||||
/*! \page control_plugins
|
||||
@@ -22,7 +22,7 @@ if BR2_PACKAGE_ALSA_LIB
|
||||
|
||||
config BR2_PACKAGE_ALSA_LIB_PYTHON
|
||||
bool "Python support for alsa-lib"
|
||||
depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
|
||||
depends on BR2_PACKAGE_PYTHON3
|
||||
help
|
||||
Add python support for alsa-lib.
|
||||
Python will be built and libpython will be installed
|
||||
@@ -80,4 +80,9 @@ config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS
|
||||
bool "old-symbols"
|
||||
default y
|
||||
|
||||
config BR2_PACKAGE_ALSA_LIB_TOPOLOGY
|
||||
bool "topology"
|
||||
default y
|
||||
depends on !BR2_STATIC_LIBS
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 628421d950cecaf234de3f899d520c0a6923313c964ad751ffac081df331438e alsa-lib-1.2.5.1.tar.bz2
|
||||
sha256 1ab01b74e33425ca99c2e36c0844fd6888273193bd898240fe8f93accbcbf347 alsa-lib-1.2.8.tar.bz2
|
||||
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
|
||||
sha256 bfe16cf823bcff261fc6a062c07ee96660e3c39678f42f39a788a68dbc234ced aserver/COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_LIB_VERSION = 1.2.5.1
|
||||
ALSA_LIB_VERSION = 1.2.8
|
||||
ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2
|
||||
ALSA_LIB_SITE = https://www.alsa-project.org/files/pub/lib
|
||||
ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver)
|
||||
@@ -16,8 +16,11 @@ ALSA_LIB_AUTORECONF = YES
|
||||
ALSA_LIB_CONF_OPTS = \
|
||||
--with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \
|
||||
--with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \
|
||||
--with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \
|
||||
--without-versioned
|
||||
--with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))"
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),)
|
||||
ALSA_LIB_CONF_OPTS += --without-versioned
|
||||
endif
|
||||
|
||||
# Can't build with static & shared at the same time (1.0.25+)
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
@@ -55,23 +58,17 @@ endif
|
||||
ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y)
|
||||
ALSA_LIB_CONF_OPTS += --disable-old-symbols
|
||||
endif
|
||||
ifneq ($(BR2_PACKAGE_ALSA_LIB_TOPOLOGY),y)
|
||||
ALSA_LIB_CONF_OPTS += --disable-topology
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y)
|
||||
ALSA_LIB_CONF_OPTS += \
|
||||
--enable-mixer-pymods
|
||||
ifeq ($(BR2_PACKAGE_PYTHON),y)
|
||||
ALSA_LIB_CONF_OPTS += \
|
||||
--with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \
|
||||
--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
|
||||
ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)
|
||||
ALSA_LIB_DEPENDENCIES = python
|
||||
else
|
||||
ALSA_LIB_CONF_OPTS += \
|
||||
--enable-mixer-pymods \
|
||||
--with-pythonlibs=-lpython$(PYTHON3_VERSION_MAJOR) \
|
||||
--with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
|
||||
ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)
|
||||
ALSA_LIB_DEPENDENCIES = python3
|
||||
endif
|
||||
ALSA_LIB_DEPENDENCIES += python3
|
||||
else
|
||||
ALSA_LIB_CONF_OPTS += --disable-python
|
||||
endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Locally calculated
|
||||
sha256 42eef98433d2c8d11f1deeeb459643619215a75aa5a5bbdd06a794e4c413df20 alsa-plugins-1.2.5.tar.bz2
|
||||
sha256 8c337814954bb7c167456733a6046142a2931f12eccba3ec2a4ae618a3432511 alsa-plugins-1.2.7.1.tar.bz2
|
||||
sha256 32434afcc8666ba060e111d715bfdb6c2d5dd8a35fa4d3ab8ad67d8f850d2f2b COPYING
|
||||
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING.GPL
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_PLUGINS_VERSION = 1.2.5
|
||||
ALSA_PLUGINS_VERSION = 1.2.7.1
|
||||
ALSA_PLUGINS_SOURCE = alsa-plugins-$(ALSA_PLUGINS_VERSION).tar.bz2
|
||||
ALSA_PLUGINS_SITE = https://www.alsa-project.org/files/pub/plugins
|
||||
ALSA_PLUGINS_LICENSE = LGPL-2.1+
|
||||
|
||||
@@ -0,0 +1,108 @@
|
||||
From 4bfd1f15114550e1be7e43ae37a61906e1bff809 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Date: Sun, 17 Jul 2022 18:59:48 +0200
|
||||
Subject: [PATCH] alsactl/info.c: fix conditionals on __ALSA_PCM_H and
|
||||
__ALSA_RAWMIDI_H
|
||||
|
||||
Commit bbc74a61ac7c35e506c3d7f76ecf943cb55736a6 ("alsactl: implement
|
||||
'info' command") implemented an alsactl info command. In this
|
||||
implementation, there was an attempt to properly address optional
|
||||
features from alsa-lib by using conditions on __ALSA_PCM_H,
|
||||
__ALSA_RAWMIDI_H.
|
||||
|
||||
Unfortunately, this attempt does not work entirely: only the code
|
||||
inside pcm_device_list(), rawmidi_device_list() was conditionally
|
||||
compiled, but their very prototype also use type definitions provided
|
||||
in pcm.h and rawmidi.h. So really, it's the entire function that needs
|
||||
to be conditionally implemented.
|
||||
|
||||
Also, snd_rawmidi_stream_name() was not handled properly, for the same
|
||||
reason.
|
||||
|
||||
This commit implements pcm_device_list() only if __ALSA_PCM_H is
|
||||
defined, and implements snd_rawmidi_stream_name() and
|
||||
rawmidi_device_list() only if __ALSA_RAWMIDI_H is defined.
|
||||
|
||||
general_card_info() is modified to not call the PCM or raw MIDI
|
||||
functions when support is not available.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
|
||||
Upstream: https://mailman.alsa-project.org/pipermail/alsa-devel/2022-July/203846.html
|
||||
---
|
||||
alsactl/info.c | 14 ++++++++++----
|
||||
1 file changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/alsactl/info.c b/alsactl/info.c
|
||||
index 253539d..9bd72af 100644
|
||||
--- a/alsactl/info.c
|
||||
+++ b/alsactl/info.c
|
||||
@@ -22,9 +22,9 @@
|
||||
#include "aconfig.h"
|
||||
#include "alsactl.h"
|
||||
|
||||
+#ifdef __ALSA_PCM_H
|
||||
static int pcm_device_list(snd_ctl_t *ctl, snd_pcm_stream_t stream, bool *first)
|
||||
{
|
||||
-#ifdef __ALSA_PCM_H
|
||||
int err, dev, idx;
|
||||
unsigned int count;
|
||||
snd_pcm_info_t *pcminfo;
|
||||
@@ -76,10 +76,12 @@ static int pcm_device_list(snd_ctl_t *ctl, snd_pcm_stream_t stream, bool *first)
|
||||
idx, snd_pcm_info_get_subdevice_name(pcminfo));
|
||||
}
|
||||
}
|
||||
-#endif
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
|
||||
+#ifdef __ALSA_RAWMIDI_H
|
||||
static const char *snd_rawmidi_stream_name(snd_rawmidi_stream_t stream)
|
||||
{
|
||||
if (stream == SND_RAWMIDI_STREAM_INPUT)
|
||||
@@ -91,7 +93,6 @@ static const char *snd_rawmidi_stream_name(snd_rawmidi_stream_t stream)
|
||||
|
||||
static int rawmidi_device_list(snd_ctl_t *ctl, snd_rawmidi_stream_t stream, bool *first)
|
||||
{
|
||||
-#ifdef __ALSA_RAWMIDI_H
|
||||
int err, dev, idx;
|
||||
unsigned int count;
|
||||
snd_rawmidi_info_t *info;
|
||||
@@ -143,9 +144,10 @@ static int rawmidi_device_list(snd_ctl_t *ctl, snd_rawmidi_stream_t stream, bool
|
||||
idx, snd_rawmidi_info_get_subdevice_name(info));
|
||||
}
|
||||
}
|
||||
-#endif
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
+#endif
|
||||
|
||||
static int hwdep_device_list(snd_ctl_t *ctl)
|
||||
{
|
||||
@@ -227,17 +229,21 @@ int general_card_info(int cardno)
|
||||
}
|
||||
err = card_info(ctl);
|
||||
|
||||
+#ifdef __ALSA_PCM_H
|
||||
first = true;
|
||||
if (err >= 0)
|
||||
err = pcm_device_list(ctl, SND_PCM_STREAM_PLAYBACK, &first);
|
||||
if (err >= 0)
|
||||
err = pcm_device_list(ctl, SND_PCM_STREAM_CAPTURE, &first);
|
||||
+#endif
|
||||
|
||||
+#ifdef __ALSA_RAWMIDI_H
|
||||
first = true;
|
||||
if (err >= 0)
|
||||
err = rawmidi_device_list(ctl, SND_PCM_STREAM_PLAYBACK, &first);
|
||||
if (err >= 0)
|
||||
err = rawmidi_device_list(ctl, SND_PCM_STREAM_CAPTURE, &first);
|
||||
+#endif
|
||||
|
||||
if (err >= 0)
|
||||
err = hwdep_device_list(ctl);
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@@ -45,6 +45,11 @@ config BR2_PACKAGE_ALSA_UTILS_ALSAUCM
|
||||
|
||||
config BR2_PACKAGE_ALSA_UTILS_ALSATPLG
|
||||
bool "alsatplg"
|
||||
depends on !BR2_STATIC_LIBS # dlfcn.h
|
||||
select BR2_PACKAGE_ALSA_LIB_TOPOLOGY
|
||||
|
||||
comment "alsatplg needs a toolchain w/ dynamic library"
|
||||
depends on BR2_STATIC_LIBS
|
||||
|
||||
config BR2_PACKAGE_ALSA_UTILS_AMIDI
|
||||
bool "amidi"
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 98ffc2d599de0577d423a48fa5f20a992ca0b82d812ed1f2e58ade49ac6da426 alsa-utils-1.2.4.tar.bz2
|
||||
sha256 e140fa604c351f36bd72167c8860c69d81b964ae6ab53992d6434dde38e9333c alsa-utils-1.2.8.tar.bz2
|
||||
sha256 231f7edcc7352d7734a96eef0b8030f77982678c516876fcb81e25b32d68564c COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ALSA_UTILS_VERSION = 1.2.4
|
||||
ALSA_UTILS_VERSION = 1.2.8
|
||||
ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2
|
||||
ALSA_UTILS_SITE = https://www.alsa-project.org/files/pub/utils
|
||||
ALSA_UTILS_LICENSE = GPL-2.0
|
||||
@@ -77,7 +77,7 @@ define ALSA_UTILS_INSTALL_TARGET_CMDS
|
||||
fi
|
||||
if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \
|
||||
mkdir -p $(TARGET_DIR)/usr/share/; \
|
||||
cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \
|
||||
cp -rdpf $(STAGING_DIR)/usr/share/alsa/* $(TARGET_DIR)/usr/share/alsa/; \
|
||||
fi
|
||||
endef
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/alsamixergui/alsamixergui_0.9.0rc2-1-9.dsc
|
||||
md5 af942a41b81ba27e2e4d0a1e1ab0decb alsamixergui_0.9.0rc2-1.orig.tar.gz
|
||||
md5 af942a41b81ba27e2e4d0a1e1ab0decb alsamixergui_0.9.0rc2-1.orig.tar.gz
|
||||
# locally computed
|
||||
sha256 ea617b76dcd0df74576686ca34c281f43bb9d844015cea91e3debc91538d2b1d debian/copyright
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally computed
|
||||
sha256 9b808e5b5a54d156348221dc86704c7831115047d5238691e6088f8c4814b2ca alure-14beed2a86d5a36030e907b21c46614d505f07cd.tar.gz
|
||||
sha256 7331ddc67daaf1a283c81e8dc17bac8dc40f54ed3fab3d3964616f4bd502a0a3 LICENSE
|
||||
sha256 9b808e5b5a54d156348221dc86704c7831115047d5238691e6088f8c4814b2ca alure-14beed2a86d5a36030e907b21c46614d505f07cd.tar.gz
|
||||
sha256 7331ddc67daaf1a283c81e8dc17bac8dc40f54ed3fab3d3964616f4bd502a0a3 LICENSE
|
||||
|
||||
@@ -38,6 +38,7 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT
|
||||
bool "fastboot"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux
|
||||
depends on !BR2_STATIC_LIBS # libselinux
|
||||
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 # libselinux -> libsepol
|
||||
depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS
|
||||
select BR2_PACKAGE_LIBSELINUX
|
||||
select BR2_PACKAGE_ZLIB
|
||||
@@ -46,8 +47,9 @@ config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT
|
||||
the target, which can be used to reflash other target devices
|
||||
implementing the fastboot protocol.
|
||||
|
||||
comment "fastboot needs a toolchain w/ threads, dynamic library"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
comment "fastboot needs a toolchain w/ threads, dynamic library, gcc >= 5"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \
|
||||
!BR2_TOOLCHAIN_GCC_AT_LEAST_5
|
||||
|
||||
comment "fastboot needs headers >= 3.10 (PowerPC64), headers >= 3.16 (MIPS64)"
|
||||
depends on !BR2_arc
|
||||
|
||||
@@ -11,11 +11,15 @@ if BR2_PACKAGE_HOST_ANDROID_TOOLS
|
||||
|
||||
config BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT
|
||||
bool "fastboot"
|
||||
depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol
|
||||
help
|
||||
This option will build and install the fastboot utility for
|
||||
the host, which can be used to reflash target devices
|
||||
implementing the fastboot protocol.
|
||||
|
||||
comment "fastboot needs a toolchain w/ host gcc >= 5"
|
||||
depends on !BR2_HOST_GCC_AT_LEAST_5
|
||||
|
||||
config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB
|
||||
bool "adb"
|
||||
help
|
||||
@@ -25,9 +29,13 @@ config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB
|
||||
|
||||
config BR2_PACKAGE_HOST_ANDROID_TOOLS_EXT4_UTILS
|
||||
bool "ext4 utils"
|
||||
depends on BR2_HOST_GCC_AT_LEAST_5 # host-libselinux -> host-libsepol
|
||||
help
|
||||
This option will build and install the ext4 utils for the
|
||||
host, i.e. make_ext4fs, ext4fixup, ext2simg, img2simg,
|
||||
simg2img and simg2simg.
|
||||
|
||||
comment "ext4 utils needs a toolchain w/ host gcc >= 5"
|
||||
depends on !BR2_HOST_GCC_AT_LEAST_5
|
||||
|
||||
endif
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# locally computed
|
||||
sha256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f android-tools_4.2.2+git20130218.orig.tar.xz
|
||||
sha256 73c3078de3e44d8a3cadf7a360863c63155d9d558c2f0933cf38ad901a3f5998 android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz
|
||||
sha256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f android-tools_4.2.2+git20130218.orig.tar.xz
|
||||
sha256 73c3078de3e44d8a3cadf7a360863c63155d9d558c2f0933cf38ad901a3f5998 android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz
|
||||
sha256 170c5939bf8c8eed1db8f66f2d6155e8c1a3e799e390b55e7aad253195b1ebf5 debian/copyright
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-2.0.0.tar.gz
|
||||
sha256 3013a57f2c8df37775804b8be5b107665a2ca209607bb92c618bcc084feb00a7 LICENSE
|
||||
sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-2.0.0.tar.gz
|
||||
sha256 3013a57f2c8df37775804b8be5b107665a2ca209607bb92c618bcc084feb00a7 LICENSE
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally computed:
|
||||
sha256 477e796f5c18e8c0e61b5d88e1759c68249e8e0210c2f3de2b98680e2cc63e32 aoetools-37.tar.gz
|
||||
sha256 477e796f5c18e8c0e61b5d88e1759c68249e8e0210c2f3de2b98680e2cc63e32 aoetools-37.tar.gz
|
||||
|
||||
# Hash for license files:
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
sha256 32b1062f7da84967e7019d01ab805935caa7ab7321a7ced0e30ebe75e5df1670 COPYING
|
||||
|
||||
@@ -4,7 +4,7 @@ config BR2_PACKAGE_APACHE
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS
|
||||
depends on BR2_USE_MMU # apr
|
||||
select BR2_PACKAGE_APR_UTIL
|
||||
select BR2_PACKAGE_PCRE
|
||||
select BR2_PACKAGE_PCRE2
|
||||
help
|
||||
The Apache HTTP Server Project is an effort to develop and
|
||||
maintain an open-source HTTP server for modern operating
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From https://downloads.apache.org/httpd/httpd-2.4.51.tar.bz2.{sha256,sha512}
|
||||
sha256 20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4 httpd-2.4.51.tar.bz2
|
||||
sha512 9fb07c4b176f5c0485a143e2b1bb1085345ca9120b959974f68c37a8911a57894d2cb488b1b42fdf3102860b99e890204f5e9fa7ae3828b481119c563812cc66 httpd-2.4.51.tar.bz2
|
||||
# From https://archive.apache.org/dist/httpd/httpd-2.4.57.tar.bz2.{sha256,sha512}
|
||||
sha256 dbccb84aee95e095edfbb81e5eb926ccd24e6ada55dcd83caecb262e5cf94d2a httpd-2.4.57.tar.bz2
|
||||
sha512 4d1e0a274ee90bdfb5f38d4a7d73a7367ed1c6388e26280e640014e49abc0df03683705b88dcfe2ec2da313dda4c7b4a3b86daffa1911f58e224eba89d82d155 httpd-2.4.57.tar.bz2
|
||||
# Locally computed
|
||||
sha256 47b8c2b6c3309282a99d4a3001575c790fead690cc14734628c4667d2bbffc43 LICENSE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
APACHE_VERSION = 2.4.51
|
||||
APACHE_VERSION = 2.4.57
|
||||
APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2
|
||||
APACHE_SITE = https://downloads.apache.org/httpd
|
||||
APACHE_LICENSE = Apache-2.0
|
||||
@@ -17,19 +17,11 @@ APACHE_INSTALL_STAGING = YES
|
||||
# We have a patch touching configure.in and Makefile.in,
|
||||
# so we need to autoreconf:
|
||||
APACHE_AUTORECONF = YES
|
||||
APACHE_DEPENDENCIES = apr apr-util pcre
|
||||
|
||||
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
|
||||
define APACHE_FIXUP_APR_LIBTOOL
|
||||
$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \
|
||||
$(STAGING_DIR)/usr/build-1/libtool
|
||||
endef
|
||||
APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL
|
||||
endif
|
||||
APACHE_DEPENDENCIES = apr apr-util pcre2
|
||||
|
||||
APACHE_CONF_ENV= \
|
||||
ap_cv_void_ptr_lt_long=no \
|
||||
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
|
||||
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre2-config
|
||||
|
||||
ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y)
|
||||
APACHE_MPM = event
|
||||
@@ -43,7 +35,7 @@ APACHE_CONF_OPTS = \
|
||||
--sysconfdir=/etc/apache2 \
|
||||
--with-apr=$(STAGING_DIR)/usr \
|
||||
--with-apr-util=$(STAGING_DIR)/usr \
|
||||
--with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \
|
||||
--with-pcre=$(STAGING_DIR)/usr/bin/pcre2-config \
|
||||
--enable-http \
|
||||
--enable-dbd \
|
||||
--enable-proxy \
|
||||
@@ -53,6 +45,13 @@ APACHE_CONF_OPTS = \
|
||||
--with-mpm=$(APACHE_MPM) \
|
||||
--disable-luajit
|
||||
|
||||
ifeq ($(BR2_PACKAGE_BROTLI),y)
|
||||
APACHE_CONF_OPTS += --enable-brotli
|
||||
APACHE_DEPENDENCIES += brotli
|
||||
else
|
||||
APACHE_CONF_OPTS += --disable-brotli
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBXML2),y)
|
||||
APACHE_DEPENDENCIES += libxml2
|
||||
# Apache wants the path to the header file, where it can find
|
||||
|
||||
@@ -10,8 +10,7 @@ APG_LICENSE = BSD-3-Clause
|
||||
APG_LICENSE_FILES = COPYING
|
||||
|
||||
define APG_BUILD_CMDS
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(APG_CFLAGS)" \
|
||||
-C $(@D)
|
||||
$(MAKE) $(TARGET_CONFIGURE_OPTS) FLAGS="$(TARGET_CFLAGS)" -C $(@D)
|
||||
endef
|
||||
|
||||
define APG_INSTALL_TARGET_CMDS
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
From d28a980802ad48568c87da02d630c8babfe163bb Mon Sep 17 00:00:00 2001
|
||||
From: Jose Fonseca <jfonseca@vmware.com>
|
||||
Date: Wed, 1 Sep 2021 16:34:54 +0100
|
||||
Subject: [PATCH] gltrace: Avoid __libc_dlsym and __libc_dlopen_mode on GLIBC
|
||||
2.34.
|
||||
|
||||
These GLIBC_PRIVATE symbols are gone from GLIBC 2.34 due to the merge of
|
||||
libdl.so onto libc.so.
|
||||
|
||||
This means apitrace can't defend against infinite recursion when
|
||||
used with Steam Overlay, but at least it should work otherwise.
|
||||
|
||||
Fixes https://github.com/apitrace/apitrace/issues/756
|
||||
|
||||
[Retrieved from:
|
||||
https://github.com/apitrace/apitrace/commit/d28a980802ad48568c87da02d630c8babfe163bb]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
wrappers/dlsym.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/wrappers/dlsym.cpp b/wrappers/dlsym.cpp
|
||||
index 5ab8465b0..5369af35a 100644
|
||||
--- a/wrappers/dlsym.cpp
|
||||
+++ b/wrappers/dlsym.cpp
|
||||
@@ -34,7 +34,7 @@
|
||||
#include "os.hpp"
|
||||
|
||||
|
||||
-#if defined(__GLIBC__) && !defined(__UCLIBC__)
|
||||
+#if defined(__GLIBC__) && !defined(__UCLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 34
|
||||
|
||||
|
||||
#include <dlfcn.h>
|
||||
@@ -38,6 +38,11 @@ ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_85180),y)
|
||||
APITRACE_CXXFLAGS += -O0
|
||||
endif
|
||||
|
||||
# m68k needs 32-bit offsets in switch tables to build
|
||||
ifeq ($(BR2_m68k),y)
|
||||
APITRACE_CXXFLAGS += -mlong-jump-table-offsets
|
||||
endif
|
||||
|
||||
APITRACE_CONF_OPTS += \
|
||||
-DCMAKE_C_FLAGS="$(APITRACE_CFLAGS)" \
|
||||
-DCMAKE_CXX_FLAGS="$(APITRACE_CXXFLAGS)"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From: https://gitlab.com/apparmor/apparmor/-/wikis/home#userspace
|
||||
sha256 8fada772d9a60989525594346d9aa22af938daafc1781adce9a1acb3c75bdf24 apparmor-3.0.1.tar.gz
|
||||
# From https://gitlab.com/apparmor/apparmor/-/wikis/Release_Notes_3.1.2
|
||||
sha256 7cbd0b2f6393abf57acaf25dc2b32b2ae197c0b5b0d661e14be46127df93a5eb apparmor-3.1.2.tar.gz
|
||||
|
||||
# locally computed
|
||||
sha256 a7e0cdcbea5c14927cedfc600d46526bdcbb1eb0a4d951e2ea53c2a6de159cb4 LICENSE
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
################################################################################
|
||||
|
||||
# When updating the version here, please also update the libapparmor package
|
||||
APPARMOR_VERSION_MAJOR = 3.0
|
||||
APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).1
|
||||
APPARMOR_VERSION_MAJOR = 3.1
|
||||
APPARMOR_VERSION = $(APPARMOR_VERSION_MAJOR).2
|
||||
APPARMOR_SITE = https://launchpad.net/apparmor/$(APPARMOR_VERSION_MAJOR)/$(APPARMOR_VERSION)/+download
|
||||
APPARMOR_DL_SUBDIR = libapparmor
|
||||
APPARMOR_LICENSE = GPL-2.0
|
||||
@@ -54,15 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y)
|
||||
APPARMOR_DEPENDENCIES += apache
|
||||
APPARMOR_TOOLS += changehat/mod_apparmor
|
||||
APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs
|
||||
|
||||
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
|
||||
define APPARMOR_FIXUP_APXS
|
||||
$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \
|
||||
$(STAGING_DIR)/usr/bin/apxs \
|
||||
$(STAGING_DIR)/usr/build/config_vars.mk
|
||||
endef
|
||||
APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS
|
||||
endif
|
||||
endif
|
||||
|
||||
define APPARMOR_BUILD_CMDS
|
||||
|
||||
@@ -8,7 +8,7 @@ config BR2_PACKAGE_APR_UTIL
|
||||
help
|
||||
The utility library for the apache runtime project
|
||||
|
||||
http://apr.apache.org/
|
||||
https://apr.apache.org
|
||||
|
||||
comment "apr-util needs a toolchain w/ dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From http://www.apache.org/dist/apr/apr-util-1.6.1.tar.bz2.sha256
|
||||
sha256 d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b apr-util-1.6.1.tar.bz2
|
||||
# From http://www.apache.org/dist/apr/apr-util-1.6.3.tar.bz2.sha256
|
||||
sha256 a41076e3710746326c3945042994ad9a4fcac0ce0277dd8fea076fec3c9772b5 apr-util-1.6.3.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE
|
||||
sha256 ef5609d18601645ad6fe22c6c122094be40e976725c1d0490778abacc836e7a2 LICENSE
|
||||
|
||||
@@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
APR_UTIL_VERSION = 1.6.1
|
||||
APR_UTIL_VERSION = 1.6.3
|
||||
APR_UTIL_SOURCE = apr-util-$(APR_UTIL_VERSION).tar.bz2
|
||||
APR_UTIL_SITE = http://archive.apache.org/dist/apr
|
||||
APR_UTIL_SITE = https://archive.apache.org/dist/apr
|
||||
APR_UTIL_LICENSE = Apache-2.0
|
||||
APR_UTIL_LICENSE_FILES = LICENSE
|
||||
APR_UTIL_CPE_ID_VENDOR = apache
|
||||
@@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \
|
||||
--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
|
||||
APR_UTIL_CONFIG_SCRIPTS = apu-1-config
|
||||
|
||||
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
|
||||
define APR_UTIL_FIX_LIBTOOL
|
||||
$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
|
||||
$(STAGING_DIR)/usr/build-1/libtool
|
||||
endef
|
||||
APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL
|
||||
|
||||
define APR_UTIL_FIX_RULES_MK
|
||||
$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
|
||||
$(@D)/build/rules.mk
|
||||
endef
|
||||
APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK
|
||||
endif
|
||||
|
||||
# When iconv is available, then use it to provide charset conversion
|
||||
# features.
|
||||
APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
Fix cross-compilation
|
||||
|
||||
Patch was backported from Apache httpd:
|
||||
http://svn.apache.org/viewvc?view=revision&revision=1327907
|
||||
http://svn.apache.org/viewvc?view=revision&revision=1328390
|
||||
http://svn.apache.org/viewvc?view=revision&revision=1328714
|
||||
|
||||
Patch submitted upstream:
|
||||
https://issues.apache.org/bugzilla/show_bug.cgi?id=57058
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
diff -uNr apr-1.5.1.org/configure.in apr-1.5.1/configure.in
|
||||
--- apr-1.5.1.org/configure.in 2014-01-25 16:17:29.000000000 +0100
|
||||
+++ apr-1.5.1/configure.in 2014-10-05 11:20:40.080746760 +0200
|
||||
@@ -118,6 +118,16 @@
|
||||
echo "Configuring APR library"
|
||||
echo "Platform: $host"
|
||||
|
||||
+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless
|
||||
+dnl we got already CC_FOR_BUILD from environment.
|
||||
+if test "x${build_alias}" != "x${host_alias}"; then
|
||||
+ if test "x${CC_FOR_BUILD}" = "x"; then
|
||||
+ CC_FOR_BUILD=cc
|
||||
+ fi
|
||||
+fi
|
||||
+AC_SUBST(CC_FOR_BUILD)
|
||||
+AC_SUBST(CFLAGS_FOR_BUILD)
|
||||
+
|
||||
dnl Some initial steps for configuration. We setup the default directory
|
||||
dnl and which files are to be configured.
|
||||
|
||||
diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in
|
||||
--- apr-1.5.1.org/Makefile.in 2014-03-17 16:10:26.000000000 +0100
|
||||
+++ apr-1.5.1/Makefile.in 2014-10-05 11:22:53.031070519 +0200
|
||||
@@ -8,6 +8,8 @@
|
||||
# APR (Apache Portable Runtime) library Makefile.
|
||||
#
|
||||
CPP = @CPP@
|
||||
+CC_FOR_BUILD = @CC_FOR_BUILD@
|
||||
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
|
||||
|
||||
# get substituted into some targets
|
||||
APR_MAJOR_VERSION=@APR_MAJOR_VERSION@
|
||||
@@ -134,8 +134,13 @@
|
||||
$(APR_MKDIR) tools
|
||||
$(LT_COMPILE)
|
||||
|
||||
+ifdef CC_FOR_BUILD
|
||||
+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS)
|
||||
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $<
|
||||
+else
|
||||
tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char)
|
||||
$(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS)
|
||||
+endif
|
||||
|
||||
include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@
|
||||
$(APR_MKDIR) include/private
|
||||
@@ -0,0 +1,30 @@
|
||||
From 0aa7e33372b479a26e5f04dfc4801e24573a8737 Mon Sep 17 00:00:00 2001
|
||||
From: Graham Leggett <minfrin@apache.org>
|
||||
Date: Wed, 1 Jan 2020 10:43:39 +0000
|
||||
Subject: [PATCH] Revert: Backport r1872164. Fix the name of libtool when
|
||||
cross compiling.
|
||||
|
||||
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872165 13f79535-47bb-0310-9956-ffa450edef68
|
||||
|
||||
[Revert upstream commit https://github.com/apache/apr/commit/f82374627b3a6500a7a6cb11e48bcac59bcbb6a1]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
apr-config.in | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/apr-config.in b/apr-config.in
|
||||
index bed47ca..4873fc0 100644
|
||||
--- a/apr-config.in
|
||||
+++ b/apr-config.in
|
||||
@@ -246,7 +246,7 @@ while test $# -gt 0; do
|
||||
if test "$location" = "installed"; then
|
||||
echo "${installbuilddir}/libtool"
|
||||
elif test "$location" = "crosscompile"; then
|
||||
- echo "$APR_TARGET_DIR/${installbuilddir}/libtool"
|
||||
+ echo "$APR_TARGET_DIR/${installbuilddir}/build"
|
||||
else
|
||||
echo "$APR_BUILD_DIR/libtool"
|
||||
fi
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@@ -0,0 +1,112 @@
|
||||
From ed1daed074fba0dabff825e63525d751b6bb7b8d Mon Sep 17 00:00:00 2001
|
||||
From: Graham Leggett <minfrin@apache.org>
|
||||
Date: Tue, 31 Dec 2019 21:26:02 +0000
|
||||
Subject: [PATCH] Revert: Add the ability to cross compile APR.
|
||||
|
||||
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/branches/1.7.x@1872147 13f79535-47bb-0310-9956-ffa450edef68
|
||||
|
||||
[Revert upstream commit https://github.com/apache/apr/commit/b6dbbc77da35a7b46754c99f465827f2a583e23c]
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
CHANGES | 2 --
|
||||
apr-config.in | 22 ----------------------
|
||||
2 files changed, 24 deletions(-)
|
||||
|
||||
diff --git a/CHANGES b/CHANGES
|
||||
index 71b2f0e..e751c90 100644
|
||||
--- a/CHANGES
|
||||
+++ b/CHANGES
|
||||
@@ -56,8 +56,6 @@ Changes for APR 1.7.1
|
||||
*) Don't try to use PROC_PTHREAD by default when cross compiling.
|
||||
[Yann Ylavic]
|
||||
|
||||
- *) Add the ability to cross compile APR. [Graham Leggett]
|
||||
-
|
||||
*) While cross-compiling, the tools/gen_test_char could not
|
||||
be executed at build time, use AX_PROG_CC_FOR_BUILD to
|
||||
build native tools/gen_test_char
|
||||
diff --git a/apr-config.in b/apr-config.in
|
||||
index 4873fc0..84b4073 100644
|
||||
--- a/apr-config.in
|
||||
+++ b/apr-config.in
|
||||
@@ -48,14 +48,6 @@ APR_LIBNAME="@APR_LIBNAME@"
|
||||
# NOTE: the following line is modified during 'make install': alter with care!
|
||||
location=@APR_CONFIG_LOCATION@
|
||||
|
||||
-# absolute path, but not installed path - we're cross compiling
|
||||
-case "$0" in
|
||||
- "${bindir}/"*) ;;
|
||||
- "/"*) location=crosscompile;
|
||||
- APR_TARGET_DIR=${0%${bindir}/apr-${APR_MAJOR_VERSION}-config} ;;
|
||||
- *) ;;
|
||||
-esac
|
||||
-
|
||||
show_usage()
|
||||
{
|
||||
cat << EOF
|
||||
@@ -101,8 +93,6 @@ fi
|
||||
|
||||
if test "$location" = "installed"; then
|
||||
LA_FILE="$libdir/lib${APR_LIBNAME}.la"
|
||||
-elif test "$location" = "crosscompile"; then
|
||||
- LA_FILE="$APR_TARGET_DIR/$libdir/lib${APR_LIBNAME}.la"
|
||||
else
|
||||
LA_FILE="$APR_BUILD_DIR/lib${APR_LIBNAME}.la"
|
||||
fi
|
||||
@@ -132,8 +122,6 @@ while test $# -gt 0; do
|
||||
--includedir)
|
||||
if test "$location" = "installed"; then
|
||||
flags="$includedir"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- flags="$APR_TARGET_DIR/$includedir"
|
||||
elif test "$location" = "source"; then
|
||||
flags="$APR_SOURCE_DIR/include"
|
||||
else
|
||||
@@ -166,8 +154,6 @@ while test $# -gt 0; do
|
||||
--includes)
|
||||
if test "$location" = "installed"; then
|
||||
flags="$flags -I$includedir $EXTRA_INCLUDES"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- flags="$flags -I$APR_TARGET_DIR/$includedir $EXTRA_INCLUDES"
|
||||
elif test "$location" = "source"; then
|
||||
flags="$flags -I$APR_SOURCE_DIR/include $EXTRA_INCLUDES"
|
||||
else
|
||||
@@ -182,8 +168,6 @@ while test $# -gt 0; do
|
||||
--installbuilddir)
|
||||
if test "$location" = "installed"; then
|
||||
echo "${installbuilddir}"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- echo "$APR_TARGET_DIR/${installbuilddir}"
|
||||
elif test "$location" = "source"; then
|
||||
echo "$APR_SOURCE_DIR/build"
|
||||
else
|
||||
@@ -200,8 +184,6 @@ while test $# -gt 0; do
|
||||
if test "$location" = "installed"; then
|
||||
### avoid using -L if libdir is a "standard" location like /usr/lib
|
||||
flags="$flags -L$libdir -l${APR_LIBNAME}"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- flags="$flags -L$APR_TARGET_DIR/$libdir -l${APR_LIBNAME}"
|
||||
else
|
||||
### this surely can't work since the library is in .libs?
|
||||
flags="$flags -L$APR_BUILD_DIR -l${APR_LIBNAME}"
|
||||
@@ -219,8 +201,6 @@ while test $# -gt 0; do
|
||||
# Since the user is specifying they are linking with libtool, we
|
||||
# *know* that -R will be recognized by libtool.
|
||||
flags="$flags -L$libdir -R$libdir -l${APR_LIBNAME}"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- flags="$flags -L${APR_TARGET_DIR}/$libdir -l${APR_LIBNAME}"
|
||||
else
|
||||
flags="$flags $LA_FILE"
|
||||
fi
|
||||
@@ -245,8 +225,6 @@ while test $# -gt 0; do
|
||||
--apr-libtool)
|
||||
if test "$location" = "installed"; then
|
||||
echo "${installbuilddir}/libtool"
|
||||
- elif test "$location" = "crosscompile"; then
|
||||
- echo "$APR_TARGET_DIR/${installbuilddir}/build"
|
||||
else
|
||||
echo "$APR_BUILD_DIR/libtool"
|
||||
fi
|
||||
--
|
||||
2.39.2
|
||||
|
||||
@@ -9,7 +9,7 @@ config BR2_PACKAGE_APR
|
||||
predictable and consistent interface to underlying
|
||||
platform-specific implementations
|
||||
|
||||
http://apr.apache.org/
|
||||
https://apr.apache.org
|
||||
|
||||
comment "apr needs a toolchain w/ dynamic library"
|
||||
depends on BR2_USE_MMU
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# From http://archive.apache.org/dist/apr/apr-1.7.0.tar.bz2.sha256
|
||||
sha256 e2e148f0b2e99b8e5c6caa09f6d4fb4dd3e83f744aa72a952f94f5a14436f7ea apr-1.7.0.tar.bz2
|
||||
# From https://archive.apache.org/dist/apr/apr-1.7.2.tar.bz2.sha256
|
||||
sha256 75e77cc86776c030c0a5c408dfbd0bf2a0b75eed5351e52d5439fa1e5509a43e apr-1.7.2.tar.bz2
|
||||
# Locally calculated
|
||||
sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE
|
||||
sha256 f854aeef66ecd55a126226e82b3f26793fc3b1c584647f6a0edc5639974c38ad LICENSE
|
||||
|
||||
@@ -4,16 +4,20 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
APR_VERSION = 1.7.0
|
||||
APR_VERSION = 1.7.2
|
||||
APR_SOURCE = apr-$(APR_VERSION).tar.bz2
|
||||
APR_SITE = http://archive.apache.org/dist/apr
|
||||
APR_SITE = https://archive.apache.org/dist/apr
|
||||
APR_LICENSE = Apache-2.0
|
||||
APR_LICENSE_FILES = LICENSE
|
||||
APR_CPE_ID_VENDOR = apache
|
||||
APR_CPE_ID_PRODUCT = portable_runtime
|
||||
APR_INSTALL_STAGING = YES
|
||||
# We have a patch touching configure.in and Makefile.in,
|
||||
# so we need to autoreconf:
|
||||
APR_AUTORECONF = YES
|
||||
|
||||
APR_CONF_OPTS = --disable-sctp
|
||||
|
||||
# avoid apr_hints.m4 by setting apr_preload_done=yes and set
|
||||
# the needed CFLAGS on our own (avoids '-D_REENTRANT' in case
|
||||
# not supported by toolchain and subsequent configure failure)
|
||||
@@ -27,6 +31,7 @@ APR_CONF_ENV = \
|
||||
CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \
|
||||
CFLAGS="$(APR_CFLAGS)" \
|
||||
ac_cv_file__dev_zero=yes \
|
||||
ac_cv_mmap__dev_zero=yes \
|
||||
ac_cv_func_setpgrp_void=yes \
|
||||
apr_cv_process_shared_works=yes \
|
||||
apr_cv_mutex_robust_shared=no \
|
||||
@@ -34,6 +39,7 @@ APR_CONF_ENV = \
|
||||
ac_cv_sizeof_struct_iovec=8 \
|
||||
ac_cv_sizeof_pid_t=4 \
|
||||
ac_cv_struct_rlimit=yes \
|
||||
ac_cv_strerror_r_rc_int=no \
|
||||
ac_cv_o_nonblock_inherited=no \
|
||||
apr_cv_mutex_recursive=yes \
|
||||
apr_cv_epoll=yes \
|
||||
|
||||
@@ -1,79 +0,0 @@
|
||||
# --- T2-COPYRIGHT-NOTE-BEGIN ---
|
||||
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
|
||||
#
|
||||
# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone
|
||||
# Copyright (C) 2006 The T2 SDE Project
|
||||
#
|
||||
# More information can be found in the files COPYING and README.
|
||||
#
|
||||
# This patch file is dual-licensed. It is available under the license the
|
||||
# patched project is licensed under, as long as it is an OpenSource license
|
||||
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
|
||||
# of the GNU General Public License as published by the Free Software
|
||||
# Foundation; either version 2 of the License, or (at your option) any later
|
||||
# version.
|
||||
# --- T2-COPYRIGHT-NOTE-END ---
|
||||
|
||||
|
||||
No __THROW in function implementation.
|
||||
--jsaw
|
||||
|
||||
--- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100
|
||||
+++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100
|
||||
@@ -560,17 +560,17 @@
|
||||
# endif
|
||||
|
||||
# ifndef ARGP_EI
|
||||
-# define ARGP_EI extern __inline__
|
||||
+# define ARGP_EI extern inline
|
||||
# endif
|
||||
|
||||
ARGP_EI void
|
||||
-__argp_usage (__const struct argp_state *__state) __THROW
|
||||
+__argp_usage (__const struct argp_state *__state)
|
||||
{
|
||||
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
|
||||
}
|
||||
|
||||
ARGP_EI int
|
||||
-__option_is_short (__const struct argp_option *__opt) __THROW
|
||||
+__option_is_short (__const struct argp_option *__opt)
|
||||
{
|
||||
if (__opt->flags & OPTION_DOC)
|
||||
return 0;
|
||||
@@ -582,7 +582,7 @@
|
||||
}
|
||||
|
||||
ARGP_EI int
|
||||
-__option_is_end (__const struct argp_option *__opt) __THROW
|
||||
+__option_is_end (__const struct argp_option *__opt)
|
||||
{
|
||||
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
|
||||
}
|
||||
--- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100
|
||||
+++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100
|
||||
@@ -1290,13 +1290,13 @@
|
||||
/* Defined here, in case a user is not inlining the definitions in
|
||||
* argp.h */
|
||||
void
|
||||
-__argp_usage (__const struct argp_state *__state) __THROW
|
||||
+__argp_usage (__const struct argp_state *__state)
|
||||
{
|
||||
__argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE);
|
||||
}
|
||||
|
||||
int
|
||||
-__option_is_short (__const struct argp_option *__opt) __THROW
|
||||
+__option_is_short (__const struct argp_option *__opt)
|
||||
{
|
||||
if (__opt->flags & OPTION_DOC)
|
||||
return 0;
|
||||
@@ -1310,7 +1310,7 @@
|
||||
}
|
||||
|
||||
int
|
||||
-__option_is_end (__const struct argp_option *__opt) __THROW
|
||||
+__option_is_end (__const struct argp_option *__opt)
|
||||
{
|
||||
return !__opt->key && !__opt->name && !__opt->doc && !__opt->group;
|
||||
}
|
||||
@@ -1,45 +0,0 @@
|
||||
Subject: restrict value range passed to isprint function
|
||||
|
||||
According to C standards isprint argument shall be representable as an
|
||||
unsigned char or be equal to EOF, otherwise the behaviour is undefined.
|
||||
|
||||
Passing arbitrary ints leads to segfault in nm program from elfutils.
|
||||
|
||||
Restrict isprint argument range to values representable by unsigned char.
|
||||
|
||||
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
|
||||
---
|
||||
Index: b/argp.h
|
||||
===================================================================
|
||||
--- a/argp.h
|
||||
+++ b/argp.h
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
+#include <limits.h>
|
||||
|
||||
#define __need_error_t
|
||||
#include <errno.h>
|
||||
@@ -577,7 +578,7 @@
|
||||
else
|
||||
{
|
||||
int __key = __opt->key;
|
||||
- return __key > 0 && isprint (__key);
|
||||
+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
|
||||
}
|
||||
}
|
||||
|
||||
Index: b/argp-parse.c
|
||||
===================================================================
|
||||
--- a/argp-parse.c
|
||||
+++ b/argp-parse.c
|
||||
@@ -1292,7 +1292,7 @@
|
||||
int __key = __opt->key;
|
||||
/* FIXME: whether or not a particular key implies a short option
|
||||
* ought not to be locale dependent. */
|
||||
- return __key > 0 && isprint (__key);
|
||||
+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,68 +0,0 @@
|
||||
From b2dfa011a3fdcb7d22764d143517d0fbd1c2a201 Mon Sep 17 00:00:00 2001
|
||||
From: Emmanuel Dreyfus <manu@netbsd.org>
|
||||
Date: Wed, 22 Jan 2014 14:47:23 +0100
|
||||
Subject: [PATCH] Fix build with c99 compilers
|
||||
|
||||
BUG: 764655
|
||||
Change-Id: If5dfdc9c7427bd3d39d8da8f79e33ae2da6a3137
|
||||
Signed-off-by: Emmanuel Dreyfus <manu@netbsd.org>
|
||||
Reviewed-on: http://review.gluster.org/6034
|
||||
Reviewed-by: Harshavardhana <harsha@harshavardhana.net>
|
||||
Tested-by: Gluster Build System <jenkins@build.gluster.com>
|
||||
---
|
||||
|
||||
diff --git a/argp-fmtstream.c b/argp-fmtstream.c
|
||||
index 7f79285..494b6b3 100644
|
||||
--- a/argp-fmtstream.c
|
||||
+++ b/argp-fmtstream.c
|
||||
@@ -389,6 +389,7 @@
|
||||
weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf)
|
||||
#endif
|
||||
|
||||
+#if __STDC_VERSION__ - 199900L < 1
|
||||
/* Duplicate the inline definitions in argp-fmtstream.h, for compilers
|
||||
* that don't do inlining. */
|
||||
size_t
|
||||
@@ -471,5 +472,6 @@
|
||||
__argp_fmtstream_update (__fs);
|
||||
return __fs->point_col >= 0 ? __fs->point_col : 0;
|
||||
}
|
||||
+#endif /* __STDC_VERSION__ - 199900L < 1 */
|
||||
|
||||
#endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */
|
||||
diff --git a/argp-fmtstream.h b/argp-fmtstream.h
|
||||
index e797b11..828f435 100644
|
||||
--- a/argp-fmtstream.h
|
||||
+++ b/argp-fmtstream.h
|
||||
@@ -153,6 +153,7 @@
|
||||
__const char *__fmt, ...)
|
||||
PRINTF_STYLE(2,3);
|
||||
|
||||
+#if __STDC_VERSION__ - 199900L < 1
|
||||
extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
|
||||
extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch);
|
||||
|
||||
@@ -163,6 +164,7 @@
|
||||
__const char *__str, size_t __len);
|
||||
extern size_t argp_fmtstream_write (argp_fmtstream_t __fs,
|
||||
__const char *__str, size_t __len);
|
||||
+#endif /* __STDC_VERSION__ - 199900L < 1 */
|
||||
|
||||
/* Access macros for various bits of state. */
|
||||
#define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin)
|
||||
@@ -172,6 +174,7 @@
|
||||
#define __argp_fmtstream_rmargin argp_fmtstream_rmargin
|
||||
#define __argp_fmtstream_wmargin argp_fmtstream_wmargin
|
||||
|
||||
+#if __STDC_VERSION__ - 199900L < 1
|
||||
/* Set __FS's left margin to LMARGIN and return the old value. */
|
||||
extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs,
|
||||
size_t __lmargin);
|
||||
@@ -193,6 +196,7 @@
|
||||
/* Return the column number of the current output point in __FS. */
|
||||
extern size_t argp_fmtstream_point (argp_fmtstream_t __fs);
|
||||
extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs);
|
||||
+#endif /* __STDC_VERSION__ - 199900L < 1 */
|
||||
|
||||
/* Internal routines. */
|
||||
extern void _argp_fmtstream_update (argp_fmtstream_t __fs);
|
||||
@@ -5,4 +5,4 @@ config BR2_PACKAGE_ARGP_STANDALONE
|
||||
help
|
||||
Glibc hierarchical argument parsing standalone library.
|
||||
|
||||
http://www.lysator.liu.se/~nisse/misc/
|
||||
https://github.com/ericonr/argp-standalone/
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# Locally calculated after checking pgp signature
|
||||
sha256 dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be argp-standalone-1.3.tar.gz
|
||||
sha256 879d76374424dce051b812f16f43c6d16de8dbaddd76002f83fd1b6e57d39e0b argp-standalone-1.4.1.tar.gz
|
||||
|
||||
# License file
|
||||
sha256 bbb8919aa520069b0234faf5e83a94052d278419ffe97ca8e843ecc9b212d1ab argp.h
|
||||
sha256 b5db0353a5b1902fc8a2e055d8899dd0c189ce73a31e67af9a0ffc24711b63f0 README.md
|
||||
|
||||
@@ -4,14 +4,19 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ARGP_STANDALONE_VERSION = 1.3
|
||||
ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive
|
||||
ARGP_STANDALONE_VERSION = 1.4.1
|
||||
ARGP_STANDALONE_SITE = \
|
||||
$(call github,ericonr,argp-standalone,$(ARGP_STANDALONE_VERSION))
|
||||
ARGP_STANDALONE_INSTALL_STAGING = YES
|
||||
ARGP_STANDALONE_LICENSE = LGPL-2.0+
|
||||
ARGP_STANDALONE_LICENSE_FILES = argp.h
|
||||
ARGP_STANDALONE_LICENSE = LGPL-2.1+
|
||||
ARGP_STANDALONE_LICENSE_FILES = README.md
|
||||
# From git
|
||||
ARGP_STANDALONE_AUTORECONF = YES
|
||||
ARGP_STANDALONE_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
|
||||
|
||||
ARGP_STANDALONE_CONF_ENV = \
|
||||
CFLAGS="$(TARGET_CFLAGS) -fPIC -fgnu89-inline"
|
||||
CFLAGS="$(TARGET_CFLAGS) -fPIC -fgnu89-inline" \
|
||||
LIBS=$(TARGET_NLS_LIBS)
|
||||
|
||||
define ARGP_STANDALONE_INSTALL_STAGING_CMDS
|
||||
$(INSTALL) -D $(@D)/libargp.a $(STAGING_DIR)/usr/lib/libargp.a
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# computed by luarocks/buildroot
|
||||
sha256 ea30d0643586a20aeb6349ca8cb7db63aefc21d9aa007c7b7168a7c564817879 argparse-0.7.1-1.src.rock
|
||||
sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.1/LICENSE
|
||||
sha256 ea30d0643586a20aeb6349ca8cb7db63aefc21d9aa007c7b7168a7c564817879 argparse-0.7.1-1.src.rock
|
||||
sha256 9a918f21485b2a4529c901491d9101392f03586d65ad5b024a4445ebc1dc37b4 argparse-0.7.1/LICENSE
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
# From http://qosient.com/argus/src/argus-3.0.8.2.tar.gz.md5
|
||||
md5 eaf5f5ec66569e556392802a70ef9ca5 argus-3.0.8.2.tar.gz
|
||||
md5 eaf5f5ec66569e556392802a70ef9ca5 argus-3.0.8.2.tar.gz
|
||||
|
||||
# Locally computed
|
||||
sha256 ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff argus-3.0.8.2.tar.gz
|
||||
sha256 c68221f7207486bfce863fada4ba9b2aaf4adc9e1c672f965ae98e88143e5f16 README
|
||||
sha256 ca4e3bd5b9d4a8ff7c01cc96d1bffd46dbd6321237ec94c52f8badd51032eeff argus-3.0.8.2.tar.gz
|
||||
sha256 c68221f7207486bfce863fada4ba9b2aaf4adc9e1c672f965ae98e88143e5f16 README
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
# Locally calculated
|
||||
sha256 ac952d89ae0fc3543e81099e7d34917efc621f5def112eee843fd1ce755eca8c gcc-arm-9.2-2019.12-x86_64-arm-none-eabi.tar.xz
|
||||
@@ -1,26 +0,0 @@
|
||||
################################################################################
|
||||
#
|
||||
# arm-gnu-a-toolchain
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ARM_GNU_A_TOOLCHAIN_VERSION = 9.2-2019.12
|
||||
ARM_GNU_A_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-a/$(ARM_GNU_A_TOOLCHAIN_VERSION)/binrel
|
||||
ARM_GNU_A_TOOLCHAIN_SOURCE = gcc-arm-$(ARM_GNU_A_TOOLCHAIN_VERSION)-x86_64-arm-none-eabi.tar.xz
|
||||
ARM_GNU_A_TOOLCHAIN_LICENSE = GPL-3.0+
|
||||
|
||||
HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi
|
||||
|
||||
define HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_CMDS
|
||||
rm -rf $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR)
|
||||
mkdir -p $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR)
|
||||
cp -rf $(@D)/* $(HOST_ARM_GNU_A_TOOLCHAIN_INSTALL_DIR)/
|
||||
|
||||
mkdir -p $(HOST_DIR)/bin
|
||||
cd $(HOST_DIR)/bin && \
|
||||
for i in ../opt/gcc-arm-none-eabi/bin/*; do \
|
||||
ln -sf $$i; \
|
||||
done
|
||||
endef
|
||||
|
||||
$(eval $(host-generic-package))
|
||||
2
package/arm-gnu-toolchain/arm-gnu-toolchain.hash
Normal file
2
package/arm-gnu-toolchain/arm-gnu-toolchain.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 97dbb4f019ad1650b732faffcc881689cedc14e2b7ee863d390e0a41ef16c9a3 gcc-arm-none-eabi-10.3-2021.10-x86_64-linux.tar.bz2
|
||||
26
package/arm-gnu-toolchain/arm-gnu-toolchain.mk
Normal file
26
package/arm-gnu-toolchain/arm-gnu-toolchain.mk
Normal file
@@ -0,0 +1,26 @@
|
||||
################################################################################
|
||||
#
|
||||
# arm-gnu-toolchain
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ARM_GNU_TOOLCHAIN_VERSION = 10.3-2021.10
|
||||
ARM_GNU_TOOLCHAIN_SITE = https://developer.arm.com/-/media/Files/downloads/gnu-rm/$(ARM_GNU_TOOLCHAIN_VERSION)
|
||||
ARM_GNU_TOOLCHAIN_SOURCE = gcc-arm-none-eabi-$(ARM_GNU_TOOLCHAIN_VERSION)-x86_64-linux.tar.bz2
|
||||
ARM_GNU_TOOLCHAIN_LICENSE = GPL-3.0+
|
||||
|
||||
HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR = $(HOST_DIR)/opt/gcc-arm-none-eabi
|
||||
|
||||
define HOST_ARM_GNU_TOOLCHAIN_INSTALL_CMDS
|
||||
rm -rf $(HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR)
|
||||
mkdir -p $(HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR)
|
||||
cp -rf $(@D)/* $(HOST_ARM_GNU_TOOLCHAIN_INSTALL_DIR)/
|
||||
|
||||
mkdir -p $(HOST_DIR)/bin
|
||||
cd $(HOST_DIR)/bin && \
|
||||
for i in ../opt/gcc-arm-none-eabi/bin/*; do \
|
||||
ln -sf $$i; \
|
||||
done
|
||||
endef
|
||||
|
||||
$(eval $(host-generic-package))
|
||||
@@ -18,6 +18,16 @@ config BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6256
|
||||
help
|
||||
Firmware files for AP6256 WiFi/BT combo chip.
|
||||
|
||||
config BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6255
|
||||
bool "AP6255 WiFi/BT"
|
||||
help
|
||||
Firmware files for AP6255 WiFi/BT combo chip.
|
||||
|
||||
config BR2_PACKAGE_ARMBIAN_FIRMWARE_RTL8822CS
|
||||
bool "Realtek 8822CS SDIO WiFi/BT"
|
||||
help
|
||||
Firmware files for Realtek 8822CS SDIO combo chip.
|
||||
|
||||
config BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819
|
||||
bool "XR819 WiFi"
|
||||
help
|
||||
|
||||
@@ -1,2 +1,2 @@
|
||||
# Locally calculated
|
||||
sha256 a370a6aeb30f12a17f8d47c81a4d81aa822b9408589305a4d6a67d544280520d armbian-firmware-70a08503ac9e765f5d1ccf4fa3e825db0751e53e-br1.tar.gz
|
||||
sha256 725b1f65a5947f053a593f917f91c6634d496c92af6180845cc3679d1377ab79 armbian-firmware-5d685ad233b4dfd03a4d025fa0061f6b0f850cb3-br1.tar.gz
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ARMBIAN_FIRMWARE_VERSION = 70a08503ac9e765f5d1ccf4fa3e825db0751e53e
|
||||
ARMBIAN_FIRMWARE_VERSION = 5d685ad233b4dfd03a4d025fa0061f6b0f850cb3
|
||||
ARMBIAN_FIRMWARE_SITE = https://github.com/armbian/firmware
|
||||
ARMBIAN_FIRMWARE_SITE_METHOD = git
|
||||
|
||||
@@ -21,6 +21,29 @@ ARMBIAN_FIRMWARE_FILES += \
|
||||
brcm/brcmfmac43456-sdio.txt
|
||||
endif
|
||||
|
||||
# AP6255 WiFi/BT combo firmware
|
||||
ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_AP6255),y)
|
||||
ARMBIAN_FIRMWARE_FILES += \
|
||||
BCM4345C0.hcd \
|
||||
fw_bcm43455c0_ag.bin \
|
||||
fw_bcm43455c0_ag_apsta.bin \
|
||||
fw_bcm43455c0_ag_p2p.bin \
|
||||
nvram_ap6255.txt \
|
||||
brcm/brcmfmac43455-sdio.bin \
|
||||
brcm/brcmfmac43455-sdio.clm_blob \
|
||||
brcm/brcmfmac43455-sdio.txt \
|
||||
brcm/config.txt
|
||||
endif
|
||||
|
||||
# Realtek 8822CS SDIO WiFi/BT combo firmware
|
||||
ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_RTL8822CS),y)
|
||||
ARMBIAN_FIRMWARE_FILES += \
|
||||
rtlbt/rtl8822cs_config \
|
||||
rtlbt/rtl8822cs_fw \
|
||||
rtl_bt/rtl8822cs_config.bin \
|
||||
rtl_bt/rtl8822cs_fw.bin
|
||||
endif
|
||||
|
||||
# XR819 WiFi firmware
|
||||
ifeq ($(BR2_PACKAGE_ARMBIAN_FIRMWARE_XR819),y)
|
||||
ARMBIAN_FIRMWARE_FILES += \
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
# Locally calculated
|
||||
sha256 e03c36e4933c655bd0e4a841272554a347cd0136faf42c4a6564059e0761c039 arp-scan-1.9.7.tar.gz
|
||||
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING
|
||||
sha256 a078fe8711ecbb8b99121c3d8be26ae7e7f339f11010ef61318be4f33394d012 arp-scan-1.10.0.tar.gz
|
||||
sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 COPYING
|
||||
|
||||
@@ -4,17 +4,23 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
ARP_SCAN_VERSION = 1.9.7
|
||||
ARP_SCAN_SITE = $(call github,royhills,arp-scan,$(ARP_SCAN_VERSION))
|
||||
ARP_SCAN_VERSION = 1.10.0
|
||||
ARP_SCAN_SITE = https://github.com/royhills/arp-scan/releases/download/$(ARP_SCAN_VERSION)
|
||||
ARP_SCAN_LICENSE = GPL-3.0+
|
||||
ARP_SCAN_LICENSE_FILES = COPYING
|
||||
ARP_SCAN_DEPENDENCIES = libpcap
|
||||
ARP_SCAN_AUTORECONF = YES
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS),y)
|
||||
ARP_SCAN_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
|
||||
ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
|
||||
endif
|
||||
|
||||
ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld'
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBCAP),y)
|
||||
ARP_SCAN_DEPENDENCIES += libcap
|
||||
ARP_SCAN_CONF_OPTS += --with-libcap
|
||||
else
|
||||
ARP_SCAN_CONF_OPTS += --without-libcap
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From cbf84a0bc377c6a368d30571f37ebfab27784697 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?J=C3=B6rg=20Krause?= <joerg.krause@embedded.rocks>
|
||||
Date: Wed, 2 Dec 2015 04:57:33 +0100
|
||||
Subject: [PATCH 4/4] Fix musl build issue
|
||||
Subject: [PATCH] Fix musl build issue
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
From 7d8285ae92253017a15282dd25f76d76eed49518 Mon Sep 17 00:00:00 2001
|
||||
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
Date: Thu, 21 Apr 2022 13:43:23 +0200
|
||||
Subject: [PATCH] libarptc/libarptc_incl.c: fix build with -O0
|
||||
|
||||
Fix the following build failure with -O0:
|
||||
|
||||
libarptc/libarptc.c:48:21: error: redefinition of 'arpt_get_target'
|
||||
48 | #define GET_TARGET arpt_get_target
|
||||
| ^~~~~~~~~~~~~~~
|
||||
libarptc/libarptc_incl.c:16:1: note: in expansion of macro 'GET_TARGET'
|
||||
16 | GET_TARGET(STRUCT_ENTRY *e)
|
||||
| ^~~~~~~~~~
|
||||
In file included from .//include/libarptc/libarptc.h:7,
|
||||
from libarptc/libarptc.c:26:
|
||||
.//include/linux/netfilter_arp/arp_tables.h:196:43: note: previous definition of 'arpt_get_target' was here
|
||||
196 | static __inline__ struct xt_entry_target *arpt_get_target(struct arpt_entry *e)
|
||||
| ^~~~~~~~~~~~~~~
|
||||
|
||||
Fixes:
|
||||
- http://autobuild.buildroot.org/results/730dce4101e7afcee233067e2870603cd64b8a48
|
||||
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
libarptc/libarptc_incl.c | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/libarptc/libarptc_incl.c b/libarptc/libarptc_incl.c
|
||||
index c4d5de3..441f2de 100644
|
||||
--- a/libarptc/libarptc_incl.c
|
||||
+++ b/libarptc/libarptc_incl.c
|
||||
@@ -11,14 +11,6 @@
|
||||
/* (C)1999 Paul ``Rusty'' Russell - Placed under the GNU GPL (See
|
||||
COPYING for details). */
|
||||
|
||||
-#ifndef __OPTIMIZE__
|
||||
-STRUCT_ENTRY_TARGET *
|
||||
-GET_TARGET(STRUCT_ENTRY *e)
|
||||
-{
|
||||
- return (void *)e + e->target_offset;
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
static int sockfd = -1;
|
||||
static void *arptc_fn = NULL;
|
||||
|
||||
--
|
||||
2.35.1
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
# From http://ftp.netfilter.org/pub/arptables/arptables-0.0.5.tar.gz.sha256sum
|
||||
sha256 4f9a0656ce5c90868f551cd4deeb2d04f33899667e1fb2818b64e432fe8f629c arptables-0.0.5.tar.gz
|
||||
sha256 4f9a0656ce5c90868f551cd4deeb2d04f33899667e1fb2818b64e432fe8f629c arptables-0.0.5.tar.gz
|
||||
|
||||
# Hash for license file
|
||||
sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING
|
||||
sha256 ebdb8ae564c952792017ec680e2edd30443642216eb9f8a3d8fa166c0cb628c1 COPYING
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user