diff options
| -rw-r--r-- | mk/linux-ver.mk | 4 | ||||
| -rw-r--r-- | package/cog/Makefile | 5 | ||||
| -rw-r--r-- | package/weston/Makefile | 4 | ||||
| -rw-r--r-- | package/wpewebkit/Makefile | 9 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelversion | 2 | ||||
| -rw-r--r-- | target/linux/patches/5.4.292/arc.patch (renamed from target/linux/patches/5.4.289/arc.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/5.4.292/arm-nommu.patch (renamed from target/linux/patches/5.4.289/arm-nommu.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/5.4.292/darwin-dtc.patch (renamed from target/linux/patches/5.4.289/darwin-dtc.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/5.4.292/dtc-noyaml.patch (renamed from target/linux/patches/5.4.289/dtc-noyaml.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/5.4.292/macsonic.patch (renamed from target/linux/patches/5.4.289/macsonic.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/5.4.292/or1k-more-ram.patch (renamed from target/linux/patches/5.4.289/or1k-more-ram.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/5.4.292/relocs.patch (renamed from target/linux/patches/5.4.289/relocs.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/5.4.292/sh4.patch (renamed from target/linux/patches/5.4.289/sh4.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/5.4.292/startup.patch (renamed from target/linux/patches/5.4.289/startup.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.12.25/mips-vdso-gcc15.patch | 12 |
15 files changed, 27 insertions, 9 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 2fcc03e6e..bd66affde 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -52,10 +52,10 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= 6da5cc8f7d39ed3acb4d59129a3f1570d981526ebbf58ea82595b7b6e000fb89 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_5_4),y) -KERNEL_FILE_VER:= 5.4.289 +KERNEL_FILE_VER:= 5.4.292 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 1e3e5fc052c8e15f8eaa37d30bf4f0b3eef7430dd234d9fed0d0005852a06d10 +KERNEL_HASH:= 0bcbf580d1ea623ac5879d0f2d69796c82431b3f653c4749e63766dbf737be85 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) KERNEL_FILE_VER:= 4.19.320 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/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/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index c4399e070..4e816c354 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -105,7 +105,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.289" + bool "5.4.292" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_CRIS diff --git a/target/linux/patches/5.4.289/arc.patch b/target/linux/patches/5.4.292/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/5.4.289/arc.patch +++ b/target/linux/patches/5.4.292/arc.patch diff --git a/target/linux/patches/5.4.289/arm-nommu.patch b/target/linux/patches/5.4.292/arm-nommu.patch index fdcec3f09..fdcec3f09 100644 --- a/target/linux/patches/5.4.289/arm-nommu.patch +++ b/target/linux/patches/5.4.292/arm-nommu.patch diff --git a/target/linux/patches/5.4.289/darwin-dtc.patch b/target/linux/patches/5.4.292/darwin-dtc.patch index 0cdc23ab4..0cdc23ab4 100644 --- a/target/linux/patches/5.4.289/darwin-dtc.patch +++ b/target/linux/patches/5.4.292/darwin-dtc.patch diff --git a/target/linux/patches/5.4.289/dtc-noyaml.patch b/target/linux/patches/5.4.292/dtc-noyaml.patch index 759bb01f7..759bb01f7 100644 --- a/target/linux/patches/5.4.289/dtc-noyaml.patch +++ b/target/linux/patches/5.4.292/dtc-noyaml.patch diff --git a/target/linux/patches/5.4.289/macsonic.patch b/target/linux/patches/5.4.292/macsonic.patch index 75a6fcad2..75a6fcad2 100644 --- a/target/linux/patches/5.4.289/macsonic.patch +++ b/target/linux/patches/5.4.292/macsonic.patch diff --git a/target/linux/patches/5.4.289/or1k-more-ram.patch b/target/linux/patches/5.4.292/or1k-more-ram.patch index 540dc43b5..540dc43b5 100644 --- a/target/linux/patches/5.4.289/or1k-more-ram.patch +++ b/target/linux/patches/5.4.292/or1k-more-ram.patch diff --git a/target/linux/patches/5.4.289/relocs.patch b/target/linux/patches/5.4.292/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/5.4.289/relocs.patch +++ b/target/linux/patches/5.4.292/relocs.patch diff --git a/target/linux/patches/5.4.289/sh4.patch b/target/linux/patches/5.4.292/sh4.patch index 8ae79d49d..8ae79d49d 100644 --- a/target/linux/patches/5.4.289/sh4.patch +++ b/target/linux/patches/5.4.292/sh4.patch diff --git a/target/linux/patches/5.4.289/startup.patch b/target/linux/patches/5.4.292/startup.patch index 081aa103a..081aa103a 100644 --- a/target/linux/patches/5.4.289/startup.patch +++ b/target/linux/patches/5.4.292/startup.patch 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 + |