diff options
33 files changed, 142 insertions, 112 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index ffb055dad..47278ac78 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,17 +15,17 @@ 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_10),y) -KERNEL_FILE_VER:= 6.10.7 +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_11),y) +KERNEL_FILE_VER:= 6.11.3 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 900d567ff01824708ce24c3b37faaef03e6f6145411dd447a6ff2edc8c5db3a9 +KERNEL_HASH:= 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) -KERNEL_FILE_VER:= 6.6.48 +KERNEL_FILE_VER:= 6.6.56 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029 +KERNEL_HASH:= f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y) KERNEL_FILE_VER:= 6.1.107 diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 2490a7d12..8f14b0e8c 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.2 +PKG_VERSION:= 20.9.3 PKG_RELEASE:= 1 -PKG_HASH:= acc85a66f3b2a0e2784f4c551b8b0241a2393c47ff353543ae63b5dcf434b1ca +PKG_HASH:= 3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4 PKG_DESCR:= open source pbx PKG_SECTION:= net/voip PKG_DEPENDS:= libncurses libcurl libopenssl libedit libuuid libjansson @@ -53,7 +53,6 @@ $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)- $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_RES_AGI},${PKG_SECTION})) CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ - --with-ncurses=${STAGING_TARGET_DIR}/usr \ --with-libedit=${STAGING_TARGET_DIR}/usr \ --with-jansson=${STAGING_TARGET_DIR}/usr \ --with-ssl=${STAGING_TARGET_DIR}/usr \ @@ -61,17 +60,14 @@ CONFIGURE_ARGS= --with-z=${STAGING_TARGET_DIR}/usr \ --without-tonezone \ --without-asound \ --without-gtk2 \ - --without-h323 \ --without-iksemel \ --without-imap \ --without-netsnmp \ --without-newt \ - --without-openais \ --without-osptk \ - --without-oss \ --without-popt \ + --without-portaudio \ --without-pri \ - --without-pwlib \ --without-tds \ --without-postgres @@ -97,9 +93,9 @@ endif INSTALL_STYLE:= manual -TARGET_CFLAGS+= -fgnu89-inline TARGET_LDFLAGS+= -lm -ltinfo -ldl -lpthread -MAKE_ENV= ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ +MAKE_ENV:= PATH="$(HOST_PATH)" \ + ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \ ASTLDFLAGS="${TARGET_LDFLAGS} -z muldefs" MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ OPTIMIZE="${TARGET_CFLAGS}" \ @@ -107,10 +103,10 @@ MAKE_FLAGS+= DESTDIR="$(WRKINST)" \ ALL_TARGET:= all install samples pre-configure: - cd "$(WRKBUILD)/menuselect"; ./configure + cd "$(WRKBUILD)/menuselect"; PATH="$(HOST_PATH)" ./configure pre-build: - $(MAKE) -C $(WRKBUILD)/menuselect + PATH="$(HOST_PATH)" $(MAKE) -C $(WRKBUILD)/menuselect #post-build: # cd ${WRKBUILD}/sounds ; \ diff --git a/package/curl/Makefile b/package/curl/Makefile index 289814e54..cfd7748f6 100644 --- a/package/curl/Makefile +++ b/package/curl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= curl -PKG_VERSION:= 8.9.1 +PKG_VERSION:= 8.10.1 PKG_RELEASE:= 1 -PKG_HASH:= f292f6cc051d5bbabf725ef85d432dfeacc8711dd717ea97612ae590643801e5 +PKG_HASH:= 73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_BUILDDEP:= zlib diff --git a/package/git/Makefile b/package/git/Makefile index 22d678e6f..7e520abee 100644 --- a/package/git/Makefile +++ b/package/git/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= git -PKG_VERSION:= 2.45.1 +PKG_VERSION:= 2.47.0 PKG_RELEASE:= 1 -PKG_HASH:= e64d340a8e627ae22cfb8bcc651cca0b497cf1e9fdf523735544ff4a732f12bf +PKG_HASH:= 1ce114da88704271b43e027c51e04d9399f8c88e9ef7542dae7aebae7d87bc4e PKG_DESCR:= fast version control system PKG_SECTION:= dev/scm PKG_BUILDDEP:= zlib curl expat @@ -15,13 +15,13 @@ PKG_NEEDS:= threads PKG_URL:= http://git-scm.com/ PKG_SITES:= https://www.kernel.org/pub/software/scm/git/ -PKG_CHOICES_GIT:= WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITH_LIBRESSL:= use libressl for crypto -PKGCB_WITH_LIBRESSL:= libressl -PKGCS_WITH_LIBRESSL:= libressl +PKG_CHOICES_GIT:= WITH_OPENSSL WITH_LIBRESSL PKGCD_WITH_OPENSSL:= use openssl for crypto PKGCB_WITH_OPENSSL:= openssl PKGCS_WITH_OPENSSL:= libopenssl +PKGCD_WITH_LIBRESSL:= use libressl for crypto +PKGCB_WITH_LIBRESSL:= libressl +PKGCS_WITH_LIBRESSL:= libressl include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/iproute2/Makefile b/package/iproute2/Makefile index 1040eb93c..d1f583742 100644 --- a/package/iproute2/Makefile +++ b/package/iproute2/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= iproute2 -PKG_VERSION:= 5.8.0 +PKG_VERSION:= 6.11.0 PKG_RELEASE:= 1 -PKG_HASH:= cfcd1f890290f8c8afcc91d9444ad929b9252c16f9ab3f286c50dd3c59dc646e +PKG_HASH:= 1f795398a04aeaacd06a8f6ace2cfd913c33fa5953ca99daae83bb5c534611c3 PKG_DESCR:= routing control utility PKG_SECTION:= net/route PKG_BUILDDEP:= iptables libnl linux-atm @@ -15,6 +15,7 @@ PKG_URL:= http://www.linuxfoundation.org/en/Net:Iproute2 PKG_SITES:= http://www.kernel.org/pub/linux/utils/net/iproute2/ PKG_SUBPKGS:= IP TC TC_ATM TC_IPT IFSTAT LNSTAT ROUTEL RTMON SS +PKGSS_IP:= libmnl PKGSD_TC:= traffic control utility PKGSB_TC:= iptables PKGSD_TC_ATM:= traffic control atm support library @@ -43,12 +44,11 @@ $(eval $(call PKG_template,SS,ss,${PKG_VERSION}-${PKG_RELEASE},,${PKGSD_SS},${PK CONFIG_STYLE:= minimal TARGET_CFLAGS+= -D_GNU_SOURCE -XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" +XAKE_FLAGS+= CCOPTS="${TARGET_CFLAGS}" MFLAGS="CC=\"${TARGET_CC}\"" V=1 CONFIGURE_ENV+= CC="${TARGET_CC}" IPTC="${TARGET_CFLAGS}" IPTL="${TARGET_LDFLAGS}" ip-install: - ${INSTALL_DIR} ${IDIR_IP}/{etc/iproute2,bin} - ${INSTALL_DATA} ${WRKINST}/etc/iproute2/* ${IDIR_IP}/etc/iproute2/ + ${INSTALL_DIR} ${IDIR_IP}/bin ${INSTALL_BIN} ${WRKINST}/sbin/ip ${IDIR_IP}/bin/ip tc-install: diff --git a/package/iproute2/patches/patch-bridge_mst_c b/package/iproute2/patches/patch-bridge_mst_c new file mode 100644 index 000000000..ed62eb842 --- /dev/null +++ b/package/iproute2/patches/patch-bridge_mst_c @@ -0,0 +1,10 @@ +--- iproute2-6.11.0.orig/bridge/mst.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/bridge/mst.c 2024-09-24 09:58:39.165522637 +0200 +@@ -4,6 +4,7 @@ + */ + + #include <stdio.h> ++#include <netinet/in.h> + #include <linux/if_bridge.h> + #include <net/if.h> + diff --git a/package/iproute2/patches/patch-ip_iplink_can_c b/package/iproute2/patches/patch-ip_iplink_can_c index 491987005..f08774b36 100644 --- a/package/iproute2/patches/patch-ip_iplink_can_c +++ b/package/iproute2/patches/patch-ip_iplink_can_c @@ -1,6 +1,6 @@ ---- iproute2-4.9.0.orig/ip/iplink_can.c 2016-12-13 00:07:42.000000000 +0100 -+++ iproute2-4.9.0/ip/iplink_can.c 2016-12-26 01:27:39.734025890 +0100 -@@ -119,7 +119,7 @@ static int can_parse_opt(struct link_uti +--- iproute2-6.11.0.orig/ip/iplink_can.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/ip/iplink_can.c 2024-09-24 09:43:33.522450056 +0200 +@@ -137,7 +137,7 @@ static int can_parse_opt(struct link_uti if (get_u32(&bt.bitrate, *argv, 0)) invarg("invalid \"bitrate\" value\n", *argv); } else if (matches(*argv, "sample-point") == 0) { diff --git a/package/iproute2/patches/patch-misc_ifstat_c b/package/iproute2/patches/patch-misc_ifstat_c deleted file mode 100644 index 7f6584649..000000000 --- a/package/iproute2/patches/patch-misc_ifstat_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/misc/ifstat.c 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/misc/ifstat.c 2013-08-17 15:27:59.236199157 +0200 -@@ -21,7 +21,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <signal.h> diff --git a/package/iproute2/patches/patch-misc_nstat_c b/package/iproute2/patches/patch-misc_nstat_c deleted file mode 100644 index feed4df14..000000000 --- a/package/iproute2/patches/patch-misc_nstat_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/misc/nstat.c 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/misc/nstat.c 2013-08-17 15:27:46.412360373 +0200 -@@ -21,7 +21,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <signal.h> diff --git a/package/iproute2/patches/patch-misc_rtacct_c b/package/iproute2/patches/patch-misc_rtacct_c deleted file mode 100644 index ac0c7d5e2..000000000 --- a/package/iproute2/patches/patch-misc_rtacct_c +++ /dev/null @@ -1,11 +0,0 @@ ---- iproute2-3.10.0.orig/misc/rtacct.c 2013-07-16 19:06:36.000000000 +0200 -+++ iproute2-3.10.0/misc/rtacct.c 2013-08-17 15:26:02.313669072 +0200 -@@ -22,7 +22,7 @@ - #include <sys/file.h> - #include <sys/socket.h> - #include <sys/un.h> --#include <sys/poll.h> -+#include <poll.h> - #include <sys/wait.h> - #include <sys/stat.h> - #include <sys/mman.h> diff --git a/package/iproute2/patches/patch-netem_Makefile b/package/iproute2/patches/patch-netem_Makefile index 69141bd62..6583220fc 100644 --- a/package/iproute2/patches/patch-netem_Makefile +++ b/package/iproute2/patches/patch-netem_Makefile @@ -1,6 +1,6 @@ ---- iproute2-4.10.0.orig/netem/Makefile 2017-02-20 17:47:52.000000000 +0100 -+++ iproute2-4.10.0/netem/Makefile 2017-04-23 20:23:07.404790192 +0200 -@@ -1,14 +1,12 @@ +--- iproute2-6.11.0.orig/netem/Makefile 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/Makefile 2024-09-24 09:43:33.530449869 +0200 +@@ -4,14 +4,12 @@ include ../config.mk DISTGEN = maketable normal pareto paretonormal DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist @@ -16,7 +16,7 @@ %.dist: % ./$* > $@ -@@ -17,7 +15,7 @@ experimental.dist: maketable experimenta +@@ -20,7 +18,7 @@ experimental.dist: maketable experimenta ./maketable experimental.dat > experimental.dist stats: stats.c diff --git a/package/iproute2/patches/patch-netem_maketable_c b/package/iproute2/patches/patch-netem_maketable_c index b6eb03405..0fe26932f 100644 --- a/package/iproute2/patches/patch-netem_maketable_c +++ b/package/iproute2/patches/patch-netem_maketable_c @@ -1,6 +1,6 @@ ---- iproute2-2.6.29-1.orig/netem/maketable.c 2009-03-24 23:40:54.000000000 +0100 -+++ iproute2-2.6.29-1/netem/maketable.c 2009-12-11 16:32:33.000000000 +0100 -@@ -10,7 +10,7 @@ +--- iproute2-6.11.0.orig/netem/maketable.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/maketable.c 2024-09-24 09:43:33.538449682 +0200 +@@ -11,7 +11,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> diff --git a/package/iproute2/patches/patch-netem_normal_c b/package/iproute2/patches/patch-netem_normal_c index 3eada6d03..ddf1927b2 100644 --- a/package/iproute2/patches/patch-netem_normal_c +++ b/package/iproute2/patches/patch-netem_normal_c @@ -1,6 +1,6 @@ ---- iproute2-3.12.0.orig/netem/normal.c 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/netem/normal.c 2014-02-09 11:40:30.000000000 +0100 -@@ -8,9 +8,7 @@ +--- iproute2-6.11.0.orig/netem/normal.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/normal.c 2024-09-24 09:43:33.542449589 +0200 +@@ -9,9 +9,7 @@ #include <string.h> #include <limits.h> diff --git a/package/iproute2/patches/patch-netem_pareto_c b/package/iproute2/patches/patch-netem_pareto_c index b422a56a0..1f6a9338f 100644 --- a/package/iproute2/patches/patch-netem_pareto_c +++ b/package/iproute2/patches/patch-netem_pareto_c @@ -1,6 +1,6 @@ ---- iproute2-3.12.0.orig/netem/pareto.c 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/netem/pareto.c 2014-02-09 11:46:07.000000000 +0100 -@@ -7,10 +7,8 @@ +--- iproute2-6.11.0.orig/netem/pareto.c 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/netem/pareto.c 2024-09-24 09:43:33.550449401 +0200 +@@ -8,10 +8,8 @@ #include <math.h> #include <limits.h> diff --git a/package/iproute2/patches/patch-tc_tc_core_h b/package/iproute2/patches/patch-tc_tc_core_h index 2716b71c8..25c259cee 100644 --- a/package/iproute2/patches/patch-tc_tc_core_h +++ b/package/iproute2/patches/patch-tc_tc_core_h @@ -1,6 +1,6 @@ ---- iproute2-3.12.0.orig/tc/tc_core.h 2013-11-23 02:10:33.000000000 +0100 -+++ iproute2-3.12.0/tc/tc_core.h 2014-02-08 20:19:59.000000000 +0100 -@@ -1,7 +1,7 @@ +--- iproute2-6.11.0.orig/tc/tc_core.h 2024-09-15 21:42:26.000000000 +0200 ++++ iproute2-6.11.0/tc/tc_core.h 2024-09-24 09:43:33.562449121 +0200 +@@ -2,7 +2,7 @@ #ifndef _TC_CORE_H_ #define _TC_CORE_H_ 1 @@ -8,4 +8,4 @@ +#include <sys/types.h> #include <linux/pkt_sched.h> - #define TIME_UNITS_PER_SEC 1000000 + enum link_layer { diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index 23067acda..aa139d40e 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -44,6 +44,9 @@ endif ifeq ($(ADK_TARGET_ARCH_PPC64),y) LIBGPG_PREFIX:= powerpc64-unknown-linux-gnu endif +ifeq ($(ADK_TARGET_ARCH_RISCV64),y) +LIBGPG_PREFIX:= riscv64-unknown-linux-gnu +endif ifeq ($(ADK_TARGET_ARCH_SH),y) LIBGPG_PREFIX:= sh4-unknown-linux-gnu endif diff --git a/package/libtirpc/Makefile b/package/libtirpc/Makefile index 5cbddde61..9e5997350 100644 --- a/package/libtirpc/Makefile +++ b/package/libtirpc/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= libtirpc -PKG_VERSION:= 1.3.4 +PKG_VERSION:= 1.3.5 PKG_RELEASE:= 1 -PKG_HASH:= 1e0b0c7231c5fa122e06c0609a76723664d068b0dba3b8219b63e6340b347860 +PKG_HASH:= 9b31370e5a38d3391bf37edfa22498e28fe2142467ae6be7a17c9068ec0bf12f PKG_DESCR:= transport independent rpc library PKG_SECTION:= libs/net PKG_URL:= http://sourceforge.net/projects/libtirpc/ diff --git a/package/ltp/Makefile b/package/ltp/Makefile index 1a039c239..d2d2358a0 100644 --- a/package/ltp/Makefile +++ b/package/ltp/Makefile @@ -4,10 +4,10 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ltp -PKG_VERSION:= 20240129 +PKG_VERSION:= 20240930 PKG_RELEASE:= 1 PKG_DESCR:= linux test project -PKG_HASH:= c302f6b2ca09cbb7835f549777bdb9233fe31f7086d7ad8e65472a0804e3e025 +PKG_HASH:= 3e9e806405aa602e2d21d221d885fd4914ff2da23eb8bba3d0f0f468bdf60238 PKG_DEPENDS:= bash mke2fs mkfs shadow libtirpc libaio PKG_DEPENDS+= kmod dosfstools PKG_BUILDDEP+= libtirpc libaio diff --git a/package/nfs-utils/Makefile b/package/nfs-utils/Makefile index d2bdba4ba..a8da2b92b 100644 --- a/package/nfs-utils/Makefile +++ b/package/nfs-utils/Makefile @@ -4,14 +4,14 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= nfs-utils -PKG_VERSION:= 2.6.4 +PKG_VERSION:= 2.7.1 PKG_RELEASE:= 1 -PKG_HASH:= c0ae376ac056011ed0954deba2362d7d8193c653b500b68a543aec512cd2ecfa +PKG_HASH:= d23bab70a7570d8140de8195c16aa3f46e01b61ef3be51ae14fcbf6363017f14 PKG_DESCR:= network filesystem utilities PKG_SECTION:= net/fs PKG_DEPENDS:= keyutils libtirpc rpcbind libmount libuuid libevent sqlite -PKG_DEPENDS+= libncurses libblkid -PKG_BUILDDEP:= keyutils libtirpc util-linux libevent sqlite ncurses +PKG_DEPENDS+= libncurses libblkid libxml2 +PKG_BUILDDEP:= keyutils libtirpc util-linux libevent sqlite ncurses libxml2 PKG_KDEPENDS:= nfs-fs PKG_NEEDS:= threads PKG_URL:= http://sourceforge.net/projects/nfs diff --git a/package/openssh/Makefile b/package/openssh/Makefile index 7e540f4f9..c987edf36 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 9.8p1 +PKG_VERSION:= 9.9p1 PKG_RELEASE:= 1 -PKG_HASH:= dd8bd002a379b5d499dfb050dd1fa9af8029e80461f4bb6c523c49973f5a39f3 +PKG_HASH:= b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02 PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security PKG_BUILDDEP:= zlib @@ -37,13 +37,13 @@ PKGFD_WITH_KRB5:= enable kerberos 5 support PKGFS_WITH_KRB5:= libkrb5 libcom-err PKGFB_WITH_KRB5:= krb5 -PKG_CHOICES_OPENSSH:= WITH_LIBRESSL WITH_OPENSSL -PKGCD_WITH_LIBRESSL:= with libressl -PKGCS_WITH_LIBRESSL:= libressl -PKGCB_WITH_LIBRESSL:= libressl +PKG_CHOICES_OPENSSH:= WITH_OPENSSL WITH_LIBRESSL PKGCD_WITH_OPENSSL:= with openssl PKGCS_WITH_OPENSSL:= libopenssl PKGCB_WITH_OPENSSL:= openssl +PKGCD_WITH_LIBRESSL:= with libressl +PKGCS_WITH_LIBRESSL:= libressl +PKGCB_WITH_LIBRESSL:= libressl include ${ADK_TOPDIR}/mk/package.mk diff --git a/package/python3/Makefile b/package/python3/Makefile index 3d1f96489..dd2374ccf 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= python3 -PKG_VERSION:= 3.11.8 +PKG_VERSION:= 3.11.10 PKG_RELEASE:= 1 -PKG_HASH:= 9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3 +PKG_HASH:= 07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372 PKG_DESCR:= python scripting language PKG_SECTION:= dev/lang PKG_DEPENDS:= libffi zlib libexpat diff --git a/package/rpcbind/Makefile b/package/rpcbind/Makefile index b0c175a04..f4eb1c9f5 100644 --- a/package/rpcbind/Makefile +++ b/package/rpcbind/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= rpcbind -PKG_VERSION:= 1.2.6 +PKG_VERSION:= 1.2.7 PKG_RELEASE:= 1 -PKG_HASH:= 5613746489cae5ae23a443bb85c05a11741a5f12c8f55d2bb5e83b9defeee8de +PKG_HASH:= f6edf8cdf562aedd5d53b8bf93962d61623292bfc4d47eedd3f427d84d06f37e PKG_DESCR:= converts rpc program numbers into universal addresses PKG_SECTION:= net/misc PKG_DEPENDS:= libtirpc diff --git a/package/rsync/Makefile b/package/rsync/Makefile index 9971074f3..508e7d9f6 100644 --- a/package/rsync/Makefile +++ b/package/rsync/Makefile @@ -9,9 +9,9 @@ PKG_RELEASE:= 1 PKG_HASH:= 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb PKG_DESCR:= utility that provides fast incremental file transfer PKG_SECTION:= net/misc -PKG_DEPENDS:= libpopt libressl -PKG_BUILDDEP:= popt libressl -HOST_BUILDDEP:= libressl-host +PKG_DEPENDS:= libpopt libopenssl +PKG_BUILDDEP:= popt openssl +HOST_BUILDDEP:= openssl-host PKG_URL:= http://rsync.samba.org/ PKG_SITES:= http://rsync.samba.org/ftp/rsync/ diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index 9e2a12bb8..ba64d7356 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= f591da9ab90ef3d6b3d173766d0ddff90c4ed7330680897486117df390d83c8f PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot -HOST_BUILDDEP:= libressl-host dtc-host swig-host python3-host python-setuptools-host +HOST_BUILDDEP:= openssl-host dtc-host swig-host python3-host python-setuptools-host PKG_BUILDDEP:= python3-host python-setuptools-host swig-host u-boot-host PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ diff --git a/package/u-boot/files/uboot-env.txt.ci20 b/package/u-boot/files/uboot-env.txt.ci20 new file mode 100644 index 000000000..c66316928 --- /dev/null +++ b/package/u-boot/files/uboot-env.txt.ci20 @@ -0,0 +1,10 @@ +baudrate=115200 +board_mfr=NP +bootargs=console=ttyS4,115200 console=tty0 mem=256M@0x0 mem=768M@0x30000000 rootwait root=/dev/mmcblk0p1 devtmpfs.mount=1 +bootcmd=run ethargs; ext4load mmc 0:1 0x88000000 /boot/kernel; bootm 0x88000000 +bootdelay=1 +ethargs=env set bootargs ${bootargs} +loads_echo=1 +stderr=eserial0,eserial4 +stdin=eserial0,eserial4 +stdout=eserial0,eserial4 diff --git a/package/wget/Makefile b/package/wget/Makefile index cd05c3724..9099283b4 100644 --- a/package/wget/Makefile +++ b/package/wget/Makefile @@ -4,19 +4,22 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= wget -PKG_VERSION:= 1.19.4 +PKG_VERSION:= 1.24.5 PKG_RELEASE:= 1 -PKG_HASH:= 93fb96b0f48a20ff5be0d9d9d3c4a986b469cb853131f9d5fe4cc9cecbc8b5b5 +PKG_HASH:= fa2dc35bab5184ecbc46a9ef83def2aaaa3f4c9f3c97d4bd19dcb07d4da637de PKG_DESCR:= retrieving files using http(s) and ftp PKG_SECTION:= net/http -HOST_BUILDDEP:= libressl-host +HOST_BUILDDEP:= openssl-host PKG_URL:= http://www.gnu.org/software/wget/ PKG_SITES:= ${MASTER_SITE_GNU:=wget/} PKG_BB:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -PKG_CHOICES_WGET:= WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKG_CHOICES_WGET:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITHOUT_SSL +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates libgmp PKGCB_WITH_LIBRESSL:= libressl @@ -36,6 +39,11 @@ CONFIGURE_ARGS+= --disable-pcre ifeq (${ADK_PACKAGE_WGET_WITHOUT_SSL},y) CONFIGURE_ARGS+= --with-ssl=no endif +ifeq (${ADK_PACKAGE_WGET_WITH_OPENSSL},y) +CONFIGURE_ARGS+= --with-ssl=openssl \ + --with-openssl=yes \ + --with-libssl-prefix=${STAGING_TARGET_DIR} +endif ifeq (${ADK_PACKAGE_WGET_WITH_LIBRESSL},y) CONFIGURE_ARGS+= --with-ssl=openssl \ --with-openssl=yes \ diff --git a/package/wpa_supplicant/Makefile b/package/wpa_supplicant/Makefile index 873b6f2d3..93c80b0e8 100644 --- a/package/wpa_supplicant/Makefile +++ b/package/wpa_supplicant/Makefile @@ -21,7 +21,10 @@ PKG_DFLT_WPA_SUPPLICANT:= y if ADK_TARGET_WITH_WIFI WRKSRC= ${WRKDIST}/${PKG_NAME} -PKG_CHOICES_WPA_SUPPLICANT:= WITH_INTERNAL WITH_LIBRESSL WITH_GNUTLS +PKG_CHOICES_WPA_SUPPLICANT:= WITH_INTERNAL WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS +PKGCD_WITH_OPENSSL:= use openssl for crypto +PKGCS_WITH_OPENSSL:= libopenssl +PKGCB_WITH_OPENSSL:= openssl PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl PKGCB_WITH_LIBRESSL:= libressl diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 0fab938eb..0754084ec 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_10 - bool "6.10.7" +config ADK_TARGET_LINUX_KERNEL_VERSION_6_11 + bool "6.11.3" 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_10 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_6 - bool "6.6.48" + bool "6.6.56" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X diff --git a/target/linux/patches/6.6.48/armnommu-fix-thread-registers.patch b/target/linux/patches/6.6.56/armnommu-fix-thread-registers.patch index 8ab2196dc..8ab2196dc 100644 --- a/target/linux/patches/6.6.48/armnommu-fix-thread-registers.patch +++ b/target/linux/patches/6.6.56/armnommu-fix-thread-registers.patch diff --git a/target/linux/patches/6.6.48/armnommu-versatile.patch b/target/linux/patches/6.6.56/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.6.48/armnommu-versatile.patch +++ b/target/linux/patches/6.6.56/armnommu-versatile.patch diff --git a/target/linux/patches/6.6.48/hppa-cross-compile.patch b/target/linux/patches/6.6.56/hppa-cross-compile.patch index 51c24fff2..51c24fff2 100644 --- a/target/linux/patches/6.6.48/hppa-cross-compile.patch +++ b/target/linux/patches/6.6.56/hppa-cross-compile.patch diff --git a/target/linux/patches/6.6.48/macsonic.patch b/target/linux/patches/6.6.56/macsonic.patch index 51e76113b..51e76113b 100644 --- a/target/linux/patches/6.6.48/macsonic.patch +++ b/target/linux/patches/6.6.56/macsonic.patch diff --git a/target/mips/imgtec-ci20/genimage.cfg b/target/mips/imgtec-ci20/genimage.cfg new file mode 100644 index 000000000..8b55766ec --- /dev/null +++ b/target/mips/imgtec-ci20/genimage.cfg @@ -0,0 +1,33 @@ +image sdcard.img { + hdimage { + } + + partition uboot-spl { + in-partition-table = "no" + image = "u-boot-spl.bin" + offset = 512 + } + + partition uboot { + in-partition-table = "no" + image = "u-boot-dtb.img" + offset = 14K + } + + partition uboot-env { + in-partition-table = "no" + image = "uboot-env.bin" + offset = 526K + } + + partition rootfs { + partition-type = 0x83 + image = "rootfs.ext" + offset = 2M + } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } +} |