summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/kernel-vars.mk2
-rw-r--r--package/asterisk/Makefile4
-rw-r--r--package/barebox/Makefile18
-rw-r--r--package/git/Makefile4
-rw-r--r--package/irssi/Makefile9
-rw-r--r--package/strace/Makefile4
-rw-r--r--package/toolbox/src/lib/fgetln.h1
-rw-r--r--package/toolbox/src/sed/main.c1
-rw-r--r--package/tor/Makefile8
-rw-r--r--package/u-boot/Makefile10
-rw-r--r--target/aarch64/Makefile2
-rw-r--r--target/arm/systems/st-stm32f746g1
-rw-r--r--target/config/Config.in.binutils6
-rw-r--r--target/config/Config.in.tools4
-rw-r--r--toolchain/binutils/Makefile.inc7
-rw-r--r--toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch38
-rw-r--r--toolchain/mpfr/Makefile.inc4
17 files changed, 93 insertions, 30 deletions
diff --git a/mk/kernel-vars.mk b/mk/kernel-vars.mk
index 475353d6f..ccb090d9d 100644
--- a/mk/kernel-vars.mk
+++ b/mk/kernel-vars.mk
@@ -27,7 +27,7 @@ ifneq ($(OS_FOR_BUILD),Linux)
KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) ${HOST_CFLAGS}'
KERNEL_MAKE_OPTS+= HOST_EXTRACFLAGS='-I${LINUX_DIR}/tools/include -I${LINUX_DIR}/usr/include -I${LINUX_DIR}/security/selinux/include -I${ADK_TOPDIR}/adk/include -I${LINUX_DIR}/scripts/dtc/libfdt -DKBUILD_NO_NLS'
else
-KERNEL_MAKE_OPTS+= HOSTCFLAGS='${HOST_CFLAGS}'
+KERNEL_MAKE_OPTS+= HOSTCFLAGS='$(HOST_CPPFLAGS) $(HOST_CFLAGS)'
endif
ifneq ($(ADK_TARGET_KERNEL_LOADADDR),)
diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 5d9f10881..ced4fbacc 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= asterisk
-PKG_VERSION:= 20.11.1
+PKG_VERSION:= 22.3.0
PKG_RELEASE:= 1
-PKG_HASH:= 5ad25c136c7772f0ad10ae02d59f19b32c0cf64027278e3de6a6314ee24d5ff9
+PKG_HASH:= 9cd9a29db5ebff861431f85b317a1f8263d49587f596886df1fcd298bd545593
PKG_DESCR:= open source pbx
PKG_SECTION:= net/voip
PKG_DEPENDS:= libncurses libcurl libopenssl libedit libuuid libjansson
diff --git a/package/barebox/Makefile b/package/barebox/Makefile
index b4490f1d6..6a78a32c4 100644
--- a/package/barebox/Makefile
+++ b/package/barebox/Makefile
@@ -4,15 +4,17 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= barebox
-PKG_VERSION:= 2019.09.0
+PKG_VERSION:= 2025.03.0
PKG_RELEASE:= 1
-PKG_HASH:= beab6bdba2466bece57d23834daf4f0d530a594efc11ca0ddb69372981e6e159
+PKG_HASH:= 0bf7118004e445bdd57feeef89ee9064982acc221e8a046c4a7994d3da6da2ec
PKG_DESCR:= portable bootloader
PKG_SECTION:= base/boot
PKG_BUILDDEP:= lzop-host
PKG_URL:= http://www.barebox.org
PKG_SITES:= http://www.barebox.org/download/
+PKG_ARCH_DEPENDS:= aarch64 arm mips or1k ppc riscv32 riscv64 x86_64
+
DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include $(ADK_TOPDIR)/mk/package.mk
@@ -25,15 +27,19 @@ BUILD_STYLE:= manual
INSTALL_STYLE:= manual
BAREBOX_ARCH:= $(ADK_TARGET_ARCH)
-ifeq ($(ADK_TARGET_ARCH_X86),y)
-CONFIG:= efi_defconfig
-endif
ifeq ($(ADK_TARGET_ARCH_X86_64),y)
CONFIG:= efi_defconfig
BAREBOX_ARCH:= x86
+BAREBOX:= barebox.efi
endif
ifeq ($(ADK_TARGET_SYSTEM_QEMU_MIPS),y)
+ifeq ($(ADK_TARGET_LITTLE_ENDIAN),y)
+CONFIG:= qemu-maltael_defconfig
+BAREBOX:= images/barebox-qemu-malta.img.swapped
+else
CONFIG:= qemu-malta_defconfig
+BAREBOX:= images/barebox-qemu-malta.img
+endif
endif
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y)
CONFIG:= vexpress_ca9_defconfig
@@ -53,6 +59,6 @@ do-build:
$(MAKE))
barebox-install:
- $(CP) $(WRKBUILD)/barebox.bin $(FW_DIR)
+ $(CP) $(WRKBUILD)/$(BAREBOX) $(FW_DIR)
include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/git/Makefile b/package/git/Makefile
index 7e520abee..9710bfc36 100644
--- a/package/git/Makefile
+++ b/package/git/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= git
-PKG_VERSION:= 2.47.0
+PKG_VERSION:= 2.49.0
PKG_RELEASE:= 1
-PKG_HASH:= 1ce114da88704271b43e027c51e04d9399f8c88e9ef7542dae7aebae7d87bc4e
+PKG_HASH:= 618190cf590b7e9f6c11f91f23b1d267cd98c3ab33b850416d8758f8b5a85628
PKG_DESCR:= fast version control system
PKG_SECTION:= dev/scm
PKG_BUILDDEP:= zlib curl expat
diff --git a/package/irssi/Makefile b/package/irssi/Makefile
index 66bc9344e..3e656877e 100644
--- a/package/irssi/Makefile
+++ b/package/irssi/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= irssi
-PKG_VERSION:= 1.4.4
+PKG_VERSION:= 1.4.5
PKG_RELEASE:= 1
-PKG_HASH:= fefe9ec8c7b1475449945c934a2360ab12693454892be47a6d288c63eb107ead
+PKG_HASH:= 72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062
PKG_DESCR:= irc text client
PKG_SECTION:= app/chat
PKG_DEPENDS:= glib libncurses
@@ -14,7 +14,10 @@ PKG_BUILDDEP:= glib ncurses
PKG_URL:= http://www.irssi.org/
PKG_SITES:= https://github.com/irssi/irssi/releases/download/$(PKG_VERSION)/
-PKG_CHOICES_IRSSI:= WITH_LIBRESSL WITHOUT_SSL
+PKG_CHOICES_IRSSI:= WITH_OPENSSL WITH_LIBRESSL WITHOUT_SSL
+PKGCD_WITH_OPENSSL:= use openssl for crypto
+PKGCB_WITH_OPENSSL:= openssl
+PKGCS_WITH_OPENSSL:= openssl
PKGCD_WITH_LIBRESSL:= use libressl for crypto
PKGCB_WITH_LIBRESSL:= libressl
PKGCS_WITH_LIBRESSL:= libressl
diff --git a/package/strace/Makefile b/package/strace/Makefile
index f32f720af..aaf1a6a04 100644
--- a/package/strace/Makefile
+++ b/package/strace/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= strace
-PKG_VERSION:= 6.13
+PKG_VERSION:= 6.14
PKG_RELEASE:= 1
-PKG_HASH:= e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17
+PKG_HASH:= 244f3b5c20a32854ca9b7ca7a3ee091dd3d4bd20933a171ecee8db486c77d3c9
PKG_DESCR:= system call trace program
PKG_SECTION:= app/debug
PKG_URL:= https://strace.io
diff --git a/package/toolbox/src/lib/fgetln.h b/package/toolbox/src/lib/fgetln.h
new file mode 100644
index 000000000..ae655c23d
--- /dev/null
+++ b/package/toolbox/src/lib/fgetln.h
@@ -0,0 +1 @@
+char *fgetln(FILE *, size_t *);
diff --git a/package/toolbox/src/sed/main.c b/package/toolbox/src/sed/main.c
index afa10d4df..1d9e3ebaa 100644
--- a/package/toolbox/src/sed/main.c
+++ b/package/toolbox/src/sed/main.c
@@ -53,6 +53,7 @@
#include "defs.h"
#include "extern.h"
+#include "fgetln.h"
__RCSID("$MirOS: src/usr.bin/sed/main.c,v 1.3 2017/11/20 01:23:57 tg Exp $");
diff --git a/package/tor/Makefile b/package/tor/Makefile
index fc690de3d..39735dcd5 100644
--- a/package/tor/Makefile
+++ b/package/tor/Makefile
@@ -4,13 +4,13 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= tor
-PKG_VERSION:= 0.4.8.10
+PKG_VERSION:= 0.4.8.16
PKG_RELEASE:= 1
-PKG_HASH:= e628b4fab70edb4727715b23cf2931375a9f7685ac08f2c59ea498a178463a86
+PKG_HASH:= 6540dd377a120fb8e7d27530aa3b7ff72a0fa5b4f670fe1d64c987c1cfd390cb
PKG_DESCR:= anonymous internet communication system
PKG_SECTION:= net/proxy
-PKG_DEPENDS:= libevent zlib libressl
-PKG_BUILDDEP:= libevent zlib libressl
+PKG_DEPENDS:= libevent zlib libopenssl
+PKG_BUILDDEP:= libevent zlib openssl
PKG_NEEDS:= threads
PKG_URL:= https://www.torproject.org/
PKG_SITES:= https://www.torproject.org/dist/
diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile
index bf97764b2..054904da0 100644
--- a/package/u-boot/Makefile
+++ b/package/u-boot/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= u-boot
-PKG_VERSION:= 2024.07
+PKG_VERSION:= 2025.01
PKG_RELEASE:= 1
-PKG_HASH:= f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f
+PKG_HASH:= cdef7d507c93f1bbd9f015ea9bc21fa074268481405501945abc6f854d5b686f
PKG_DESCR:= portable bootloader
PKG_SECTION:= base/boot
HOST_BUILDDEP:= gnutls-host openssl-host dtc-host swig-host python3-host python-setuptools-host
@@ -91,6 +91,8 @@ CONFIG:= starfive_visionfive2_defconfig
UBOOT:= u-boot.itb
endif
+MAKE_FLAGS+= HOSTCFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \
+ HOSTLDFLAGS="$(HOST_LDFLAGS)"
HOST_MAKE_FLAGS+= HOSTCFLAGS="$(HOST_CPPFLAGS) $(HOST_CFLAGS)" \
HOSTLDFLAGS="$(HOST_LDFLAGS) -ldl"
HOST_STYLE:= manual
@@ -104,9 +106,9 @@ endif
host-build:
(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
- $(HOST_MAKE_FLAGS) sandbox_defconfig )
+ $(HOST_MAKE_FLAGS) tools-only_defconfig )
(cd $(WRKBUILD) && env $(HOST_MAKE_ENV) $(MAKE) -f $(MAKE_FILE) \
- $(HOST_MAKE_FLAGS) tools $(MAKE_TRACE) )
+ $(HOST_MAKE_FLAGS) tools-only $(MAKE_TRACE) )
u-boot-hostinstall:
$(INSTALL_BIN) $(WRKBUILD)/tools/mk{,env}image \
diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile
index a461cf4d3..e81b4dec5 100644
--- a/target/aarch64/Makefile
+++ b/target/aarch64/Makefile
@@ -9,9 +9,7 @@ KERNEL:=${LINUX_DIR}/arch/arm64/boot/Image
QEMU_ARGS:=${ADK_QEMU_ARGS}
QEMU_ARGS+=-M virt -cpu cortex-a57 -smp 1
-ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y)
QEMU_ARGS+=-netdev user,id=eth0 -device virtio-net-device,netdev=eth0
-endif
ifeq ($(ADK_TARGET_FS),archive)
QEMU_ARGS+=-device virtio-blk-device,drive=vda -drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=none,id=vda,format=raw
endif
diff --git a/target/arm/systems/st-stm32f746g b/target/arm/systems/st-stm32f746g
index 4b87b9340..eb68dbfe4 100644
--- a/target/arm/systems/st-stm32f746g
+++ b/target/arm/systems/st-stm32f746g
@@ -4,6 +4,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F746G
select ADK_TARGET_LITTLE_ENDIAN
select ADK_TARGET_CPU_ARM_CORTEX_M7
select ADK_TARGET_ARCH_ARM_WITH_THUMB
+ select ADK_TARGET_SOFT_FLOAT
select ADK_TARGET_WITH_SERIAL
select ADK_TARGET_UCLINUX
select ADK_TARGET_KERNEL_WITH_COMPRESSION
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index cf11a76c9..3e141d4d6 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -8,6 +8,7 @@ default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_CPU_ARC_ARC64
default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32
default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX
default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32
+default ADK_TOOLCHAIN_BINUTILS_2_26 if ADK_TARGET_ARCH_BFIN && ADK_TARGET_BINFMT_FDPIC
default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_NIOS2
default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_X86_64
default ADK_TOOLCHAIN_BINUTILS_2_44
@@ -54,6 +55,11 @@ config ADK_TOOLCHAIN_BINUTILS_2_37
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_KVX
+config ADK_TOOLCHAIN_BINUTILS_2_26
+ bool "2.26"
+ depends on !ADK_TARGET_ARCH_AVR32
+ depends on !ADK_TARGET_ARCH_KVX
+
config ADK_TOOLCHAIN_BINUTILS_ARC
bool "arc-2023.09"
depends on ADK_TARGET_ARCH_ARC
diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools
index cdeeb90ed..d60b42a08 100644
--- a/target/config/Config.in.tools
+++ b/target/config/Config.in.tools
@@ -39,9 +39,9 @@ config ADK_HOST_BUILD_LIBTOOL
bool
default y
-config ADK_HOST_BUILD_LIBRESSL
+config ADK_HOST_BUILD_OPENSSL
bool
- default n
+ default y
config ADK_HOST_BUILD_PKGCONF
bool
diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc
index 9e9e9a4c4..1fcab41a2 100644
--- a/toolchain/binutils/Makefile.inc
+++ b/toolchain/binutils/Makefile.inc
@@ -58,6 +58,13 @@ PKG_HASH:= c44968b97cd86499efbc4b4ab7d98471f673e5414c554ef54afa930062dbbfcb
PKG_SITES:= ${MASTER_SITE_GNU:=binutils/}
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
endif
+ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_26),y)
+PKG_VERSION:= 2.26
+PKG_RELEASE:= 1
+PKG_HASH:= 9615feddaeedc214d1a1ecd77b6697449c952eab69d79ab2125ea050e944bcc1
+PKG_SITES:= ${MASTER_SITE_GNU:=binutils/}
+DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+endif
ifeq ($(ADK_TOOLCHAIN_BINUTILS_KVX),y)
PKG_VERSION:= 782547a4e2bdf1308728032853678ca69bb154ea
PKG_GIT:= hash
diff --git a/toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch b/toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch
new file mode 100644
index 000000000..074317a24
--- /dev/null
+++ b/toolchain/binutils/patches/2.26/0001-Relax-assertion-in-BFIN-linker-to-allow-for-discard-.patch
@@ -0,0 +1,38 @@
+From ed3056ebdb9795446157af03d3e08fbb93c1b01d Mon Sep 17 00:00:00 2001
+From: Nick Clifton <nickc@redhat.com>
+Date: Tue, 29 Mar 2016 10:24:16 +0100
+Subject: [PATCH] Relax assertion in BFIN linker to allow for discard GOT
+ relocs.
+
+ PR 17334
+ * elf32-bfin.c (elf32_bfinfdpic_finish_dynamic_sections): Relax
+ assertion on the size of the got section to allow it to be bigger
+ than the number of relocs.
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+---
+ bfd/elf32-bfin.c | 8 +++++++-
+ 2 files changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c
+index 7cc8b6d851e..b2fcf38b470 100644
+--- a/bfd/elf32-bfin.c
++++ b/bfd/elf32-bfin.c
+@@ -4457,7 +4457,13 @@ elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd,
+ if (bfinfdpic_got_section (info))
+ {
+ BFD_ASSERT (bfinfdpic_gotrel_section (info)->size
+- == (bfinfdpic_gotrel_section (info)->reloc_count
++ /* PR 17334: It appears that the GOT section can end up
++ being bigger than the number of relocs. Presumably
++ because some relocs have been deleted. A test case has
++ yet to be generated for verify this, but in the meantime
++ the test below has been changed from == to >= so that
++ applications can continue to be built. */
++ >= (bfinfdpic_gotrel_section (info)->reloc_count
+ * sizeof (Elf32_External_Rel)));
+
+ if (bfinfdpic_gotfixup_section (info))
+--
+2.39.5
+
diff --git a/toolchain/mpfr/Makefile.inc b/toolchain/mpfr/Makefile.inc
index 4aa9f0e9b..02641e48c 100644
--- a/toolchain/mpfr/Makefile.inc
+++ b/toolchain/mpfr/Makefile.inc
@@ -2,7 +2,7 @@
# material, please see the LICENCE file in the top-level directory.
PKG_NAME:= mpfr
-PKG_VERSION:= 4.2.1
+PKG_VERSION:= 4.2.2
PKG_RELEASE:= 1
-PKG_HASH:= 277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2
+PKG_HASH:= b67ba0383ef7e8a8563734e2e889ef5ec3c3b898a01d00fa0a6869ad81c6ce01
PKG_SITES:= http://www.mpfr.org/mpfr-current/
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-31 23:38:19 +0000