diff options
| -rw-r--r-- | mk/image.mk | 1 | ||||
| -rw-r--r-- | package/cog/Makefile | 5 | ||||
| -rw-r--r-- | package/openssh/Makefile | 6 | ||||
| -rw-r--r-- | package/weston/Makefile | 4 | ||||
| -rw-r--r-- | package/wpewebkit/Makefile | 9 | ||||
| -rw-r--r-- | target/config/Config.in.cpu | 32 | ||||
| -rw-r--r-- | target/linux/patches/6.12.25/mips-vdso-gcc15.patch | 12 |
7 files changed, 45 insertions, 24 deletions
diff --git a/mk/image.mk b/mk/image.mk index 35adc3ef6..d2059c5cc 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -171,6 +171,7 @@ ${STAGING_TARGET_DIR}/${INITRAMFS}_list: ${TARGET_DIR}/.adk echo "nod /dev/tty4 0644 0 0 c 4 4"; \ echo "nod /dev/tty5 0644 0 0 c 4 5"; \ echo "nod /dev/tty6 0644 0 0 c 4 6"; \ + echo "nod /dev/tty11 0644 0 0 c 4 11"; \ echo "nod /dev/null 0666 0 0 c 1 3"; \ echo "nod /dev/zero 0666 0 0 c 1 5"; \ echo "nod /dev/kmsg 0644 0 0 c 1 11"; \ diff --git a/package/cog/Makefile b/package/cog/Makefile index f2f757750..9a22fac0b 100644 --- a/package/cog/Makefile +++ b/package/cog/Makefile @@ -24,7 +24,7 @@ MESON_FLAGS+= -Ddocumentation=false \ -Dmanpages=false \ -Dprograms=true \ -Dwpe_api=2.0 \ - -Dplatforms=drm + -Dplatforms="wayland" CONFIG_STYLE:= meson BUILD_STYLE:= meson @@ -34,6 +34,9 @@ cog-install: $(INSTALL_DIR) $(IDIR_COG)/usr/lib $(CP) $(WRKINST)/usr/lib/libcogcore.so* \ $(IDIR_COG)/usr/lib + $(INSTALL_DIR) $(IDIR_COG)/usr/lib/cog/modules + $(CP) $(WRKINST)/usr/lib/cog/modules/* \ + $(IDIR_COG)/usr/lib/cog/modules $(INSTALL_DIR) $(IDIR_COG)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/cog \ $(IDIR_COG)/usr/bin diff --git a/package/openssh/Makefile b/package/openssh/Makefile index c987edf36..63c0682a0 100644 --- a/package/openssh/Makefile +++ b/package/openssh/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= openssh -PKG_VERSION:= 9.9p1 +PKG_VERSION:= 10.0p1 PKG_RELEASE:= 1 -PKG_HASH:= b343fbcdbff87f15b1986e6e15d6d4fc9a7d36066be6b7fb507087ba8f966c02 +PKG_HASH:= 021a2e709a0edf4250b1256bd5a9e500411a90dddabea830ed59cef90eb9d85c PKG_DESCR:= secure shell implementation PKG_SECTION:= net/security PKG_BUILDDEP:= zlib @@ -110,6 +110,8 @@ openssh-server-install: ${IDIR_OPENSSH_SERVER}/usr/sbin ${INSTALL_BIN} ${WRKINST}/usr/libexec/sshd-session \ ${IDIR_OPENSSH_SERVER}/usr/libexec + ${INSTALL_BIN} ${WRKINST}/usr/libexec/sshd-auth \ + ${IDIR_OPENSSH_SERVER}/usr/libexec # ssh pubkey test -z $(ADK_RUNTIME_SSH_PUBKEY) || ( \ mkdir -p $(IDIR_OPENSSH_SERVER)/etc/ssh; \ diff --git a/package/weston/Makefile b/package/weston/Makefile index 9165036cd..76f4e5bb6 100644 --- a/package/weston/Makefile +++ b/package/weston/Makefile @@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= weston PKG_VERSION:= 14.0.2 -PKG_RELEASE:= 1 +PKG_RELEASE:= 2 PKG_HASH:= 633f4e0f232ad150300c95ffcbc646fedf1349487bf389dbd2045fa69013d6e2 PKG_DESCR:= wayland compositor PKG_SECTION:= x11/drivers @@ -56,7 +56,7 @@ weston-install: $(CP) $(WRKINST)/usr/lib/*so* \ $(IDIR_WESTON)/usr/lib/ $(INSTALL_DIR) $(IDIR_WESTON)/usr/bin - $(INSTALL_BIN) $(WRKINST)/usr/bin/weston \ + $(INSTALL_BIN) $(WRKINST)/usr/bin/* \ $(IDIR_WESTON)/usr/bin include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/wpewebkit/Makefile b/package/wpewebkit/Makefile index 08fbe767e..d3d7a275e 100644 --- a/package/wpewebkit/Makefile +++ b/package/wpewebkit/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= wpewebkit -PKG_VERSION:= 2.48.0 +PKG_VERSION:= 2.48.1 PKG_RELEASE:= 1 -PKG_HASH:= 25bc557fd62f06ac8393a6f638ffceff3d9f367d6d35195315fa459c82f80850 +PKG_HASH:= 2f411b692bb4c2a924d9bddf0c794fd69a24931ad836d6a93c9a65f5adb0357f PKG_DESCR:= web platform for embedded PKG_SECTION:= libs/misc PKG_DEPENDS:= libwpe libsoup3 harfbuzz libjpeg-turbo libgcrypt PKG_DEPENDS+= libtasn1 libwebp gstreamer gst-plugins-base libxslt -PKG_DEPENDS+= libpsl libmount +PKG_DEPENDS+= libpsl libmount libblkid PKG_BUILDDEP:= cmake-host libwpe libsoup3 harfbuzz libjpeg-turbo PKG_BUILDDEP+= libgcrypt libtasn1 libwebp gstreamer gst-plugins-base PKG_BUILDDEP+= libxslt libpsl @@ -46,5 +46,8 @@ wpewebkit-install: $(INSTALL_DIR) $(IDIR_WPEWEBKIT)/usr/lib $(CP) $(WRKINST)/usr/lib/libWPEWebKit*.so* \ $(IDIR_WPEWEBKIT)/usr/lib + $(INSTALL_DIR) $(IDIR_WPEWEBKIT)/usr/libexec/wpe-webkit-2.0 + $(INSTALL_BIN) $(WRKINST)/usr/libexec/wpe-webkit-2.0/* \ + $(IDIR_WPEWEBKIT)/usr/libexec/wpe-webkit-2.0 include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index aea2b04b7..e0a91b003 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -1207,6 +1207,14 @@ config ADK_TARGET_CPU_PPC64_POWERPC64 depends on ADK_TARGET_BIG_ENDIAN # riscv +config ADK_TARGET_CPU_RISCV32_RV32IMADC + bool "rv32imadc" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_ABI_ILP32D + depends on ADK_TARGET_ARCH_RISCV32 + config ADK_TARGET_CPU_RISCV32_RV32IMAC bool "rv32imac" select ADK_TARGET_SUPPORTS_THREADS @@ -1231,14 +1239,6 @@ config ADK_TARGET_CPU_RISCV32_RV32IMAFC select ADK_TARGET_ABI_ILP32F depends on ADK_TARGET_ARCH_RISCV32 -config ADK_TARGET_CPU_RISCV32_RV32IMADC - bool "rv32imadc" - select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU - select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_ABI_ILP32D - depends on ADK_TARGET_ARCH_RISCV32 - config ADK_TARGET_CPU_RISCV32_RV32IMAFDC bool "rv32imafdc" select ADK_TARGET_SUPPORTS_THREADS if ADK_TARGET_WITH_MMU @@ -1246,6 +1246,14 @@ config ADK_TARGET_CPU_RISCV32_RV32IMAFDC select ADK_TARGET_SUPPORTS_LT if ADK_TARGET_WITH_MMU depends on ADK_TARGET_ARCH_RISCV32 +config ADK_TARGET_CPU_RISCV64_RV64IMADC + bool "rv64imadc" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_ABI_LP64D + depends on ADK_TARGET_ARCH_RISCV64 + config ADK_TARGET_CPU_RISCV64_RV64IMAC bool "rv64imac" select ADK_TARGET_SUPPORTS_THREADS @@ -1270,14 +1278,6 @@ config ADK_TARGET_CPU_RISCV64_RV64IMAFC select ADK_TARGET_ABI_LP64F depends on ADK_TARGET_ARCH_RISCV64 -config ADK_TARGET_CPU_RISCV64_RV64IMADC - bool "rv64imadc" - select ADK_TARGET_SUPPORTS_THREADS - select ADK_TARGET_SUPPORTS_NPTL if ADK_TARGET_WITH_MMU - select ADK_TARGET_SUPPORTS_LT - select ADK_TARGET_ABI_LP64D - depends on ADK_TARGET_ARCH_RISCV64 - config ADK_TARGET_CPU_RISCV64_RV64IMAFDC bool "rv64imafdc" select ADK_TARGET_SUPPORTS_THREADS if ADK_TARGET_WITH_MMU diff --git a/target/linux/patches/6.12.25/mips-vdso-gcc15.patch b/target/linux/patches/6.12.25/mips-vdso-gcc15.patch new file mode 100644 index 000000000..c18bc6c92 --- /dev/null +++ b/target/linux/patches/6.12.25/mips-vdso-gcc15.patch @@ -0,0 +1,12 @@ +diff -Nur linux-6.12.25.orig/arch/mips/vdso/Makefile linux-6.12.25/arch/mips/vdso/Makefile +--- linux-6.12.25.orig/arch/mips/vdso/Makefile 2025-04-25 10:48:08.000000000 +0200 ++++ linux-6.12.25/arch/mips/vdso/Makefile 2025-04-30 19:42:08.538362252 +0200 +@@ -30,7 +30,7 @@ + -O3 -g -fPIC -fno-strict-aliasing -fno-common -fno-builtin -G 0 \ + -mrelax-pic-calls $(call cc-option, -mexplicit-relocs) \ + -fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \ +- $(call cc-option, -fno-asynchronous-unwind-tables) ++ $(call cc-option, -fno-asynchronous-unwind-tables) -std=gnu11 + aflags-vdso := $(ccflags-vdso) \ + -D__ASSEMBLY__ -Wa,-gdwarf-2 + |