diff options
175 files changed, 1051 insertions, 575 deletions
@@ -75,7 +75,7 @@ source "target/linux/config/Config.in.compression" source "target/config/Config.in.cmdline" menu "Advanced Linux Kernel configuration" - visible if ADK_TARGET_OS_LINUX && ADK_TARGET_KERNEL_CUSTOMISING && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH && !ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG && !ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG + visible if ADK_TARGET_OS_LINUX && ADK_TARGET_KERNEL_CUSTOMISING && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH && !ADK_TARGET_LINUX_KERNEL_USE_DEFCONFIG && !ADK_TARGET_LINUX_KERNEL_USE_CUSTOMCONFIG && !ADK_TARGET_NO_KERNEL source "target/linux/Config.in" endmenu endmenu diff --git a/mk/build.mk b/mk/build.mk index 78a3e7709..aae4ffeca 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -33,8 +33,6 @@ DEFCONFIG= ADK_DEBUG=n \ ADK_TARGET_USE_SSP=n \ ADK_TOOLCHAIN_WITH_LTO=n \ ADK_TARGET_USE_LTO=n \ - ADK_TOOLCHAIN_WITH_GOLD=n \ - ADK_TARGET_USE_GOLD=n \ ADK_TARGET_USE_GNU_HASHSTYLE=n \ ADK_TARGET_USE_PIE=n \ ADK_TARGET_USE_STATIC_LIBS_ONLY=n \ @@ -181,9 +179,13 @@ ifeq ($(ADK_TARGET_OS_BAREMETAL),y) $(MAKE) -f mk/build.mk package/hostcompile toolchain/final endif ifeq ($(ADK_TARGET_OS_LINUX),y) +ifeq ($(ADK_TARGET_NO_KERNEL),y) + $(MAKE) -f mk/build.mk package/hostcompile toolchain/final package_clean package/compile root_clean package/install package_index +else $(MAKE) -f mk/build.mk package/hostcompile toolchain/final target/config-prepare target/compile package_clean package/compile root_clean package/install target/install package_index endif endif +endif package_index: ifeq ($(ADK_TARGET_PACKAGE_IPKG),y) diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 47278ac78..e8bcf6990 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,41 +15,41 @@ KERNEL_FILE_VER:= $(ADK_TARGET_LINUX_KERNEL_GIT) KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_11),y) -KERNEL_FILE_VER:= 6.11.3 +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) +KERNEL_FILE_VER:= 6.12.11 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 +KERNEL_HASH:= 475172fdbd87a153f123a57952672e773bdb6daf5b58a417d1a5e419fcfeec49 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) -KERNEL_FILE_VER:= 6.6.56 +KERNEL_FILE_VER:= 6.6.77 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 +KERNEL_HASH:= 081089dfcf125aef67aa940ebb995ff789b646129f5d4b2365e1d5685b29a84e endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y) -KERNEL_FILE_VER:= 6.1.107 +KERNEL_FILE_VER:= 6.1.127 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= f43229d1d73011fa0a37400320a26972946f8ff295c404c31c0dd0407228b0e8 +KERNEL_HASH:= 18b0d41d1a7fbad56045cde0d7fc176bfb18361d29c9f07e57109bbf21bf7876 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_15),y) -KERNEL_FILE_VER:= 5.15.165 +KERNEL_FILE_VER:= 5.15.177 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= a36dd3e82ceb634afded31f2656568f57c4d9c4b399859f298b18116df11c6fe +KERNEL_HASH:= ea9eb8088d4231f8a01b191ceef5f4d92238f6c7519f6fbcb57e448ee9e0a6e0 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_10),y) -KERNEL_FILE_VER:= 5.10.224 +KERNEL_FILE_VER:= 5.10.233 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 19b099c67324bba6378e22dc51ad3906e4dcd6a908d137766b4bfa9174ddd11a +KERNEL_HASH:= 239e57280f8c9159187e383d7b730d29f5cc8e1b30be218f004e0c90d1137f52 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y) -KERNEL_FILE_VER:= 5.4.282 +KERNEL_FILE_VER:= 5.4.289 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 5582770976d33bb7bf9494e0fa0c49f449aa02b0133d00a5a198b6c208dd7de0 +KERNEL_HASH:= 1e3e5fc052c8e15f8eaa37d30bf4f0b3eef7430dd234d9fed0d0005852a06d10 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) KERNEL_FILE_VER:= 4.19.320 diff --git a/mk/mirrors.mk b/mk/mirrors.mk index a8dc27f6a..dba447fec 100644 --- a/mk/mirrors.mk +++ b/mk/mirrors.mk @@ -12,8 +12,8 @@ MASTER_SITE_MIRBSD?= \ ifeq ($(ADK_TARGET_KERNEL_NO_MIRROR),) MASTER_SITE_KERNEL?= \ + https://www.kernel.org/pub/linux/ \ http://www.kernel.org/pub/linux/ \ - ftp://www.kernel.org/pub/linux/ \ else MASTER_SITE_KERNEL?= \ @@ -22,23 +22,8 @@ MASTER_SITE_KERNEL?= \ endif MASTER_SITE_GNU?= \ + https://ftp.gnu.org/gnu/ \ http://ftp.gnu.org/gnu/ \ - ftp://ftp.gnu.org/gnu/ \ - ftp://ftp.funet.fi/pub/gnu/prep/ \ - ftp://mirrors.usc.edu/pub/gnu/ \ - ftp://ftp.cs.tu-berlin.de/pub/gnu/ \ - ftp://aeneas.mit.edu/pub/gnu/ \ - ftp://mirrors.dotsrc.org/gnu/ \ - ftp://ftp.wustl.edu/pub/gnu/ \ - ftp://ftp.kddilabs.jp/GNU/ \ - ftp://ftp.mirror.ac.uk/sites/ftp.gnu.org/gnu/ \ - ftp://sunsite.org.uk/package/gnu/ \ - ftp://ftp.informatik.hu-berlin.de/pub/gnu/ \ - ftp://ftp.rediris.es/mirror/gnu/gnu/ \ - ftp://ftp.cs.univ-paris8.fr/mirrors/ftp.gnu.org/ \ - ftp://ftp.chg.ru/pub/gnu/ \ - ftp://ftp.uvsq.fr/pub/gnu/ \ - ftp://ftp.sunet.se/pub/gnu/ \ MASTER_SITE_SOURCEFORGE?= \ http://jaist.dl.sourceforge.net/sourceforge/ \ @@ -50,19 +35,10 @@ MASTER_SITE_SOURCEFORGE?= \ http://easynews.dl.sourceforge.net/sourceforge/ \ MASTER_SITE_MYSQL?= \ - ftp://ftp.fu-berlin.de/unix/databases/mysql/ \ http://sunsite.informatik.rwth-aachen.de/mysql/ \ + ftp://ftp.fu-berlin.de/unix/databases/mysql/ \ http://mysql.easynet.be/ \ MASTER_SITE_GNOME?= \ https://download.gnome.org/sources/ \ - ftp://ftp.gnome.org/pub/GNOME/sources/ \ - ftp://ftp.linux.org.uk/mirrors/ftp.gnome.org/sources/ \ - ftp://ftp.acc.umu.se/pub/GNOME/sources/ \ - ftp://ftp.rpmfind.net/linux/gnome.org/sources/ \ - ftp://ftp.unina.it/pub/linux/GNOME/sources/ \ - ftp://ftp.belnet.be/mirror/ftp.gnome.org/sources/ \ - ftp://ftp.dit.upm.es/linux/gnome/sources/ \ - ftp://ftp.dataplus.se/pub/linux/gnome/sources/ \ - ftp://ftp.cse.buffalo.edu/pub/Gnome/sources/ \ diff --git a/mk/vars.mk b/mk/vars.mk index 672f03d9f..b99230c84 100644 --- a/mk/vars.mk +++ b/mk/vars.mk @@ -335,7 +335,7 @@ PATCHP0= PATH='${HOST_PATH}' patch -p0 ifeq ($(ADK_STATIC_TOOLCHAIN),y) HOST_STATIC_CFLAGS:= -static -Wl,-static HOST_STATIC_CXXFLAGS:= -static -Wl,-static -HOST_STATIC_LDFLAGS:= -Wl,-static +HOST_STATIC_LDFLAGS:= -Wl,-static -all-static endif SED:= PATH='${HOST_PATH}' sed -i -e diff --git a/package/apcupsd/Makefile b/package/apcupsd/Makefile new file mode 100644 index 000000000..52b6def9a --- /dev/null +++ b/package/apcupsd/Makefile @@ -0,0 +1,44 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= apcupsd +PKG_VERSION:= 3.14.14 +PKG_RELEASE:= 1 +PKG_HASH:= db7748559b6b4c3784f9856561ef6ac6199ef7bd019b3edcd7e0a647bf8f9867 +PKG_DESCR:= APC UPS daemon with integrated tcp/ip remote shutdown +PKG_SECTION:= sys/misc +PKG_DEPENDS:= libusb +PKG_BUILDDEP:= libusb +PKG_URL:= http://www.apcupsd.org +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=apcupsd/) +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +PKG_CFLINE_APCUPSD:= select BUSYBOX_WALL@ +PKG_CFLINE_APCUPSD+= select ADK_LINUX_KERNEL_USB_HID@ + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,APCUPSD,apcupsd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +CONFIGURE_ARGS+= --prefix="${WRKINST}" --sbindir="/usr/sbin" --enable-usb +CONFIGURE_ENV+= ac_cv_path_WALL=/usr/bin/wall +XAKE_FLAGS:= VERBOSE=1 STRIP="" LD="$(TARGET_CXX)" + +# XXX: custom init script? +apcupsd-install: + $(INSTALL_DIR) $(IDIR_APCUPSD)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/apc{access,test,upsd} \ + $(IDIR_APCUPSD)/usr/sbin + $(INSTALL_DIR) $(IDIR_APCUPSD)/etc + $(INSTALL_DATA) $(WRKINST)/etc/apcupsd.conf $(IDIR_APCUPSD)/etc + # default to USB-based UPS, avoid writing to /etc to keep cfgfs clean + $(SED) 's/^UPSCABLE smart/UPSCABLE usb/' \ + -e 's/^UPSTYPE apcsmart/UPSTYPE usb/' \ + -e 's,^DEVICE /dev/ttyS0,DEVICE,' \ + -e 's,^PWRFAILDIR /etc,PWRFAILDIR /tmp,' \ + $(IDIR_APCUPSD)/etc/apcupsd.conf + $(INSTALL_BIN) ./files/apccontrol $(IDIR_APCUPSD)/etc/ + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/apcupsd/files/apccontrol b/package/apcupsd/files/apccontrol new file mode 100644 index 000000000..e402c513d --- /dev/null +++ b/package/apcupsd/files/apccontrol @@ -0,0 +1,74 @@ +#!/bin/sh +# +# A custom apccontrol for use in embedded systems: just make sure there's no +# data in-flight and wait for the blackout to shut us down. + +# these filesystems are not relevant +IGNORE_FS="tmpfs proc sysfs devtmpfs devpts nfsd" + +get_rw_mounts() { + local excl='\((ro,\|type \(' + local sep="" + for fs in $IGNORE_FS; do + excl+="${sep}$fs" + sep='\|' + done + excl+='\)\)' + mount | grep -v "$excl" | while read dev on mnt opts; do + echo "$mnt" + done +} + +log() { + logger -s -t "$(basename $0)" -p daemon.crit "$*" +} +__mount() { # (ro/rw, txt, mnt) + local opt=$1 + local txt=$2 + local mnt="$3" + + mount -o remount,$opt "$mnt" + rc=$? + case $rc in + 0) log "remounted $mnt $txt" + *) log "failed to remount $mnt $txt: rc=$rc" + esac + return $rc +} +mount_ro() { + __mount ro read-only "$1" +} +mount_rw() { + __mount rw read-write "$1" +} + +romounts="/tmp/apcupsd.romounts" + +case "$1" in + emergency|failing) + log "UPS error condition happening" + ;& # fall through + doshutdown) + log "bracing for upcoming blackout" + + rm -f "$romounts" + sync + get_rw_mounts | while read mnt; do + mount_ro "$mnt" && echo "$mnt" >>"$romounts" + done + ;; + mainsback) + log "returning to routine after near blackout" + + touch "$romounts" + while read mnt; do + mount_rw "$mnt" + done <"$romounts" + rm "$romounts" + ;; + *) + log "Called for $1" + ;; +esac + +exit 0 diff --git a/package/apcupsd/files/apcupsd.conffiles b/package/apcupsd/files/apcupsd.conffiles new file mode 100644 index 000000000..7bae4c961 --- /dev/null +++ b/package/apcupsd/files/apcupsd.conffiles @@ -0,0 +1 @@ +/etc/apcupsd.conf diff --git a/package/apcupsd/files/apcupsd.init b/package/apcupsd/files/apcupsd.init new file mode 100644 index 000000000..a9817f1be --- /dev/null +++ b/package/apcupsd/files/apcupsd.init @@ -0,0 +1,38 @@ +#!/bin/sh +#PKG apcupsd +#INIT 15 +. /etc/rc.conf + +pidfile=$(echo "$apcupsd_flags" | \ + sed -n 's/.*\(-P\|--pid-file\) \([^ ]\+\).*/\2/p') +[ "$pidfile" ] || pidfile="/var/run/apcupsd.pid" + +case $1 in +autostop) ;; +autostart) + test x"${apcupsd:-NO}" = x"NO" && exit 0 + test x"$apcupsd" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + exec sh $0 start + ;; +start) + mkdir -p /var/lock + /usr/sbin/apcupsd $apcupsd_flags + ;; +stop) + if [ -f "$pidfile" ]; then + kill $(<$pidfile) + rm -f $pidfile + else + kill $(pgrep -f /usr/sbin/apcupsd) + fi + ;; +restart) + sh $0 stop + sleep 1 + sh $0 start + ;; +*) + echo "usage: $0 (start | stop | restart)" + exit 1 +esac +exit $? diff --git a/package/apcupsd/files/apcupsd.postinst b/package/apcupsd/files/apcupsd.postinst new file mode 100644 index 000000000..299fabc0f --- /dev/null +++ b/package/apcupsd/files/apcupsd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf apcupsd NO diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 8f14b0e8c..5d9f10881 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 20.9.3 +PKG_VERSION:= 20.11.1 PKG_RELEASE:= 1 -PKG_HASH:= 3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4 +PKG_HASH:= 5ad25c136c7772f0ad10ae02d59f19b32c0cf64027278e3de6a6314ee24d5ff9 PKG_DESCR:= open source pbx PKG_SECTION:= net/voip PKG_DEPENDS:= libncurses libcurl libopenssl libedit libuuid libjansson diff --git a/package/base-files/files/interfaces-dhcp b/package/base-files/files/interfaces-dhcp index 11174c152..652101214 100644 --- a/package/base-files/files/interfaces-dhcp +++ b/package/base-files/files/interfaces-dhcp @@ -22,6 +22,15 @@ iface eth0 inet dhcp # bridge-ports eth0 eth1 ## +## LACP configuration +#auto lacp0 +#iface lacp0 inet dhcp +# bond-ports eth0 eth1 +# bond-mode 802.3ad +# bond-miimon 100 +# bond-lacp-rate slow +# bond-xmit-hash-policy layer2+3 + ## pppoe configuration #auto ppp0 #iface ppp0 inet ppp @@ -55,4 +64,4 @@ iface eth0 inet dhcp # wireless-passphrase xxxxxxxx ## -# for more special cases see: http://www.openadk.org/doku.php?id=network +# for more special cases see: https://docs.openadk.org/html/manual.html#network-configuration diff --git a/package/base-files/src/etc/network/if-post-down.d/04-bonding b/package/base-files/src/etc/network/if-post-down.d/04-bonding new file mode 100755 index 000000000..0b9c9f362 --- /dev/null +++ b/package/base-files/src/etc/network/if-post-down.d/04-bonding @@ -0,0 +1,20 @@ +#!/bin/sh + +case "$IF_BOND_PORTS" in +"") + exit 0 + ;; +none) + INTERFACES="" + ;; +*) + INTERFACES="$IF_BOND_PORTS" + ;; +esac + +for IF in $INTERFACES; do + ip link set $IF nomaster + ip link set $IF down +done +ip link del $IFACE +exit 0 diff --git a/package/base-files/src/etc/network/if-pre-up.d/05-bonding b/package/base-files/src/etc/network/if-pre-up.d/05-bonding new file mode 100755 index 000000000..489a2fcad --- /dev/null +++ b/package/base-files/src/etc/network/if-pre-up.d/05-bonding @@ -0,0 +1,37 @@ +#!/bin/sh + +INTERFACES="" +BONDOPTS="" +for var in $(env | grep '^IF_BOND_'); do + val="${var#*=}" + opt="${var%%=*}" + if [ "$opt" == "IF_BOND_PORTS" ]; then + case "$val" in + none) + INTERFACES="" + ;; + *) + INTERFACES="$val" + ;; + esac + continue + fi + opt="$(tr '[A-Z]' '[a-z]' <<< ${opt#IF_BOND_})" + BONDOPTS+=" $opt" + [ -n "$val" ] && BONDOPTS+=" $val" +done + +[ -n "$INTERFACES" ] || exit 0 + +ip link add $IFACE type bond ${BONDOPTS} || exit 1 +for IF in $INTERFACES; do + if ! grep -q $IF /proc/net/dev; then + echo "Error: interface '$IF' does not exist!" + ip link del $IFACE + exit 1 + fi + ip link set $IF master $IFACE + ip link set $IF up +done + +exit 0 diff --git a/package/bind/Makefile b/package/bind/Makefile index ac208569d..32eb0bbef 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= bind -PKG_VERSION:= 9.18.30 +PKG_VERSION:= 9.18.33 PKG_RELEASE:= 1 -PKG_HASH:= 9f6817640970267317e5aa143ecf70531040f2155636b1a63ea45379aa09034a +PKG_HASH:= fb373fac5ebbc41c645160afd5a9fb451918f6c0e69ab1d9474154e2b515de40 PKG_DESCR:= dns server PKG_SECTION:= net/dns PKG_DEPENDS:= libxml2 libopenssl libuv openssl-util diff --git a/package/bind/files/named.init b/package/bind/files/named.init index 2bc4b952d..ede96cabe 100644 --- a/package/bind/files/named.init +++ b/package/bind/files/named.init @@ -11,6 +11,9 @@ autostop) ;; exec sh $0 start ;; start) + if [ ! -f /etc/rndc.key ]; then + rndc-confgen -a 2>/dev/null + fi if [ -f /etc/bind/named.conf ]; then /usr/sbin/named -c /etc/bind/named.conf & fi diff --git a/package/busybox/config/coreutils/Config.in b/package/busybox/config/coreutils/Config.in index 00d646599..ff7ab88ed 100644 --- a/package/busybox/config/coreutils/Config.in +++ b/package/busybox/config/coreutils/Config.in @@ -719,12 +719,12 @@ config BUSYBOX_SUM checksum and count the blocks in a file config BUSYBOX_SYNC bool "sync (3.8 kb)" - default y + default n help sync is used to flush filesystem buffers. config BUSYBOX_FEATURE_SYNC_FANCY bool "Enable -d and -f flags (requires syncfs(2) in libc)" - default y + default n depends on BUSYBOX_SYNC help sync -d FILE... executes fdatasync() on each FILE. diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in index 77b2b83f1..5bc9673d3 100644 --- a/package/busybox/config/util-linux/Config.in +++ b/package/busybox/config/util-linux/Config.in @@ -660,7 +660,7 @@ config BUSYBOX_NOLOGIN_DEPENDENCIES disable this option. config BUSYBOX_NSENTER bool "nsenter (6.5 kb)" - default y + default n help Run program with namespaces of other processes. config BUSYBOX_PIVOT_ROOT diff --git a/package/ca-certificates/patches/patch-mozilla_Makefile b/package/ca-certificates/patches/patch-mozilla_Makefile index 768f26373..a9cd5ad44 100644 --- a/package/ca-certificates/patches/patch-mozilla_Makefile +++ b/package/ca-certificates/patches/patch-mozilla_Makefile @@ -5,7 +5,7 @@ all: - python3 certdata2pem.py -+ /bin/python3 certdata2pem.py ++ /usr/bin/python3 certdata2pem.py clean: -rm -f *.crt diff --git a/package/cfgfs/src/c_lzo1x1.c b/package/cfgfs/src/c_lzo1x1.c index 570f8673c..94cf8322b 100644 --- a/package/cfgfs/src/c_lzo1x1.c +++ b/package/cfgfs/src/c_lzo1x1.c @@ -51,10 +51,10 @@ __RCSID("$MirOS: contrib/hosted/fwcf/c_lzo1x1.c,v 1.5 2007/03/13 18:31:07 tg Exp static void c_lzo1x1_load(void) __attribute__((constructor)); static int c_init(void); static int c_compress(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); static int c_decompress(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); static fwcf_compressor c_lzo1x1 = { c_init, /* init */ diff --git a/package/cfgfs/src/c_null.c b/package/cfgfs/src/c_null.c index 4806ae261..718550415 100644 --- a/package/cfgfs/src/c_null.c +++ b/package/cfgfs/src/c_null.c @@ -34,10 +34,10 @@ __RCSID("$MirOS: contrib/hosted/fwcf/c_null.c,v 1.5 2006/09/23 23:46:35 tg Exp $ static void c_null_load(void) __attribute__((constructor)); static int c_init(void); static int c_compress(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); static int c_decompress(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); static fwcf_compressor c_null = { c_init, /* init */ diff --git a/package/cfgfs/src/c_zlib.c b/package/cfgfs/src/c_zlib.c index 2285f2eeb..65245d507 100644 --- a/package/cfgfs/src/c_zlib.c +++ b/package/cfgfs/src/c_zlib.c @@ -34,10 +34,10 @@ __RCSID("$MirOS: contrib/hosted/fwcf/c_zlib.c,v 1.4 2006/09/23 23:46:35 tg Exp $ static void c_zlib_load(void) __attribute__((constructor)); static int c_init(void); static int c_compress(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); static int c_decompress(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); static fwcf_compressor c_zlib = { c_init, /* init */ diff --git a/package/cfgfs/src/compress.h b/package/cfgfs/src/compress.h index 413075d83..2237595c5 100644 --- a/package/cfgfs/src/compress.h +++ b/package/cfgfs/src/compress.h @@ -18,12 +18,12 @@ typedef int (*fwcf_compress_init_func)(void); /* in: *dst (malloc'd), src, size of source (max. INT_MAX) */ /* returns size of destination on success, -1 on failure */ typedef int (*fwcf_compress_work_func)(char **, char *, size_t) - __attribute__((bounded (string, 2, 3))); + __attribute__((access (read_only, 2, 3))); /* in: dst, max size of dst, src, size of source (max. INT_MAX) */ /* returns size of destination on success, -1 on failure */ typedef int (*fwcf_compress_rev_func)(char *, size_t, char *, size_t) - __attribute__((bounded (string, 1, 2))) - __attribute__((bounded (string, 3, 4))); + __attribute__((access (read_write, 1, 2))) + __attribute__((access (read_only, 3, 4))); typedef struct FWCF_COMPRESSOR { fwcf_compress_init_func init; diff --git a/package/cfgfs/src/ft_pack.c b/package/cfgfs/src/ft_pack.c index 5d04f8b5c..53fd98713 100644 --- a/package/cfgfs/src/ft_pack.c +++ b/package/cfgfs/src/ft_pack.c @@ -21,6 +21,7 @@ * the possibility of such damage or existence of a defect. */ +#define _GNU_SOURCE #include <sys/param.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index fa6503bd2..8dd026ecc 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -4,26 +4,28 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= cyrus-sasl -PKG_VERSION:= 2.1.26 -PKG_RELEASE:= 2 -PKG_HASH:= 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 +PKG_VERSION:= 2.1.28 +PKG_RELEASE:= 1 +PKG_HASH:= 3e38933a30b9ce183a5488b4f6a5937a702549cde0d3287903d80968ad4ec341 PKG_DESCR:= general purpose authentication library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libopenssl PKG_BUILDDEP:= openssl PKG_URL:= http://cyrusimap.org/ -PKG_SITES:= ftp://ftp.cyrusimap.org/cyrus-sasl/ +PKG_SITES:= https://github.com/cyrusimap/cyrus-sasl/archive/refs/tags/ PKG_LIBNAME:= libsasl2 PKG_OPTS:= dev PKG_NOPARALLEL:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +WRKDIST= ${WRKDIR}/$(PKG_NAME)-$(PKG_NAME)-${PKG_VERSION} include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,LIBSASL2,libsasl2,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) +AUTOTOOL_STYLE:= autogen CONFIGURE_ARGS+= --enable-plain \ --enable-login \ --disable-anon \ diff --git a/package/cyrus-sasl/patches/patch-config_ltconfig b/package/cyrus-sasl/patches/patch-config_ltconfig deleted file mode 100644 index 1a04b28e0..000000000 --- a/package/cyrus-sasl/patches/patch-config_ltconfig +++ /dev/null @@ -1,29 +0,0 @@ ---- cyrus-sasl-2.1.26.orig/config/ltconfig 2012-10-12 16:05:48.000000000 +0200 -+++ cyrus-sasl-2.1.26/config/ltconfig 2014-03-07 07:46:01.000000000 +0100 -@@ -2024,7 +2024,7 @@ linux-gnuoldld* | linux-gnuaout* | linux - ;; - - # This must be Linux ELF. --linux-gnu*) -+linux-*) - version_type=linux - need_lib_prefix=no - need_version=no -@@ -2034,16 +2034,7 @@ linux-gnu*) - shlibpath_var=LD_LIBRARY_PATH - shlibpath_overrides_runpath=no - deplibs_check_method=pass_all -- -- if test -f /lib/ld.so.1; then -- dynamic_linker='GNU ld.so' -- else -- # Only the GNU ld.so supports shared libraries on MkLinux. -- case "$host_cpu" in -- powerpc*) dynamic_linker=no ;; -- *) dynamic_linker='Linux ld.so' ;; -- esac -- fi -+ dynamic_linker='Linux ld.so' - ;; - - netbsd*) diff --git a/package/cyrus-sasl/patches/patch-config_ltmain_sh b/package/cyrus-sasl/patches/patch-config_ltmain_sh deleted file mode 100644 index 01b5a992c..000000000 --- a/package/cyrus-sasl/patches/patch-config_ltmain_sh +++ /dev/null @@ -1,14 +0,0 @@ ---- cyrus-sasl-2.1.23.orig/config/ltmain.sh 2003-07-02 15:29:00.000000000 +0200 -+++ cyrus-sasl-2.1.23/config/ltmain.sh 2011-03-30 21:20:59.111809629 +0200 -@@ -1081,6 +1081,11 @@ compiler." - esac - ;; - -+ -fstack-protector*|-flto*) -+ linkopts="$linkopts $arg" -+ continue -+ ;; -+ - -l*) - if test "$arg" = "-lc"; then - case "$host" in diff --git a/package/elfutils/Makefile b/package/elfutils/Makefile index 825ab10eb..231559424 100644 --- a/package/elfutils/Makefile +++ b/package/elfutils/Makefile @@ -4,16 +4,16 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= elfutils -PKG_VERSION:= 0.161 +PKG_VERSION:= 0.189 PKG_RELEASE:= 1 -PKG_HASH:= 570c91a1783fa5386aaa2dfdd08dda1de777c2b63bf3b9c1437d635ffdd7a070 +PKG_HASH:= 39bd8f1a338e2b7cd4abc3ff11a0eddc6e690f69578a57478d8179b4148708c8 PKG_DESCR:= libraries/utilities to handle elf objects (drop in replacement for libelf) PKG_SECTION:= base/libs -PKG_URL:= https://fedorahosted.org/elfutils/ -PKG_SITES:= https://fedorahosted.org/releases/e/l/elfutils/$(PKG_VERSION)/ +PKG_NEEDS:= intl +PKG_SITES:= https://sourceware.org/elfutils/ftp/$(PKG_VERSION)/ # require argp() -PKG_LIBC_DEPENDS:= glibc +PKG_LIBC_DEPENDS:= glibc uclibc-ng DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -24,14 +24,16 @@ $(eval $(call PKG_template,ELFUTILS,elfutils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG # not only because we pass -DNDEBUG, this package won't build with -Werror TARGET_CFLAGS+= -Wno-error +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --disable-symbol-versioning \ + --disable-debuginfod \ + --disable-libdebuginfod \ + --disable-demangler \ + --disable-progs + elfutils-install: $(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/lib/elfutils $(CP) $(WRKINST)/usr/lib/lib{asm,dw,elf}*.so* \ $(IDIR_ELFUTILS)/usr/lib - $(CP) $(WRKINST)/usr/lib/elfutils/libebl*.so \ - $(IDIR_ELFUTILS)/usr/lib/elfutils - $(INSTALL_DIR) $(IDIR_ELFUTILS)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ - $(IDIR_ELFUTILS)/usr/bin include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/elfutils/patches/patch-Makefile_am b/package/elfutils/patches/patch-Makefile_am new file mode 100644 index 000000000..579e76113 --- /dev/null +++ b/package/elfutils/patches/patch-Makefile_am @@ -0,0 +1,16 @@ +--- elfutils-0.189.orig/Makefile.am 2023-03-03 16:42:26.000000000 +0100 ++++ elfutils-0.189/Makefile.am 2025-01-08 20:12:14.302360288 +0100 +@@ -26,8 +26,12 @@ AM_MAKEFLAGS = --no-print-directory + + pkginclude_HEADERS = version.h + ++if ENABLE_PROGS ++PROGS_SUBDIR = src ++endif ++ + SUBDIRS = config lib libelf libcpu backends libebl libdwelf libdwfl libdw \ +- libasm debuginfod src po doc tests ++ libasm debuginfod $(PROGS_SUBDIR) po doc tests + + EXTRA_DIST = elfutils.spec GPG-KEY NOTES CONTRIBUTING \ + COPYING COPYING-GPLV2 COPYING-LGPLV3 diff --git a/package/elfutils/patches/patch-configure_ac b/package/elfutils/patches/patch-configure_ac new file mode 100644 index 000000000..40b65da79 --- /dev/null +++ b/package/elfutils/patches/patch-configure_ac @@ -0,0 +1,24 @@ +--- elfutils-0.189.orig/configure.ac 2023-03-03 16:42:26.000000000 +0100 ++++ elfutils-0.189/configure.ac 2025-01-08 20:12:14.302360288 +0100 +@@ -422,6 +422,12 @@ AS_HELP_STRING([--enable-tests-rpath],[b + [tests_use_rpath=$enableval], [tests_use_rpath=no]) + AM_CONDITIONAL(TESTS_RPATH, test "$tests_use_rpath" = yes) + ++AC_ARG_ENABLE([progs], ++ AS_HELP_STRING([--enable-progs], [enable progs]), ++ enable_progs=$enableval, ++ enable_progs=yes) ++AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) ++ + dnl zlib is mandatory. + save_LIBS="$LIBS" + LIBS= +@@ -659,7 +665,7 @@ saved_LIBS="$LIBS" + AC_SEARCH_LIBS([_obstack_free], [obstack]) + LIBS="$saved_LIBS" + case "$ac_cv_search__obstack_free" in +- no) AC_MSG_FAILURE([failed to find _obstack_free]) ;; ++ no) obstack_LIBS= ;; + -l*) obstack_LIBS="$ac_cv_search__obstack_free" ;; + *) obstack_LIBS= ;; + esac diff --git a/package/ffmpeg/Makefile b/package/ffmpeg/Makefile index 8c00cdef4..2920791d7 100644 --- a/package/ffmpeg/Makefile +++ b/package/ffmpeg/Makefile @@ -5,19 +5,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ffmpeg PKG_VERSION:= 6.1.1 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 5e3133939a61ef64ac9b47ffd29a5ea6e337a4023ef0ad972094b4da844e3a20 PKG_DESCR:= record, convert and stream audio & video PKG_SECTION:= libs/video PKG_NEEDS:= threads -PKG_DEPENDS:= libncurses libressl -PKG_BUILDDEP:= ncurses libressl +PKG_DEPENDS:= libncurses +PKG_BUILDDEP:= ncurses PKG_URL:= http://www.ffmpeg.org/ PKG_SITES:= http://www.ffmpeg.org/releases/ PKG_LIBNAME:= libffmpeg PKG_OPTS:= dev -PKG_CHOICES_FFMPEG:= WITH_LIBRESSL WITH_OPENSSL +PKG_CHOICES_LIBFFMPEG:= WITH_LIBRESSL WITH_OPENSSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl diff --git a/package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch b/package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch new file mode 100644 index 000000000..a23de2e78 --- /dev/null +++ b/package/ffmpeg/patches/0001-libavcodec-arm-mlpdsp_armv5te-fix-label-format-to-wo.patch @@ -0,0 +1,59 @@ +From 654bd47716c4f36719fb0f3f7fd8386d5ed0b916 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Fri, 9 Aug 2024 11:32:00 +0100 +Subject: [PATCH] libavcodec/arm/mlpdsp_armv5te: fix label format to work with + binutils 2.43 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +binutils 2.43 has stricter validation for labels[1] and results in errors +when building ffmpeg for armv5: + +src/libavcodec/arm/mlpdsp_armv5te.S:232: Error: junk at end of line, first unrecognized character is `0' + +Remove the leading zero in the "01" label to resolve this error. + +[1] https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=226749d5a6ff0d5c607d6428d6c81e1e7e7a994b + +Signed-off-by: Ross Burton <ross.burton@arm.com> +Signed-off-by: Martin Storsjö <martin@martin.st> +Signed-off-by: Phil Sutter <phil@nwl.cc> +--- + libavcodec/arm/mlpdsp_armv5te.S | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/libavcodec/arm/mlpdsp_armv5te.S b/libavcodec/arm/mlpdsp_armv5te.S +index 4f9aa485fd21a..d31568611c30f 100644 +--- a/libavcodec/arm/mlpdsp_armv5te.S ++++ b/libavcodec/arm/mlpdsp_armv5te.S +@@ -229,7 +229,7 @@ A .endif + .endif + + // Begin loop +-01: ++1: + .if TOTAL_TAPS == 0 + // Things simplify a lot in this case + // In fact this could be pipelined further if it's worth it... +@@ -241,7 +241,7 @@ A .endif + str ST0, [PST, #-4]! + str ST0, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] + str ST0, [PSAMP], #4 * MAX_CHANNELS +- bne 01b ++ bne 1b + .else + .if \fir_taps & 1 + .set LOAD_REG, 1 +@@ -333,7 +333,7 @@ T orr AC0, AC0, AC1 + str ST3, [PST, #-4]! + str ST2, [PST, #4 * (MAX_BLOCKSIZE + MAX_FIR_ORDER)] + str ST3, [PSAMP], #4 * MAX_CHANNELS +- bne 01b ++ bne 1b + .endif + b 99f + +-- +2.43.0 + diff --git a/package/ffmpeg/src/libavcodec/arm/synth_filter_vfp.S b/package/ffmpeg/src/libavcodec/arm/synth_filter_vfp.S deleted file mode 100644 index 451fe5ce9..000000000 --- a/package/ffmpeg/src/libavcodec/arm/synth_filter_vfp.S +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (c) 2013 RISC OS Open Ltd - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Author: Ben Avison <bavison@riscosopen.org> - */ - -#include "libavutil/arm/asm.S" - -IMDCT .req r0 -ORIG_P_SB .req r1 -P_SB_OFF .req r2 -I .req r0 -P_SB2_UP .req r1 -OLDFPSCR .req r2 -P_SB2_DN .req r3 -P_WIN_DN .req r4 -P_OUT_DN .req r5 -P_SB .req r6 -J_WRAP .req r7 -P_WIN_UP .req r12 -P_OUT_UP .req r14 - -SCALE .req s0 -SBUF_DAT_REV0 .req s4 -SBUF_DAT_REV1 .req s5 -SBUF_DAT_REV2 .req s6 -SBUF_DAT_REV3 .req s7 -VA0 .req s8 -VA3 .req s11 -VB0 .req s12 -VB3 .req s15 -VC0 .req s8 -VC3 .req s11 -VD0 .req s12 -VD3 .req s15 -SBUF_DAT0 .req s16 -SBUF_DAT1 .req s17 -SBUF_DAT2 .req s18 -SBUF_DAT3 .req s19 -SBUF_DAT_ALT0 .req s20 -SBUF_DAT_ALT1 .req s21 -SBUF_DAT_ALT2 .req s22 -SBUF_DAT_ALT3 .req s23 -WIN_DN_DAT0 .req s24 -WIN_UP_DAT0 .req s28 - - -.macro inner_loop half, tail, head - .if (OFFSET & (64*4)) == 0 @ even numbered call - SBUF_DAT_THIS0 .req SBUF_DAT0 - SBUF_DAT_THIS1 .req SBUF_DAT1 - SBUF_DAT_THIS2 .req SBUF_DAT2 - SBUF_DAT_THIS3 .req SBUF_DAT3 - .ifnc "\head","" - vldr d8, [P_SB, #OFFSET] @ d8 = SBUF_DAT - vldr d9, [P_SB, #OFFSET+8] - .endif - .else - SBUF_DAT_THIS0 .req SBUF_DAT_ALT0 - SBUF_DAT_THIS1 .req SBUF_DAT_ALT1 - SBUF_DAT_THIS2 .req SBUF_DAT_ALT2 - SBUF_DAT_THIS3 .req SBUF_DAT_ALT3 - .ifnc "\head","" - vldr d10, [P_SB, #OFFSET] @ d10 = SBUF_DAT_ALT - vldr d11, [P_SB, #OFFSET+8] - .endif - .endif - .ifnc "\tail","" - .ifc "\half","ab" - vmls.f VA0, SBUF_DAT_REV0, WIN_DN_DAT0 @ all operands treated as vectors - .else - vmla.f VD0, SBUF_DAT_REV0, WIN_DN_DAT0 @ all operands treated as vectors - .endif - .endif - .ifnc "\head","" - vldr d14, [P_WIN_UP, #OFFSET] @ d14 = WIN_UP_DAT - vldr d15, [P_WIN_UP, #OFFSET+8] - vldr d12, [P_WIN_DN, #OFFSET] @ d12 = WIN_DN_DAT - vldr d13, [P_WIN_DN, #OFFSET+8] - vmov SBUF_DAT_REV3, SBUF_DAT_THIS0 - vmov SBUF_DAT_REV2, SBUF_DAT_THIS1 - vmov SBUF_DAT_REV1, SBUF_DAT_THIS2 - vmov SBUF_DAT_REV0, SBUF_DAT_THIS3 - .ifc "\half","ab" - vmla.f VB0, SBUF_DAT_THIS0, WIN_UP_DAT0 - .else - vmla.f VC0, SBUF_DAT_THIS0, WIN_UP_DAT0 - .endif - teq J_WRAP, #J - bne 2f @ strongly predictable, so better than cond exec in this case - sub P_SB, P_SB, #512*4 -2: - .set J, J - 64 - .set OFFSET, OFFSET + 64*4 - .endif - .unreq SBUF_DAT_THIS0 - .unreq SBUF_DAT_THIS1 - .unreq SBUF_DAT_THIS2 - .unreq SBUF_DAT_THIS3 -.endm - - -/* void ff_synth_filter_float_vfp(FFTContext *imdct, - * float *synth_buf_ptr, int *synth_buf_offset, - * float synth_buf2[32], const float window[512], - * float out[32], const float in[32], float scale) - */ -function ff_synth_filter_float_vfp, export=1 - push {r3-r7,lr} - vpush {s16-s31} - ldr lr, [P_SB_OFF] - add a2, ORIG_P_SB, lr, LSL #2 @ calculate synth_buf to pass to imdct_half - mov P_SB, a2 @ and keep a copy for ourselves - bic J_WRAP, lr, #63 @ mangled to make testing for wrap easier in inner loop - sub lr, lr, #32 - and lr, lr, #512-32 - str lr, [P_SB_OFF] @ rotate offset, modulo buffer size, ready for next call - ldr a3, [sp, #(16+6+2)*4] @ fetch in from stack, to pass to imdct_half -VFP vmov s16, SCALE @ imdct_half is free to corrupt s0, but it contains one of our arguments in hardfp case - bl ff_imdct_half_c -VFP vmov SCALE, s16 - - vmrs OLDFPSCR, FPSCR - ldr lr, =0x03030000 @ RunFast mode, short vectors of length 4, stride 1 - vmsr FPSCR, lr - ldr P_SB2_DN, [sp, #16*4] - ldr P_WIN_DN, [sp, #(16+6+0)*4] - ldr P_OUT_DN, [sp, #(16+6+1)*4] -NOVFP vldr SCALE, [sp, #(16+6+3)*4] - -#define IMM_OFF_SKEW 956 /* also valid immediate constant when you add 16*4 */ - add P_SB, P_SB, #IMM_OFF_SKEW @ so we can use -ve offsets to use full immediate offset range - add P_SB2_UP, P_SB2_DN, #16*4 - add P_WIN_UP, P_WIN_DN, #16*4+IMM_OFF_SKEW - add P_OUT_UP, P_OUT_DN, #16*4 - add P_SB2_DN, P_SB2_DN, #16*4 - add P_WIN_DN, P_WIN_DN, #12*4+IMM_OFF_SKEW - add P_OUT_DN, P_OUT_DN, #16*4 - mov I, #4 -1: - vldmia P_SB2_UP!, {VB0-VB3} - vldmdb P_SB2_DN!, {VA0-VA3} - .set J, 512 - 64 - .set OFFSET, -IMM_OFF_SKEW - inner_loop ab,, head - .rept 7 - inner_loop ab, tail, head - .endr - inner_loop ab, tail - add P_WIN_UP, P_WIN_UP, #4*4 - sub P_WIN_DN, P_WIN_DN, #4*4 - vmul.f VB0, VB0, SCALE @ SCALE treated as scalar - add P_SB, P_SB, #(512+4)*4 - subs I, I, #1 - vmul.f VA0, VA0, SCALE - vstmia P_OUT_UP!, {VB0-VB3} - vstmdb P_OUT_DN!, {VA0-VA3} - bne 1b - - add P_SB2_DN, P_SB2_DN, #(16+28-12)*4 - sub P_SB2_UP, P_SB2_UP, #(16+16)*4 - add P_WIN_DN, P_WIN_DN, #(32+16+28-12)*4 - mov I, #4 -1: - vldr.d d4, zero @ d4 = VC0 - vldr.d d5, zero - vldr.d d6, zero @ d6 = VD0 - vldr.d d7, zero - .set J, 512 - 64 - .set OFFSET, -IMM_OFF_SKEW - inner_loop cd,, head - .rept 7 - inner_loop cd, tail, head - .endr - inner_loop cd, tail - add P_WIN_UP, P_WIN_UP, #4*4 - sub P_WIN_DN, P_WIN_DN, #4*4 - add P_SB, P_SB, #(512+4)*4 - subs I, I, #1 - vstmia P_SB2_UP!, {VC0-VC3} - vstmdb P_SB2_DN!, {VD0-VD3} - bne 1b - - vmsr FPSCR, OLDFPSCR - vpop {s16-s31} - pop {r3-r7,pc} -endfunc - - .align 3 -zero: .word 0, 0 diff --git a/package/gdb/Makefile b/package/gdb/Makefile index b19d19716..18f4e1b75 100644 --- a/package/gdb/Makefile +++ b/package/gdb/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdb -PKG_VERSION:= 15.1 +PKG_VERSION:= 16.2 PKG_RELEASE:= 1 -PKG_HASH:= 38254eacd4572134bca9c5a5aa4d4ca564cbbd30c369d881f733fb6b903354f2 +PKG_HASH:= 4002cb7f23f45c37c790536a13a720942ce4be0402d929c9085e92f10d480119 PKG_DESCR:= program debugger PKG_SECTION:= app/debug PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} diff --git a/package/gdbserver/Makefile b/package/gdbserver/Makefile index 40a2e4111..a8c55c504 100644 --- a/package/gdbserver/Makefile +++ b/package/gdbserver/Makefile @@ -4,12 +4,12 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= gdbserver -PKG_VERSION:= 15.1 +PKG_VERSION:= 16.2 PKG_RELEASE:= 1 -PKG_HASH:= 38254eacd4572134bca9c5a5aa4d4ca564cbbd30c369d881f733fb6b903354f2 +PKG_HASH:= 4002cb7f23f45c37c790536a13a720942ce4be0402d929c9085e92f10d480119 PKG_DESCR:= remote program debugger utility PKG_SECTION:= app/debug -PKG_NEEDS:= c++ +PKG_NEEDS:= c++ iconv PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} PKG_DEPENDS:= libthread-db libgmp PKG_BUILDDEP:= gmp diff --git a/package/glib/Makefile b/package/glib/Makefile index f83648bae..188f1fc2e 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -13,7 +13,7 @@ PKG_SECTION:= libs/misc PKG_DEPENDS:= pcre2 zlib libffi libiconv PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2 libiconv HOST_BUILDDEP:= pkgconf-host libiconv-host libffi-host python3-host gettext-host util-linux-host -HOST_BUILDDEP+= pcre2-host meson-host +HOST_BUILDDEP+= pcre2-host meson-host zlib-host PKG_NEEDS:= threads intl iconv PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/GNOME/sources/glib/$(PKG_EXTRAVER)/ diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile index ae1db5a19..b93c9f15d 100644 --- a/package/gnutls/Makefile +++ b/package/gnutls/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gnutls -PKG_VERSION:= 3.8.4 +PKG_VERSION:= 3.8.9 PKG_RELEASE:= 1 -PKG_HASH:= 2bea4e154794f3f00180fa2a5c51fe8b005ac7a31cd58bd44cdfa7f36ebc3a9b +PKG_HASH:= 69e113d802d1670c4d5ac1b99040b1f2d5c7c05daec5003813c049b5184820ed PKG_DESCR:= transport layer security library PKG_SECTION:= libs/crypto PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp libunistring diff --git a/package/json-c/patches/patch-arraylist_c b/package/json-c/patches/patch-arraylist_c new file mode 100644 index 000000000..6143e8fd8 --- /dev/null +++ b/package/json-c/patches/patch-arraylist_c @@ -0,0 +1,17 @@ + Fix for gcc-14 + + Upstream did not just fix this, but delay (the implicit) memset() in + commit 4a546e7b2f471 ("In arraylist, use malloc instead of calloc, + avoid clearing with memeset until we really need to, and micro-optimize + array_list_add().") which is not suitable for a backport. +--- json-c-0.13.orig/arraylist.c 2017-11-30 05:41:30.000000000 +0100 ++++ json-c-0.13/arraylist.c 2025-01-08 02:21:28.914179381 +0100 +@@ -46,7 +46,7 @@ array_list_new(array_list_free_fn *free_ + arr->size = ARRAY_LIST_DEFAULT_SIZE; + arr->length = 0; + arr->free_fn = free_fn; +- if(!(arr->array = (void**)calloc(sizeof(void*), arr->size))) { ++ if(!(arr->array = (void**)calloc(arr->size, sizeof(void*)))) { + free(arr); + return NULL; + } diff --git a/package/json-c/patches/patch-json_object_c b/package/json-c/patches/patch-json_object_c new file mode 100644 index 000000000..09b93743e --- /dev/null +++ b/package/json-c/patches/patch-json_object_c @@ -0,0 +1,17 @@ + Fix for gcc-14 + + Upstream did not just fix this, but delay (the implicit) memset() in + commit 4a546e7b2f471 ("In arraylist, use malloc instead of calloc, + avoid clearing with memeset until we really need to, and micro-optimize + array_list_add().") which is not suitable for a backport. +--- json-c-0.13.orig/json_object.c 2017-12-05 05:44:03.000000000 +0100 ++++ json-c-0.13/json_object.c 2025-01-08 02:21:42.515180709 +0100 +@@ -218,7 +218,7 @@ static struct json_object* json_object_n + { + struct json_object *jso; + +- jso = (struct json_object*)calloc(sizeof(struct json_object), 1); ++ jso = (struct json_object*)calloc(1, sizeof(struct json_object)); + if (!jso) + return NULL; + jso->o_type = o_type; diff --git a/package/libass/Makefile b/package/libass/Makefile index b7cf2d2f5..f9bcc9906 100644 --- a/package/libass/Makefile +++ b/package/libass/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= f0da0bbfba476c16ae3e1cfd862256d30915911f7abaa1b16ce62ee653192784 PKG_DESCR:= portable subtitle renderer PKG_SECTION:= libs/video -PKG_DEPENDS:= fribidi fontconfig -PKG_BUILDDEP:= fribidi fontconfig +PKG_DEPENDS:= fribidi fontconfig harfbuzz +PKG_BUILDDEP:= fribidi fontconfig harfbuzz PKG_SITES:= https://github.com/libass/libass/releases/download/$(PKG_VERSION)/ PKG_OPTS:= dev diff --git a/package/libelf/Makefile b/package/libelf/Makefile deleted file mode 100644 index 708b3bbd7..000000000 --- a/package/libelf/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# This file is part of the OpenADK project. OpenADK is copyrighted -# material, please see the LICENCE file in the top-level directory. - -include ${ADK_TOPDIR}/rules.mk - -PKG_NAME:= libelf -PKG_VERSION:= 0.8.13 -PKG_RELEASE:= 1 -PKG_HASH:= 591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d -PKG_DESCR:= elf library -PKG_SECTION:= libs/misc -PKG_SITES:= http://www.mr511.de/software/ -PKG_OPTS:= dev - -DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz - -include ${ADK_TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,LIBELF,libelf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) - -CONFIGURE_ENV+= mr_cv_target_elf=yes \ - ac_cv_sizeof_long_long=8 -CONFIGURE_ARGS+= --enable-elf64=yes \ - --disable-sanity-checks -FAKE_FLAGS+= instroot="${WRKINST}" - -libelf-install: - ${INSTALL_DIR} ${IDIR_LIBELF}/usr/lib - ${CP} ${WRKINST}/usr/lib/libelf.so* ${IDIR_LIBELF}/usr/lib/ - -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libelf/patches/patch-lib_Makefile_in b/package/libelf/patches/patch-lib_Makefile_in deleted file mode 100644 index 7630c7f5c..000000000 --- a/package/libelf/patches/patch-lib_Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- libelf-0.8.13.orig/lib/Makefile.in 2009-11-01 14:04:19.000000000 +0100 -+++ libelf-0.8.13/lib/Makefile.in 2011-01-15 21:55:08.000000000 +0100 -@@ -158,7 +158,7 @@ libelf.a: $(OBJS) $(LIBOBJS) - - $(SHLIB): libelf.a - @$(RM) $(SHLIB) -- $(LINK_SHLIB) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS) -+ $(LINK_SHLIB) $(LDFLAGS) -o $(SHLIB) $(OBJS:.o=.os) $(LIBOBJS:.o=.os) $(DEPSHLIBS) - if test "$(SONAME)" = "$(SHLIB)"; then true; else \ - $(RM) $(SONAME) && $(LN_S) $(SHLIB) $(SONAME); \ - fi diff --git a/package/libexif/Makefile b/package/libexif/Makefile new file mode 100644 index 000000000..f22edca4f --- /dev/null +++ b/package/libexif/Makefile @@ -0,0 +1,27 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= libexif +PKG_VERSION:= 0.6.24 +PKG_RELEASE:= 1 +PKG_HASH:= d47564c433b733d83b6704c70477e0a4067811d184ec565258ac563d8223f6ae +PKG_DESCR:= Library for parsing, editing, and saving EXIF data +PKG_SECTION:= libs/image +PKG_URL:= https://libexif.github.io/ +PKG_SITES:= https://github.com/libexif/libexif/releases/download/v${PKG_VERSION}/ +PKG_OPTS:= dev + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,LIBEXIF,libexif,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) + +libexif-install: + $(INSTALL_DIR) $(IDIR_LIBEXIF)/usr/lib + $(CP) $(WRKINST)/usr/lib/libexif*.so* \ + $(IDIR_LIBEXIF)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libffi/Makefile b/package/libffi/Makefile index c6cfe64e9..b6dd3c851 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -22,7 +22,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,LIBFFI,libffi,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --disable-builddir --with-pic --disable-symvers CONFIGURE_ARGS+= --disable-builddir --with-pic --disable-symvers diff --git a/package/libuv/Makefile b/package/libuv/Makefile index 3a8b43a61..8ddad9e87 100644 --- a/package/libuv/Makefile +++ b/package/libuv/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libuv -PKG_VERSION:= 1.42.0 +PKG_VERSION:= 1.50.0 PKG_RELEASE:= 1 -PKG_HASH:= 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764 +PKG_HASH:= b1ec56444ee3f1e10c8bd3eed16ba47016ed0b94fe42137435aaf2e0bd574579 PKG_DESCR:= multi-platform support library PKG_SECTION:= libs/misc PKG_URL:= https://github.com/libuv/libuv/ diff --git a/package/libuv/patches/patch-libuv_pc_in b/package/libuv/patches/patch-libuv_pc_in deleted file mode 100644 index 4c7ae339d..000000000 --- a/package/libuv/patches/patch-libuv_pc_in +++ /dev/null @@ -1,12 +0,0 @@ ---- libuv-1.42.0.orig/libuv.pc.in 2021-07-20 04:44:04.000000000 +0200 -+++ libuv-1.42.0/libuv.pc.in 2021-10-29 13:40:49.561398557 +0200 -@@ -1,7 +1,7 @@ - prefix=@prefix@ - exec_prefix=${prefix} --libdir=@libdir@ --includedir=@includedir@ -+libdir=${prefix}/@libdir@ -+includedir=${prefix}/@includedir@ - - Name: libuv - Version: @PACKAGE_VERSION@ diff --git a/package/libxml2/Makefile b/package/libxml2/Makefile index 20a1428b7..078788d7e 100644 --- a/package/libxml2/Makefile +++ b/package/libxml2/Makefile @@ -22,7 +22,6 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBXML2,libxml2,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,LIBXML2,libxml2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_STYLE:= auto HOST_CONFIGURE_ARGS+= --without-python \ --with-threads \ --without-iconv \ diff --git a/package/linux-atm/patches/patch-src_ilmid_io_c b/package/linux-atm/patches/patch-src_ilmid_io_c deleted file mode 100644 index 9b88b0b49..000000000 --- a/package/linux-atm/patches/patch-src_ilmid_io_c +++ /dev/null @@ -1,15 +0,0 @@ ---- linux-atm-2.5.1.orig/src/ilmid/io.c 2007-07-11 18:07:57.000000000 +0200 -+++ linux-atm-2.5.1/src/ilmid/io.c 2013-08-15 21:40:35.168523713 +0200 -@@ -48,6 +48,12 @@ - be manually configured (after ilmid has - registered the "official" address) - HACK */ - -+#ifndef SUN_LEN -+# include <string.h> /* For prototype of `strlen'. */ -+ /* Evaluate to actual length of the `sockaddr_un' structure. */ -+# define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) + strlen ((ptr)->sun_path)) -+#endif -+ - extern SysGroup *remsys; - extern State ilmi_state; - static short atm_itf = -1; /* bad value */ diff --git a/package/linux-atm/patches/patch-src_mpoad_io_c b/package/linux-atm/patches/patch-src_mpoad_io_c deleted file mode 100644 index 14dd75d00..000000000 --- a/package/linux-atm/patches/patch-src_mpoad_io_c +++ /dev/null @@ -1,18 +0,0 @@ ---- linux-atm-2.5.1.orig/src/mpoad/io.c 2007-12-11 18:46:12.000000000 +0100 -+++ linux-atm-2.5.1/src/mpoad/io.c 2013-08-17 14:41:53.542968628 +0200 -@@ -10,14 +10,7 @@ - #include <errno.h> - #include <sys/ioctl.h> - #include <sys/param.h> /* for OPEN_MAX */ --#if __GLIBC__ >= 2 --#include <sys/poll.h> --#else /* ugly hack to make it compile on RH 4.2 - WA */ --#include <syscall.h> --#include <linux/poll.h> --#define SYS_poll 168 --_syscall3(int,poll,struct pollfd *,ufds,unsigned int,nfds,int,timeout); --#endif -+#include <poll.h> - #include <atm.h> - #include <linux/types.h> - #include <linux/atmioc.h> diff --git a/package/linux-atm/patches/patch-src_sigd_atmsigd_c b/package/linux-atm/patches/patch-src_sigd_atmsigd_c deleted file mode 100644 index 7eb31abf9..000000000 --- a/package/linux-atm/patches/patch-src_sigd_atmsigd_c +++ /dev/null @@ -1,11 +0,0 @@ ---- linux-atm-2.5.1.orig/src/sigd/atmsigd.c 2004-09-25 13:25:48.000000000 +0200 -+++ linux-atm-2.5.1/src/sigd/atmsigd.c 2013-08-15 21:22:05.226477574 +0200 -@@ -517,7 +517,7 @@ int main(int argc,char **argv) - exit(0); - } - } -- (void) on_exit(trace_on_exit,NULL); -+ (void) atexit(trace_on_exit); - poll_loop(); - close_all(); - for (sig = entities; sig; sig = sig->next) stop_saal(&sig->saal); diff --git a/package/ltp/Makefile b/package/ltp/Makefile index d2d2358a0..8f9ebaa88 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp -PKG_VERSION:= 20240930 +PKG_VERSION:= 20250130 PKG_RELEASE:= 1 PKG_DESCR:= linux test project -PKG_HASH:= 3e9e806405aa602e2d21d221d885fd4914ff2da23eb8bba3d0f0f468bdf60238 +PKG_HASH:= 02e4ec326be54c3fd92968229a468c02c665d168a8a673edc38a891f7395ae10 PKG_DEPENDS:= bash mke2fs mkfs shadow libtirpc libaio PKG_DEPENDS+= kmod dosfstools PKG_BUILDDEP+= libtirpc libaio diff --git a/package/ltrace/Makefile b/package/ltrace/Makefile index c26099d09..1ce0e48c1 100644 --- a/package/ltrace/Makefile +++ b/package/ltrace/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= 0e6f8c077471b544c06def7192d983861ad2f8688dd5504beae62f0c5f5b9503 PKG_DESCR:= intercepts and records dynamic library calls PKG_SECTION:= app/debug -PKG_DEPENDS:= libelf -PKG_BUILDDEP:= libelf +PKG_DEPENDS:= elfutils +PKG_BUILDDEP:= elfutils PKG_NEEDS:= c++ PKG_URL:= http://ltrace.org/ PKG_SITES:= http://www.ltrace.org/ diff --git a/package/make/Makefile b/package/make/Makefile index ee584771a..3a130489c 100644 --- a/package/make/Makefile +++ b/package/make/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3 PKG_DESCR:= c/c++ code buildtool PKG_SECTION:= dev/tools -PKG_DEPENDS:= libelf -PKG_BUILDDEP:= libelf +PKG_DEPENDS:= elfutils +PKG_BUILDDEP:= elfutils PKG_URL:= http://www.gnu.org/software/make PKG_SITES:= ${MASTER_SITE_GNU:=make/} diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile index 69d17ee2f..1301203cc 100644 --- a/package/mdadm/Makefile +++ b/package/mdadm/Makefile @@ -4,23 +4,32 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mdadm -PKG_VERSION:= 4.2 +PKG_VERSION:= 4.4 PKG_RELEASE:= 1 -PKG_HASH:= 461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d +PKG_HASH:= 556266fb8322de465eff2aa7e0f7d2b1056153770c70971834833f571dbc02a2 PKG_DESCR:= tool for managing software raid arrays PKG_DEPENDS:= libudev PKG_BUILDDEP:= eudev PKG_KDEPENDS:= blk-dev-md md md-raid0 md-raid1 md-raid456 PKG_SECTION:= sys/fs PKG_URL:= http://neil.brown.name/blog/mdadm -PKG_SITES:= ${MASTER_SITE_KERNEL:=utils/raid/mdadm/} +PKG_SITES:= https://github.com/md-raid-utilities/mdadm/archive/refs/tags/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/${PKG_NAME}-${PKG_NAME}-${PKG_VERSION} include ${ADK_TOPDIR}/mk/package.mk $(eval $(call PKG_template,MDADM,mdadm,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIG_STYLE:= manual -XAKE_FLAGS+= CROSS_COMPILE="${TARGET_CROSS}" CHECK_RUN_DIR=0 +# gcc-12.4.0 at least seems to get some things wrong +TARGET_CFLAGS+= -Wno-error=uninitialized +# Without this, I get "undefined reference to `__stack_chk_fail'" while linking +TARGET_CFLAGS+= -fno-stack-protector +XAKE_FLAGS+= CROSS_COMPILE="${TARGET_CROSS}" \ + CHECK_RUN_DIR=0 \ + CXFLAGS="${TARGET_CFLAGS}" mdadm-install: ${INSTALL_DIR} ${IDIR_MDADM}/usr/sbin diff --git a/package/minidlna/Makefile b/package/minidlna/Makefile new file mode 100644 index 000000000..2a51c978d --- /dev/null +++ b/package/minidlna/Makefile @@ -0,0 +1,29 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= minidlna +PKG_VERSION:= 1.3.3 +PKG_RELEASE:= 1 +PKG_HASH:= 39026c6d4a139b9180192d1c37225aa3376fdf4f1a74d7debbdbb693d996afa4 +PKG_DESCR:= DLNA/UPnP-AV compliant media server +PKG_SECTION:= mm/video +PKG_DEPENDS:= libffmpeg libjpeg-turbo libexif libid3tag libogg libflac libvorbis libsqlite libiconv +PKG_BUILDDEP:= ffmpeg libjpeg-turbo libexif libid3tag libogg flac libvorbis sqlite libiconv +PKG_URL:= http://sourceforge.net/projects/minidlna/ +PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=minidlna/) +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,MINIDLNA,minidlna,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) + +minidlna-install: + $(INSTALL_DIR) $(IDIR_MINIDLNA)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/minidlnad \ + $(IDIR_MINIDLNA)/usr/sbin + $(INSTALL_DIR) $(IDIR_MINIDLNA)/etc/ + $(INSTALL_DATA) $(WRKSRC)/minidlna.conf $(IDIR_MINIDLNA)/etc/ + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/minidlna/files/minidlna.init b/package/minidlna/files/minidlna.init new file mode 100644 index 000000000..c4a1fe795 --- /dev/null +++ b/package/minidlna/files/minidlna.init @@ -0,0 +1,36 @@ +#!/bin/sh +#PKG minidlna +#INIT 60 +. /etc/rc.conf + +pidfile=$(echo "$minidlna_flags" | sed -n 's/.*-P \([^ ]\+\).*/\1/p') +[ "$pidfile" ] || pidfile="/var/run/minidlna/minidlna.pid" + +case $1 in +autostop) ;; +autostart) + test x"${minidlna:-NO}" = x"NO" && exit 0 + test x"$minidlna" = x"DAEMON" && test -x /bin/mksh && exec mksh -T- $0 start + exec sh $0 start + ;; +start) + /usr/sbin/minidlnad $minidlna_flags + ;; +stop) + if [ -f "$pidfile" ]; then + kill $(<$pidfile) + rm $pidfile + else + kill $(pgrep -f /usr/sbin/minidlnad) + fi + ;; +restart) + sh $0 stop + sleep 1 + sh $0 start + ;; +*) + echo "usage: $0 (start | stop | restart)" + exit 1 +esac +exit $? diff --git a/package/minidlna/files/minidlna.postinst b/package/minidlna/files/minidlna.postinst new file mode 100644 index 000000000..6c14ff1e8 --- /dev/null +++ b/package/minidlna/files/minidlna.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf minidlna NO diff --git a/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch b/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch new file mode 100644 index 000000000..c42c28097 --- /dev/null +++ b/package/minidlna/patches/0001-log-Try-syslog-if-no-log-path-was-given.patch @@ -0,0 +1,104 @@ +From 989841a0c4e83b0ac1b9d276be3797bcfa83bcb1 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Sun, 27 Nov 2022 23:45:41 +0100 +Subject: [PATCH] log: Try syslog if no log path was given + +Signed-off-by: Phil Sutter <phil@nwl.cc> +--- + log.c | 44 ++++++++++++++++++++++++++++++++++++++++++-- + minidlna.c | 2 -- + 2 files changed, 42 insertions(+), 4 deletions(-) + +diff --git a/log.c b/log.c +index a989904a24d93..840a8c02e678b 100644 +--- a/log.c ++++ b/log.c +@@ -23,6 +23,7 @@ + #include <stdio.h> + #include <stdarg.h> + #include <string.h> ++#include <syslog.h> + #include <time.h> + + #include "upnpglobalvars.h" +@@ -147,6 +148,40 @@ log_init(const char *debug) + return 0; + } + ++static int ++syslog_err(int level, enum _log_facility facility, ++ char *fname, int lineno, char *fmt, va_list *ap) ++{ ++ char myfmt[1024]; ++ int level_to_syslog[E_MAXDEBUG + 1] = { ++ /* [E_OFF] = 0, */ ++ [E_FATAL] = LOG_CRIT, ++ [E_ERROR] = LOG_ERR, ++ [E_WARN] = LOG_WARNING, ++ [E_INFO] = LOG_NOTICE, ++ [E_DEBUG] = LOG_INFO, ++ [E_MAXDEBUG] = LOG_DEBUG, ++ }; ++ ++ if (level == E_OFF) ++ return 0; ++ ++ if (level > E_MAXDEBUG) ++ return -1; ++ ++ if (level) ++ snprintf(myfmt, 1024, "%s:%d: %s: %s", fname, lineno, level_name[level], fmt); ++ else ++ snprintf(myfmt, 1024, "%s:%d: %s", fname, lineno, fmt); ++ ++ vsyslog(level_to_syslog[level], myfmt, *ap); ++ ++ if (level == E_FATAL) ++ exit(-1); ++ ++ return 0; ++} ++ + void + log_err(int level, enum _log_facility facility, char *fname, int lineno, char *fmt, ...) + { +@@ -155,8 +190,14 @@ log_err(int level, enum _log_facility facility, char *fname, int lineno, char *f + if (level && level>log_level[facility] && level>E_FATAL) + return; + +- if (!log_fp) ++ va_start(ap, fmt); ++ if (!log_fp) { ++ if (!syslog_err(level, facility, fname, lineno, fmt, &ap)) { ++ va_end(ap); ++ return; ++ } + log_fp = stdout; ++ } + + // timestamp + if (!GETFLAG(SYSTEMD_MASK)) +@@ -176,7 +217,6 @@ log_err(int level, enum _log_facility facility, char *fname, int lineno, char *f + fprintf(log_fp, "%s:%d: ", fname, lineno); + + // user log +- va_start(ap, fmt); + if (vfprintf(log_fp, fmt, ap) == -1) + { + va_end(ap); +diff --git a/minidlna.c b/minidlna.c +index 999adee977353..db29d603d1e28 100644 +--- a/minidlna.c ++++ b/minidlna.c +@@ -817,8 +817,6 @@ init(int argc, char **argv) + optionsfile); + } + } +- if (!log_path[0]) +- strncpyt(log_path, DEFAULT_LOG_PATH, sizeof(log_path)); + if (!db_path[0]) + strncpyt(db_path, DEFAULT_DB_PATH, sizeof(db_path)); + +-- +2.38.1 + diff --git a/package/ndisc6/patches/patch-src_traceroute_h b/package/ndisc6/patches/patch-src_traceroute_h index d47efc0c3..1571df884 100644 --- a/package/ndisc6/patches/patch-src_traceroute_h +++ b/package/ndisc6/patches/patch-src_traceroute_h @@ -8,9 +8,9 @@ $Id: update-patches 24 2008-08-31 14:56:13Z wbx $ -typedef ssize_t (*trace_parser_t) (const void *restrict data, size_t len, - int *restrict ttl, - unsigned *restrict n, uint16_t port); -+typedef ssize_t (*trace_parser_t) (const data, size_t len, -+ int ttl, -+ unsigned n, uint16_t port); ++typedef ssize_t (*trace_parser_t) (const void *data, size_t len, ++ int *ttl, ++ unsigned *n, uint16_t port); typedef struct tracetype { diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 58188d011..748d6ac6d 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= b2fc3500840ebe532734c4786b0da4ef0a5f67e51ef4c86b3345d697e4976adf PKG_DESCR:= snmp agent PKG_SECTION:= net/misc -PKG_DEPENDS:= libnetsnmp libelf libnl -PKG_BUILDDEP:= libelf libnl +PKG_DEPENDS:= libnetsnmp elfutils libnl +PKG_BUILDDEP:= elfutils libnl PKG_URL:= http://www.net-snmp.org/ PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=net-snmp/) PKG_NOPARALLEL:= 1 @@ -21,9 +21,9 @@ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SUBPKGS:= SNMPD SNMP_UTILS LIBNETSNMP PKGSD_SNMP_UTILS:= snmp utilities -PKGSS_SNMP_UTILS:= libnetsnmp libelf +PKGSS_SNMP_UTILS:= libnetsnmp elfutils PKGSD_LIBNETSNMP:= snmp library -PKGSS_LIBNETSNMP:= libelf +PKGSS_LIBNETSNMP:= elfutils PKGSC_LIBNETSNMP:= libs/net PKG_FLAVOURS_SNMPD:= WITH_IPV6 diff --git a/package/openssl/Makefile b/package/openssl/Makefile index 01841828c..9a2c8a7f2 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 3.3.2 +PKG_VERSION:= 3.4.1 PKG_RELEASE:= 1 -PKG_HASH:= 2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 +PKG_HASH:= 002a2d6b30b58bf4bea46c43bdd96365aaf8daa6c428782aa4feee06da197df3 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= https://openssl-library.org/ @@ -38,7 +38,7 @@ OPENSSL_OPTIONS:= shared zlib-dynamic endif OPENSSL_OPTIONS+= threads no-err no-tests no-fuzz-libfuzzer no-fuzz-afl -OPENSSL_OPTIONS+= no-rc5 no-rc2 no-rc4 no-md2 no-idea +OPENSSL_OPTIONS+= no-rc5 no-rc2 no-rc4 no-md2 no-idea no-docs HOST_STYLE:= manual CONFIG_STYLE:= manual diff --git a/package/python3-jinja2/Makefile b/package/python3-jinja2/Makefile index 5cde4fc47..3a5108562 100644 --- a/package/python3-jinja2/Makefile +++ b/package/python3-jinja2/Makefile @@ -22,7 +22,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,PYTHON3_JINJA2,python3-jinja2,${PKG_VERSION}-${PKG_RELEASE})) -include $(ADK_TOPDIR)/mk/python.mk +include $(ADK_TOPDIR)/mk/python3.mk HOST_STYLE:= manual diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 508e7d9f6..b18291929 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= rsync -PKG_VERSION:= 3.2.7 +PKG_VERSION:= 3.4.1 PKG_RELEASE:= 1 -PKG_HASH:= 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb +PKG_HASH:= 2924bcb3a1ed8b551fc101f740b9f0fe0a202b115027647cf69850d65fd88c52 PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net/misc PKG_DEPENDS:= libpopt libopenssl @@ -28,7 +28,6 @@ HOST_CONFIGURE_ARGS:= --disable-xxhash \ --disable-lz4 CONFIGURE_ARGS:= --disable-xxhash \ --disable-zstd \ - --disable-simd \ --disable-lz4 rsync-install: diff --git a/package/samba/Makefile b/package/samba/Makefile index e47d34af3..63085b06a 100644 --- a/package/samba/Makefile +++ b/package/samba/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= samba PKG_VERSION:= 4.19.4 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 4026d93b866db198c8ca1685b0f5d52793f65c6e63cb364163af661fdff0968c PKG_DESCR:= file and print server PKG_SECTION:= net/fs @@ -68,8 +68,11 @@ pre-configure: echo 'Checking uname machine type: "$(ADK_TARGET_ARCH)"' >>$(WRKSRC)/cache.txt ifneq ($(ADK_LINUX_64),) echo 'Checking for a 64-bit host to support lmdb: OK' >>$(WRKSRC)/cache.txt + echo 'Checking for large file support without additional flags: OK' >>$(WRKSRC)/cache.txt else echo 'Checking for a 64-bit host to support lmdb: NO' >>$(WRKSRC)/cache.txt + echo 'Checking for large file support without additional flags: NO' >>$(WRKSRC)/cache.txt + echo 'Checking for -D_FILE_OFFSET_BITS=64: OK' >>$(WRKSRC)/cache.txt endif samba-install: diff --git a/package/samba/files/cache.txt b/package/samba/files/cache.txt index 9ab9fcd5b..e08011165 100644 --- a/package/samba/files/cache.txt +++ b/package/samba/files/cache.txt @@ -2,8 +2,6 @@ Checking simple C program: OK rpath library support: OK -Wl,--version-script support: OK Checking getconf LFS_CFLAGS: NO -Checking for large file support without additional flags: OK -Checking for -D_LARGE_FILES: OK Checking correct behavior of strtoll: NO Checking for working strptime: OK Checking for C99 vsnprintf: OK diff --git a/package/screen/Makefile b/package/screen/Makefile index ce436e084..a5dbf8043 100644 --- a/package/screen/Makefile +++ b/package/screen/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 1 PKG_HASH:= f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971 PKG_DESCR:= window manager for the terminal session PKG_SECTION:= sys/utils -PKG_DEPENDS:= libncurses libelf -PKG_BUILDDEP:= ncurses libelf +PKG_DEPENDS:= libncurses elfutils +PKG_BUILDDEP:= ncurses elfutils PKG_NEEDS:= mmu PKG_URL:= http://www.gnu.org/software/screen/ PKG_SITES:= ${MASTER_SITE_GNU:=screen/} diff --git a/package/squid/Makefile b/package/squid/Makefile index e4e83cdc4..7a1199e69 100644 --- a/package/squid/Makefile +++ b/package/squid/Makefile @@ -4,16 +4,19 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= squid -PKG_VERSION:= 6.10 +PKG_VERSION:= 6.13 PKG_RELEASE:= 1 -PKG_HASH:= 0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7 +PKG_HASH:= 9b33de09d733b5933f6c2b54ebe0be51a9fa4751f183f3aead90b3c5d930aa72 PKG_DESCR:= web and cache proxy PKG_SECTION:= net/proxy -PKG_DEPENDS:= libltdl +PKG_DEPENDS:= libltdl libxcrypt PKG_BUILDDEP:= libtool +PKG_BUILDDEP_GLIBC:= libxcrypt PKG_NEEDS:= threads c++ PKG_URL:= http://www.squid-cache.org/ -PKG_SITES:= http://www.squid-cache.org/Versions/v6/ +PKG_SITES:= https://github.com/squid-cache/squid/releases/download/SQUID_6_13/ + +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SUBPKGS:= SQUID SQUID_MOD_BASIC_AUTH_GETPWNAM SQUID_MOD_BASIC_AUTH_NCSA PKG_SUBPKGS+= SQUID_MOD_BASIC_AUTH_SMB SQUID_MOD_DIGEST_AUTH_FILE @@ -110,7 +113,7 @@ $(eval $(call PKG_mod_template,SQUID_MOD_EXTERNAL_ACL_UNIX_GROUP,ext_unix_group_ $(eval $(call PKG_mod_template,SQUID_MOD_NTLM_AUTH_FAKE,ntlm_fake_auth)) TARGET_LDFLAGS+= -lpthread -HOST_CXXFLAGS+= -static-libstdc++ +HOST_CXXFLAGS+= -std=c++17 -static-libstdc++ CONFIGURE_ENV+= ac_cv_func_setresuid=yes \ ac_cv_func_va_copy=yes \ diff --git a/package/strace/Makefile b/package/strace/Makefile index d445c4737..f32f720af 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= strace -PKG_VERSION:= 6.11 +PKG_VERSION:= 6.13 PKG_RELEASE:= 1 -PKG_HASH:= 83262583a3529f02c3501aa8b8ac772b4cbc03dc934e98bab6e4883626e283a5 +PKG_HASH:= e209daf0ee038ca5adcc4c277e9273b4d51f46a2ff86da575d36742ac3508a17 PKG_DESCR:= system call trace program PKG_SECTION:= app/debug PKG_URL:= https://strace.io diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 85c0397e8..33c2d1809 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -109,6 +109,11 @@ CONFIGURE_ARGS+= --exec-prefix=/usr \ --enable-libuuid \ --enable-libblkid \ --enable-libmount +ifneq (${ADK_PACKAGE_LSFD},) +CONFIGURE_ARGS+= --enable-lsfd +else +CONFIGURE_ARGS+= --disable-lsfd +endif TARGET_CFLAGS+= -fPIC FAKE_FLAGS+= INSTALLSUID="install -m 4755" diff --git a/package/valgrind/Makefile b/package/valgrind/Makefile index 10e7b35fc..4ea3e65cf 100644 --- a/package/valgrind/Makefile +++ b/package/valgrind/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= valgrind -PKG_VERSION:= 3.22.0 +PKG_VERSION:= 3.24.0 PKG_RELEASE:= 1 -PKG_HASH:= c811db5add2c5f729944caf47c4e7a65dcaabb9461e472b578765dd7bf6d2d4c +PKG_HASH:= 71aee202bdef1ae73898ccf7e9c315134fa7db6c246063afc503aef702ec03bd PKG_DESCR:= memory management debugging tool PKG_SECTION:= app/debug PKG_URL:= http://valgrind.org/ diff --git a/package/zfs/Makefile b/package/zfs/Makefile new file mode 100644 index 000000000..0e3db6392 --- /dev/null +++ b/package/zfs/Makefile @@ -0,0 +1,70 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= zfs +PKG_VERSION:= 2.2.6 +PKG_RELEASE:= 1 +PKG_HASH:= c92e02103ac5dd77bf01d7209eabdca55c7b3356aa747bb2357ec4222652a2a7 +PKG_DESCR:= Advanced file system and volume manager +PKG_SECTION:= sys/fs +PKG_DEPENDS:= libcurl +PKG_URL:= https://openzfs.org +PKG_SITES:= https://github.com/openzfs/zfs/releases/download/${PKG_NAME}-${PKG_VERSION}/ +DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz + +PKG_SUBPKGS:= ZFS ZFS_TESTS +PKGSS_ZFS_TESTS:= bash +PKGSC_ZFS_TESTS:= base/tests +PKGSD_ZFS_TESTS:= OpenZFS testsuite + +include $(ADK_TOPDIR)/mk/package.mk +include $(ADK_TOPDIR)/mk/$(ADK_TARGET_OS)-ver.mk +include ${ADK_TOPDIR}/mk/kernel-vars.mk + +$(eval $(call PKG_template,ZFS,zfs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +$(eval $(call PKG_template,ZFS_TESTS,zfs-tests,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_ZFS_TESTS),$(PKGSD_ZFS_TESTS),$(PKGSC_ZFS_TESTS))) + +AUTOTOOL_STYLE:= autoreconf +CONFIGURE_ARGS+= --with-linux=${LINUX_DIR} --without-python +CONFIGURE_ENV+= KERNEL_CC="${TARGET_CC}" \ + KERNEL_CROSS_COMPILE="${TARGET_CROSS}" \ + KERNEL_ARCH="${ADK_TARGET_KARCH}" + +zfs-install: + $(INSTALL_DIR) $(IDIR_ZFS)/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/mount.zfs $(IDIR_ZFS)/sbin + $(INSTALL_DIR) $(IDIR_ZFS)/etc/zfs/zed.d + $(CP) $(WRKINST)/etc/zfs/zed.d/* $(IDIR_ZFS)/etc/zfs/zed.d + $(CP) $(WRKINST)/etc/zfs/zfs-functions $(IDIR_ZFS)/etc/zfs + $(INSTALL_DIR) $(IDIR_ZFS)/etc/zfs/zpool.d + $(CP) $(WRKINST)/etc/zfs/zpool.d/* $(IDIR_ZFS)/etc/zfs/zpool.d + $(INSTALL_DIR) $(IDIR_ZFS)/lib/modules/${KERNEL_VERSION}/ + $(CP) $(WRKINST)/lib/modules/${KERNEL_VERSION}/extra/{zfs,spl}.ko \ + $(IDIR_ZFS)/lib/modules/${KERNEL_VERSION}/ + $(INSTALL_DIR) $(IDIR_ZFS)/etc/modules.d/ + printf "spl\nzfs\n" >$(IDIR_ZFS)/etc/modules.d/2-zfs + $(INSTALL_DIR) $(IDIR_ZFS)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/* $(IDIR_ZFS)/usr/bin + $(INSTALL_DIR) $(IDIR_ZFS)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/* $(IDIR_ZFS)/usr/sbin + $(INSTALL_DIR) $(IDIR_ZFS)/usr/libexec/zfs/zed.d + $(INSTALL_BIN) $(WRKINST)/usr/libexec/zfs/zed.d/* \ + $(IDIR_ZFS)/usr/libexec/zfs/zed.d/ + $(INSTALL_DIR) $(IDIR_ZFS)/usr/libexec/zfs/zpool.d + $(INSTALL_BIN) $(WRKINST)/usr/libexec/zfs/zpool.d/* \ + $(IDIR_ZFS)/usr/libexec/zfs/zpool.d/ + $(INSTALL_BIN) $(WRKINST)/usr/libexec/zfs/zpool_influxdb \ + $(IDIR_ZFS)/usr/libexec/zfs/ + $(INSTALL_DIR) $(IDIR_ZFS)/usr/lib + $(CP) $(WRKINST)/usr/lib/*.so* $(IDIR_ZFS)/usr/lib/ + +zfs-tests-install: + $(INSTALL_DIR) $(IDIR_ZFS_TESTS)/usr/share + $(CP) $(WRKINST)/usr/share/zfs $(IDIR_ZFS_TESTS)/usr/share/ + +# XXX: use /usr/share/initramfs-tools for custom init scripts +# or just the files in root/etc/{conf,init}.d + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/zfs/patches/0001-Support-for-cross-compiling-kernel-modules.patch b/package/zfs/patches/0001-Support-for-cross-compiling-kernel-modules.patch new file mode 100644 index 000000000..b20c3ecf6 --- /dev/null +++ b/package/zfs/patches/0001-Support-for-cross-compiling-kernel-modules.patch @@ -0,0 +1,53 @@ +From 1d566bf169297faba7afbe59df151ac479b234d5 Mon Sep 17 00:00:00 2001 +From: Phil Sutter <phil@nwl.cc> +Date: Fri, 3 Jan 2025 16:30:24 +0100 +Subject: [PATCH] Support for cross-compiling kernel modules + +In order to correctly cross-compile, one has to pass ARCH and +CROSS_COMPILE make flags to kernel module build calls. Facilitate this +in the same way as for custom CC flag by recognizing KERNEL_-prefixed +configure environment variables of same name. + +Signed-off-by: Phil Sutter <phil@nwl.cc> +--- + config/kernel.m4 | 5 +++++ + module/Makefile.in | 2 ++ + 2 files changed, 7 insertions(+) + +diff --git a/config/kernel.m4 b/config/kernel.m4 +index 173c78a2a561a..c0a8355945dce 100644 +--- a/config/kernel.m4 ++++ b/config/kernel.m4 +@@ -663,11 +663,16 @@ AC_DEFUN([ZFS_LINUX_COMPILE], [ + building kernel modules]) + AC_ARG_VAR([KERNEL_LLVM], [Binary option to + build kernel modules with LLVM/CLANG toolchain]) ++ AC_ARG_VAR([KERNEL_CROSS_COMPILE], [Cross compile prefix ++ for kernel module builds]) ++ AC_ARG_VAR([KERNEL_ARCH], [Architecture to build kernel modules for]) + AC_TRY_COMMAND([ + KBUILD_MODPOST_NOFINAL="$5" KBUILD_MODPOST_WARN="$6" + make modules -k -j$TEST_JOBS ${KERNEL_CC:+CC=$KERNEL_CC} + ${KERNEL_LD:+LD=$KERNEL_LD} ${KERNEL_LLVM:+LLVM=$KERNEL_LLVM} + CONFIG_MODULES=y CFLAGS_MODULE=-DCONFIG_MODULES ++ ${KERNEL_CROSS_COMPILE:+CROSS_COMPILE=$KERNEL_CROSS_COMPILE} ++ ${KERNEL_ARCH:+ARCH=$KERNEL_ARCH} + -C $LINUX_OBJ $ARCH_UM M=$PWD/$1 >$1/build.log 2>&1]) + AS_IF([AC_TRY_COMMAND([$2])], [$3], [$4]) + ]) +diff --git a/module/Makefile.in b/module/Makefile.in +index b6338430e8125..b6e3c8e88ccac 100644 +--- a/module/Makefile.in ++++ b/module/Makefile.in +@@ -54,6 +54,8 @@ FMAKE = env -u MAKEFLAGS make $(FMAKEFLAGS) + list='$(SUBDIR_TARGETS)'; for td in $$list; do $(MAKE) -C $$td; done + $(MAKE) -C @LINUX_OBJ@ $(if @KERNEL_CC@,CC=@KERNEL_CC@) \ + $(if @KERNEL_LD@,LD=@KERNEL_LD@) $(if @KERNEL_LLVM@,LLVM=@KERNEL_LLVM@) \ ++ $(if @KERNEL_CROSS_COMPILE@,CROSS_COMPILE=@KERNEL_CROSS_COMPILE@) \ ++ $(if @KERNEL_ARCH@,ARCH=@KERNEL_ARCH@) \ + M="$$PWD" @KERNEL_MAKE@ CONFIG_ZFS=m modules + + modules-FreeBSD: +-- +2.43.0 + diff --git a/package/zlib/Makefile b/package/zlib/Makefile index 9d7cea2ae..e5de4a036 100644 --- a/package/zlib/Makefile +++ b/package/zlib/Makefile @@ -27,6 +27,7 @@ endif HOST_STYLE:= auto HOST_CONFIG_STYLE:= manual HOST_CONFIGURE_ENV+= uname=Linux +HOST_FAKE_FLAGS+= DESTDIR=/ CONFIG_STYLE:= manual CONFIGURE_ENV+= uname=Linux @@ -45,7 +46,7 @@ host-configure: CPPFLAGS="-I$(STAGING_HOST_DIR)/usr/include" \ LDFLAGS="-L$(STAGING_HOST_DIR)/usr/lib" \ ./configure \ - --prefix=/usr \ + --prefix=$(STAGING_HOST_DIR)/usr \ --shared \ ); diff --git a/target/arc/kernel/qemu-arc b/target/arc/kernel/qemu-arc index d537406d4..813c00d2e 100644 --- a/target/arc/kernel/qemu-arc +++ b/target/arc/kernel/qemu-arc @@ -1,3 +1,2 @@ CONFIG_ARC=y CONFIG_ARC_HAS_ACCL_REGS=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arc/kernel/synopsys-hsdk b/target/arc/kernel/synopsys-hsdk index 8deed79ef..55ae3ccb6 100644 --- a/target/arc/kernel/synopsys-hsdk +++ b/target/arc/kernel/synopsys-hsdk @@ -9,4 +9,3 @@ CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS=y CONFIG_ARC_HAS_LL64=y CONFIG_ARC_HAS_DIV_REM=y CONFIG_ARC_HAS_ACCL_REGS=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/Makefile b/target/arm/Makefile index 280e954b7..9ce20ef4f 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -180,7 +180,7 @@ ifeq ($(ADK_TARGET_FS),squashfs) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_9)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_12)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y) ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) VENDOR:=arm/ endif diff --git a/target/arm/kernel/banana-p2-zero b/target/arm/kernel/banana-p2-zero index 586bc605a..acd35737e 100644 --- a/target/arm/kernel/banana-p2-zero +++ b/target/arm/kernel/banana-p2-zero @@ -37,7 +37,6 @@ CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_CLONE_BACKWARDS=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OLD_SIGACTION=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_HAVE_ARCH_VMAP_STACK=y CONFIG_VMAP_STACK=y CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y diff --git a/target/arm/kernel/qemu-arm-realview-eb-mpcore b/target/arm/kernel/qemu-arm-realview-eb-mpcore index acd059cc8..9f967f4f2 100644 --- a/target/arm/kernel/qemu-arm-realview-eb-mpcore +++ b/target/arm/kernel/qemu-arm-realview-eb-mpcore @@ -16,4 +16,3 @@ CONFIG_KUSER_HELPERS=y CONFIG_ATAGS=y CONFIG_CMDLINE="console=ttyAMA0 mem=128M" CONFIG_CMDLINE_FROM_BOOTLOADER=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-spitz b/target/arm/kernel/qemu-arm-spitz index 259028d95..09a1d76ff 100644 --- a/target/arm/kernel/qemu-arm-spitz +++ b/target/arm/kernel/qemu-arm-spitz @@ -44,4 +44,3 @@ CONFIG_SERIAL_PXA_NON8250=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-terrier b/target/arm/kernel/qemu-arm-terrier index 4a947ea14..e8a01e232 100644 --- a/target/arm/kernel/qemu-arm-terrier +++ b/target/arm/kernel/qemu-arm-terrier @@ -44,4 +44,3 @@ CONFIG_SERIAL_PXA_NON8250=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index 148fda569..8c08abdc7 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -15,4 +15,3 @@ CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y CONFIG_PLAT_VERSATILE=y CONFIG_VECTORS_BASE=0x00000000 CONFIG_PHYS_OFFSET=0x00000000 -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/arm/kernel/qemu-arm-vexpress-a9 b/target/arm/kernel/qemu-arm-vexpress-a9 index b3953ad10..170965e9b 100644 --- a/target/arm/kernel/qemu-arm-vexpress-a9 +++ b/target/arm/kernel/qemu-arm-vexpress-a9 @@ -13,7 +13,6 @@ CONFIG_ARM_THUMB=y CONFIG_ARM_VIRT_EXT=y CONFIG_SWP_EMULATE=y CONFIG_KUSER_HELPERS=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARM_AMBA=y CONFIG_MFD_CORE=y CONFIG_MFD_SYSCON=y diff --git a/target/arm/kernel/raspberry-pi4 b/target/arm/kernel/raspberry-pi4 index 77c23a997..04b7aadff 100644 --- a/target/arm/kernel/raspberry-pi4 +++ b/target/arm/kernel/raspberry-pi4 @@ -25,7 +25,6 @@ CONFIG_RASPBERRYPI_FIRMWARE=y CONFIG_CLK_BCM2711_DVP=y CONFIG_CLK_BCM2835=y CONFIG_CLK_RASPBERRYPI=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_SERIAL_DEV_BUS=y CONFIG_GPIO_CDEV=y CONFIG_GPIO_CDEV_V1=y diff --git a/target/arm/kernel/solidrun-imx6 b/target/arm/kernel/solidrun-imx6 index 801f1d1b7..3289ef4e7 100644 --- a/target/arm/kernel/solidrun-imx6 +++ b/target/arm/kernel/solidrun-imx6 @@ -21,7 +21,6 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ATAGS_PROC=y CONFIG_AUTO_ZRELADDR=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_MXC_TZIC=y CONFIG_MXC_AVIC=y diff --git a/target/arm/kernel/st-stm32f746g b/target/arm/kernel/st-stm32f746g index 7c8375059..a156d2bff 100644 --- a/target/arm/kernel/st-stm32f746g +++ b/target/arm/kernel/st-stm32f746g @@ -25,4 +25,3 @@ CONFIG_DMADEVICES=y CONFIG_STM32_DMA=y CONFIG_STM32_DMAMUX=y CONFIG_STM32_MDMA=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/bfin/Makefile b/target/bfin/Makefile index 084de21d1..9c28ea4d0 100644 --- a/target/bfin/Makefile +++ b/target/bfin/Makefile @@ -5,7 +5,11 @@ include $(ADK_TOPDIR)/rules.mk include $(ADK_TOPDIR)/mk/kernel-build.mk include $(ADK_TOPDIR)/mk/image.mk +ifeq ($(ADK_TARGET_KERNEL_IMAGE_GZ),y) +KERNEL:=$(LINUX_DIR)/arch/blackfin/boot/vmlinux.bin.gz +else KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) +endif # target helper text ifeq ($(ADK_TARGET_FS),archive) diff --git a/target/bfin/systems/arcturus-ucbf54x b/target/bfin/systems/arcturus-ucbf54x index 1079b4b7e..f3ea2775f 100644 --- a/target/bfin/systems/arcturus-ucbf54x +++ b/target/bfin/systems/arcturus-ucbf54x @@ -1,6 +1,9 @@ config ADK_TARGET_SYSTEM_ARCTURUS_UCBF54X bool "Arcturus uCBF54x" select ADK_TARGET_CPU_BFIN_BF548 + select ADK_TARGET_WITH_NETDEVICE + select ADK_TARGET_WITH_SERIAL + select ADK_TARGET_NO_KERNEL select ADK_TARGET_PACKAGE_TXZ help Arcturus uCBF54x. diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index 75b43639a..79c1f5dfb 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -8,12 +8,18 @@ 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_43_1 +default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_NIOS2 +default ADK_TOOLCHAIN_BINUTILS_2_44 config ADK_TOOLCHAIN_BINUTILS_GIT bool "git" depends on !ADK_TARGET_ARCH_AVR32 +config ADK_TOOLCHAIN_BINUTILS_2_44 + bool "2.44" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_NIOS2 + config ADK_TOOLCHAIN_BINUTILS_2_43_1 bool "2.43.1" depends on !ADK_TARGET_ARCH_AVR32 diff --git a/target/config/Config.in.cmdline b/target/config/Config.in.cmdline index 782f51efe..fa163c36b 100644 --- a/target/config/Config.in.cmdline +++ b/target/config/Config.in.cmdline @@ -3,6 +3,7 @@ config ADK_TARGET_CMDLINE string "Kernel commandline" + depends on !ADK_TARGET_NO_KERNEL default "fbcon=rotate:1" if ADK_TARGET_SYSTEM_SHARP_ZAURUS default "geodewdt.nowayout=1" if ADK_TARGET_MODEL_PCENGINES_ALIX1C default "kinetis_platform=k70-som" if ADK_TARGET_SYSTEM_KINETIS_K70 diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 2b0e0cc27..4c07e594e 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -109,6 +109,28 @@ config ADK_TOOLCHAIN_GCC_6 depends on !ADK_TARGET_ARCH_OR1K depends on !ADK_TARGET_ARCH_LOONGARCH +config ADK_TOOLCHAIN_GCC_5 + bool "5.5.0" + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CSKY + depends on !ADK_TARGET_ARCH_HPPA + depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_ARCH_OR1K + depends on !ADK_TARGET_ARCH_LOONGARCH + +config ADK_TOOLCHAIN_GCC_4 + bool "4.9.4" + depends on !ADK_TARGET_ARCH_ARC + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_CSKY + depends on !ADK_TARGET_ARCH_HPPA + depends on !ADK_TARGET_ARCH_METAG + depends on !ADK_TARGET_ARCH_NDS32 + depends on !ADK_TARGET_ARCH_OR1K + depends on !ADK_TARGET_ARCH_LOONGARCH + config ADK_TOOLCHAIN_GCC_ARC bool "arc-2023.09" depends on ADK_TARGET_ARCH_ARC diff --git a/target/config/Config.in.gdb b/target/config/Config.in.gdb index d8daac66e..f1a09ca9e 100644 --- a/target/config/Config.in.gdb +++ b/target/config/Config.in.gdb @@ -21,7 +21,7 @@ choice prompt "GNU debugger version" depends on ADK_TOOLCHAIN_WITH_GDB default ADK_TOOLCHAIN_GDB_H8300_GIT if ADK_TARGET_ARCH_H8300 -default ADK_TOOLCHAIN_GDB_15_1 +default ADK_TOOLCHAIN_GDB_16_2 config ADK_TOOLCHAIN_GDB_GIT bool "git" @@ -33,6 +33,12 @@ config ADK_TOOLCHAIN_GDB_H8300_GIT bool "h8300-git" depends on ADK_TARGET_ARCH_H8300 +config ADK_TOOLCHAIN_GDB_16_2 + bool "16.2" + depends on !ADK_TARGET_ARCH_AVR32 + depends on !ADK_TARGET_ARCH_H8300 + depends on !ADK_TARGET_ARCH_NDS32 + config ADK_TOOLCHAIN_GDB_15_1 bool "15.1" depends on !ADK_TARGET_ARCH_AVR32 diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt index 2a1fb1e9f..2704b08ae 100644 --- a/target/config/Config.in.kernelfmt +++ b/target/config/Config.in.kernelfmt @@ -13,6 +13,9 @@ config ADK_TARGET_KERNEL_LINUXBIN config ADK_TARGET_KERNEL_IMAGE bool +config ADK_TARGET_KERNEL_IMAGE_GZ + bool + config ADK_TARGET_KERNEL_UIMAGE bool @@ -55,6 +58,7 @@ config ADK_TARGET_KERNEL_LOADER config ADK_TARGET_KERNEL string default "loader" if ADK_TARGET_KERNEL_LOADER + default "vmImage.gz" if ADK_TARGET_KERNEL_IMAGE_GZ default "uImage" if ADK_TARGET_KERNEL_UIMAGE default "uImage.bin" if ADK_TARGET_KERNEL_UIMAGEBIN default "uImage.gz" if ADK_TARGET_KERNEL_UIMAGEGZ @@ -73,6 +77,9 @@ config ADK_TARGET_KERNEL default "bzImage" if ADK_TARGET_SYSTEM_GENERIC_X86_64 || ADK_TARGET_SYSTEM_GENERIC_X86 default "vmlinux" +config ADK_TARGET_NO_KERNEL + bool + config ADK_TARGET_KERNEL_WITH_COMPRESSION bool @@ -84,6 +91,25 @@ config ADK_TARGET_KERNEL_LOADADDR default 0x40008000 if ADK_TARGET_SYSTEM_ORANGE_PI0 default 0xc0008000 if ADK_TARGET_SYSTEM_ST_STM32F746G +config ADK_TARGET_KERNEL_VENDORED_DTB + bool + default y + default n if ADK_TARGET_LINUX_KERNEL_VERSION_6_1 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_5_15 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_5_10 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_5_4 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_19 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_14 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_9 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_4 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_3_16 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_3_4 + default n if ADK_TARGET_LINUX_KERNEL_VERSION_2_6_32 + help + Starting with linux-6.5, DTB files sit in vendor-specific + sub-directories. + config ADK_TARGET_KERNEL_APPEND_DTB string - default "armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 + default "armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 && !ADK_TARGET_KERNEL_VENDORED_DTB + default "marvell/armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 && ADK_TARGET_KERNEL_VENDORED_DTB diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index aff202edf..2cb1fccec 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -79,13 +79,11 @@ config ADK_TARGET_LIB_GLIBC ADK_TARGET_ARCH_ARM || \ ADK_TARGET_ARCH_CSKY || \ ADK_TARGET_ARCH_HPPA || \ - ADK_TARGET_ARCH_IA64 || \ ADK_TARGET_ARCH_LOONGARCH || \ ADK_TARGET_ARCH_M68K || \ ADK_TARGET_ARCH_MICROBLAZE || \ ADK_TARGET_ARCH_MIPS || \ ADK_TARGET_ARCH_MIPS64 || \ - ADK_TARGET_ARCH_NIOS2 || \ ADK_TARGET_ARCH_OR1K || \ ADK_TARGET_ARCH_PPC || \ ADK_TARGET_ARCH_PPC64 || \ @@ -150,16 +148,16 @@ choice prompt "Target C library version" depends on !ADK_TARGET_CHOOSE_ARCH -config ADK_TARGET_LIB_UCLIBC_NG_1_0_50 - bool "1.0.50" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_51 + bool "1.0.51" depends on ADK_TARGET_LIB_UCLIBC_NG config ADK_TARGET_LIB_UCLIBC_NG_GIT bool "git" depends on ADK_TARGET_LIB_UCLIBC_NG && ADK_EXPERIMENTAL -config ADK_TARGET_LIB_GLIBC_2_40 - bool "2.40" +config ADK_TARGET_LIB_GLIBC_2_41 + bool "2.41" depends on ADK_TARGET_LIB_GLIBC config ADK_TARGET_LIB_GLIBC_GIT @@ -200,9 +198,9 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string - default "1.0.50" if ADK_TARGET_LIB_UCLIBC_NG_1_0_50 + default "1.0.51" if ADK_TARGET_LIB_UCLIBC_NG_1_0_51 default "1.2.5" if ADK_TARGET_LIB_MUSL_1_2_5 - default "2.40" if ADK_TARGET_LIB_GLIBC_2_40 + default "2.41" if ADK_TARGET_LIB_GLIBC_2_40 default "4.4.0" if ADK_TARGET_LIB_NEWLIB_4_4_0 default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \ ADK_TARGET_LIB_MUSL_GIT || \ diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain index 144f92a9b..7b5bc2d5b 100644 --- a/target/config/Config.in.toolchain +++ b/target/config/Config.in.toolchain @@ -85,14 +85,6 @@ config ADK_TARGET_USE_LD_BIND_NOW config ADK_TARGET_USE_LD_GC bool "Use LD garbage collection for all packages" -config ADK_TOOLCHAIN_WITH_GOLD - bool "Enable building of GOLD linker" - -config ADK_TARGET_USE_GOLD - bool "Use GOLD as default linker" - depends on ADK_TOOLCHAIN_WITH_GOLD - depends on ADK_TARGET_LIB_GLIBC # can not be build with GOLD (glibc 2.24 checked) - config ADK_TARGET_USE_GNU_HASHSTYLE bool "Use GNU hashstyle for all packages" depends on !ADK_TARGET_ARCH_MIPS diff --git a/target/csky/kernel/qemu-csky b/target/csky/kernel/qemu-csky index 876d5a87f..1d06909b6 100644 --- a/target/csky/kernel/qemu-csky +++ b/target/csky/kernel/qemu-csky @@ -5,4 +5,3 @@ CONFIG_NATIONALCHIP_IRQ=y CONFIG_NATIONALCHIP_TIMER=y CONFIG_CSKYMAC=y CONFIG_SECTION_MISMATCH_WARN_ONLY=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/hppa/kernel/qemu-hppa b/target/hppa/kernel/qemu-hppa index e0d0e95a3..e16c3f466 100644 --- a/target/hppa/kernel/qemu-hppa +++ b/target/hppa/kernel/qemu-hppa @@ -6,4 +6,3 @@ CONFIG_GSC_WAX=y CONFIG_GSC_DINO=y CONFIG_SERIAL_MUX=y CONFIG_SERIAL_MUX_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/kvx/kernel/generic-kvx b/target/kvx/kernel/generic-kvx index 1d953b12e..484a43d3a 100644 --- a/target/kvx/kernel/generic-kvx +++ b/target/kvx/kernel/generic-kvx @@ -247,7 +247,6 @@ CONFIG_STACKPROTECTOR_STRONG=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_RELA=y -# CONFIG_COMPAT_32BIT_TIME is not set CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y diff --git a/target/kvx/kernel/qemu-kvx b/target/kvx/kernel/qemu-kvx index 1d953b12e..484a43d3a 100644 --- a/target/kvx/kernel/qemu-kvx +++ b/target/kvx/kernel/qemu-kvx @@ -247,7 +247,6 @@ CONFIG_STACKPROTECTOR_STRONG=y CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_MODULES_USE_ELF_RELA=y -# CONFIG_COMPAT_32BIT_TIME is not set CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_STRICT_KERNEL_RWX=y diff --git a/target/linux/Config.in b/target/linux/Config.in index 42e4efcbb..fb9d1810e 100644 --- a/target/linux/Config.in +++ b/target/linux/Config.in @@ -28,3 +28,4 @@ source target/linux/config/Config.in.pm source target/linux/config/Config.in.kvm source target/linux/config/Config.in.virtio source target/linux/config/Config.in.debug +source target/linux/config/Config.in.compat diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 0754084ec..e3260d3bc 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -39,8 +39,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK -config ADK_TARGET_LINUX_KERNEL_VERSION_6_11 - bool "6.11.3" +config ADK_TARGET_LINUX_KERNEL_VERSION_6_12 + bool "6.12.11" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -51,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_11 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_6 - bool "6.6.56" + bool "6.6.77" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -62,7 +62,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_6 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_1 - bool "6.1.107" + bool "6.1.127" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -73,7 +73,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_1 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_5_15 - bool "5.15.165" + bool "5.15.177" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -83,7 +83,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_15 depends on !ADK_TARGET_ARCH_METAG config ADK_TARGET_LINUX_KERNEL_VERSION_5_10 - bool "5.10.224" + bool "5.10.233" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -94,7 +94,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_10 depends on !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 - bool "5.4.282" + bool "5.4.289" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -185,7 +185,6 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_3_4 config ADK_TARGET_LINUX_KERNEL_VERSION_2_6_32 bool "2.6.32.70" depends on !ADK_TARGET_ARCH_ARC - depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CSKY depends on !ADK_TARGET_ARCH_H8300 depends on !ADK_TARGET_ARCH_NDS32 @@ -246,7 +245,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT default "f6e9dab9d1dc1e8fa2acb75504bf5ff86b885b8e" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 default "b02c139d3608c8ae87f5398a3a29854f6df7a041" if ADK_TARGET_ARCH_KVX default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 - default "ba0f2212e0e100ee16bdde76b7efca6bb8ee9446" if ADK_TARGET_BOARD_BCM28XX + default "a320d39840745502d420f56b3d49b3723a12058f" if ADK_TARGET_BOARD_BCM28XX default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537 default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70 default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG @@ -258,7 +257,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT config ADK_TARGET_LINUX_KERNEL_GIT_VER string "kernel version" depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT - default "6.6.47" if ADK_TARGET_BOARD_BCM28XX + default "6.6.74" if ADK_TARGET_BOARD_BCM28XX default "5.16" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 default "5.10.110" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "6.6.32" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK diff --git a/target/linux/config/Config.in.compat b/target/linux/config/Config.in.compat new file mode 100644 index 000000000..f255088ab --- /dev/null +++ b/target/linux/config/Config.in.compat @@ -0,0 +1,13 @@ +config ADK_LINUX_KERNEL_COMPAT_32BIT_TIME + bool + default n if ADK_TARGET_ARCH_AARCH64 + default n if ADK_TARGET_ARCH_ALPHA + default n if ADK_TARGET_ARCH_IA64 + default n if ADK_TARGET_ARCH_LOONGARCH + default n if ADK_TARGET_ARCH_MIPS64 + default n if ADK_TARGET_ARCH_PPC64 + default n if ADK_TARGET_ARCH_RISCV64 + default n if ADK_TARGET_ARCH_S390 + default n if ADK_TARGET_ARCH_SPARC64 + default n if ADK_TARGET_ARCH_X86_64 + default y diff --git a/target/linux/config/Config.in.compression b/target/linux/config/Config.in.compression index c2461ba80..6e6a2645c 100644 --- a/target/linux/config/Config.in.compression +++ b/target/linux/config/Config.in.compression @@ -72,7 +72,7 @@ config ADK_LINUX_KERNEL_INITRAMFS_SOURCE choice prompt "Kernel compression" -depends on ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH +depends on ADK_TARGET_OS_LINUX && !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH && !ADK_TARGET_NO_KERNEL default ADK_LINUX_KERNEL_COMP_ZSTD if ADK_TARGET_ARCH_OR1K default ADK_LINUX_KERNEL_COMP_GZIP diff --git a/target/linux/config/Config.in.input b/target/linux/config/Config.in.input index 0d7800c92..7d4932e41 100644 --- a/target/linux/config/Config.in.input +++ b/target/linux/config/Config.in.input @@ -115,6 +115,7 @@ config ADK_LINUX_KERNEL_USB_HID select ADK_LINUX_KERNEL_HID select ADK_LINUX_KERNEL_HID_SUPPORT select ADK_LINUX_KERNEL_HID_GENERIC + select ADK_LINUX_KERNEL_USB_HIDDEV depends on ADK_TARGET_WITH_USB \ || ADK_TARGET_GENERIC \ || ADK_TARGET_QEMU diff --git a/target/linux/patches/5.10.224/arc.patch b/target/linux/patches/5.10.233/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/5.10.224/arc.patch +++ b/target/linux/patches/5.10.233/arc.patch diff --git a/target/linux/patches/5.10.224/darwin-dtc.patch b/target/linux/patches/5.10.233/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.10.224/darwin-dtc.patch +++ b/target/linux/patches/5.10.233/darwin-dtc.patch diff --git a/target/linux/patches/5.10.224/darwin-file2alias.patch b/target/linux/patches/5.10.233/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/5.10.224/darwin-file2alias.patch +++ b/target/linux/patches/5.10.233/darwin-file2alias.patch diff --git a/target/linux/patches/5.10.224/dtc-noyaml.patch b/target/linux/patches/5.10.233/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.10.224/dtc-noyaml.patch +++ b/target/linux/patches/5.10.233/dtc-noyaml.patch diff --git a/target/linux/patches/5.10.224/nds32-ag101p.patch b/target/linux/patches/5.10.233/nds32-ag101p.patch index a8beea478..a8beea478 100644 --- a/target/linux/patches/5.10.224/nds32-ag101p.patch +++ b/target/linux/patches/5.10.233/nds32-ag101p.patch diff --git a/target/linux/patches/5.10.224/or1k-more-ram.patch b/target/linux/patches/5.10.233/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/5.10.224/or1k-more-ram.patch +++ b/target/linux/patches/5.10.233/or1k-more-ram.patch diff --git a/target/linux/patches/5.10.224/relocs.patch b/target/linux/patches/5.10.233/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.10.224/relocs.patch +++ b/target/linux/patches/5.10.233/relocs.patch diff --git a/target/linux/patches/5.10.224/startup.patch b/target/linux/patches/5.10.233/startup.patch index eef481021..eef481021 100644 --- a/target/linux/patches/5.10.224/startup.patch +++ b/target/linux/patches/5.10.233/startup.patch diff --git a/target/linux/patches/5.15.165/darwin-dtc.patch b/target/linux/patches/5.15.177/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.15.165/darwin-dtc.patch +++ b/target/linux/patches/5.15.177/darwin-dtc.patch diff --git a/target/linux/patches/5.15.165/darwin-file2alias.patch b/target/linux/patches/5.15.177/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/5.15.165/darwin-file2alias.patch +++ b/target/linux/patches/5.15.177/darwin-file2alias.patch diff --git a/target/linux/patches/5.15.165/dtc-noyaml.patch b/target/linux/patches/5.15.177/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.15.165/dtc-noyaml.patch +++ b/target/linux/patches/5.15.177/dtc-noyaml.patch diff --git a/target/linux/patches/5.15.165/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/5.15.177/enable-ethernet-bpi-m2-plus.patch index 7e9abd9ce..7e9abd9ce 100644 --- a/target/linux/patches/5.15.165/enable-ethernet-bpi-m2-plus.patch +++ b/target/linux/patches/5.15.177/enable-ethernet-bpi-m2-plus.patch diff --git a/target/linux/patches/5.15.165/nds32-ag101p.patch b/target/linux/patches/5.15.177/nds32-ag101p.patch index a8beea478..a8beea478 100644 --- a/target/linux/patches/5.15.165/nds32-ag101p.patch +++ b/target/linux/patches/5.15.177/nds32-ag101p.patch diff --git a/target/linux/patches/5.15.165/or1k-more-ram.patch b/target/linux/patches/5.15.177/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/5.15.165/or1k-more-ram.patch +++ b/target/linux/patches/5.15.177/or1k-more-ram.patch diff --git a/target/linux/patches/5.15.165/relocs.patch b/target/linux/patches/5.15.177/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.15.165/relocs.patch +++ b/target/linux/patches/5.15.177/relocs.patch diff --git a/target/linux/patches/5.15.165/rockchip-115200.patch b/target/linux/patches/5.15.177/rockchip-115200.patch index ad8a2d7a7..ad8a2d7a7 100644 --- a/target/linux/patches/5.15.165/rockchip-115200.patch +++ b/target/linux/patches/5.15.177/rockchip-115200.patch diff --git a/target/linux/patches/5.15.165/startup.patch b/target/linux/patches/5.15.177/startup.patch index eef481021..eef481021 100644 --- a/target/linux/patches/5.15.165/startup.patch +++ b/target/linux/patches/5.15.177/startup.patch diff --git a/target/linux/patches/5.4.282/arc.patch b/target/linux/patches/5.4.289/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/5.4.282/arc.patch +++ b/target/linux/patches/5.4.289/arc.patch diff --git a/target/linux/patches/5.4.282/arm-nommu.patch b/target/linux/patches/5.4.289/arm-nommu.patch index fdcec3f09..fdcec3f09 100644 --- a/target/linux/patches/5.4.282/arm-nommu.patch +++ b/target/linux/patches/5.4.289/arm-nommu.patch diff --git a/target/linux/patches/5.4.282/darwin-dtc.patch b/target/linux/patches/5.4.289/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.4.282/darwin-dtc.patch +++ b/target/linux/patches/5.4.289/darwin-dtc.patch diff --git a/target/linux/patches/5.4.282/darwin-file2alias.patch b/target/linux/patches/5.4.289/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/5.4.282/darwin-file2alias.patch +++ b/target/linux/patches/5.4.289/darwin-file2alias.patch diff --git a/target/linux/patches/5.4.282/dtc-noyaml.patch b/target/linux/patches/5.4.289/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.4.282/dtc-noyaml.patch +++ b/target/linux/patches/5.4.289/dtc-noyaml.patch diff --git a/target/linux/patches/5.4.282/macsonic.patch b/target/linux/patches/5.4.289/macsonic.patch index 75a6fcad2..75a6fcad2 100644 --- a/target/linux/patches/5.4.282/macsonic.patch +++ b/target/linux/patches/5.4.289/macsonic.patch diff --git a/target/linux/patches/5.4.282/or1k-more-ram.patch b/target/linux/patches/5.4.289/or1k-more-ram.patch index 540dc43b5..540dc43b5 100644 --- a/target/linux/patches/5.4.282/or1k-more-ram.patch +++ b/target/linux/patches/5.4.289/or1k-more-ram.patch diff --git a/target/linux/patches/5.4.282/relocs.patch b/target/linux/patches/5.4.289/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.4.282/relocs.patch +++ b/target/linux/patches/5.4.289/relocs.patch diff --git a/target/linux/patches/5.4.282/sh4.patch b/target/linux/patches/5.4.289/sh4.patch index 8ae79d49d..8ae79d49d 100644 --- a/target/linux/patches/5.4.282/sh4.patch +++ b/target/linux/patches/5.4.289/sh4.patch diff --git a/target/linux/patches/5.4.282/startup.patch b/target/linux/patches/5.4.289/startup.patch index 081aa103a..081aa103a 100644 --- a/target/linux/patches/5.4.282/startup.patch +++ b/target/linux/patches/5.4.289/startup.patch diff --git a/target/linux/patches/6.1.107/armnommu-fix-thread-registers.patch b/target/linux/patches/6.1.127/armnommu-fix-thread-registers.patch index 8ab2196dc..8ab2196dc 100644 --- a/target/linux/patches/6.1.107/armnommu-fix-thread-registers.patch +++ b/target/linux/patches/6.1.127/armnommu-fix-thread-registers.patch diff --git a/target/linux/patches/6.1.107/armnommu-versatile.patch b/target/linux/patches/6.1.127/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.1.107/armnommu-versatile.patch +++ b/target/linux/patches/6.1.127/armnommu-versatile.patch diff --git a/target/linux/patches/6.1.107/board-rockpi4-0003-arm64-dts-pcie.patch b/target/linux/patches/6.1.127/board-rockpi4-0003-arm64-dts-pcie.patch index 1777e7a86..1777e7a86 100644 --- a/target/linux/patches/6.1.107/board-rockpi4-0003-arm64-dts-pcie.patch +++ b/target/linux/patches/6.1.127/board-rockpi4-0003-arm64-dts-pcie.patch diff --git a/target/linux/patches/6.1.107/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/6.1.127/enable-ethernet-bpi-m2-plus.patch index 7e9abd9ce..7e9abd9ce 100644 --- a/target/linux/patches/6.1.107/enable-ethernet-bpi-m2-plus.patch +++ b/target/linux/patches/6.1.127/enable-ethernet-bpi-m2-plus.patch diff --git a/target/linux/patches/6.1.107/hppa-cross-compile.patch b/target/linux/patches/6.1.127/hppa-cross-compile.patch index 5400e87a0..5400e87a0 100644 --- a/target/linux/patches/6.1.107/hppa-cross-compile.patch +++ b/target/linux/patches/6.1.127/hppa-cross-compile.patch diff --git a/target/linux/patches/6.1.107/macsonic.patch b/target/linux/patches/6.1.127/macsonic.patch index 177397221..177397221 100644 --- a/target/linux/patches/6.1.107/macsonic.patch +++ b/target/linux/patches/6.1.127/macsonic.patch diff --git a/target/linux/patches/6.1.107/nios2.patch b/target/linux/patches/6.1.127/nios2.patch index 43631971e..43631971e 100644 --- a/target/linux/patches/6.1.107/nios2.patch +++ b/target/linux/patches/6.1.127/nios2.patch diff --git a/target/linux/patches/6.1.107/or1k-more-ram.patch b/target/linux/patches/6.1.127/or1k-more-ram.patch index 6397f8445..6397f8445 100644 --- a/target/linux/patches/6.1.107/or1k-more-ram.patch +++ b/target/linux/patches/6.1.127/or1k-more-ram.patch diff --git a/target/linux/patches/6.1.107/riscv32.patch b/target/linux/patches/6.1.127/riscv32.patch index 648b0de4d..648b0de4d 100644 --- a/target/linux/patches/6.1.107/riscv32.patch +++ b/target/linux/patches/6.1.127/riscv32.patch diff --git a/target/linux/patches/6.1.107/riscv64-flat.patch b/target/linux/patches/6.1.127/riscv64-flat.patch index ee70ea915..ee70ea915 100644 --- a/target/linux/patches/6.1.107/riscv64-flat.patch +++ b/target/linux/patches/6.1.127/riscv64-flat.patch diff --git a/target/linux/patches/6.1.107/rockchip-115200.patch b/target/linux/patches/6.1.127/rockchip-115200.patch index ad8a2d7a7..ad8a2d7a7 100644 --- a/target/linux/patches/6.1.107/rockchip-115200.patch +++ b/target/linux/patches/6.1.127/rockchip-115200.patch diff --git a/target/linux/patches/6.1.107/rockchip-pcie-timeout.patch b/target/linux/patches/6.1.127/rockchip-pcie-timeout.patch index 2ef7df2da..2ef7df2da 100644 --- a/target/linux/patches/6.1.107/rockchip-pcie-timeout.patch +++ b/target/linux/patches/6.1.127/rockchip-pcie-timeout.patch diff --git a/target/linux/patches/6.6.56/armnommu-fix-thread-registers.patch b/target/linux/patches/6.6.77/armnommu-fix-thread-registers.patch index 8ab2196dc..8ab2196dc 100644 --- a/target/linux/patches/6.6.56/armnommu-fix-thread-registers.patch +++ b/target/linux/patches/6.6.77/armnommu-fix-thread-registers.patch diff --git a/target/linux/patches/6.6.56/armnommu-versatile.patch b/target/linux/patches/6.6.77/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.6.56/armnommu-versatile.patch +++ b/target/linux/patches/6.6.77/armnommu-versatile.patch diff --git a/target/linux/patches/6.6.56/hppa-cross-compile.patch b/target/linux/patches/6.6.77/hppa-cross-compile.patch index 51c24fff2..51c24fff2 100644 --- a/target/linux/patches/6.6.56/hppa-cross-compile.patch +++ b/target/linux/patches/6.6.77/hppa-cross-compile.patch diff --git a/target/linux/patches/6.6.56/macsonic.patch b/target/linux/patches/6.6.77/macsonic.patch index 51e76113b..51e76113b 100644 --- a/target/linux/patches/6.6.56/macsonic.patch +++ b/target/linux/patches/6.6.77/macsonic.patch diff --git a/target/linux/patches/a320d39840745502d420f56b3d49b3723a12058f/defconfig.patch b/target/linux/patches/a320d39840745502d420f56b3d49b3723a12058f/defconfig.patch new file mode 100644 index 000000000..bab9a96aa --- /dev/null +++ b/target/linux/patches/a320d39840745502d420f56b3d49b3723a12058f/defconfig.patch @@ -0,0 +1,54 @@ +diff -Nur linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm/configs/bcm2709_defconfig linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm/configs/bcm2709_defconfig +--- linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm/configs/bcm2709_defconfig 2025-01-29 11:26:07.000000000 +0100 ++++ linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm/configs/bcm2709_defconfig 2025-01-30 10:01:43.360002642 +0100 +@@ -1,4 +1,4 @@ +-CONFIG_LOCALVERSION="-v7" ++CONFIG_LOCALVERSION="" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y +@@ -61,7 +61,7 @@ + CONFIG_MODULE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_MODULE_SRCVERSION_ALL=y +-CONFIG_MODULE_COMPRESS_XZ=y ++CONFIG_MODULE_COMPRESS_NONE=y + CONFIG_PARTITION_ADVANCED=y + CONFIG_MAC_PARTITION=y + CONFIG_BINFMT_MISC=m +diff -Nur linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm/configs/bcm2711_defconfig linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm/configs/bcm2711_defconfig +--- linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm/configs/bcm2711_defconfig 2025-01-29 11:26:07.000000000 +0100 ++++ linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm/configs/bcm2711_defconfig 2025-01-30 10:01:21.870272370 +0100 +@@ -1,4 +1,4 @@ +-CONFIG_LOCALVERSION="-v7l" ++CONFIG_LOCALVERSION="" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y +@@ -61,7 +61,7 @@ + CONFIG_MODULE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_MODULE_SRCVERSION_ALL=y +-CONFIG_MODULE_COMPRESS_XZ=y ++CONFIG_MODULE_COMPRESS_NONE=y + CONFIG_BLK_DEV_THROTTLING=y + CONFIG_PARTITION_ADVANCED=y + CONFIG_MAC_PARTITION=y +diff -Nur linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm64/configs/bcm2711_defconfig linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm64/configs/bcm2711_defconfig +--- linux-a320d39840745502d420f56b3d49b3723a12058f.orig/arch/arm64/configs/bcm2711_defconfig 2025-01-29 11:26:08.000000000 +0100 ++++ linux-a320d39840745502d420f56b3d49b3723a12058f/arch/arm64/configs/bcm2711_defconfig 2025-01-30 10:02:18.394060065 +0100 +@@ -1,4 +1,4 @@ +-CONFIG_LOCALVERSION="-v8" ++CONFIG_LOCALVERSION="" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SYSVIPC=y + CONFIG_POSIX_MQUEUE=y +@@ -71,7 +71,7 @@ + CONFIG_MODULE_UNLOAD=y + CONFIG_MODVERSIONS=y + CONFIG_MODULE_SRCVERSION_ALL=y +-CONFIG_MODULE_COMPRESS_XZ=y ++CONFIG_MODULE_COMPRESS_NONE=y + CONFIG_BLK_DEV_THROTTLING=y + CONFIG_PARTITION_ADVANCED=y + CONFIG_MAC_PARTITION=y diff --git a/target/m68k/Makefile b/target/m68k/Makefile index 0b742ed19..a9ecd1abc 100644 --- a/target/m68k/Makefile +++ b/target/m68k/Makefile @@ -67,6 +67,11 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif +ifeq ($(ADK_TARGET_FS),nfsroot) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" +endif kernel-strip: @@ -86,3 +91,6 @@ endif ifeq ($(ADK_TARGET_FS),initramfspiggyback) imageinstall: createinitramfs targethelp endif +ifeq ($(ADK_TARGET_FS),nfsroot) +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +endif diff --git a/target/m68k/kernel/aranym-m68k b/target/m68k/kernel/aranym-m68k index 9a4db207a..fb084e4b9 100644 --- a/target/m68k/kernel/aranym-m68k +++ b/target/m68k/kernel/aranym-m68k @@ -6,4 +6,3 @@ CONFIG_FPU=y CONFIG_ATARI=y CONFIG_NATFEAT=y CONFIG_NFETH=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/m68k/kernel/arcturus-uc5328 b/target/m68k/kernel/arcturus-uc5328 new file mode 100644 index 000000000..771109f0b --- /dev/null +++ b/target/m68k/kernel/arcturus-uc5328 @@ -0,0 +1,6 @@ +CONFIG_M68K=y +# CONFIG_MMU is not set +CONFIG_COLDFIRE=y +CONFIG_M532x=y +CONFIG_M53xx=y +CONFIG_COLDFIRE_TIMERS=y diff --git a/target/m68k/kernel/qemu-m68k-mcf5208 b/target/m68k/kernel/qemu-m68k-mcf5208 index 9cfa4b601..42497f9fa 100644 --- a/target/m68k/kernel/qemu-m68k-mcf5208 +++ b/target/m68k/kernel/qemu-m68k-mcf5208 @@ -16,4 +16,3 @@ CONFIG_RAMKERNEL=y CONFIG_BOOTPARAM=y CONFIG_BOOTPARAM_STRING="console=ttyS0,115200" CONFIG_CRC32=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/m68k/kernel/qemu-m68k-q800 b/target/m68k/kernel/qemu-m68k-q800 index 69cac7e51..05324c42b 100644 --- a/target/m68k/kernel/qemu-m68k-q800 +++ b/target/m68k/kernel/qemu-m68k-q800 @@ -7,4 +7,3 @@ CONFIG_ADB=y CONFIG_ADB_MACII=y CONFIG_BOOTPARAM=y CONFIG_BOOTPARAM_STRING="" -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/m68k/kernel/qemu-m68k-virt b/target/m68k/kernel/qemu-m68k-virt index 47e9200d4..db5f51c8e 100644 --- a/target/m68k/kernel/qemu-m68k-virt +++ b/target/m68k/kernel/qemu-m68k-virt @@ -1,3 +1,2 @@ CONFIG_M68K=y CONFIG_VIRT=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/m68k/systems/arcturus-uc5328 b/target/m68k/systems/arcturus-uc5328 new file mode 100644 index 000000000..9bc76cfbb --- /dev/null +++ b/target/m68k/systems/arcturus-uc5328 @@ -0,0 +1,11 @@ +config ADK_TARGET_SYSTEM_ARCTURUS_UC5328 + bool "Arcturus uC5328" + select ADK_TARGET_CPU_CF_5328 + select ADK_TARGET_WITH_NETDEVICE + select ADK_TARGET_WITH_SERIAL + select ADK_TARGET_NO_KERNEL + select ADK_TARGET_PACKAGE_TXZ + help + Arcturus uC5328 + https://www.arcturusnetworks.com/products + diff --git a/target/m68k/uclibc-ng.config b/target/m68k/uclibc-ng.config index 7c8422128..0e96278b4 100644 --- a/target/m68k/uclibc-ng.config +++ b/target/m68k/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.45 C Library Configuration +# uClibc-ng 1.0.51 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -95,9 +95,9 @@ PTHREADS_DEBUG_SUPPORT=y PTHREADS_STACK_DEFAULT_SIZE=2097152 UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y -MALLOC=y +# MALLOC is not set # MALLOC_SIMPLE is not set -# MALLOC_STANDARD is not set +MALLOC_STANDARD=y UCLIBC_DYNAMIC_ATEXIT=y UCLIBC_HAS_UTMPX=y UCLIBC_HAS_UTMP=y diff --git a/target/microblaze/kernel/qemu-microblaze-ml605 b/target/microblaze/kernel/qemu-microblaze-ml605 index 9749c22fa..932843c13 100644 --- a/target/microblaze/kernel/qemu-microblaze-ml605 +++ b/target/microblaze/kernel/qemu-microblaze-ml605 @@ -13,4 +13,3 @@ CONFIG_XILINX_MICROBLAZE0_HW_VER="8.10.a" CONFIG_PCI_XILINX=y CONFIG_CMDLINE_BOOL=y CONFIG_CMDLINE_FORCE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 index 91a7dc577..cf8c3a91c 100644 --- a/target/microblaze/kernel/qemu-microblaze-s3adsp1800 +++ b/target/microblaze/kernel/qemu-microblaze-s3adsp1800 @@ -13,4 +13,3 @@ CONFIG_XILINX_MICROBLAZE0_HW_VER="7.10.d" CONFIG_PCI_XILINX=y CONFIG_CMDLINE_FORCE=y CONFIG_CMDLINE_BOOL=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/mips/kernel/qemu-mips b/target/mips/kernel/qemu-mips index 85ad371b6..94a0a0175 100644 --- a/target/mips/kernel/qemu-mips +++ b/target/mips/kernel/qemu-mips @@ -3,4 +3,3 @@ CONFIG_MIPS_MALTA=y CONFIG_MIPS_BONITO64=y CONFIG_MIPS_MSC=y CONFIG_CMDLINE_BOOL=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/nios2/kernel/qemu-nios2 b/target/nios2/kernel/qemu-nios2 index 19e0ac753..8b354e8a8 100644 --- a/target/nios2/kernel/qemu-nios2 +++ b/target/nios2/kernel/qemu-nios2 @@ -10,5 +10,4 @@ CONFIG_NIOS2_DTB_SOURCE_BOOL=y CONFIG_NIOS2_DTB_SOURCE="10m50_devboard.dts" CONFIG_CMDLINE_BOOL=y CONFIG_NIOS2_PASS_CMDLINE=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_NIOS2_ALIGNMENT_TRAP=y diff --git a/target/or1k/kernel/qemu-or1k b/target/or1k/kernel/qemu-or1k index e96067748..ee4d9d55c 100644 --- a/target/or1k/kernel/qemu-or1k +++ b/target/or1k/kernel/qemu-or1k @@ -6,4 +6,3 @@ CONFIG_OPENRISC_HAVE_INST_FL1=y CONFIG_OPENRISC_HAVE_INST_MUL=y CONFIG_OPENRISC_HAVE_INST_DIV=y CONFIG_OPENRISC_NO_SPR_SR_DSX=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/ppc/kernel/qemu-ppc-bamboo b/target/ppc/kernel/qemu-ppc-bamboo index 424addb14..b12292b7b 100644 --- a/target/ppc/kernel/qemu-ppc-bamboo +++ b/target/ppc/kernel/qemu-ppc-bamboo @@ -3,4 +3,3 @@ CONFIG_PPC32=y CONFIG_44x=y CONFIG_BAMBOO=y CONFIG_PRINTK=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/ppc/kernel/qemu-ppc-macppc b/target/ppc/kernel/qemu-ppc-macppc index b873a3096..b68a484c0 100644 --- a/target/ppc/kernel/qemu-ppc-macppc +++ b/target/ppc/kernel/qemu-ppc-macppc @@ -23,4 +23,3 @@ CONFIG_ADB_CUDA=y CONFIG_INPUT_ADBHID=y CONFIG_CMDLINE_BOOL=y CONFIG_PRINTK=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/ppc/kernel/qemu-ppc-mpc8544ds b/target/ppc/kernel/qemu-ppc-mpc8544ds index 515cf400c..1e51d4b07 100644 --- a/target/ppc/kernel/qemu-ppc-mpc8544ds +++ b/target/ppc/kernel/qemu-ppc-mpc8544ds @@ -9,4 +9,3 @@ CONFIG_PHYS_64BIT=y CONFIG_SPE=y CONFIG_PPC_UDBG_16550=y CONFIG_DEFAULT_UIMAGE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/riscv32/kernel/qemu-riscv32 b/target/riscv32/kernel/qemu-riscv32 index 0aab14765..e49c3ab0d 100644 --- a/target/riscv32/kernel/qemu-riscv32 +++ b/target/riscv32/kernel/qemu-riscv32 @@ -1,7 +1,6 @@ CONFIG_RISCV=y CONFIG_32BIT=y CONFIG_FPU=y -CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_RV32I=y CONFIG_SOC_VIRT=y CONFIG_NONPORTABLE=y diff --git a/target/sh/kernel/numato-mimasv2 b/target/sh/kernel/numato-mimasv2 index faa0ff558..ca290f15d 100644 --- a/target/sh/kernel/numato-mimasv2 +++ b/target/sh/kernel/numato-mimasv2 @@ -15,4 +15,3 @@ CONFIG_MMC_SPI=y CONFIG_CLKSRC_JCORE_PIT=y CONFIG_JCORE_AIC=y CONFIG_SERIAL_EARLYCON=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/sparc/kernel/qemu-sparc b/target/sparc/kernel/qemu-sparc index 1ee79ef31..ffa9bb9f8 100644 --- a/target/sparc/kernel/qemu-sparc +++ b/target/sparc/kernel/qemu-sparc @@ -7,4 +7,3 @@ CONFIG_SERIAL_CONSOLE=y CONFIG_SERIAL_SUNCORE=y CONFIG_SERIAL_SUNZILOG=y CONFIG_SERIAL_SUNZILOG_CONSOLE=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/target/x86/kernel/qemu-x86 b/target/x86/kernel/qemu-x86 index 41a00164c..1049b23d8 100644 --- a/target/x86/kernel/qemu-x86 +++ b/target/x86/kernel/qemu-x86 @@ -1,4 +1,3 @@ CONFIG_X86=y CONFIG_X86_32=y CONFIG_CMDLINE_BOOL=y -CONFIG_COMPAT_32BIT_TIME=y diff --git a/toolchain/binutils/Makefile b/toolchain/binutils/Makefile index 5e2431165..fdedaeaff 100644 --- a/toolchain/binutils/Makefile +++ b/toolchain/binutils/Makefile @@ -18,16 +18,6 @@ else CONFOPTS+= --disable-lto --disable-plugins endif -ifeq ($(ADK_TOOLCHAIN_WITH_GOLD),y) -ifeq ($(ADK_TARGET_USE_GOLD),y) -CONFOPTS+= --enable-gold=default -else -CONFOPTS+= --enable-gold -endif -else -CONFOPTS+= --disable-gold -endif - ifeq ($(ADK_TARGET_ARCH_ARC),y) CONFOPTS+= --enable-lto --enable-plugins endif @@ -67,6 +57,7 @@ endif --enable-obsolete \ --disable-werror \ --disable-gprof \ + --enable-gprofng=no \ --disable-install-libiberty \ ${CONFOPTS} \ ); @@ -74,7 +65,7 @@ endif touch $@ $(WRKBUILD)/.compiled: $(WRKBUILD)/.configured - PATH='$(HOST_PATH)' $(MAKE) ${BINUTILS_MAKEOPTS} MAKEINFO=true -C $(WRKBUILD) all + PATH='$(HOST_PATH)' V=1 $(MAKE) ${BINUTILS_MAKEOPTS} LDFLAGS='$(HOST_STATIC_LDFLAGS)' MAKEINFO=true -C $(WRKBUILD) all touch $@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled @@ -83,15 +74,10 @@ ifeq ($(ADK_TARGET_ARCH_KVX)$(ADK_TARGET_ARCH_H8300)$(ADK_TARGET_ARCH_NDS32)$(AD $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/lib/ldscripts $(CP) $(WRKBUILD)/ld/ldscripts/* $(STAGING_TARGET_DIR)/usr/lib/ldscripts/ endif -ifeq ($(ADK_TARGET_USE_GOLD),y) - (cd $(TOOLCHAIN_DIR)/usr/bin && \ - ln -sf $(GNU_TARGET_NAME)-ld.gold $(GNU_TARGET_NAME)-ld) -else ifeq (ADK_TOOLCHAIN_BINUTILS_AVR32),) (cd $(TOOLCHAIN_DIR)/usr/bin && \ ln -sf $(GNU_TARGET_NAME)-ld.bfd $(GNU_TARGET_NAME)-ld) endif -endif touch $@ include ${ADK_TOPDIR}/mk/toolchain.mk diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 72a4eb856..9e9e9a4c4 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -2,6 +2,13 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= binutils +ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_44),y) +PKG_VERSION:= 2.44 +PKG_RELEASE:= 1 +PKG_HASH:= 0cdd76777a0dfd3dd3a63f215f030208ddb91c2361d2bcc02acec0f1c16b6a2e +PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_43_1),y) PKG_VERSION:= 2.43.1 PKG_RELEASE:= 1 diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile index e596c1a0d..4177d54d7 100644 --- a/toolchain/elf2flt/Makefile +++ b/toolchain/elf2flt/Makefile @@ -10,6 +10,10 @@ ifeq ($(ADK_TOOLCHAIN_BINUTILS_GIT),y) BINUTILS_VERSION:= git BFDLIB:= .libs/libbfd.a endif +ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_44),y) +BINUTILS_VERSION:= 2.44 +BFDLIB:= .libs/libbfd.a +endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_43_1),y) BINUTILS_VERSION:= 2.43.1 BFDLIB:= .libs/libbfd.a diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index 8798b06d2..fb03e9633 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -324,7 +324,7 @@ ifeq ($(ADK_TARGET_CPU_SH_SH4A),y) (cd ${STAGING_TARGET_DIR}/ && ln -sf . m4a) endif endif -ifeq ($(ADK_TARGET_ARCH_M68K),y) +ifeq ($(ADK_TARGET_CPU_CF),y) # Need to get gcc to generate _all_ the multilib variants # (so both MMU and non-mmu M68k and ColdFire). $(SED) 's/M68K_MLIB_CPU +=/#M68K_MLIB_CPU +=/' $(WRKBUILD)/gcc/config/m68k/t-m68k diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 6f111ffa2..bc0740cc9 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -74,6 +74,22 @@ PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz LIBSTDCXXVER:= 22 endif +ifeq ($(ADK_TOOLCHAIN_GCC_5),y) +PKG_VERSION:= 5.5.0 +PKG_HASH:= 3aabce75d6dd206876eced17504b28d47a724c2e430dbd2de176beb948708983 +PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} +PKG_RELEASE:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +LIBSTDCXXVER:= 21 +endif +ifeq ($(ADK_TOOLCHAIN_GCC_4),y) +PKG_VERSION:= 4.9.4 +PKG_HASH:= 1680f92781b92cbdb57d7e4f647c650678c594154cb0d707fd9a994424a9860d +PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} +PKG_RELEASE:= 1 +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +LIBSTDCXXVER:= 20 +endif ifeq ($(ADK_TOOLCHAIN_GCC_ARC),y) PKG_VERSION:= arc-2023.09 PKG_GIT:= tag diff --git a/toolchain/gdb/Makefile.inc b/toolchain/gdb/Makefile.inc index 0262ff2e0..0fac2ecb9 100644 --- a/toolchain/gdb/Makefile.inc +++ b/toolchain/gdb/Makefile.inc @@ -2,6 +2,13 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= gdb +ifeq ($(ADK_TOOLCHAIN_GDB_16_2),y) +PKG_VERSION:= 16.2 +PKG_RELEASE:= 1 +PKG_HASH:= bdc1da4a033280ac752e7d34b0418efaa45bed093235cb88e62ea961752a37f8 +PKG_SITES:= ${MASTER_SITE_GNU:=gdb/} +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +endif ifeq ($(ADK_TOOLCHAIN_GDB_15_1),y) PKG_VERSION:= 15.1 PKG_RELEASE:= 1 diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index 724acfc06..4f35b1e94 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -3,16 +3,16 @@ PKG_NAME:= glibc ifeq ($(ADK_LIBC_VERSION),git) -PKG_VERSION:= 2.40.90 -PKG_GLIBCVER:= 2.40.9000 +PKG_VERSION:= 2.41.90 +PKG_GLIBCVER:= 2.41.9000 PKG_SITES:= https://sourceware.org/git/glibc.git PKG_RELEASE:= 1 endif -ifeq ($(ADK_TARGET_LIB_GLIBC_2_40),y) -PKG_VERSION:= 2.40 -PKG_GLIBCVER:= 2.40 +ifeq ($(ADK_TARGET_LIB_GLIBC_2_41),y) +PKG_VERSION:= 2.41 +PKG_GLIBCVER:= 2.41 PKG_RELEASE:= 1 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} -PKG_HASH:= 2abc038f5022949cb67e996c3cae0e7764f99b009f0b9b7fd954dfc6577b599e +PKG_HASH:= c7be6e25eeaf4b956f5d4d56a04d23e4db453fc07760f872903bb61a49519b80 endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc index 51406154d..1f89a22b1 100644 --- a/toolchain/uclibc-ng/Makefile.inc +++ b/toolchain/uclibc-ng/Makefile.inc @@ -7,10 +7,10 @@ PKG_VERSION:= git PKG_RELEASE:= 1 PKG_SITES:= https://git.uclibc-ng.org/git/uclibc-ng.git endif -ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_50),y) -PKG_VERSION:= 1.0.50 +ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_51),y) +PKG_VERSION:= 1.0.51 PKG_RELEASE:= 1 -PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.50/ -PKG_HASH:= 7b96bc6d0695ee77370ac49116f1012059de0f37342a68cd437e45d876449664 +PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.51/ +PKG_HASH:= 46f772e5192605f422ae190526c9d867eb715271da1937bd37afb754e18e730e endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz |