diff options
163 files changed, 661 insertions, 620 deletions
@@ -1,4 +1,4 @@ -OpenADK is Copyright © 2008-2020 Waldemar Brodkorb <wbx@openadk.org> +OpenADK is Copyright © 2008-2024 Waldemar Brodkorb <wbx@openadk.org> All rights reserved. This licence file covers all of the OpenADK meta distribution diff --git a/adk/tools/Makefile b/adk/tools/Makefile index fd0a3c791..dec651462 100644 --- a/adk/tools/Makefile +++ b/adk/tools/Makefile @@ -6,12 +6,12 @@ include $(ADK_TOPDIR)/rules.mk install: ${STAGING_HOST_DIR}/usr/bin/depmaker ${STAGING_HOST_DIR}/usr/bin/pkgrebuild ${STAGING_HOST_DIR}/usr/bin/dkgetsz ${STAGING_HOST_DIR}/usr/bin/depmaker: depmaker.c - ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ depmaker.c + ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -w -o $@ depmaker.c ${STAGING_HOST_DIR}/usr/bin/pkgrebuild: pkgrebuild.c strmap.c - ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ pkgrebuild.c strmap.c + ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -w -o $@ pkgrebuild.c strmap.c ${STAGING_HOST_DIR}/usr/bin/dkgetsz: dkgetsz.c - ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -o $@ dkgetsz.c + ${CC_FOR_BUILD} ${FLAGS_FOR_BUILD} -w -o $@ dkgetsz.c include $(ADK_TOPDIR)/mk/tools.mk diff --git a/mk/build.mk b/mk/build.mk index 1fe387598..78a3e7709 100644 --- a/mk/build.mk +++ b/mk/build.mk @@ -632,13 +632,13 @@ distclean cleandir: endif # ! ifeq ($(strip $(ADK_HAVE_DOT_CONFIG)),y) $(ADK_TOPDIR)/adk/tools/pkgmaker: $(ADK_TOPDIR)/adk/tools/pkgmaker.c $(ADK_TOPDIR)/adk/tools/sortfile.c $(ADK_TOPDIR)/adk/tools/strmap.c - @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c + @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ adk/tools/pkgmaker.c adk/tools/sortfile.c adk/tools/strmap.c $(ADK_TOPDIR)/adk/tools/pkgrebuild: $(ADK_TOPDIR)/adk/tools/pkgrebuild.c $(ADK_TOPDIR)/adk/tools/strmap.c - @$(HOST_CC) $(HOST_CFLAGS) -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c + @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ adk/tools/pkgrebuild.c adk/tools/strmap.c $(ADK_TOPDIR)/adk/tools/depmaker: $(ADK_TOPDIR)/adk/tools/depmaker.c - @$(HOST_CC) $(HOST_CFLAGS) -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c + @$(HOST_CC) $(HOST_CFLAGS) -w -o $@ $(ADK_TOPDIR)/adk/tools/depmaker.c menu .menu: $(wildcard package/*/Makefile) $(wildcard target/*/systems) $(wildcard target/*/systems/*) $(ADK_TOPDIR)/adk/tools/pkgmaker $(ADK_TOPDIR)/adk/tools/pkgrebuild $(wildcard tasks/*) @printf " ---> generating menu structure.. " diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index f7e635f15..21ba5223f 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -61,8 +61,9 @@ ifeq (${HOST_CONFIG_STYLE},cmake) endif ifeq (${HOST_CONFIG_STYLE},meson) @$(CMD_TRACE) "configuring meson.. " - cd ${WRKSRC}; PATH='${HOST_PATH}' \ - meson --prefix $(STAGING_HOST_DIR)/usr \ + cd ${WRKSRC}; env PATH='${HOST_PATH}' CPPFLAGS='$(HOST_CPPFLAGS)' \ + LDFLAGS='$(HOST_LDFLAGS)' CFLAGS='$(HOST_CFLAGS)' \ + meson setup --prefix $(STAGING_HOST_DIR)/usr \ --pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ --buildtype release $(HOST_MESON_FLAGS) \ $(WRKSRC) $(WRKBUILD) $(MAKE_TRACE) @@ -109,6 +110,10 @@ ifeq (${HOST_INSTALL_STYLE},auto) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \ DESTDIR='${STAGING_HOST_DIR}' ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} $(MAKE_TRACE) endif +ifeq (${HOST_INSTALL_STYLE},meson) + DESTDIR='' PATH='$(HOST_PATH)' \ + ninja -C $(WRKBUILD) install $(MAKE_TRACE) +endif ifeq (${HOST_INSTALL_STYLE},manual) env ${HOST_MAKE_ENV} ${MAKE} host-install $(MAKE_TRACE) endif diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 62b96465b..47278ac78 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,47 +15,47 @@ 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_9),y) -KERNEL_FILE_VER:= 6.9.3 +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:= c321c46401368774fc236f57095b205a5da57415f9a6008018902f9fd5eddfae +KERNEL_HASH:= 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) -KERNEL_FILE_VER:= 6.6.32 +KERNEL_FILE_VER:= 6.6.56 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 +KERNEL_HASH:= f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y) -KERNEL_FILE_VER:= 6.1.90 +KERNEL_FILE_VER:= 6.1.107 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 83a3d72e764fceda2c1fc68a4ea6b91253a28da56a688a2b61776b0d19788e1d +KERNEL_HASH:= f43229d1d73011fa0a37400320a26972946f8ff295c404c31c0dd0407228b0e8 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_15),y) -KERNEL_FILE_VER:= 5.15.158 +KERNEL_FILE_VER:= 5.15.165 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= f9071c83a4fd8b80af026b48cfc1869bfa25883f9148b92b5dc1e1e1e26dd5c6 +KERNEL_HASH:= a36dd3e82ceb634afded31f2656568f57c4d9c4b399859f298b18116df11c6fe endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_10),y) -KERNEL_FILE_VER:= 5.10.216 +KERNEL_FILE_VER:= 5.10.224 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= e310588c4b23f0959614e60f007afc20e9b1a8f296d682b041fa129f96fbe151 +KERNEL_HASH:= 19b099c67324bba6378e22dc51ad3906e4dcd6a908d137766b4bfa9174ddd11a endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y) -KERNEL_FILE_VER:= 5.4.275 +KERNEL_FILE_VER:= 5.4.282 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= dad2b068946f0ca0026130d7ab17601d5074d90b381379c4479314d4edf4304c +KERNEL_HASH:= 5582770976d33bb7bf9494e0fa0c49f449aa02b0133d00a5a198b6c208dd7de0 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) -KERNEL_FILE_VER:= 4.19.313 +KERNEL_FILE_VER:= 4.19.320 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= a8145e2ecf8437b6d06400c3358a595c47a74443b164890cf12a07d8722539c8 +KERNEL_HASH:= 9d671a12b00301b7ce63022d4e4afa3e40aa318f8f7f25a1147e602fdb1047a1 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y) KERNEL_FILE_VER:= 4.14.334 diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 6b1bc0b74..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.1 +PKG_VERSION:= 20.9.3 PKG_RELEASE:= 1 -PKG_HASH:= 548cdb1e1d854bc466af5178a5ee1b51b6e52d07359a0b286bc9147a64c1adb1 +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/autoconf/Makefile b/package/autoconf/Makefile index 874cb0617..e2d15cc67 100644 --- a/package/autoconf/Makefile +++ b/package/autoconf/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= autoconf -PKG_VERSION:= 2.69 +PKG_VERSION:= 2.72 PKG_RELEASE:= 1 -PKG_HASH:= 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 +PKG_HASH:= ba885c1319578d6c94d46e9b0dceb4014caafe2490e437a0dbca3f270a223f5a PKG_DESCR:= automatically configure software source code packages PKG_SECTION:= dev/tools HOST_BUILDDEP:= m4-host diff --git a/package/autoconf/patches/patch-Makefile_in b/package/autoconf/patches/patch-Makefile_in deleted file mode 100644 index 502588165..000000000 --- a/package/autoconf/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- autoconf-2.69.orig/Makefile.in 2012-04-25 04:40:26.000000000 +0200 -+++ autoconf-2.69/Makefile.in 2015-12-06 17:42:13.000000000 +0100 -@@ -245,7 +245,7 @@ top_srcdir = @top_srcdir@ - # bin/ must be run first, as it builds executables needed for tests. - # autom4te uses autotest.m4f to generate `testsuite', so build tests last. - # Rules in man/ use scripts from both bin/ and tests/, so *it* goes last. --SUBDIRS = bin . lib doc tests man -+SUBDIRS = bin . lib - ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = ChangeLog.0 ChangeLog.1 ChangeLog.2 ChangeLog.3 \ - BUGS COPYINGv3 COPYING.EXCEPTION \ diff --git a/package/bind/Makefile b/package/bind/Makefile index ac59cc624..ac208569d 100644 --- a/package/bind/Makefile +++ b/package/bind/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= bind -PKG_VERSION:= 9.18.24 +PKG_VERSION:= 9.18.30 PKG_RELEASE:= 1 -PKG_HASH:= 709d73023c9115ddad3bab65b6c8c79a590196d0d114f5d0ca2533dbd52ddf66 +PKG_HASH:= 9f6817640970267317e5aa143ecf70531040f2155636b1a63ea45379aa09034a PKG_DESCR:= dns server PKG_SECTION:= net/dns -PKG_DEPENDS:= libxml2 libressl libuv libressl-util -PKG_BUILDDEP:= libxml2 libressl libuv +PKG_DEPENDS:= libxml2 libopenssl libuv openssl-util +PKG_BUILDDEP:= libxml2 openssl libuv PKG_NEEDS:= c++ PKG_URL:= https://www.isc.org/software/bind/ -PKG_SITES:= ftp://ftp.isc.org/isc/bind9/${PKG_VERSION}/ +PKG_SITES:= https://ftp.isc.org/isc/bind9/${PKG_VERSION}/ PKG_LIBNAME:= libbind PKG_OPTS:= dev diff --git a/package/bind/files/named.init b/package/bind/files/named.init index e853202b4..2bc4b952d 100644 --- a/package/bind/files/named.init +++ b/package/bind/files/named.init @@ -12,7 +12,7 @@ autostop) ;; ;; start) if [ -f /etc/bind/named.conf ]; then - /usr/sbin/named -c /etc/bind/named.conf + /usr/sbin/named -c /etc/bind/named.conf & fi ;; stop) diff --git a/package/bind/patches/patch-bin_rndc_Makefile_am b/package/bind/patches/patch-bin_rndc_Makefile_am deleted file mode 100644 index 4bf3b893c..000000000 --- a/package/bind/patches/patch-bin_rndc_Makefile_am +++ /dev/null @@ -1,18 +0,0 @@ ---- bind-9.18.24.orig/bin/rndc/Makefile.am 2024-02-11 11:42:55.296980787 +0100 -+++ bind-9.18.24/bin/rndc/Makefile.am 2024-02-20 08:02:25.039885442 +0100 -@@ -2,6 +2,7 @@ include $(top_srcdir)/Makefile.top - - AM_CPPFLAGS += \ - $(LIBISC_CFLAGS) \ -+ $(LIBNS_CFLAGS) \ - $(LIBDNS_CFLAGS) \ - $(LIBISCCFG_CFLAGS) \ - $(LIBISCCC_CFLAGS) \ -@@ -20,6 +21,7 @@ rndc_SOURCES = \ - - rndc_LDADD = \ - $(LIBISC_LIBS) \ -+ $(LIBNS_LIBS) \ - $(LIBDNS_LIBS) \ - $(LIBISCCC_LIBS) \ - $(LIBISCCFG_LIBS) \ diff --git a/package/coreutils/Makefile b/package/coreutils/Makefile index f27fd4f00..70dc6bfdc 100644 --- a/package/coreutils/Makefile +++ b/package/coreutils/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= coreutils -PKG_VERSION:= 9.4 +PKG_VERSION:= 9.5 PKG_RELEASE:= 1 -PKG_HASH:= ea613a4cf44612326e917201bbbcdfbd301de21ffc3b59b6e5c07e040b275e52 +PKG_HASH:= cd328edeac92f6a665de9f323c93b712af1858bc2e0d88f3f7100469470a1b8a PKG_DESCR:= file, shell and text utilities PKG_SECTION:= base/apps PKG_NEEDS:= threads diff --git a/package/coreutils/patches/patch-lib_mcel_h b/package/coreutils/patches/patch-lib_mcel_h new file mode 100644 index 000000000..2e04561df --- /dev/null +++ b/package/coreutils/patches/patch-lib_mcel_h @@ -0,0 +1,11 @@ +--- coreutils-9.5.orig/lib/mcel.h 2024-01-01 14:21:47.000000000 +0100 ++++ coreutils-9.5/lib/mcel.h 2024-08-21 22:53:39.818834251 +0200 +@@ -221,7 +221,7 @@ mcel_scan (char const *p, char const *li + + /* An initial mbstate_t; initialization optimized for some platforms. + For details about these and other platforms, see wchar.in.h. */ +-#if defined __GLIBC__ && 2 < __GLIBC__ + (2 <= __GLIBC_MINOR__) ++#if defined __GLIBC__ && 2 < __GLIBC__ + (2 <= __GLIBC_MINOR__) && !defined __UCLIBC__ + /* Although only a trivial optimization, it's worth it for GNU. */ + mbstate_t mbs; mbs.__count = 0; + #elif (defined __FreeBSD__ || defined __DragonFly__ || defined __OpenBSD__ \ diff --git a/package/curl/Makefile b/package/curl/Makefile index 9034528f1..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.0 +PKG_VERSION:= 8.10.1 PKG_RELEASE:= 1 -PKG_HASH:= ff09b2791ca56d25fd5c3f3a4927dce7c8a9dc4182200c487ca889fba1fdd412 +PKG_HASH:= 73a4b0e99596a09fa5924a4fb7e4b995a85fda0d18a2c02ab9cf134bebce04ee PKG_DESCR:= client-side url transfer tool PKG_SECTION:= net/http PKG_BUILDDEP:= zlib @@ -27,7 +27,7 @@ PKGSS_CURL:= zlib libcurl PKG_FLAVOURS_LIBCURL:= WITH_IPV6 PKGFD_WITH_IPV6:= enable ipv6 support -PKG_CHOICES_LIBCURL:= WITH_LIBRESSL WITH_OPENSSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL +PKG_CHOICES_LIBCURL:= WITH_OPENSSL WITH_LIBRESSL WITH_GNUTLS WITH_WOLFSSL WITHOUT_SSL PKGCD_WITH_LIBRESSL:= use libressl for crypto PKGCS_WITH_LIBRESSL:= libressl ca-certificates PKGCB_WITH_LIBRESSL:= libressl diff --git a/package/cyrus-sasl/Makefile b/package/cyrus-sasl/Makefile index a761f2e59..fa6503bd2 100644 --- a/package/cyrus-sasl/Makefile +++ b/package/cyrus-sasl/Makefile @@ -9,8 +9,8 @@ PKG_RELEASE:= 2 PKG_HASH:= 8fbc5136512b59bb793657f36fadda6359cae3b08f01fd16b3d406f1345b7bc3 PKG_DESCR:= general purpose authentication library PKG_SECTION:= libs/crypto -PKG_DEPENDS:= libressl -PKG_BUILDDEP:= libressl +PKG_DEPENDS:= libopenssl +PKG_BUILDDEP:= openssl PKG_URL:= http://cyrusimap.org/ PKG_SITES:= ftp://ftp.cyrusimap.org/cyrus-sasl/ PKG_LIBNAME:= libsasl2 diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile index 3e565c647..cfadb30af 100644 --- a/package/e2fsprogs/Makefile +++ b/package/e2fsprogs/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= e2fsprogs -PKG_VERSION:= 1.47.0 +PKG_VERSION:= 1.47.1 PKG_RELEASE:= 1 -PKG_HASH:= 144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db +PKG_HASH:= 5a33dc047fd47284bca4bb10c13cfe7896377ae3d01cb81a05d406025d99e0d1 PKG_DESCR:= ext2/3/4 filesystem utilities PKG_SECTION:= sys/fs PKG_BUILDDEP:= util-linux @@ -18,7 +18,7 @@ PKG_OPTS:= dev PKG_CFLINE_E2FSPROGS:= select BUSYBOX_FSCK PKG_SUBPKGS:= LIBE2FS LIBCOM_ERR LIBSS -PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS +PKG_SUBPKGS+= RESIZE2FS TUNE2FS E2FSCK MKE2FS E4DEFRAG PKGSD_LIBE2FS:= e2fsprogs library PKGSC_LIBE2FS:= libs/misc PKGSD_LIBCOM_ERR:= common error library @@ -34,6 +34,9 @@ PKGSS_TUNE2FS:= libe2fs libcom-err libblkid libuuid PKGSD_E2FSCK:= ext2/3/4 filesystem check utility PKGSC_E2FSCK:= sys/fs PKGSS_E2FSCK:= libe2fs libcom-err libblkid libuuid +PKGSD_E4DEFRAG:= ext4 filesystem defragmentation utility +PKGSC_E4DEFRAG:= sys/fs +PKGSS_E4DEFRAG:= libe2fs libcom-err libblkid libuuid PKGSD_MKE2FS:= ext2/3/4 filesystem creation utility PKGSC_MKE2FS:= sys/fs PKGSS_MKE2FS:= libe2fs libcom-err libblkid libuuid libncurses @@ -49,6 +52,7 @@ $(eval $(call PKG_template,TUNE2FS,tune2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS $(eval $(call PKG_template,RESIZE2FS,resize2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_RESIZE2FS),$(PKGSD_RESIZE2FS),$(PKGSC_RESIZE2FS))) $(eval $(call PKG_template,MKE2FS,mke2fs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKE2FS),$(PKGSD_MKE2FS),$(PKGSC_MKE2FS))) $(eval $(call PKG_template,E2FSCK,e2fsck,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E2FSCK),$(PKGSD_E2FSCK),$(PKGSC_E2FSCK))) +$(eval $(call PKG_template,E4DEFRAG,e4defrag,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_E4DEFRAG),$(PKGSD_E4DEFRAG),$(PKGSC_E4DEFRAG))) HOST_CONFIGURE_ARGS+= --disable-rpath \ --disable-nls \ @@ -66,7 +70,7 @@ endif CONFIGURE_ARGS+= --disable-rpath \ --disable-uuidd \ --disable-testio-debug \ - --disable-defrag \ + --enable-defrag \ --disable-libblkid \ --disable-libuuid \ --disable-debugfs @@ -91,6 +95,10 @@ libe2fs-install: $(CP) $(WRKINST)/usr/lib/lib{e2p,ext2fs}.so.* \ $(IDIR_LIBE2FS)/usr/lib +e4defrag-install: + $(INSTALL_DIR) $(IDIR_E4DEFRAG)/usr/sbin + $(INSTALL_BIN) $(WRKINST)/usr/sbin/e4defrag $(IDIR_E4DEFRAG)/usr/sbin + e2fsck-install: $(INSTALL_DIR) $(IDIR_E2FSCK)/usr/sbin $(INSTALL_BIN) $(WRKINST)/usr/sbin/e2fsck $(IDIR_E2FSCK)/usr/sbin diff --git a/package/firefox/Makefile b/package/firefox/Makefile index eb3cfeb9e..93a0199cb 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= firefox -PKG_VERSION:= 108.0.1 +PKG_VERSION:= 129.0.2 PKG_RELEASE:= 1 -PKG_HASH:= 9821ac130dad01383e03276bf6cc92d41329d351da1fa7fa238168f8890611ea +PKG_HASH:= 35a1da121af474833d013ecbc1f77aa55bb35678fe06d438842d320dfab3f344 PKG_DESCR:= www browser PKG_SECTION:= app/browser PKG_DEPENDS:= pango libfreetype fontconfig libxcomposite libxcursor @@ -41,7 +41,9 @@ CONFIGURE_ARGS+= --prefix=/usr \ --disable-audio-backends \ --without-wasm-sandboxed-libraries \ --disable-profiling \ - --with-clang-path=/usr/bin/clang-13 + --disable-crashreporter \ + --with-clang-path=/usr/bin/clang-18 \ + --with-libclang-path=/usr/lib/llvm-18/lib firefox-install: $(INSTALL_DIR) $(IDIR_FIREFOX)/usr/bin diff --git a/package/firefox/patches/patch-build_moz_configure_flags_configure b/package/firefox/patches/patch-build_moz_configure_flags_configure new file mode 100644 index 000000000..c0ac77a7c --- /dev/null +++ b/package/firefox/patches/patch-build_moz_configure_flags_configure @@ -0,0 +1,13 @@ +--- firefox-129.0.2.orig/build/moz.configure/flags.configure 2024-08-19 21:21:42.000000000 +0200 ++++ firefox-129.0.2/build/moz.configure/flags.configure 2024-09-08 06:27:20.661198142 +0200 +@@ -72,10 +72,6 @@ def link_libstdcxx_statically( + ) + + +-@depends(when=link_libstdcxx_statically) +-def check_libstdcxx_linkage(): +- die("Firefox does not support linking statically with libstdc++") +- + + check_and_add_flag( + "-mieee", diff --git a/package/firefox/patches/patch-servo_components_style_traits_values_rs b/package/firefox/patches/patch-servo_components_style_traits_values_rs new file mode 100644 index 000000000..cc02de658 --- /dev/null +++ b/package/firefox/patches/patch-servo_components_style_traits_values_rs @@ -0,0 +1,37 @@ +--- firefox-129.0.2.orig/servo/components/style_traits/values.rs 2024-08-19 21:21:51.000000000 +0200 ++++ firefox-129.0.2/servo/components/style_traits/values.rs 2024-09-08 06:18:31.271680673 +0200 +@@ -388,11 +388,11 @@ impl Separator for Space { + where + F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>, + { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. + let mut results = vec![parse_one(input)?]; + loop { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. +- if let Ok(item) = input.try(&mut parse_one) { ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. ++ if let Ok(item) = input.try_parse(&mut parse_one) { + results.push(item); + } else { + return Ok(results); +@@ -413,14 +413,14 @@ impl Separator for CommaWithSpace { + where + F: for<'tt> FnMut(&mut Parser<'i, 'tt>) -> Result<T, ParseError<'i, E>>, + { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. + let mut results = vec![parse_one(input)?]; + loop { +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. + let comma_location = input.current_source_location(); +- let comma = input.try(|i| i.expect_comma()).is_ok(); +- input.skip_whitespace(); // Unnecessary for correctness, but may help try() rewind less. +- if let Ok(item) = input.try(&mut parse_one) { ++ let comma = input.try_parse(|i| i.expect_comma()).is_ok(); ++ input.skip_whitespace(); // Unnecessary for correctness, but may help try_parse() rewind less. ++ if let Ok(item) = input.try_parse(&mut parse_one) { + results.push(item); + } else if comma { + return Err(comma_location.new_unexpected_token_error(Token::Comma)); diff --git a/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml b/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml new file mode 100644 index 000000000..7cf9a3d17 --- /dev/null +++ b/package/firefox/patches/patch-servo_ports_geckolib_cbindgen_toml @@ -0,0 +1,10 @@ +--- firefox-129.0.2.orig/servo/ports/geckolib/cbindgen.toml 2024-08-19 21:21:52.000000000 +0200 ++++ firefox-129.0.2/servo/ports/geckolib/cbindgen.toml 2024-09-08 06:18:31.275680774 +0200 +@@ -360,7 +360,6 @@ renaming_overrides_prefixing = true + "Keyframe" = "Keyframe" + "nsChangeHint" = "nsChangeHint" + "ServoElementSnapshotTable" = "ServoElementSnapshotTable" +-"Keyframe" = "Keyframe" + "ComputedKeyframeValues" = "ComputedKeyframeValues" + "OriginFlags" = "OriginFlags" + "ServoTraversalFlags" = "ServoTraversalFlags" diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 15e797efc..614a16381 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= fontconfig -PKG_VERSION:= 2.13.1 +PKG_VERSION:= 2.15.0 PKG_RELEASE:= 1 -PKG_HASH:= 9f0d852b39d75fc655f9f53850eb32555394f36104a044bb2b2fc9e66dbbfa7f +PKG_HASH:= f5f359d6332861bd497570848fcb42520964a9e83d5e3abe397b6b6db9bcaaf4 PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs/fonts PKG_DEPENDS:= libxml2 @@ -24,7 +24,6 @@ include ${ADK_TOPDIR}/mk/package.mk $(eval $(call HOST_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,FONTCONFIG,fontconfig,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -AUTOTOOL_STYLE:= autoreconf HOST_STYLE:= auto CONFIGURE_ARGS+= --with-arch=${ADK_TARGET_ARCH} \ --enable-libxml2 \ diff --git a/package/freeradius-server/Makefile b/package/freeradius-server/Makefile index b9c1f12f2..e58967d6b 100644 --- a/package/freeradius-server/Makefile +++ b/package/freeradius-server/Makefile @@ -4,16 +4,16 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= freeradius-server -PKG_VERSION:= 3.2.3 +PKG_VERSION:= 3.2.6 PKG_RELEASE:= 1 -PKG_HASH:= 4bde047122e588c63fe2d599a73f7ab9a863806f9e716e88a3d77080b482c577 +PKG_HASH:= dfed5a53596470e8c977fa2d4d154622ad673a0717d56dd085fb5000eda32f0d PKG_DESCR:= flexible radius server PKG_SECTION:= net/radius -PKG_DEPENDS:= libltdl libpcre libtalloc libressl libatomic -PKG_BUILDDEP:= libtool pcre talloc libressl +PKG_DEPENDS:= libltdl libpcre libtalloc libopenssl libatomic libreadline +PKG_BUILDDEP:= libtool pcre talloc openssl readline PKG_NEEDS:= threads PKG_URL:= http://www.freeradius.org/ -PKG_SITES:= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_3/ +PKG_SITES:= https://github.com/FreeRADIUS/freeradius-server/releases/download/release_3_2_6/ DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/package/freeradius-server/patches/patch-raddb_all_mk b/package/freeradius-server/patches/patch-raddb_all_mk new file mode 100644 index 000000000..6fa765ca2 --- /dev/null +++ b/package/freeradius-server/patches/patch-raddb_all_mk @@ -0,0 +1,23 @@ +--- freeradius-server-3.2.6.orig/raddb/all.mk 2024-08-24 15:06:25.000000000 +0200 ++++ freeradius-server-3.2.6/raddb/all.mk 2024-08-26 16:30:35.470666078 +0200 +@@ -125,20 +125,6 @@ $(R)$(raddbdir)/users: $(R)$(modconfdir) + @[ -e $@ ] || echo LN-S $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) + @[ -e $@ ] || ln -s $(patsubst $(R)$(raddbdir)/%,./%,$<) $@ + +-ifneq "$(LOCAL_CERT_PRODUCTS)" "" +-$(LOCAL_CERT_PRODUCTS): +- @echo BOOTSTRAP raddb/certs/ +- @$(MAKE) -C $(R)$(raddbdir)/certs/ +- +-# Bootstrap is special +-$(R)$(raddbdir)/certs/bootstrap: | raddb/certs/bootstrap $(LOCAL_CERT_PRODUCTS) +- @echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) +- @$(INSTALL) -m 750 $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) $@ +-else +-$(R)$(raddbdir)/certs/bootstrap: +- @echo INSTALL $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) +- @$(INSTALL) -m 750 $(patsubst $(R)$(raddbdir)/%,raddb/%,$@) $@ +-endif + + # List directories before the file targets. + # It's not clear why GNU Make doesn't deal well with this. diff --git a/package/freeradius-server/patches/patch-scripts_libtool_mk b/package/freeradius-server/patches/patch-scripts_libtool_mk index bcfdeff89..9dcbbe114 100644 --- a/package/freeradius-server/patches/patch-scripts_libtool_mk +++ b/package/freeradius-server/patches/patch-scripts_libtool_mk @@ -1,13 +1,13 @@ ---- freeradius-server-3.2.3.orig/scripts/libtool.mk 2023-05-26 15:56:52.000000000 +0200 -+++ freeradius-server-3.2.3/scripts/libtool.mk 2024-02-27 03:44:17.243010645 +0100 -@@ -48,8 +48,8 @@ ifeq "${LIBTOOL}" "JLIBTOOL" - # binary! - ${JLIBTOOL}: ${top_makedir}/jlibtool.c +--- freeradius-server-3.2.6.orig/scripts/libtool.mk 2024-08-24 15:06:25.000000000 +0200 ++++ freeradius-server-3.2.6/scripts/libtool.mk 2024-08-26 15:15:40.489814433 +0200 +@@ -40,8 +40,8 @@ all install: ${JLIBTOOL} + # binary! + ${JLIBTOOL}: ${top_makedir}/jlibtool.c $(Q)mkdir -p $(dir $@) - $(Q)echo CC jlibtool.c - $(Q)${CC} $< -o $@ ${JLIBTOOL_DEFS} + $(Q)echo CC_FOR_BUILD jlibtool.c + ${CC_FOR_BUILD} $< -o $@ ${JLIBTOOL_DEFS} - clean: jlibtool_clean + clean: jlibtool_clean diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index ee6d9c043..058134b26 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -23,7 +23,7 @@ $(eval $(call HOST_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE)) $(eval $(call PKG_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) HOST_STYLE:= auto -HOST_LDFLAGS+= -lffi -lz -ldl -lresolv -liconv -lmount +HOST_LDFLAGS+= -lz -ldl -lresolv -liconv -lmount -lffi HOST_CONFIGURE_ARGS+= --disable-glibtest \ --without-libjpeg \ --without-libpng \ diff --git a/package/genimage/Makefile b/package/genimage/Makefile index 889d77eda..164d72e4e 100644 --- a/package/genimage/Makefile +++ b/package/genimage/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= genimage -PKG_VERSION:= 17 +PKG_VERSION:= 18 PKG_RELEASE:= 1 -PKG_HASH:= a8756e3567a0d4d82c36b08ccc1e088250b9006d5670c6b2b014185e6ec60671 +PKG_HASH:= ebc3f886c4d80064dd6c6d5e3c2e98e5a670078264108ce2f89ada8a2e13fedd PKG_DESCR:= image creation utility PKG_SECTION:= dev/tools HOST_BUILDDEP:= confuse-host 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/glib/Makefile b/package/glib/Makefile index eb77cf8fe..f83648bae 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -10,8 +10,8 @@ PKG_EXTRAVER:= 2.78 PKG_HASH:= 24b8e0672dca120cc32d394bccb85844e732e04fe75d18bb0573b2dbc7548f63 PKG_DESCR:= low-level core library that forms the basis of gtk+ PKG_SECTION:= libs/misc -PKG_DEPENDS:= pcre2 zlib libffi -PKG_BUILDDEP:= glib-host util-linux libffi zlib dbus pcre2 +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 PKG_NEEDS:= threads intl iconv @@ -28,29 +28,23 @@ $(eval $(call PKG_template,GLIB,glib,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS HOSTWRKBUILD= $(WRKSRC) WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj -HOST_CONFIG_STYLE:= manual -HOST_STYLE:= manual +HOST_STYLE:= meson +HOST_INSTALL_STYLE:= meson + CONFIG_STYLE:= meson BUILD_STYLE:= meson INSTALL_STYLE:= meson +HOST_MESON_FLAGS:= --default-library static -Dtests=false -Dxattr=false -Doss_fuzz=disabled MESON_FLAGS:= -Dtests=false -Dxattr=false -Doss_fuzz=disabled -host-configure: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix $(STAGING_HOST_DIR)/usr _build) - -host-build: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) - -glib-hostinstall: - (cd $(HOSTWRKBUILD) && PATH='$(HOST_PATH)' meson install -C _build) - -do-configure: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson setup --prefix /usr \ - --libdir lib --cross-file $(STAGING_HOST_DIR)/etc/meson/cross-compilation.conf -Dtests=false _build) - -do-build: - (cd $(WRKBUILD) && PATH='$(HOST_PATH)' meson compile -C _build) +hostpost-install: + $(CP) $(HOSTWRKBUILD)/../glib-obj/meson-private/glib-2.0.pc \ + $(STAGING_HOST_DIR)/usr/lib/pkgconfig + $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-mkenums \ + $(STAGING_HOST_DIR)/usr/bin + $(INSTALL_BIN) $(HOSTWRKBUILD)/../glib-obj/gobject/glib-genmarshal \ + $(STAGING_HOST_DIR)/usr/bin glib-install: $(INSTALL_DIR) $(IDIR_GLIB)/usr/lib diff --git a/package/glib/patches/patch-meson_build b/package/glib/patches/patch-meson_build index c410eac33..dbc6c7457 100644 --- a/package/glib/patches/patch-meson_build +++ b/package/glib/patches/patch-meson_build @@ -1,6 +1,6 @@ ---- glib-2.75.2.orig/meson.build 2023-01-06 13:49:52.000000000 +0100 -+++ glib-2.75.2/meson.build 2023-01-22 14:18:11.633406695 +0100 -@@ -513,6 +513,7 @@ if cc.get_id() == 'gcc' or cc.get_id() = +--- glib-2.78.4.orig/meson.build 2024-01-21 20:48:20.000000000 +0100 ++++ glib-2.78.4/meson.build 2024-08-30 10:20:24.877632538 +0200 +@@ -527,6 +527,7 @@ if cc.get_id() == 'gcc' or cc.get_id() = '-Werror=missing-include-dirs', '-Werror=pointer-arith', '-Werror=unused-result', 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/libdisplay-info/Makefile b/package/libdisplay-info/Makefile index 89ee541d8..9edc11c4f 100644 --- a/package/libdisplay-info/Makefile +++ b/package/libdisplay-info/Makefile @@ -4,13 +4,13 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libdisplay-info -PKG_VERSION:= 0.1.1 +PKG_VERSION:= 0.2.0 PKG_RELEASE:= 1 -PKG_HASH:= 0d8731588e9f82a9cac96324a3d7c82e2ba5b1b5e006143fefe692c74069fb60 +PKG_HASH:= 5a2f002a16f42dd3540c8846f80a90b8f4bdcd067a94b9d2087bc2feae974176 PKG_DESCR:= edid and displayid library PKG_SECTION:= libs/misc PKG_BUILDDEP:= hwdata -PKG_SITES:= https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/0.1.1/downloads/ +PKG_SITES:= https://gitlab.freedesktop.org/emersion/libdisplay-info/-/releases/$(PKG_VERSION)/downloads/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/package.mk diff --git a/package/libgpg-error/Makefile b/package/libgpg-error/Makefile index c9d50ca65..aa139d40e 100644 --- a/package/libgpg-error/Makefile +++ b/package/libgpg-error/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= 9e3c670966b96ecc746c28c2c419541e3bcb787d1a73930f5e5f5e1bcbbb9bdb PKG_DESCR:= helper library for common error codes and descriptions PKG_SECTION:= libs/misc PKG_URL:= http://www.gnupg.org/ -PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgpg-error/ +PKG_SITES:= https://www.gnupg.org/ftp/gcrypt/libgpg-error/ PKG_OPTS:= dev PKG_NOPARALLEL:= 1 @@ -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/libiconv/Makefile b/package/libiconv/Makefile index d978dbba8..941d6a8d0 100644 --- a/package/libiconv/Makefile +++ b/package/libiconv/Makefile @@ -21,6 +21,8 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,LIBICONV,libiconv,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +HOST_CONFIGURE_ARGS+= --enable-static + libiconv-install: $(INSTALL_DIR) $(IDIR_LIBICONV)/usr/lib $(CP) $(WRKINST)/usr/lib/libiconv.so* $(IDIR_LIBICONV)/usr/lib/ diff --git a/package/libjpeg-turbo/Makefile b/package/libjpeg-turbo/Makefile index 15aa86202..26ddffb1e 100644 --- a/package/libjpeg-turbo/Makefile +++ b/package/libjpeg-turbo/Makefile @@ -4,19 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libjpeg-turbo -PKG_VERSION:= 1.5.2 +PKG_VERSION:= 3.0.3 PKG_RELEASE:= 1 -PKG_HASH:= 9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528 +PKG_HASH:= a649205a90e39a548863a3614a9576a3fb4465f8e8e66d54999f127957c25b21 PKG_DESCR:= jpeg image library PKG_SECTION:= libs/image PKG_BUILDDEP:= yasm-host HOST_BUILDDEP:= yasm-host -PKG_URL:= http://libjpeg-turbo.virtualgl.org/ -PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/} +PKG_URL:= http://libjpeg-turbo.org/ +PKG_SITES:= https://github.com/libjpeg-turbo/libjpeg-turbo/archive/refs/tags/ PKG_OPTS:= dev -PKG_NOPARALLEL:= 1 -DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +DISTFILES:= ${PKG_VERSION}.tar.gz include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -24,15 +23,7 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,LIBJPEG_TURBO,libjpeg-turbo,$(PKG_VERSION)-${PKG_RELEASE})) $(eval $(call PKG_template,LIBJPEG_TURBO,libjpeg-turbo,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS})) -TARGET_CFLAGS+= -fPIC - -ifeq ($(ADK_x32),y) -CONFIGURE_ARGS+= --without-simd -endif - -CONFIGURE_ENV+= ac_cv_prog_NASM=yasm -CONFIGURE_ARGS+= --with-pic -HOST_CONFIGURE_ARGS+= --without-simd +CONFIG_STYLE:= cmake libjpeg-turbo-install: $(INSTALL_DIR) $(IDIR_LIBJPEG_TURBO)/usr/lib diff --git a/package/libpcap/Makefile b/package/libpcap/Makefile index efc9440da..b9772780d 100644 --- a/package/libpcap/Makefile +++ b/package/libpcap/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libpcap -PKG_VERSION:= 1.10.4 +PKG_VERSION:= 1.10.5 PKG_RELEASE:= 1 -PKG_HASH:= ed19a0383fad72e3ad435fd239d7cd80d64916b87269550159d20e47160ebe5f +PKG_HASH:= 37ced90a19a302a7f32e458224a00c365c117905c2cd35ac544b6880a81488f0 PKG_DESCR:= low-level packet capture library PKG_SECTION:= libs/net PKG_URL:= http://www.tcpdump.org/ diff --git a/package/libseat/Makefile b/package/libseat/Makefile index b408fcaf6..3c3b85d01 100644 --- a/package/libseat/Makefile +++ b/package/libseat/Makefile @@ -4,18 +4,30 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libseat -PKG_VERSION:= 0.7.0 +PKG_VERSION:= 0.8.0 PKG_RELEASE:= 1 -PKG_HASH:= ea6ccbaf86949dba4eda64761b11aa8d05b61fc60f569b0fc05f2c4d06baeb87 +PKG_HASH:= a562a44ee33ccb20954a1c1ec9a90ecb2db7a07ad6b18d0ac904328efbcf65a0 PKG_DESCR:= seat library PKG_SECTION:= libs/misc -PKG_URL:= https://git.sr.ht/~kennylevinsen/seatd -PKG_SITES:= https://git.sr.ht/~kennylevinsen/seatd +PKG_URL:= https://git.sr.ht/~kennylevinsen/seatd/ +PKG_SITES:= https://git.sr.ht/~kennylevinsen/seatd/archive/ +PKG_LIBNAME:= libseat PKG_OPTS:= dev +PKG_SUBPKGS:= LIBSEAT SEATD +PKGSD_LIBSEAT:= seat library +PKGSC_LIBSEAT:= libs/misc +PKGSD_SEATD:= seat daemon +PKGSC_SEATD:= sys/misc +PKGSS_SEATD:= libseat + +DISTFILES:= $(PKG_VERSION).tar.gz +WRKDIST= ${WRKDIR}/seatd-${PKG_VERSION} + include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,LIBSEAT,libseat,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +$(eval $(call PKG_template,SEATD,seatd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj @@ -28,4 +40,9 @@ libseat-install: $(CP) $(WRKINST)/usr/lib/libseat*.so* \ $(IDIR_LIBSEAT)/usr/lib +seatd-install: + $(INSTALL_DIR) $(IDIR_SEATD)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/seatd \ + $(IDIR_SEATD)/usr/bin + include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/libssh/Makefile b/package/libssh/Makefile index 231bae2c4..217cecc3b 100644 --- a/package/libssh/Makefile +++ b/package/libssh/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libssh -PKG_VERSION:= 0.9.5 +PKG_VERSION:= 0.11.1 PKG_RELEASE:= 1 -PKG_HASH:= acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718 +PKG_HASH:= 14b7dcc72e91e08151c58b981a7b570ab2663f630e7d2837645d5a9c612c1b79 PKG_DESCR:= secure shell library PKG_SECTION:= libs/crypto -PKG_DEPENDS:= zlib libressl -PKG_BUILDDEP:= cmake-host zlib libressl +PKG_DEPENDS:= zlib libopenssl +PKG_BUILDDEP:= cmake-host zlib openssl PKG_URL:= http://www.libssh.org/ -PKG_SITES:= https://www.libssh.org/files/0.9/ +PKG_SITES:= https://www.libssh.org/files/0.11/ PKG_OPTS:= dev include $(ADK_TOPDIR)/mk/package.mk @@ -21,14 +21,14 @@ $(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj CONFIG_STYLE:= cmake -CMAKE_FLAGS:= -DOPENSSL_INCLUDE_DIRS='$(STAGING_TARGET_DIR)/usr/include' \ +CMAKE_FLAGS:= -DOPENSSL_INCLUDE_DIR='$(STAGING_TARGET_DIR)/usr/include' \ -DOPENSSL_LIBRARIES='-lcrypto -lssl -lz' \ - -DZLIB_INCLUDE_DIR='$(STAGING_TARGET_DIR)/usr/include' \ - -DZLIB_LIBRARY='$(STAGING_TARGET_DIR)/usr/lib' \ - -DWITH_GSSAPI=off \ - -DWITH_STACK_PROTECTOR=off \ + -DWITH_GSSAPI=on \ + -DWITH_SYMBOL_VERSIONING=off \ -DWITH_EXAMPLES=off +XAKE_FLAGS+= VERBOSE=1 + libssh-install: $(INSTALL_DIR) $(IDIR_LIBSSH)/usr/lib $(CP) $(WRKINST)/usr/lib/libssh*.so* \ diff --git a/package/libssh/patches/patch-CompilerChecks_cmake b/package/libssh/patches/patch-CompilerChecks_cmake deleted file mode 100644 index 8f5d3d805..000000000 --- a/package/libssh/patches/patch-CompilerChecks_cmake +++ /dev/null @@ -1,32 +0,0 @@ ---- libssh-0.9.5.orig/CompilerChecks.cmake 2020-05-07 13:51:36.000000000 +0200 -+++ libssh-0.9.5/CompilerChecks.cmake 2021-03-01 23:53:39.370794233 +0100 -@@ -67,29 +67,6 @@ if (UNIX) - endif() - endif() - -- check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG) -- if (WITH_STACK_PROTECTOR_STRONG) -- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong") -- # This is needed as Solaris has a seperate libssp -- if (SOLARIS) -- list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong") -- endif() -- else (WITH_STACK_PROTECTOR_STRONG) -- check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR) -- if (WITH_STACK_PROTECTOR) -- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector") -- # This is needed as Solaris has a seperate libssp -- if (SOLARIS) -- list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector") -- endif() -- endif() -- endif (WITH_STACK_PROTECTOR_STRONG) -- -- check_c_compiler_flag_ssp("-fstack-clash-protection" WITH_STACK_CLASH_PROTECTION) -- if (WITH_STACK_CLASH_PROTECTION) -- list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-clash-protection") -- endif() -- - if (PICKY_DEVELOPER) - add_c_compiler_flag("-Wno-error=deprecated-declarations" SUPPORTED_COMPILER_FLAGS) - add_c_compiler_flag("-Wno-error=tautological-compare" SUPPORTED_COMPILER_FLAGS) diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h deleted file mode 100644 index 39310ba16..000000000 --- a/package/libssh/patches/patch-include_libssh_libssh_h +++ /dev/null @@ -1,10 +0,0 @@ ---- libssh-0.9.5.orig/include/libssh/libssh.h 2020-09-10 14:43:02.000000000 +0200 -+++ libssh-0.9.5/include/libssh/libssh.h 2021-03-01 23:52:22.358253014 +0100 -@@ -58,6 +58,7 @@ - typedef unsigned long long uint64_t; - typedef int mode_t; - #else /* _MSC_VER */ -+ #include <sys/types.h> - #include <unistd.h> - #include <inttypes.h> - #include <sys/types.h> diff --git a/package/libtiff/Makefile b/package/libtiff/Makefile index 960605be8..282f1befc 100644 --- a/package/libtiff/Makefile +++ b/package/libtiff/Makefile @@ -10,7 +10,7 @@ PKG_HASH:= 0e46e5acb087ce7d1ac53cf4f56a09b221537fc86dfc5daaad1c2e89e1b37ac8 PKG_DESCR:= library for reading/writing tiff images PKG_SECTION:= libs/image PKG_NEEDS:= c++ -PKG_BUILDDEP:= zlib xz +PKG_BUILDDEP:= zlib PKG_URL:= http://simplesystems.org/libtiff/ PKG_SITES:= http://download.osgeo.org/libtiff/ PKG_LIBNAME:= libtiff 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/mariadb/Makefile b/package/mariadb/Makefile index 33a865c1f..6f380f8a7 100644 --- a/package/mariadb/Makefile +++ b/package/mariadb/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= mariadb -PKG_VERSION:= 10.11.7 +PKG_VERSION:= 10.11.9 PKG_RELEASE:= 1 -PKG_HASH:= 5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157 +PKG_HASH:= 0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20 PKG_DESCR:= sql client library PKG_SECTION:= libs/db PKG_DEPENDS:= libncurses zlib libevent libpcre boost libfmt libkrb5 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/nginx/Makefile b/package/nginx/Makefile index 6a13c1277..803371016 100644 --- a/package/nginx/Makefile +++ b/package/nginx/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= nginx -PKG_VERSION:= 1.25.3 +PKG_VERSION:= 1.26.1 PKG_RELEASE:= 1 -PKG_HASH:= 64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86 +PKG_HASH:= f9187468ff2eb159260bfd53867c25ff8e334726237acf227b9e870e53d3e36b PKG_DESCR:= powerful http reverse proxy and webserver PKG_SECTION:= net/http PKG_BUILDDEP:= pcre zlib @@ -58,7 +58,7 @@ ALL_TARGET:= nginx-install: $(INSTALL_DIR) $(IDIR_NGINX)/usr/sbin $(IDIR_NGINX)/etc/nginx - $(INSTALL_BIN) $(WRKINST)/usr/sbin/nginx \ + $(INSTALL_BIN) $(WRKBUILD)/objs/nginx \ $(IDIR_NGINX)/usr/sbin for f in nginx.conf mime.types fastcgi_params koi-utf koi-win win-utf; do \ cp ./files/$${f} \ diff --git a/package/nginx/patches/patch-auto_install b/package/nginx/patches/patch-auto_install deleted file mode 100644 index 0c9f06568..000000000 --- a/package/nginx/patches/patch-auto_install +++ /dev/null @@ -1,16 +0,0 @@ ---- nginx-1.9.13.orig/auto/install 2016-03-29 17:09:30.000000000 +0200 -+++ nginx-1.9.13/auto/install 2016-04-01 23:45:09.250318293 +0200 -@@ -107,11 +107,8 @@ $NGX_OBJS/nginx.8: $NGX_MAN $NGX_AUTO_CO - install: build $NGX_INSTALL_PERL_MODULES - test -d '\$(DESTDIR)$NGX_PREFIX' || mkdir -p '\$(DESTDIR)$NGX_PREFIX' - -- test -d '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' \\ -- || mkdir -p '\$(DESTDIR)`dirname "$NGX_SBIN_PATH"`' -- test ! -f '\$(DESTDIR)$NGX_SBIN_PATH' \\ -- || mv '\$(DESTDIR)$NGX_SBIN_PATH' \\ -- '\$(DESTDIR)$NGX_SBIN_PATH.old' -+ test -d '\$(DESTDIR)$NGX_SBIN_PATH' \\ -+ || mkdir -p '\$(DESTDIR)$NGX_SBIN_PATH' - cp $NGX_OBJS/nginx '\$(DESTDIR)$NGX_SBIN_PATH' - - test -d '\$(DESTDIR)$NGX_CONF_PREFIX' \\ diff --git a/package/nginx/patches/patch-auto_os_linux b/package/nginx/patches/patch-auto_os_linux deleted file mode 100644 index 0e33cb195..000000000 --- a/package/nginx/patches/patch-auto_os_linux +++ /dev/null @@ -1,59 +0,0 @@ ---- nginx-1.21.3.orig/auto/os/linux 2021-09-07 17:21:03.000000000 +0200 -+++ nginx-1.21.3/auto/os/linux 2021-10-29 14:50:09.089546624 +0200 -@@ -36,7 +36,7 @@ fi - - ngx_feature="epoll" - ngx_feature_name="NGX_HAVE_EPOLL" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/epoll.h>" - ngx_feature_path= - ngx_feature_libs= -@@ -135,7 +135,7 @@ ngx_feature_test="int fd; struct stat sb - CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE" - ngx_feature="sendfile()" - ngx_feature_name="NGX_HAVE_SENDFILE" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/sendfile.h> - #include <errno.h>" - ngx_feature_path= -@@ -156,7 +156,7 @@ fi - CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" - ngx_feature="sendfile64()" - ngx_feature_name="NGX_HAVE_SENDFILE64" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/sendfile.h> - #include <errno.h>" - ngx_feature_path= -@@ -174,7 +174,7 @@ ngx_include="sys/prctl.h"; . auto/includ - - ngx_feature="prctl(PR_SET_DUMPABLE)" - ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE" --ngx_feature_run=yes -+ngx_feature_run=no - ngx_feature_incs="#include <sys/prctl.h>" - ngx_feature_path= - ngx_feature_libs= -@@ -215,20 +215,6 @@ ngx_feature_test="struct __user_cap_data - (void) SYS_capset" - . auto/feature - -- --# crypt_r() -- --ngx_feature="crypt_r()" --ngx_feature_name="NGX_HAVE_GNU_CRYPT_R" --ngx_feature_run=no --ngx_feature_incs="#include <crypt.h>" --ngx_feature_path= --ngx_feature_libs=-lcrypt --ngx_feature_test="struct crypt_data cd; -- crypt_r(\"key\", \"salt\", &cd);" --. auto/feature -- -- - ngx_include="sys/vfs.h"; . auto/include - - diff --git a/package/openldap/Makefile b/package/openldap/Makefile index 2471893d1..ba69f6066 100644 --- a/package/openldap/Makefile +++ b/package/openldap/Makefile @@ -4,13 +4,13 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openldap -PKG_VERSION:= 2.6.0 +PKG_VERSION:= 2.6.8 PKG_RELEASE:= 1 -PKG_HASH:= b71c580eac573e9aba15d95f33dd4dd08f2ed4f0d7fc09e08ad4be7ed1e41a4f +PKG_HASH:= 48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e PKG_DESCR:= ldap client libraries PKG_SECTION:= libs/misc -PKG_DEPENDS:= libsasl2 libdb libuuid libncurses libressl -PKG_BUILDDEP:= cyrus-sasl db util-linux libressl +PKG_DEPENDS:= libsasl2 libuuid libncurses libopenssl +PKG_BUILDDEP:= cyrus-sasl util-linux openssl PKG_NEEDS:= threads c++ PKG_URL:= http://www.openldap.org/ PKG_SITES:= https://openldap.org/software/download/OpenLDAP/openldap-release/ @@ -39,7 +39,7 @@ $(eval $(call PKG_template,OPENLDAP_SLAPD,openldap-slapd,${PKG_VERSION}-${PKG_RE CONFIGURE_ENV+= ac_cv_func_memcmp_working=yes CONFIGURE_ARGS+= --enable-slapd \ --libexecdir=/usr/sbin \ - --enable-bdb \ + --disable-bdb \ --disable-hdb \ --disable-relay \ --enable-dynamic \ diff --git a/package/openldap/files/slapd.conf b/package/openldap/files/slapd.conf index 3a065043b..df18922e5 100644 --- a/package/openldap/files/slapd.conf +++ b/package/openldap/files/slapd.conf @@ -13,9 +13,9 @@ argsfile /var/run/slapd.args # moduleload back_ldap.la ####################################################################### -# BDB database definitions +# MDB database definitions ####################################################################### -database bdb +database mdb suffix "o=openadk" rootdn "cn=admin,o=openadk" # Cleartext passwords, especially for the rootdn, should diff --git a/package/openldap/patches/patch-Makefile_in b/package/openldap/patches/patch-Makefile_in deleted file mode 100644 index c248c3f7e..000000000 --- a/package/openldap/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- openldap-2.4.23.orig/Makefile.in 2010-04-13 22:22:14.000000000 +0200 -+++ openldap-2.4.23/Makefile.in 2011-03-04 20:59:55.000000000 +0100 -@@ -13,7 +13,7 @@ - ## top-level directory of the distribution or, alternatively, at - ## <http://www.OpenLDAP.org/license.html>. - --SUBDIRS= include libraries clients servers tests doc -+SUBDIRS= include libraries clients servers - CLEANDIRS= - INSTALLDIRS= - diff --git a/package/openldap/patches/patch-configure b/package/openldap/patches/patch-configure deleted file mode 100644 index 248f06e8a..000000000 --- a/package/openldap/patches/patch-configure +++ /dev/null @@ -1,33 +0,0 @@ ---- openldap-2.4.42.orig/configure 2015-08-14 17:25:28.000000000 +0200 -+++ openldap-2.4.42/configure 2015-10-22 07:28:53.000000000 +0200 -@@ -22223,29 +22223,10 @@ $as_echo "$as_me: WARNING: Strong authen - fi - fi - --if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then -- dev=no -- if test -r /dev/urandom ; then -- dev="/dev/urandom"; -- elif test -r /idev/urandom ; then -- dev="/idev/urandom"; -- elif test -r /dev/srandom ; then -- dev="/dev/srandom"; -- elif test -r /dev/random ; then -- dev="/dev/random"; -- elif test -r /idev/random ; then -- dev="/idev/random"; -- fi -- -- if test $dev != no ; then -- - cat >>confdefs.h <<_ACEOF --#define URANDOM_DEVICE "$dev" -+#define URANDOM_DEVICE "/dev/urandom" - _ACEOF - -- fi --fi -- - ol_link_fetch=no - if test $ol_with_fetch != no ; then - ol_LIBS=$LIBS diff --git a/package/openldap/patches/patch-configure_in b/package/openldap/patches/patch-configure_in deleted file mode 100644 index 5bd5b2503..000000000 --- a/package/openldap/patches/patch-configure_in +++ /dev/null @@ -1,31 +0,0 @@ ---- openldap-2.4.42.orig/configure.in 2015-08-14 17:25:28.000000000 +0200 -+++ openldap-2.4.42/configure.in 2015-10-22 07:23:38.000000000 +0200 -@@ -2147,26 +2147,8 @@ else - fi - fi - --dnl ---------------------------------------------------------------- --dnl Check for entropy sources --if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then -- dev=no -- if test -r /dev/urandom ; then -- dev="/dev/urandom"; -- elif test -r /idev/urandom ; then -- dev="/idev/urandom"; -- elif test -r /dev/srandom ; then -- dev="/dev/srandom"; -- elif test -r /dev/random ; then -- dev="/dev/random"; -- elif test -r /idev/random ; then -- dev="/idev/random"; -- fi -- -- if test $dev != no ; then -- AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device]) -- fi --fi -+# set unconditionally to /dev/urandom for Linux cross-compilation -+AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"/dev/urandom",[set to urandom device]) - - dnl ---------------------------------------------------------------- - dnl diff --git a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h b/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h deleted file mode 100644 index a80083bc2..000000000 --- a/package/openldap/patches/patch-libraries_librewrite_rewrite-int_h +++ /dev/null @@ -1,21 +0,0 @@ ---- openldap-2.4.36.orig/libraries/librewrite/rewrite-int.h 2013-08-16 20:12:59.000000000 +0200 -+++ openldap-2.4.36/libraries/librewrite/rewrite-int.h 2013-11-01 14:30:43.000000000 +0100 -@@ -40,12 +40,18 @@ - - #include <rewrite.h> - -+/* -+#undef malloc - #define malloc(x) ber_memalloc(x) -+#undef calloc - #define calloc(x,y) ber_memcalloc(x,y) -+#undef realloc - #define realloc(x,y) ber_memrealloc(x,y) -+#undef free - #define free(x) ber_memfree(x) - #undef strdup - #define strdup(x) ber_strdup(x) -+*/ - - /* Uncomment to use ldap pvt threads */ - #define USE_REWRITE_LDAP_PVT_THREADS 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/openssl/Makefile b/package/openssl/Makefile index cba0c4552..01841828c 100644 --- a/package/openssl/Makefile +++ b/package/openssl/Makefile @@ -4,15 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= openssl -PKG_VERSION:= 3.0.14 +PKG_VERSION:= 3.3.2 PKG_RELEASE:= 1 -PKG_HASH:= eeca035d4dd4e84fc25846d952da6297484afa0650a6f84c682e39df3a4123ca +PKG_HASH:= 2e8a40b01979afe8be0bbfb3de5dc1c6709fedb46d6c89c10da114ab5fc3d281 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto -PKG_URL:= https://www.openssl.org +PKG_URL:= https://openssl-library.org/ PKG_DEPENDS:= zlib PKG_BUILDDEP:= zlib -PKG_SITES:= https://www.openssl.org/source/ +PKG_SITES:= https://github.com/openssl/openssl/releases/download/openssl-$(PKG_VERSION)/ PKG_LIBNAME:= libopenssl PKG_OPTS:= dev @@ -62,6 +62,7 @@ CONFIG:= linux-x86_64 endif ifeq ($(ADK_TARGET_ARCH_AARCH64),y) CONFIG:= linux-aarch64 +OPENSSL_OPTIONS+= no-asm endif ifneq (,$(filter CYGWIN%,${OS_FOR_BUILD})) diff --git a/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl b/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl deleted file mode 100644 index eb64f9a73..000000000 --- a/package/openssl/patches/patch-Configurations_unix-Makefile_tmpl +++ /dev/null @@ -1,20 +0,0 @@ ---- openssl-3.0.10.orig/Configurations/unix-Makefile.tmpl 2023-08-01 15:47:24.000000000 +0200 -+++ openssl-3.0.10/Configurations/unix-Makefile.tmpl 2023-08-12 19:44:43.932070216 +0200 -@@ -523,7 +523,7 @@ build_all_generated: $(GENERATED_MANDATO - @echo " then make will fail..." - @ : {- output_on() if $disabled{makedepend}; "" -} - --all: build_sw build_docs -+all: build_sw - - test: tests - {- dependmagic('tests'); -}: build_programs_nodep build_modules_nodep link-utils run_tests -@@ -546,7 +546,7 @@ list-tests: - @echo "Tests are not supported with your chosen Configure options" - @ : {- output_on() if !$disabled{tests}; "" -} - --install: install_sw install_ssldirs install_docs {- $disabled{fips} ? "" : "install_fips" -} -+install: install_sw install_ssldirs {- $disabled{fips} ? "" : "install_fips" -} - - uninstall: uninstall_docs uninstall_sw {- $disabled{fips} ? "" : "uninstall_fips" -} - diff --git a/package/pcre2/Makefile b/package/pcre2/Makefile index 3bd0d9935..5062daea4 100644 --- a/package/pcre2/Makefile +++ b/package/pcre2/Makefile @@ -23,14 +23,11 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,PCRE2,pcre2,${PKG_VERSION}-${PKG_RELEASE})) $(eval $(call PKG_template,PCRE2,pcre2,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_STYLE:= cmake +HOST_CONFIG_STYLE:= cmake +HOST_CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DBUILD_SHARED_LIBS=ON -pcre2-hostinstall: - cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ - ${HOST_FAKE_FLAGS} ${HOST_INSTALL_TARGET} - pcre2-install: $(INSTALL_DIR) $(IDIR_PCRE2)/usr/lib $(CP) $(WRKINST)/usr/lib/libpcre2*.so* \ diff --git a/package/perl/Makefile b/package/perl/Makefile index 788d08745..55c1ca65f 100644 --- a/package/perl/Makefile +++ b/package/perl/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= perl -PKG_VERSION:= 5.38.2 +PKG_VERSION:= 5.40.0 PKG_RELEASE:= 1 -PKG_HASH:= d91115e90b896520e83d4de6b52f8254ef2b70a8d545ffab33200ea9f1cf29e8 +PKG_HASH:= d5325300ad267624cb0b7d512cfdfcd74fa7fe00c455c5b51a6bd53e5e199ef9 PKG_DESCR:= perl interpreter PKG_SECTION:= dev/lang PKG_NEEDS:= threads @@ -14,7 +14,7 @@ PKG_URL:= http://www.perl.org/ PKG_SITES:= http://www.cpan.org/src/ PKG_NOPARALLEL:= 1 -PC_VERSION:= 1.5.2 +PC_VERSION:= 1.5.3 PC_SITE:= https://github.com/arsv/perl-cross/releases/download/$(PC_VERSION) include ${ADK_TOPDIR}/mk/host.mk @@ -36,7 +36,9 @@ CONFIGURE_ARGS:= --target=$(GNU_TARGET_NAME) \ -Dmyuname="$(ADK_VENDOR)" \ -Dosname=linux \ -Dosvers=4.0 \ - -Dperladmin=root + -Dperladmin=root \ + -Ud_strlcat \ + -Ud_strlcpy ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) CONFIGURE_ARGS+= --all-static --no-dynaloader diff --git a/package/php/Makefile b/package/php/Makefile index 7b9a1e81b..0c6fd2389 100644 --- a/package/php/Makefile +++ b/package/php/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= php -PKG_VERSION:= 8.3.2 +PKG_VERSION:= 8.3.11 PKG_RELEASE:= 1 -PKG_HASH:= 4ffa3e44afc9c590e28dc0d2d31fc61f0139f8b335f11880a121b9f9b9f0634e +PKG_HASH:= b862b098a08ab9bf4b36ed12c7d0d9f65353656b36fb0e3c5344093aceb35802 PKG_DESCR:= php language interpreter PKG_SECTION:= dev/lang PKG_NEEDS:= threads @@ -34,6 +34,8 @@ PKGFB_MOD_CURL:= curl PKGFS_MOD_CURL:= libcurl PKGFD_MOD_FTP:= ftp support PKGFD_MOD_GD:= gd support +PKGFB_MOD_GD:= libpng +PKGFS_MOD_GD:= libpng PKGFD_MOD_GMP:= gmp support PKGFB_MOD_GMP:= gmp PKGFS_MOD_GMP:= libgmp @@ -44,8 +46,8 @@ PKGFD_MOD_MARIADB:= mariadb support PKGFS_MOD_MARIADB:= libmariadbclient PKGFB_MOD_MARIADB:= mariadb PKGFD_MOD_SSL:= ssl support -PKGFB_MOD_SSL:= libressl -PKGFS_MOD_SSL:= libressl +PKGFB_MOD_SSL:= openssl +PKGFS_MOD_SSL:= libopenssl PKGFD_MOD_PCNTL:= process control support PKGFD_MOD_SESSION:= session support PKGFD_MOD_SNMP:= snmp support diff --git a/package/python-mako/Makefile b/package/python-mako/Makefile index bb069a434..0fe5b1923 100644 --- a/package/python-mako/Makefile +++ b/package/python-mako/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= d60a3903dc3bb01a18ad6a89cdbe2e4eadc69c0bc8ef1e3773ba53d44c3f7a34 PKG_DESCR:= fast, expressive, extensible templating engine PKG_SECTION:= dev/tools -PKG_BUILDDEP:= python3-host +HOST_BUILDDEP:= python3-host python-markupsafe-host PKG_SITES:= https://files.pythonhosted.org/packages/05/5f/2ba6e026d33a0e6ddc1dddf9958677f76f5f80c236bd65309d280b166d3e/ DISTFILES:= Mako-$(PKG_VERSION).tar.gz diff --git a/package/python-markupsafe/Makefile b/package/python-markupsafe/Makefile new file mode 100644 index 000000000..e35e13602 --- /dev/null +++ b/package/python-markupsafe/Makefile @@ -0,0 +1,33 @@ +# 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:= python-markupsafe +PKG_VERSION:= 2.1.5 +PKG_RELEASE:= 1 +PKG_HASH:= d283d37a890ba4c1ae73ffadf8046435c76e7bc2247bbb63c00bd1a709c6544b +PKG_DESCR:= implements a XML/HTML/XHTML markup safe string +PKG_SECTION:= dev/tools +HOST_BUILDDEP:= python3-host +PKG_SITES:= https://files.pythonhosted.org/packages/87/5b/aae44c6655f3801e81aa3eef09dbbf012431987ba564d7231722f68df02d/ + +DISTFILES:= MarkupSafe-$(PKG_VERSION).tar.gz + +WRKDIST= $(WRKDIR)/MarkupSafe-$(PKG_VERSION) + +include ${ADK_TOPDIR}/mk/host.mk +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call HOST_template,PYTHON_MAKO,python-markupsafe,${PKG_VERSION}-${PKG_RELEASE})) + +include $(ADK_TOPDIR)/mk/python3.mk + +HOST_STYLE:= manual + +python-markupsafe-hostinstall: + (cd $(WRKBUILD); PATH='$(HOST_PATH)' python3 ./setup.py install \ + --prefix=$(STAGING_HOST_DIR)/usr) + +include ${ADK_TOPDIR}/mk/host-bottom.mk +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/python3/Makefile b/package/python3/Makefile index 3d8761af2..dd2374ccf 100644 --- a/package/python3/Makefile +++ b/package/python3/Makefile @@ -4,20 +4,20 @@ 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 PKG_BUILDDEP:= python3-host libffi zlib expat -HOST_BUILDDEP:= libffi-host libressl-host zlib-host bzip2-host ncurses-host sqlite-host +HOST_BUILDDEP:= libffi-host openssl-host zlib-host bzip2-host ncurses-host sqlite-host PKG_NEEDS:= threads PKG_URL:= http://www.python.org/ PKG_SITES:= http://legacy.python.org/ftp/python/${PKG_VERSION}/ PKG_FLAVOURS_PYTHON3:= MOD_ZLIB MOD_BZ2 MOD_SQLITE MOD_GDBM -PKG_FLAVOURS_PYTHON3+= MOD_NCURSES MOD_LIBRESSL MOD_OPENSSL MOD_READLINE +PKG_FLAVOURS_PYTHON3+= MOD_NCURSES MOD_OPENSSL MOD_READLINE PKGFD_MOD_ZLIB:= zlib support PKGFB_MOD_ZLIB:= zlib @@ -37,9 +37,6 @@ PKGFS_MOD_NCURSES:= libncurses PKGFD_MOD_READLINE:= readline support PKGFB_MOD_READLINE:= readline PKGFS_MOD_READLINE:= libreadline -PKGFD_MOD_LIBRESSL:= libressl support -PKGFB_MOD_LIBRESSL:= libressl -PKGFS_MOD_LIBRESSL:= libressl PKGFD_MOD_OPENSSL:= openssl support PKGFB_MOD_OPENSSL:= openssl PKGFS_MOD_OPENSSL:= libopenssl @@ -70,7 +67,6 @@ $(eval $(call PKG_template,PYTHON3_MOD_BZ2,python3-mod-bz2,$(PKG_VERSION)-${PKG_ $(eval $(call PKG_template,PYTHON3_MOD_SQLITE,python3-mod-sqlite,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_SQLITE},${PKGFD_MOD_SQLITE},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_GDBM,python3-mod-gdbm,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_GDBM},${PKGFD_MOD_GDBM},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_NCURSES,python3-mod-ncurses,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_NCURSES},${PKGFD_MOD_NCURSES},${PKG_SECTION})) -$(eval $(call PKG_template,PYTHON3_MOD_LIBRESSL,python3-mod-libressl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_LIBRESSL},${PKGFD_MOD_LIBRESSL},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_OPENSSL,python3-mod-openssl,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_OPENSSL},${PKGFD_MOD_OPENSSL},${PKG_SECTION})) $(eval $(call PKG_template,PYTHON3_MOD_READLINE,python3-mod-readline,$(PKG_VERSION)-${PKG_RELEASE},${PKGFS_MOD_READLINE},${PKGFD_MOD_READLINE},${PKG_SECTION})) @@ -79,7 +75,6 @@ $(eval $(call PKG_mod_template,PYTHON3_MOD_BZ2,_bz2)) $(eval $(call PKG_mod_template,PYTHON3_MOD_SQLITE,_sqlite)) $(eval $(call PKG_mod_template,PYTHON3_MOD_GDBM,_gdbm)) $(eval $(call PKG_mod_template,PYTHON3_MOD_NCURSES,_curses)) -$(eval $(call PKG_mod_template,PYTHON3_MOD_LIBRESSL,_ssl)) $(eval $(call PKG_mod_template,PYTHON3_MOD_OPENSSL,_ssl)) $(eval $(call PKG_mod_template,PYTHON3_MOD_READLINE,readline)) 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/strace/Makefile b/package/strace/Makefile index dc4541f9c..d445c4737 100644 --- a/package/strace/Makefile +++ b/package/strace/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= strace -PKG_VERSION:= 6.8 +PKG_VERSION:= 6.11 PKG_RELEASE:= 1 -PKG_HASH:= ba6950a96824cdf93a584fa04f0a733896d2a6bc5f0ad9ffe505d9b41e970149 +PKG_HASH:= 83262583a3529f02c3501aa8b8ac772b4cbc03dc934e98bab6e4883626e283a5 PKG_DESCR:= system call trace program PKG_SECTION:= app/debug PKG_URL:= https://strace.io diff --git a/package/tcpdump/Makefile b/package/tcpdump/Makefile index 1bfaaa7b7..85ef22357 100644 --- a/package/tcpdump/Makefile +++ b/package/tcpdump/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= tcpdump -PKG_VERSION:= 4.99.4 +PKG_VERSION:= 4.99.5 PKG_RELEASE:= 1 -PKG_HASH:= 0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea +PKG_HASH:= 8c75856e00addeeadf70dad67c9ff3dd368536b2b8563abf6854d7c764cd3adb PKG_DESCR:= tool for network monitoring and data acquisition PKG_SECTION:= net/debug PKG_DEPENDS:= libpcap diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index c3976e0ce..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/ @@ -27,7 +27,7 @@ $(eval $(call PKG_template,U_BOOT,u-boot,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP UBOOT:= u-boot.bin ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) CONFIG:= clearfog_defconfig -UBOOT:= u-boot-spl.kwb +UBOOT:= u-boot-with-spl.kwb endif ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_IMX6),y) CONFIG:= pcm058_defconfig @@ -143,6 +143,7 @@ ifeq ($(ADK_TARGET_SYSTEM_ROCKPI4_PLUS),y) endif ifeq ($(ADK_TARGET_SYSTEM_IMGTEC_CI20),y) $(CP) $(WRKBUILD)/spl/u-boot-spl.bin $(FW_DIR) + cat ./files/uboot-env.txt.ci20 | PATH='$(HOST_PATH)' mkenvimage -s "32768" -o $(FW_DIR)/uboot-env.bin - endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) $(INSTALL_BIN) ./files/boot.script.bpi $(FW_DIR) 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/uclibc-ng/Makefile b/package/uclibc-ng/Makefile index c1f2215c4..38903074a 100644 --- a/package/uclibc-ng/Makefile +++ b/package/uclibc-ng/Makefile @@ -54,6 +54,11 @@ uclibc-ng-dev-install: -${CP} ${STAGING_TARGET_DIR}/usr/lib/libc.so ${IDIR_UCLIBC_NG_DEV}/usr/lib -${CP} ${STAGING_TARGET_DIR}/usr/lib/uclibc_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread_nonshared.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libm.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libdl.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/librt.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libutil.a ${IDIR_UCLIBC_NG_DEV}/usr/lib + -${CP} ${STAGING_TARGET_DIR}/usr/lib/libpthread.a ${IDIR_UCLIBC_NG_DEV}/usr/lib ${CP} ${STAGING_TARGET_DIR}/usr/lib/crt*.o ${IDIR_UCLIBC_NG_DEV}/usr/lib ${KERNEL_MAKE} INSTALL_HDR_PATH=$(IDIR_UCLIBC_NG_DEV)/usr headers_install $(MAKE) -C $(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/${PKG_NAME}-${PKG_VERSION} \ diff --git a/package/util-linux/Makefile b/package/util-linux/Makefile index 7d2510443..85c0397e8 100644 --- a/package/util-linux/Makefile +++ b/package/util-linux/Makefile @@ -4,18 +4,18 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= util-linux -PKG_VERSION:= 2.39.3 +PKG_VERSION:= 2.40.2 PKG_RELEASE:= 1 -PKG_HASH:= 7b6605e48d1a49f43cc4b4cfc59f313d0dd5402fa40b96810bd572e167dfed0f +PKG_HASH:= d78b37a66f5922d70edf3bdfb01a6b33d34ed3c3cafd6628203b2a2b67c8e8b3 PKG_DESCR:= basic utilities PKG_SECTION:= base/apps PKG_BUILDDEP:= ncurses PKG_NEEDS:= threads -PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.39/ +PKG_SITES:= http://www.kernel.org/pub/linux/utils/util-linux/v2.40/ PKG_OPTS:= dev -PKG_SUBPKGS:= FDISK AGETTY SFDISK SWAP_UTILS LOSETUP MCOOKIE MOUNT -PKG_SUBPKGS+= LIBFDISK LIBUUID LIBBLKID LIBMOUNT CFDISK MKFS +PKG_SUBPKGS:= FDISK AGETTY SFDISK SWAP_UTILS LOSETUP LSFD MCOOKIE MOUNT +PKG_SUBPKGS+= LIBFDISK LIBUUID LIBBLKID LIBMOUNT LIBSMARTCOLS CFDISK MKFS PKGSD_LIBUUID:= uuid library PKGSC_LIBUUID:= libs/misc PKGSD_LIBBLKID:= blkid library @@ -24,9 +24,11 @@ PKGSD_LIBFDISK:= fdisk library PKGSC_LIBFDISK:= libs/misc PKGSD_LIBMOUNT:= mount library PKGSC_LIBMOUNT:= libs/misc +PKGSD_LIBSMARTCOLS:= smartcols library +PKGSC_LIBSMARTCOLS:= libs/misc PKGSD_FDISK:= partition table manipulation utility PKGSC_FDISK:= sys/fs -PKGSS_FDISK:= libfdisk libblkid libuuid libncurses +PKGSS_FDISK:= libfdisk libblkid libuuid libncurses libscmartcols PKGSD_AGETTY:= getty utility PKGSC_AGETTY:= sys/utils PKGSS_AGETTY:= libncurses @@ -41,6 +43,9 @@ PKGSS_SWAP_UTILS:= libblkid PKGSC_SWAP_UTILS:= sys/fs PKGSD_LOSETUP:= loop devices management utilities PKGSC_LOSETUP:= sys/fs +PKGSD_LSFD:= modern lsof alternative program +PKGSC_LSFD:= sys/utils +PKGSS_LSFD:= libsmartcols libncurses PKGSD_MKFS:= filesystem creation frontend PKGSC_MKFS:= sys/fs PKGSD_MOUNT:= mount/umount utilities @@ -59,6 +64,7 @@ $(eval $(call PKG_template,CFDISK,cfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP $(eval $(call PKG_template,SFDISK,sfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_SFDISK),$(PKGSC_SFDISK))) $(eval $(call PKG_template,SWAP_UTILS,swap-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_SWAP_UTILS),$(PKGSD_SWAP_UTILS),$(PKGSC_SWAP_UTILS))) $(eval $(call PKG_template,LOSETUP,losetup,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LOSETUP),$(PKGSD_LOSETUP),$(PKGSC_LOSETUP))) +$(eval $(call PKG_template,LSFD,lsfd,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_LSFD),$(PKGSD_LSFD),$(PKGSC_LSFD))) $(eval $(call PKG_template,MKFS,mkfs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MKFS),$(PKGSD_MKFS),$(PKGSC_MKFS))) $(eval $(call PKG_template,MOUNT,mount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_MOUNT),$(PKGSD_MOUNT),$(PKGSC_MOUNT))) $(eval $(call PKG_template,MCOOKIE,mcookie,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_MCOOKIE),$(PKGSC_MCOOKIE))) @@ -66,6 +72,7 @@ $(eval $(call PKG_template,LIBUUID,libuuid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_D $(eval $(call PKG_template,LIBBLKID,libblkid,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBBLKID),$(PKGSC_LIBBLKID),$(PKG_OPTS))) $(eval $(call PKG_template,LIBFDISK,libfdisk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBFDISK),$(PKGSC_LIBFDISK),$(PKG_OPTS))) $(eval $(call PKG_template,LIBMOUNT,libmount,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBMOUNT),$(PKGSC_LIBMOUNT),$(PKG_OPTS))) +$(eval $(call PKG_template,LIBSMARTCOLS,libsmartcols,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBSMARTCOLS),$(PKGSC_LIBSMARTCOLS),$(PKG_OPTS))) TARGET_CFLAGS+= -DSWAPON_HAS_TWO_ARGS -DHAVE_LLSEEK TARGET_LDFLAGS+= -ltinfo @@ -93,6 +100,7 @@ CONFIGURE_ARGS+= --exec-prefix=/usr \ --disable-nsenter \ --disable-unshare \ --disable-wall \ + --disable-liblastlog2 \ --disable-symvers \ --without-python \ --without-systemd \ @@ -102,10 +110,6 @@ CONFIGURE_ARGS+= --exec-prefix=/usr \ --enable-libblkid \ --enable-libmount -ifeq ($(ADK_PACKAGE_FDISK)$(ADK_PACKAGE_AGETTY)$(ADK_PACKAGE_SFDISK)$(ADK_PACKAGE_CFDISK)$(ADK_PACKAGE_MKFS)$(ADK_PACKAGE_MOUNT)$(ADK_PACKAGE_SWAP_UTILS)$(ADK_PACKAGE_MCOOKIE),) -CONFIGURE_ARGS+= --disable-all-programs -endif - TARGET_CFLAGS+= -fPIC FAKE_FLAGS+= INSTALLSUID="install -m 4755" HOST_CONFIGURE_ARGS+= --enable-libblkid \ @@ -137,6 +141,10 @@ losetup-install: $(INSTALL_DIR) $(IDIR_LOSETUP)/usr/sbin $(CP) $(WRKINST)/sbin/losetup $(IDIR_LOSETUP)/usr/sbin +lsfd-install: + $(INSTALL_DIR) $(IDIR_LSFD)/usr/bin + $(CP) $(WRKINST)/usr/bin/lsfd $(IDIR_LSFD)/usr/bin + swap-utils-install: $(INSTALL_DIR) $(IDIR_SWAP_UTILS)/usr/sbin $(CP) $(WRKINST)/sbin/mkswap $(IDIR_SWAP_UTILS)/usr/sbin @@ -165,11 +173,15 @@ libblkid-install: libfdisk-install: $(INSTALL_DIR) $(IDIR_LIBFDISK)/usr/lib $(CP) $(WRKINST)/usr/lib/libfdisk.so* $(IDIR_LIBFDISK)/usr/lib - $(CP) $(WRKINST)/usr/lib/libsmartcols.so* $(IDIR_LIBFDISK)/usr/lib libmount-install: $(INSTALL_DIR) $(IDIR_LIBMOUNT)/usr/lib $(CP) $(WRKINST)/usr/lib/libmount.so* $(IDIR_LIBMOUNT)/usr/lib +libsmartcols-install: + $(INSTALL_DIR) $(IDIR_LIBSMARTCOLS)/usr/lib + $(CP) $(WRKINST)/usr/lib/libsmartcols.so* $(IDIR_LIBSMARTCOLS)/usr/lib + + include $(ADK_TOPDIR)/mk/host-bottom.mk include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wayland/Makefile b/package/wayland/Makefile index 796af73f6..a546ebb51 100644 --- a/package/wayland/Makefile +++ b/package/wayland/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wayland -PKG_VERSION:= 1.22.0 +PKG_VERSION:= 1.23.0 PKG_RELEASE:= 1 -PKG_HASH:= 1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842 +PKG_HASH:= 05b3e1574d3e67626b5974f862f36b5b427c7ceeb965cb36a4e6c2d342e45ab2 PKG_DESCR:= wayland PKG_SECTION:= x11/libs PKG_BUILDDEP:= wayland-host diff --git a/package/weston/Makefile b/package/weston/Makefile index a3d374355..5ce452214 100644 --- a/package/weston/Makefile +++ b/package/weston/Makefile @@ -4,33 +4,32 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= weston -PKG_VERSION:= 11.0.0 +PKG_VERSION:= 13.0.3 PKG_RELEASE:= 1 -PKG_HASH:= 5816a9e7bd67d03f268553a7af2f0c3430b409f7606244dada65188478f90800 +PKG_HASH:= 27f68d96e3b97d98daadef13a202356524924fa381418fa6716b9136ef099093 PKG_DESCR:= wayland compositor PKG_SECTION:= x11/drivers -PKG_DEPENDS:= wayland libxkbcommon libinput libpng libjpeg-turbo libseat -PKG_DEPENDS+= libwebp pam libxcursor libudev xkeyboard-config cairo libffi -PKG_BUILDDEP:= wayland libxkbcommon libinput libpng libjpeg-turbo -PKG_BUILDDEP+= libwebp pam libXcursor eudev cairo libseat libffi -PKG_SITES:= https://github.com/wayland-project/weston/archive/refs/tags/ +PKG_DEPENDS:= wayland libxkbcommon libinput libpng libjpeg-turbo libseat mesa libexpat +PKG_DEPENDS+= libwebp pam libxcursor libudev xkeyboard-config cairo libffi libdrm seatd +PKG_BUILDDEP:= wayland wayland-protocols libxkbcommon libinput libpng libjpeg-turbo expat +PKG_BUILDDEP+= libwebp pam libXcursor eudev cairo libseat libffi libdrm libdisplay-info mesa +PKG_SITES:= https://gitlab.freedesktop.org/wayland/weston/-/releases/$(PKG_VERSION)/downloads/ PKG_CFLINE_WESTON:= select ADK_PACKAGE_CAIRO_WITH_PNG@ -DISTFILES:= $(PKG_VERSION).tar.gz - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,WESTON,weston,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) -MESON_FLAGS+= -Dlauncher-logind=false \ - -Dlauncher-libseat=true \ - -Dsystemd=false \ +MESON_FLAGS+= -Dsystemd=false \ -Dbackend-drm-screencast-vaapi=false \ -Dbackend-rdp=false \ -Dcolor-management-lcms=false \ -Dremoting=false \ -Dpipewire=false \ + -Dbackend-pipewire=false \ + -Dxwayland=false \ + -Dtest-junit-xml=false \ -Ddemo-clients=false WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj @@ -49,9 +48,9 @@ weston-install: $(INSTALL_DIR) $(IDIR_WESTON)/usr/lib $(CP) $(WRKINST)/usr/lib/weston \ $(IDIR_WESTON)/usr/lib/ - $(CP) $(WRKINST)/usr/lib/libweston-11 \ + $(CP) $(WRKINST)/usr/lib/libweston-13 \ $(IDIR_WESTON)/usr/lib/ - $(CP) $(WRKINST)/usr/lib/libweston*so* \ + $(CP) $(WRKINST)/usr/lib/*so* \ $(IDIR_WESTON)/usr/lib/ $(INSTALL_DIR) $(IDIR_WESTON)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/weston \ 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/package/xfsprogs/Makefile b/package/xfsprogs/Makefile index e21801f9f..a3d453b8f 100644 --- a/package/xfsprogs/Makefile +++ b/package/xfsprogs/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= xfsprogs -PKG_VERSION:= 6.6.0 +PKG_VERSION:= 6.9.0 PKG_RELEASE:= 1 -PKG_HASH:= 50ca2f4676df8fab4cb4c3ef3dd512d5551e6844d40a65a31d5b8e03593d22df +PKG_HASH:= 975284783fb3fbc4e1ae640bd804d788e4237a86b07582acee86b6e48f6521b7 PKG_DESCR:= utilities for xfs filesystems PKG_SECTION:= sys/fs PKG_DEPENDS:= libuuid libblkid libncurses libinih liburcu diff --git a/scripts/install.sh b/scripts/install.sh index e3494d5d6..335607391 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -563,7 +563,7 @@ case $target { dd if="$fwdir/u-boot-sunxi-with-spl.bin" of="$tgt" bs=1024 seek=8 > /dev/null 2>&1 ;; (solidrun-clearfog) - dd if="$fwdir/u-boot-spl.kwb" of="$tgt" bs=512 seek=1 > /dev/null 2>&1 + dd if="$fwdir/u-boot-with-spl.kwb" of="$tgt" bs=512 seek=1 > /dev/null 2>&1 ;; (solidrun-imx6|phytec-imx6) dd if="$fwdir/SPL" of="$tgt" bs=1024 seek=1 > /dev/null 2>&1 diff --git a/scripts/prereq.sh b/scripts/prereq.sh index 717ddf15c..8caa5d5f5 100755 --- a/scripts/prereq.sh +++ b/scripts/prereq.sh @@ -233,7 +233,7 @@ printf " ---> checking if bash is installed.. " if which bash >/dev/null; then printf "found\n" printf " ---> checking if it is bash 4.x or 5.x.. " - LC_ALL=C bash --version 2>/dev/null| egrep -i 'version 4|5' >/dev/null + LC_ALL=C bash --version 2>/dev/null| grep -E -i 'version 4|5' >/dev/null if [ $? -eq 0 ]; then printf "yes\n" else @@ -304,6 +304,15 @@ if ! which git >/dev/null 2>&1; then fi printf "found\n" +printf " ---> checking if xz is installed.. " +if ! which xz >/dev/null 2>&1; then + echo You must install xz to continue. + echo + out=1 + printf "not found\n" +fi +printf "found\n" + printf " ---> checking if ncurses is installed.. " check_lxdialog=${topdir}/adk/config/lxdialog/check-lxdialog.sh CURSES_CFLAGS=$(/bin/sh ${check_lxdialog} -ccflags | tr '\n' ' ') @@ -914,7 +923,7 @@ else fi if [ -n "$NEED_CLANG" ]; then - if ! which clang-13 >/dev/null 2>&1; then + if ! which clang-18 >/dev/null 2>&1; then printf "You need clang-13 to build $NEED_CLANG \n" out=1 fi diff --git a/target/arm/Makefile b/target/arm/Makefile index 1f449dbe9..280e954b7 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -162,7 +162,7 @@ ifeq ($(ADK_TARGET_FS),genimage) targethelp: @echo "The disk image is: $(FW_DIR)/sdcard.img" @echo "Use following command to install it on SD card:" - @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k' + @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=32M' endif kernel-strip: @@ -193,6 +193,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y) VENDOR:=xilinx/ endif +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) +VENDOR:=marvell/ +endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) VENDOR:=st/ endif @@ -202,6 +205,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK),y) VENDOR:=ti/omap/ endif +ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) +VENDOR:=allwinner/ +endif endif dtb-install: @@ -242,7 +248,7 @@ ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) done endif ifeq ($(ADK_TARGET_SYSTEM_BANANA_PRO),y) - ${KERNEL_MAKE} sun7i-a20-bananapro.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)sun7i-a20-bananapro.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_ORANGE_PI0),y) ${KERNEL_MAKE} sun8i-h2-plus-orangepi-zero.dtb $(MAKE_TRACE) @@ -255,7 +261,7 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) $(VENDOR)imx6dl-hummingboard.dtb $(VENDOR)imx6q-hummingboard.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) - ${KERNEL_MAKE} armada-388-clearfog.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)armada-388-clearfog.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F429),y) ${KERNEL_MAKE} dtbs $(MAKE_TRACE) diff --git a/target/arm/kernel/banana-pro b/target/arm/kernel/banana-pro index e55c93aa7..d3beba2b4 100644 --- a/target/arm/kernel/banana-pro +++ b/target/arm/kernel/banana-pro @@ -1,9 +1,51 @@ CONFIG_ARM=y CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_SUNXI=y CONFIG_MACH_SUN7I=y CONFIG_KUSER_HELPERS=y -CONFIG_SERIAL_8250=y -CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_DW=y +CONFIG_ATAGS=y +CONFIG_PINCTRL=y +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +CONFIG_PINCTRL_SUNXI=y +CONFIG_PINCTRL_SUN4I_A10=y +CONFIG_PINCTRL_SUN5I=y +CONFIG_PINCTRL_SUN6I_A31=y +CONFIG_PINCTRL_SUN6I_A31_R=y +CONFIG_PINCTRL_SUN8I_A23=y +CONFIG_PINCTRL_SUN8I_A33=y +CONFIG_PINCTRL_SUN8I_A83T=y +CONFIG_PINCTRL_SUN8I_A83T_R=y +CONFIG_PINCTRL_SUN8I_A23_R=y +CONFIG_PINCTRL_SUN8I_H3=y +CONFIG_PINCTRL_SUN8I_H3_R=y +CONFIG_PINCTRL_SUN8I_V3S=y +CONFIG_PINCTRL_SUN9I_A80=y +CONFIG_PINCTRL_SUN9I_A80_R=y +CONFIG_PINCTRL_SUN20I_D1=y +CONFIG_COMMON_CLK=y +CONFIG_CLK_SUNXI=y +CONFIG_CLK_SUNXI_CLOCKS=y +CONFIG_CLK_SUNXI_PRCM_SUN6I=y +CONFIG_CLK_SUNXI_PRCM_SUN8I=y +CONFIG_CLK_SUNXI_PRCM_SUN9I=y +CONFIG_SUNXI_CCU=y +CONFIG_SUN20I_D1_CCU=y +CONFIG_SUN20I_D1_R_CCU=y +CONFIG_SUN4I_A10_CCU=y +CONFIG_SUN5I_CCU=y +CONFIG_SUN6I_A31_CCU=y +CONFIG_SUN6I_RTC_CCU=y +CONFIG_SUN8I_A23_CCU=y +CONFIG_SUN8I_A33_CCU=y +CONFIG_SUN8I_A83T_CCU=y +CONFIG_SUN8I_H3_CCU=y +CONFIG_SUN8I_V3S_CCU=y +CONFIG_SUN8I_DE2_CCU=y +CONFIG_SUN8I_R40_CCU=y +CONFIG_SUN9I_A80_CCU=y +CONFIG_SUN8I_R_CCU=y diff --git a/target/arm/kernel/solidrun-clearfog b/target/arm/kernel/solidrun-clearfog index 431536dff..b75cf2c6d 100644 --- a/target/arm/kernel/solidrun-clearfog +++ b/target/arm/kernel/solidrun-clearfog @@ -1,9 +1,12 @@ CONFIG_ARM=y CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MVEBU=y -CONFIG_MACH_ARMADA_370=y -CONFIG_MACH_ARMADA_375=y -CONFIG_MACH_ARMADA_380=y -CONFIG_MACH_ARMADA_XP=y +CONFIG_MACH_MVEBU_ANY=y +CONFIG_MACH_MVEBU_V7=y +CONFIG_MACH_ARMADA_38X=y +CONFIG_KUSER_HELPERS=y +CONFIG_ATAGS=y CONFIG_PCI_MVEBU=y diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index 7a7d2ff82..75b43639a 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -8,12 +8,16 @@ 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_42 +default ADK_TOOLCHAIN_BINUTILS_2_43_1 config ADK_TOOLCHAIN_BINUTILS_GIT bool "git" depends on !ADK_TARGET_ARCH_AVR32 +config ADK_TOOLCHAIN_BINUTILS_2_43_1 + bool "2.43.1" + depends on !ADK_TARGET_ARCH_AVR32 + config ADK_TOOLCHAIN_BINUTILS_2_42 bool "2.42" depends on !ADK_TARGET_ARCH_AVR32 diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 41091c763..d744915dc 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -32,7 +32,7 @@ config ADK_TOOLCHAIN_GCC_GIT depends on !ADK_TARGET_ARCH_NDS32 config ADK_TOOLCHAIN_GCC_14 - bool "14.1.0" + bool "14.2.0" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt index 23d800d24..2a1fb1e9f 100644 --- a/target/config/Config.in.kernelfmt +++ b/target/config/Config.in.kernelfmt @@ -19,6 +19,9 @@ config ADK_TARGET_KERNEL_UIMAGE config ADK_TARGET_KERNEL_UIMAGEBIN bool +config ADK_TARGET_KERNEL_UIMAGEGZ + bool + config ADK_TARGET_KERNEL_BZIMAGE bool @@ -54,6 +57,7 @@ config ADK_TARGET_KERNEL default "loader" if ADK_TARGET_KERNEL_LOADER default "uImage" if ADK_TARGET_KERNEL_UIMAGE default "uImage.bin" if ADK_TARGET_KERNEL_UIMAGEBIN + default "uImage.gz" if ADK_TARGET_KERNEL_UIMAGEGZ default "zImage" if ADK_TARGET_KERNEL_ZIMAGE default "Image" if ADK_TARGET_KERNEL_IMAGE default "linux.bin" if ADK_TARGET_KERNEL_LINUXBIN diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index 1c352c608..aff202edf 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -150,8 +150,8 @@ choice prompt "Target C library version" depends on !ADK_TARGET_CHOOSE_ARCH -config ADK_TARGET_LIB_UCLIBC_NG_1_0_49 - bool "1.0.49" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_50 + bool "1.0.50" depends on ADK_TARGET_LIB_UCLIBC_NG config ADK_TARGET_LIB_UCLIBC_NG_GIT @@ -200,7 +200,7 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string - default "1.0.49" if ADK_TARGET_LIB_UCLIBC_NG_1_0_49 + default "1.0.50" if ADK_TARGET_LIB_UCLIBC_NG_1_0_50 default "1.2.5" if ADK_TARGET_LIB_MUSL_1_2_5 default "2.40" if ADK_TARGET_LIB_GLIBC_2_40 default "4.4.0" if ADK_TARGET_LIB_NEWLIB_4_4_0 diff --git a/target/linux/Config.in.kernelcfg b/target/linux/Config.in.kernelcfg index ee5b555a8..6817795e7 100644 --- a/target/linux/Config.in.kernelcfg +++ b/target/linux/Config.in.kernelcfg @@ -38,16 +38,18 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "twr-k70f120m_defconfig" if ADK_TARGET_SYSTEM_KINETIS_K70 default "imx_v7_cbi_hb_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 && ADK_TARGET_LINUX_KERNEL_VERSION_GIT default "imx_v6_v7_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 - default "mvebu_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default "mvebu_v7_defconfig" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default "nsim_700_defconfig" if ADK_TARGET_CPU_ARC_ARC700 && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM default "haps_hs_defconfig" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM default "10m50_defconfig" if ADK_TARGET_SYSTEM_QEMU_NIOS2 default "ag101p_defconfig" if ADK_TARGET_SYSTEM_ANDES_AG101P - default "bb.org_defconfig" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK + default "bb.org_defconfig" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK && ADK_TARGET_LINUX_KERNEL_VERSION_GIT + default "omap2plus_defconfig" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK && !ADK_TARGET_LINUX_KERNEL_VERSION_GIT default "am335x_phytec_defconfig" if ADK_TARGET_SYSTEM_PHYTEC_WEGA default "j2_defconfig" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 default "sunxi_defconfig" if ADK_TARGET_SYSTEM_ORANGE_PI0 default "sunxi_defconfig" if ADK_TARGET_SYSTEM_BANANA_P2_ZERO + default "sunxi_defconfig" if ADK_TARGET_SYSTEM_BANANA_PRO default "edosk2674_defconfig" if ADK_TARGET_SYSTEM_HITACHI_EDOSK2674 default "x86_64_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86_64 default "i386_defconfig" if ADK_TARGET_SYSTEM_GENERIC_X86 @@ -65,6 +67,7 @@ config ADK_TARGET_LINUX_KERNEL_DEFCONFIG default "haps_arc64_defconfig" if ADK_TARGET_CPU_ARC_ARC64 default "m5208evb_defconfig" if ADK_TARGET_SYSTEM_QEMU_M68K_MCF5208 default "default_defconfig" if ADK_TARGET_ARCH_KVX + default "ci20_defconfig" if ADK_TARGET_SYSTEM_IMGTEC_CI20 default "" config ADK_TARGET_LINUX_KERNEL_CUSTOMCONFIG_PATH diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index aa9e5609a..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_9 - bool "6.9.3" +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_9 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_6 - bool "6.6.32" + bool "6.6.56" 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.90" + bool "6.1.107" 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.158" + bool "5.15.165" 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.216" + bool "5.10.224" 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.275" + bool "5.4.282" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -104,7 +104,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 depends on !ADK_TARGET_SYSTEM_SIPEED_MAIX_BIT config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 - bool "4.19.313" + bool "4.19.320" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS @@ -246,7 +246,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 "d5066442e39dd9bf4ba6431ffb3f99e3d5085d3f" if ADK_TARGET_BOARD_BCM28XX + default "ba0f2212e0e100ee16bdde76b7efca6bb8ee9446" 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,8 +258,8 @@ 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 "5.16" if ADK_TARGET_CPU_ARC_ARC32 || ADK_TARGET_CPU_ARC_ARC64 - default "6.1.70" if ADK_TARGET_BOARD_BCM28XX default "5.10.110" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "6.6.32" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index a287c05cf..59fffad68 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -154,6 +154,12 @@ config ADK_LINUX_KERNEL_MMC_SDHCI_IPROC config ADK_LINUX_KERNEL_MMC_SDHCI_BRCMSTB bool +config ADK_LINUX_KERNEL_MMC_SDHCI_DOVE + bool + +config ADK_LINUX_KERNEL_MMC_SDHCI_PXAV3 + bool + config ADK_LINUX_KERNEL_MMC_BCM2835_MMC bool @@ -483,6 +489,33 @@ config ADK_LINUX_KERNEL_MMC_BCM2835_MMC default y if ADK_TARGET_BOARD_BCM28XX default n +config ADK_LINUX_KERNEL_MMC_MVSDIO + bool "SD card support for Soidrun Clearfog" + select ADK_LINUX_KERNEL_BLOCK + select ADK_LINUX_KERNEL_LBDAF + select ADK_LINUX_KERNEL_SCSI + select ADK_LINUX_KERNEL_SCSI_DMA + select ADK_LINUX_KERNEL_SCSI_MULTI_LUN + select ADK_LINUX_KERNEL_SCSI_CONSTANTS + select ADK_LINUX_KERNEL_SCSI_LOGGING + select ADK_LINUX_KERNEL_SCSI_SCAN_ASYNC + select ADK_LINUX_KERNEL_MMC + select ADK_LINUX_KERNEL_MMC_BLOCK + select ADK_LINUX_KERNEL_MMC_BLOCK_BOUNCE + select ADK_LINUX_KERNEL_BLK_DEV + select ADK_LINUX_KERNEL_BLK_DEV_SD + select ADK_LINUX_KERNEL_BLK_DEV_BSG + select ADK_LINUX_KERNEL_BLK_DEV_BSGLIB + select ADK_LINUX_KERNEL_MMC_SDHCI + select ADK_LINUX_KERNEL_MMC_SDHCI_IO_ACCESSORS + select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM + select ADK_LINUX_KERNEL_MMC_SDHCI_DOVE + select ADK_LINUX_KERNEL_MMC_SDHCI_PXAV3 + select ADK_LINUX_KERNEL_MMC_UNSAFE_RESUME + depends on ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default n + config ADK_LINUX_KERNEL_MMC_SDHCI_ESDHC_IMX bool "SD card support for IMX6 boards" select ADK_LINUX_KERNEL_BLOCK diff --git a/target/linux/config/Config.in.ethernet b/target/linux/config/Config.in.ethernet index ec58b3069..7c3a617ed 100644 --- a/target/linux/config/Config.in.ethernet +++ b/target/linux/config/Config.in.ethernet @@ -451,6 +451,16 @@ config ADK_LINUX_KERNEL_MACB also supports the Cadence GEM (Gigabit Ethernet MAC found in some ARM SoC devices). +config ADK_LINUX_KERNEL_MVNETA + tristate "Marvell Ethernet driver for Solidrun Clearfog" + select ADK_LINUX_KERNEL_NETDEV_1000 + select ADK_LINUX_KERNEL_NET_VENDOR_MARVELL + depends on ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG + default n + help + Marvell Ethernet driver + config ADK_LINUX_KERNEL_TI_DAVINCI_MDIO tristate "BeagleBone Back Davinci" select ADK_LINUX_KERNEL_NET_VENDOR_TI diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial index c22746371..39470b7f7 100644 --- a/target/linux/config/Config.in.serial +++ b/target/linux/config/Config.in.serial @@ -127,6 +127,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_QEMU_ARC select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_ROCKPI4_PLUS select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 + select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_BANANA_PRO select ADK_LINUX_KERNEL_SERIAL_8250_EXTENDED if ADK_TARGET_SYSTEM_VISIONFIVE2 select ADK_LINUX_KERNEL_SERIAL_8250_DMA if ADK_TARGET_SYSTEM_ORANGE_PI0 select ADK_LINUX_KERNEL_SERIAL_8250_INGENIC if ADK_TARGET_SYSTEM_IMGTEC_CI20 @@ -171,7 +172,8 @@ config ADK_LINUX_KERNEL_SERIAL_8250 || ADK_TARGET_SYSTEM_RASPBERRY_PI4 \ || ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 \ || ADK_TARGET_SYSTEM_ROCKPI4_PLUS \ - || ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 + || ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 \ + || ADK_TARGET_SYSTEM_BANANA_PRO default y if ADK_TARGET_SYSTEM_XILINX_KINTEX7 default y if ADK_TARGET_SYSTEM_IMGTEC_CI20 default y if ADK_TARGET_SYSTEM_LINKSYS_NSLU2 @@ -208,6 +210,7 @@ config ADK_LINUX_KERNEL_SERIAL_8250 default y if ADK_TARGET_SYSTEM_RASPBERRY_PI4_64 default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default y if ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 + default y if ADK_TARGET_SYSTEM_BANANA_PRO default n help Serial driver for 8250 UART chip. diff --git a/target/linux/config/Config.in.usb b/target/linux/config/Config.in.usb index 07e097bc1..157c2f222 100644 --- a/target/linux/config/Config.in.usb +++ b/target/linux/config/Config.in.usb @@ -60,6 +60,9 @@ config ADK_LINUX_KERNEL_USB_EHCI_HCD_PCI config ADK_LINUX_KERNEL_USB_XHCI_PCI bool +config ADK_LINUX_KERNEL_USB_XHCI_MVEBU + bool + config ADK_LINUX_KERNEL_USB_LIBUSUAL tristate @@ -123,8 +126,10 @@ config ADK_LINUX_KERNEL_USB_XHCI_HCD select ADK_LINUX_KERNEL_USB_PCI select ADK_LINUX_KERNEL_USB_XHCI_PLATFORM select ADK_LINUX_KERNEL_USB_XHCI_PCI + select ADK_LINUX_KERNEL_USB_XHCI_MVEBU if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default y if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default y if ADK_TARGET_SYSTEM_RASPBERRY_PI5 + default y if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG default n help The eXtensible Host Controller Interface (xHCI) is standard for USB 3.0 diff --git a/target/linux/patches/4.19.313/arc.patch b/target/linux/patches/4.19.320/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/4.19.313/arc.patch +++ b/target/linux/patches/4.19.320/arc.patch diff --git a/target/linux/patches/4.19.313/arm-nommu.patch b/target/linux/patches/4.19.320/arm-nommu.patch index d23d3f4eb..d23d3f4eb 100644 --- a/target/linux/patches/4.19.313/arm-nommu.patch +++ b/target/linux/patches/4.19.320/arm-nommu.patch diff --git a/target/linux/patches/4.19.313/darwin-dtc.patch b/target/linux/patches/4.19.320/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/4.19.313/darwin-dtc.patch +++ b/target/linux/patches/4.19.320/darwin-dtc.patch diff --git a/target/linux/patches/4.19.313/darwin-file2alias.patch b/target/linux/patches/4.19.320/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/4.19.313/darwin-file2alias.patch +++ b/target/linux/patches/4.19.320/darwin-file2alias.patch diff --git a/target/linux/patches/4.19.313/fec-coldfire.patch b/target/linux/patches/4.19.320/fec-coldfire.patch index 09d8ad047..09d8ad047 100644 --- a/target/linux/patches/4.19.313/fec-coldfire.patch +++ b/target/linux/patches/4.19.320/fec-coldfire.patch diff --git a/target/linux/patches/4.19.313/or1k-more-ram.patch b/target/linux/patches/4.19.320/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/4.19.313/or1k-more-ram.patch +++ b/target/linux/patches/4.19.320/or1k-more-ram.patch diff --git a/target/linux/patches/4.19.313/relocs.patch b/target/linux/patches/4.19.320/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/4.19.313/relocs.patch +++ b/target/linux/patches/4.19.320/relocs.patch diff --git a/target/linux/patches/4.19.313/startup.patch b/target/linux/patches/4.19.320/startup.patch index 4f42e84a7..4f42e84a7 100644 --- a/target/linux/patches/4.19.313/startup.patch +++ b/target/linux/patches/4.19.320/startup.patch diff --git a/target/linux/patches/4.19.313/vdso2.patch b/target/linux/patches/4.19.320/vdso2.patch index 3d9d47ede..3d9d47ede 100644 --- a/target/linux/patches/4.19.313/vdso2.patch +++ b/target/linux/patches/4.19.320/vdso2.patch diff --git a/target/linux/patches/5.10.216/arc.patch b/target/linux/patches/5.10.224/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/5.10.216/arc.patch +++ b/target/linux/patches/5.10.224/arc.patch diff --git a/target/linux/patches/5.10.216/darwin-dtc.patch b/target/linux/patches/5.10.224/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.10.216/darwin-dtc.patch +++ b/target/linux/patches/5.10.224/darwin-dtc.patch diff --git a/target/linux/patches/5.10.216/darwin-file2alias.patch b/target/linux/patches/5.10.224/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/5.10.216/darwin-file2alias.patch +++ b/target/linux/patches/5.10.224/darwin-file2alias.patch diff --git a/target/linux/patches/5.10.216/dtc-noyaml.patch b/target/linux/patches/5.10.224/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.10.216/dtc-noyaml.patch +++ b/target/linux/patches/5.10.224/dtc-noyaml.patch diff --git a/target/linux/patches/5.10.216/nds32-ag101p.patch b/target/linux/patches/5.10.224/nds32-ag101p.patch index a8beea478..a8beea478 100644 --- a/target/linux/patches/5.10.216/nds32-ag101p.patch +++ b/target/linux/patches/5.10.224/nds32-ag101p.patch diff --git a/target/linux/patches/5.10.216/or1k-more-ram.patch b/target/linux/patches/5.10.224/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/5.10.216/or1k-more-ram.patch +++ b/target/linux/patches/5.10.224/or1k-more-ram.patch diff --git a/target/linux/patches/5.10.216/relocs.patch b/target/linux/patches/5.10.224/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.10.216/relocs.patch +++ b/target/linux/patches/5.10.224/relocs.patch diff --git a/target/linux/patches/5.10.216/startup.patch b/target/linux/patches/5.10.224/startup.patch index eef481021..eef481021 100644 --- a/target/linux/patches/5.10.216/startup.patch +++ b/target/linux/patches/5.10.224/startup.patch diff --git a/target/linux/patches/5.15.158/darwin-dtc.patch b/target/linux/patches/5.15.165/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.15.158/darwin-dtc.patch +++ b/target/linux/patches/5.15.165/darwin-dtc.patch diff --git a/target/linux/patches/5.15.158/darwin-file2alias.patch b/target/linux/patches/5.15.165/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/5.15.158/darwin-file2alias.patch +++ b/target/linux/patches/5.15.165/darwin-file2alias.patch diff --git a/target/linux/patches/5.15.158/dtc-noyaml.patch b/target/linux/patches/5.15.165/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.15.158/dtc-noyaml.patch +++ b/target/linux/patches/5.15.165/dtc-noyaml.patch diff --git a/target/linux/patches/5.15.158/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/5.15.165/enable-ethernet-bpi-m2-plus.patch index 7e9abd9ce..7e9abd9ce 100644 --- a/target/linux/patches/5.15.158/enable-ethernet-bpi-m2-plus.patch +++ b/target/linux/patches/5.15.165/enable-ethernet-bpi-m2-plus.patch diff --git a/target/linux/patches/5.15.158/nds32-ag101p.patch b/target/linux/patches/5.15.165/nds32-ag101p.patch index a8beea478..a8beea478 100644 --- a/target/linux/patches/5.15.158/nds32-ag101p.patch +++ b/target/linux/patches/5.15.165/nds32-ag101p.patch diff --git a/target/linux/patches/5.15.158/or1k-more-ram.patch b/target/linux/patches/5.15.165/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/5.15.158/or1k-more-ram.patch +++ b/target/linux/patches/5.15.165/or1k-more-ram.patch diff --git a/target/linux/patches/5.15.158/relocs.patch b/target/linux/patches/5.15.165/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.15.158/relocs.patch +++ b/target/linux/patches/5.15.165/relocs.patch diff --git a/target/linux/patches/5.15.158/rockchip-115200.patch b/target/linux/patches/5.15.165/rockchip-115200.patch index ad8a2d7a7..ad8a2d7a7 100644 --- a/target/linux/patches/5.15.158/rockchip-115200.patch +++ b/target/linux/patches/5.15.165/rockchip-115200.patch diff --git a/target/linux/patches/5.15.158/startup.patch b/target/linux/patches/5.15.165/startup.patch index eef481021..eef481021 100644 --- a/target/linux/patches/5.15.158/startup.patch +++ b/target/linux/patches/5.15.165/startup.patch diff --git a/target/linux/patches/5.4.275/arc.patch b/target/linux/patches/5.4.282/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/5.4.275/arc.patch +++ b/target/linux/patches/5.4.282/arc.patch diff --git a/target/linux/patches/5.4.275/arm-nommu.patch b/target/linux/patches/5.4.282/arm-nommu.patch index fdcec3f09..fdcec3f09 100644 --- a/target/linux/patches/5.4.275/arm-nommu.patch +++ b/target/linux/patches/5.4.282/arm-nommu.patch diff --git a/target/linux/patches/5.4.275/darwin-dtc.patch b/target/linux/patches/5.4.282/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.4.275/darwin-dtc.patch +++ b/target/linux/patches/5.4.282/darwin-dtc.patch diff --git a/target/linux/patches/5.4.275/darwin-file2alias.patch b/target/linux/patches/5.4.282/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/5.4.275/darwin-file2alias.patch +++ b/target/linux/patches/5.4.282/darwin-file2alias.patch diff --git a/target/linux/patches/5.4.275/dtc-noyaml.patch b/target/linux/patches/5.4.282/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.4.275/dtc-noyaml.patch +++ b/target/linux/patches/5.4.282/dtc-noyaml.patch diff --git a/target/linux/patches/5.4.275/macsonic.patch b/target/linux/patches/5.4.282/macsonic.patch index 75a6fcad2..75a6fcad2 100644 --- a/target/linux/patches/5.4.275/macsonic.patch +++ b/target/linux/patches/5.4.282/macsonic.patch diff --git a/target/linux/patches/5.4.275/or1k-more-ram.patch b/target/linux/patches/5.4.282/or1k-more-ram.patch index 540dc43b5..540dc43b5 100644 --- a/target/linux/patches/5.4.275/or1k-more-ram.patch +++ b/target/linux/patches/5.4.282/or1k-more-ram.patch diff --git a/target/linux/patches/5.4.275/relocs.patch b/target/linux/patches/5.4.282/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.4.275/relocs.patch +++ b/target/linux/patches/5.4.282/relocs.patch diff --git a/target/linux/patches/5.4.275/sh4.patch b/target/linux/patches/5.4.282/sh4.patch index 8ae79d49d..8ae79d49d 100644 --- a/target/linux/patches/5.4.275/sh4.patch +++ b/target/linux/patches/5.4.282/sh4.patch diff --git a/target/linux/patches/5.4.275/startup.patch b/target/linux/patches/5.4.282/startup.patch index 081aa103a..081aa103a 100644 --- a/target/linux/patches/5.4.275/startup.patch +++ b/target/linux/patches/5.4.282/startup.patch diff --git a/target/linux/patches/6.1.90/armnommu-fix-thread-registers.patch b/target/linux/patches/6.1.107/armnommu-fix-thread-registers.patch index 8ab2196dc..8ab2196dc 100644 --- a/target/linux/patches/6.1.90/armnommu-fix-thread-registers.patch +++ b/target/linux/patches/6.1.107/armnommu-fix-thread-registers.patch diff --git a/target/linux/patches/6.1.90/armnommu-versatile.patch b/target/linux/patches/6.1.107/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.1.90/armnommu-versatile.patch +++ b/target/linux/patches/6.1.107/armnommu-versatile.patch diff --git a/target/linux/patches/6.1.90/board-rockpi4-0003-arm64-dts-pcie.patch b/target/linux/patches/6.1.107/board-rockpi4-0003-arm64-dts-pcie.patch index 1777e7a86..1777e7a86 100644 --- a/target/linux/patches/6.1.90/board-rockpi4-0003-arm64-dts-pcie.patch +++ b/target/linux/patches/6.1.107/board-rockpi4-0003-arm64-dts-pcie.patch diff --git a/target/linux/patches/6.1.90/enable-ethernet-bpi-m2-plus.patch b/target/linux/patches/6.1.107/enable-ethernet-bpi-m2-plus.patch index 7e9abd9ce..7e9abd9ce 100644 --- a/target/linux/patches/6.1.90/enable-ethernet-bpi-m2-plus.patch +++ b/target/linux/patches/6.1.107/enable-ethernet-bpi-m2-plus.patch diff --git a/target/linux/patches/6.1.90/hppa-cross-compile.patch b/target/linux/patches/6.1.107/hppa-cross-compile.patch index 5400e87a0..5400e87a0 100644 --- a/target/linux/patches/6.1.90/hppa-cross-compile.patch +++ b/target/linux/patches/6.1.107/hppa-cross-compile.patch diff --git a/target/linux/patches/6.1.90/macsonic.patch b/target/linux/patches/6.1.107/macsonic.patch index 177397221..177397221 100644 --- a/target/linux/patches/6.1.90/macsonic.patch +++ b/target/linux/patches/6.1.107/macsonic.patch diff --git a/target/linux/patches/6.1.90/nios2.patch b/target/linux/patches/6.1.107/nios2.patch index 43631971e..43631971e 100644 --- a/target/linux/patches/6.1.90/nios2.patch +++ b/target/linux/patches/6.1.107/nios2.patch diff --git a/target/linux/patches/6.1.90/or1k-more-ram.patch b/target/linux/patches/6.1.107/or1k-more-ram.patch index 6397f8445..6397f8445 100644 --- a/target/linux/patches/6.1.90/or1k-more-ram.patch +++ b/target/linux/patches/6.1.107/or1k-more-ram.patch diff --git a/target/linux/patches/6.1.90/riscv32.patch b/target/linux/patches/6.1.107/riscv32.patch index 648b0de4d..648b0de4d 100644 --- a/target/linux/patches/6.1.90/riscv32.patch +++ b/target/linux/patches/6.1.107/riscv32.patch diff --git a/target/linux/patches/6.1.90/riscv64-flat.patch b/target/linux/patches/6.1.107/riscv64-flat.patch index ee70ea915..ee70ea915 100644 --- a/target/linux/patches/6.1.90/riscv64-flat.patch +++ b/target/linux/patches/6.1.107/riscv64-flat.patch diff --git a/target/linux/patches/6.1.90/rockchip-115200.patch b/target/linux/patches/6.1.107/rockchip-115200.patch index ad8a2d7a7..ad8a2d7a7 100644 --- a/target/linux/patches/6.1.90/rockchip-115200.patch +++ b/target/linux/patches/6.1.107/rockchip-115200.patch diff --git a/target/linux/patches/6.1.90/rockchip-pcie-timeout.patch b/target/linux/patches/6.1.107/rockchip-pcie-timeout.patch index 2ef7df2da..2ef7df2da 100644 --- a/target/linux/patches/6.1.90/rockchip-pcie-timeout.patch +++ b/target/linux/patches/6.1.107/rockchip-pcie-timeout.patch diff --git a/target/linux/patches/6.6.32/riscv-flat.patch b/target/linux/patches/6.6.32/riscv-flat.patch deleted file mode 100644 index 6d26c638f..000000000 --- a/target/linux/patches/6.6.32/riscv-flat.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Nur linux-6.6.22.orig/fs/binfmt_flat.c linux-6.6.22/fs/binfmt_flat.c ---- linux-6.6.22.orig/fs/binfmt_flat.c 2024-03-15 19:25:07.000000000 +0100 -+++ linux-6.6.22/fs/binfmt_flat.c 2024-04-17 15:41:29.292461687 +0200 -@@ -879,6 +879,7 @@ - if (res < 0) - return res; - -+#ifndef CONFIG_BINFMT_FLAT_NO_DATA_START_OFFSET - /* Update data segment pointers for all libraries */ - for (i = 0; i < MAX_SHARED_LIBS; i++) { - if (!libinfo.lib_list[i].loaded) -@@ -893,6 +894,7 @@ - return -EFAULT; - } - } -+#endif - - set_binfmt(&flat_format); - diff --git a/target/linux/patches/6.6.32/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.32/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.32/armnommu-versatile.patch b/target/linux/patches/6.6.56/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.6.32/armnommu-versatile.patch +++ b/target/linux/patches/6.6.56/armnommu-versatile.patch diff --git a/target/linux/patches/6.6.32/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.32/hppa-cross-compile.patch +++ b/target/linux/patches/6.6.56/hppa-cross-compile.patch diff --git a/target/linux/patches/6.6.32/macsonic.patch b/target/linux/patches/6.6.56/macsonic.patch index 51e76113b..51e76113b 100644 --- a/target/linux/patches/6.6.32/macsonic.patch +++ b/target/linux/patches/6.6.56/macsonic.patch diff --git a/target/mips/Makefile b/target/mips/Makefile index db66205bd..2255ffa42 100644 --- a/target/mips/Makefile +++ b/target/mips/Makefile @@ -9,6 +9,9 @@ KERNEL:=$(LINUX_DIR)/$(ADK_TARGET_KERNEL) ifeq ($(ADK_TARGET_KERNEL_UIMAGE),y) KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage endif +ifeq ($(ADK_TARGET_KERNEL_UIMAGEGZ),y) +KERNEL:=$(LINUX_DIR)/arch/mips/boot/uImage.gz +endif OSTRIP:=-R .reginfo -R .notes -R .note -R .comment -R .mdebug -R .note.gnu.build-id @@ -76,12 +79,12 @@ targethelp: endif ifeq ($(ADK_TARGET_FS),genimage) targethelp: - @echo "The disk image is: $(FW_DIR)/disk.img" + @echo "The disk image is: $(FW_DIR)/sdcard.img" ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} $(FW_DIR)/disk.img' else @echo "Use following command to install it on SD card:" - @echo 'sudo dd if=$(FW_DIR)/disk.img of=/dev/sdX bs=2048k' + @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k' endif endif ifeq ($(ADK_TARGET_FS),ubifs) @@ -90,13 +93,9 @@ targethelp: @echo 'The UBI image is: ${FW_DIR}/${ROOTFSUBIFS}' endif -# image creation and kernel install +# dummy kernel-strip: -ifeq ($(ADK_TARGET_KERNEL_UIMAGE),) - $(TARGET_CROSS)objcopy $(OSTRIP) -S $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) -else @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) -endif kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/${TARGET_KERNEL} 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" + } +} diff --git a/target/mips/systems/imgtec-ci20 b/target/mips/systems/imgtec-ci20 index 82ea79683..bd2f750d1 100644 --- a/target/mips/systems/imgtec-ci20 +++ b/target/mips/systems/imgtec-ci20 @@ -10,7 +10,7 @@ config ADK_TARGET_SYSTEM_IMGTEC_CI20 select ADK_TARGET_WITH_NETDEVICE select ADK_TARGET_WITH_BLOCK select ADK_TARGET_KERNEL_WITH_COMPRESSION - select ADK_TARGET_KERNEL_UIMAGE + select ADK_TARGET_KERNEL_UIMAGEGZ select ADK_PACKAGE_U_BOOT select ADK_HOST_BUILD_U_BOOT help diff --git a/target/riscv32/kernel/qemu-riscv32 b/target/riscv32/kernel/qemu-riscv32 index 18c6f367d..0aab14765 100644 --- a/target/riscv32/kernel/qemu-riscv32 +++ b/target/riscv32/kernel/qemu-riscv32 @@ -1,5 +1,6 @@ CONFIG_RISCV=y CONFIG_32BIT=y +CONFIG_FPU=y CONFIG_COMPAT_32BIT_TIME=y CONFIG_ARCH_RV32I=y CONFIG_SOC_VIRT=y diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 4e31a01e7..72a4eb856 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_43_1),y) +PKG_VERSION:= 2.43.1 +PKG_RELEASE:= 1 +PKG_HASH:= e4c38b893f590853fbe276a6b8a1268101e35e61849a07f6ee97b5ecc97fbff8 +PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz +endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_42),y) PKG_VERSION:= 2.42 PKG_RELEASE:= 1 diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile index 8e5fec5a4..95ef02a52 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_43),y) +BINUTILS_VERSION:= 2.43 +BFDLIB:= .libs/libbfd.a +endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_42),y) BINUTILS_VERSION:= 2.42 BFDLIB:= .libs/libbfd.a diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 8f96784e1..3218a44c5 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -3,8 +3,8 @@ PKG_NAME:= gcc ifeq ($(ADK_TOOLCHAIN_GCC_14),y) -PKG_VERSION:= 14.1.0 -PKG_HASH:= a0be066c02775002a0fa65ad3c65fb56a8bfd923d072a26ed148c0439ecdb68f +PKG_VERSION:= 14.2.0 +PKG_HASH:= 7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/toolchain/gcc/patches/14.1.0/csky.patch b/toolchain/gcc/patches/14.2.0/csky.patch index ee352951b..ee352951b 100644 --- a/toolchain/gcc/patches/14.1.0/csky.patch +++ b/toolchain/gcc/patches/14.2.0/csky.patch diff --git a/toolchain/gcc/patches/14.1.0/nios2-softfp.patch b/toolchain/gcc/patches/14.2.0/nios2-softfp.patch index c677c6c2f..c677c6c2f 100644 --- a/toolchain/gcc/patches/14.1.0/nios2-softfp.patch +++ b/toolchain/gcc/patches/14.2.0/nios2-softfp.patch diff --git a/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc index d3b46e126..51406154d 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_49),y) -PKG_VERSION:= 1.0.49 +ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_50),y) +PKG_VERSION:= 1.0.50 PKG_RELEASE:= 1 -PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.49/ -PKG_HASH:= 4cb65c53b3724ca526fb228c72e29924432294868157ade8fa2667e0622ebd49 +PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.50/ +PKG_HASH:= 7b96bc6d0695ee77370ac49116f1012059de0f37342a68cd437e45d876449664 endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz |