8 次代码提交 9e3aabb51c ... 43d98bb6ad

作者 SHA1 备注 提交日期
  Waldemar Brodkorb 43d98bb6ad imgtec-ci20: genimage config/ u-boot env 1 月之前
  Waldemar Brodkorb 746bffcc4c linux: update 6.6.x/6.11.x 1 月之前
  Waldemar Brodkorb 6ad27de8d6 ltp: update to 20240930 1 月之前
  Waldemar Brodkorb f007490e62 asterisk: update to 20.9.3 2 月之前
  Waldemar Brodkorb 6371536cee add openssl choice 2 月之前
  Waldemar Brodkorb 6433a0597b use openssl instead of libressl 2 月之前
  Waldemar Brodkorb f44f71e951 use openssl instead of libressl 2 月之前
  Waldemar Brodkorb a70118dfac python3: update to 3.11.10 2 月之前

+ 5 - 5
mk/linux-ver.mk

@@ -15,17 +15,17 @@ KERNEL_FILE_VER:=	$(ADK_TARGET_LINUX_KERNEL_GIT)
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE)
 endif
-ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_10),y)
-KERNEL_FILE_VER:=	6.10.7
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_11),y)
+KERNEL_FILE_VER:=	6.11.3
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		900d567ff01824708ce24c3b37faaef03e6f6145411dd447a6ff2edc8c5db3a9
+KERNEL_HASH:=		057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y)
-KERNEL_FILE_VER:=	6.6.48
+KERNEL_FILE_VER:=	6.6.56
 KERNEL_RELEASE:=	1
 KERNEL_VERSION:=	$(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:=		6b16df7b2aba3116b78fdfd8aea0b6cd7abe8f0cb699b04a66d3169141772029
+KERNEL_HASH:=		f74812f78e88992c416434cb107639e13a551dbaff36bb90d6346ab16ab71a95
 endif
 ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y)
 KERNEL_FILE_VER:=	6.1.107

+ 7 - 11
package/asterisk/Makefile

@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		asterisk
-PKG_VERSION:=		20.9.2
+PKG_VERSION:=		20.9.3
 PKG_RELEASE:=		1
-PKG_HASH:=		acc85a66f3b2a0e2784f4c551b8b0241a2393c47ff353543ae63b5dcf434b1ca
+PKG_HASH:=		3d3d3c558f0ca9c3209a6aa7c561c2b85a1ab1b4099d4995f33c917b4cff9ee4
 PKG_DESCR:=		open source pbx
 PKG_SECTION:=		net/voip
 PKG_DEPENDS:=		libncurses libcurl libopenssl libedit libuuid libjansson
@@ -53,7 +53,6 @@ $(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-
 $(eval $(call PKG_template,ASTERISK_RES_AGI,asterisk-res-agi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_ASTERISK_RES_AGI},${PKG_SECTION}))
 
 CONFIGURE_ARGS=		--with-z=${STAGING_TARGET_DIR}/usr \
-			--with-ncurses=${STAGING_TARGET_DIR}/usr \
 			--with-libedit=${STAGING_TARGET_DIR}/usr \
 			--with-jansson=${STAGING_TARGET_DIR}/usr \
 			--with-ssl=${STAGING_TARGET_DIR}/usr \
@@ -61,17 +60,14 @@ CONFIGURE_ARGS=		--with-z=${STAGING_TARGET_DIR}/usr \
 			--without-tonezone \
 			--without-asound \
 			--without-gtk2 \
-			--without-h323 \
 			--without-iksemel \
 			--without-imap \
 			--without-netsnmp \
 			--without-newt \
-			--without-openais \
 			--without-osptk \
-			--without-oss \
 			--without-popt \
+			--without-portaudio \
 			--without-pri \
-			--without-pwlib \
 			--without-tds \
 			--without-postgres
 
@@ -97,9 +93,9 @@ endif
 
 INSTALL_STYLE:=		manual
 
-TARGET_CFLAGS+=		-fgnu89-inline
 TARGET_LDFLAGS+=	-lm -ltinfo -ldl -lpthread
-MAKE_ENV=		ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \
+MAKE_ENV:=		PATH="$(HOST_PATH)" \
+			ASTCFLAGS="${TARGET_CPPFLAGS} -DHAVE_STRTOQ" \
 			ASTLDFLAGS="${TARGET_LDFLAGS} -z muldefs"
 MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 			OPTIMIZE="${TARGET_CFLAGS}" \
@@ -107,10 +103,10 @@ MAKE_FLAGS+=		DESTDIR="$(WRKINST)" \
 ALL_TARGET:=		all install samples
 
 pre-configure:
-	cd "$(WRKBUILD)/menuselect"; ./configure
+	cd "$(WRKBUILD)/menuselect"; PATH="$(HOST_PATH)" ./configure
 
 pre-build:
-	$(MAKE) -C $(WRKBUILD)/menuselect
+	PATH="$(HOST_PATH)" $(MAKE) -C $(WRKBUILD)/menuselect
 
 #post-build:
 #	cd ${WRKBUILD}/sounds ; \

+ 2 - 2
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

+ 2 - 2
package/python3/Makefile

@@ -4,9 +4,9 @@
 include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		python3
-PKG_VERSION:=		3.11.8
+PKG_VERSION:=		3.11.10
 PKG_RELEASE:=		1
-PKG_HASH:=		9e06008c8901924395bc1da303eac567a729ae012baa182ab39269f650383bb3
+PKG_HASH:=		07a4356e912900e61a15cb0949a06c4a05012e213ecd6b4e84d0f67aabbee372
 PKG_DESCR:=		python scripting language
 PKG_SECTION:=		dev/lang
 PKG_DEPENDS:=		libffi zlib libexpat

+ 3 - 3
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/
 

+ 1 - 1
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/

+ 10 - 0
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

+ 4 - 1
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

+ 3 - 3
target/linux/Config.in.kernelversion

@@ -39,8 +39,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
 	select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
 	select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
 
-config ADK_TARGET_LINUX_KERNEL_VERSION_6_10
-	bool "6.10.7"
+config ADK_TARGET_LINUX_KERNEL_VERSION_6_11
+	bool "6.11.3"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X
@@ -51,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_10
 	depends on !ADK_TARGET_ARCH_NDS32
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_6_6
-	bool "6.6.48"
+	bool "6.6.56"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X

+ 0 - 0
target/linux/patches/6.6.48/armnommu-fix-thread-registers.patch → target/linux/patches/6.6.56/armnommu-fix-thread-registers.patch


+ 0 - 0
target/linux/patches/6.6.48/armnommu-versatile.patch → target/linux/patches/6.6.56/armnommu-versatile.patch


+ 0 - 0
target/linux/patches/6.6.48/hppa-cross-compile.patch → target/linux/patches/6.6.56/hppa-cross-compile.patch


+ 0 - 0
target/linux/patches/6.6.48/macsonic.patch → target/linux/patches/6.6.56/macsonic.patch


+ 33 - 0
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"
+	}
+}