Skip to content

Commit b77eb07

Browse files
committed
Merge branch 'master' into add-freerdp3-package
2 parents 3372206 + c04a56f commit b77eb07

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
should_skip: ${{ steps.check.outputs.should_skip }}
2424
steps:
2525
- id: check
26-
uses: fkirc/skip-duplicate-actions@v5.3.1
26+
uses: fkirc/skip-duplicate-actions@v5.3.2
2727
with:
2828
skip_after_successful_duplicate: 'true'
2929
concurrent_skipping: 'same_content_newer'

buildroot-external/configs/generic-x86_64.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ BR2_ROOTFS_POST_BUILD_SCRIPT="$(BR2_EXTERNAL_THINROOT_PATH)/board/generic-x86_64
77
BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_THINROOT_PATH)/board/generic-x86_64/post-image.sh"
88
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_THINROOT_PATH)/board/generic-x86_64"
99
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
10-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.38"
10+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.39"
1111
BR2_LINUX_KERNEL_DEFCONFIG="x86_64"
1212
BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_THINROOT_PATH)/kernel/6.18/global.config $(BR2_EXTERNAL_THINROOT_PATH)/kernel/6.18/device-support.config $(BR2_EXTERNAL_THINROOT_PATH)/kernel/6.18/device-support-pci.config $(BR2_EXTERNAL_THINROOT_PATH)/kernel/6.18/security-x86_64.config $(BR2_EXTERNAL_THINROOT_PATH)/kernel/6.18/security.config $(BR2_EXTERNAL_THINROOT_PATH)/board/generic-x86_64/kernel.config"
1313
BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_CROCUS=y

buildroot-external/configs/tinkerboard.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="$(BR2_EXTERNAL_THINROOT_PATH)/board/tinkerboard/po
99
BR2_ROOTFS_POST_SCRIPT_ARGS="$(BR2_EXTERNAL_THINROOT_PATH)/board/tinkerboard"
1010
BR2_LINUX_KERNEL=y
1111
BR2_LINUX_KERNEL_CUSTOM_VERSION=y
12-
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.38"
12+
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.18.39"
1313
BR2_LINUX_KERNEL_PATCH="$(BR2_EXTERNAL_THINROOT_PATH)/board/tinkerboard/kernel-patches"
1414
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
1515
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_THINROOT_PATH)/board/tinkerboard/kernel_defconfig"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sha256 333683b482417282af5c7f1d9010074ec6efebb4c6015b66459769fe6b993172 hotkeyd-b35ba8173d9a95f0e8cc3be2d168124fc641fee6.tar.gz
1+
sha256 3c13d0d49627635eebbb48828b8fd4983358d077a2785c6ff07166d7abc83117 hotkeyd-6dbc1d9ccf4462e97a3c8dd3cbebc83f7aa5e671.tar.gz

buildroot-external/package/hotkeyd/hotkeyd.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#
77
################################################################################
88

9-
HOTKEYD_VERSION = b35ba8173d9a95f0e8cc3be2d168124fc641fee6
9+
HOTKEYD_VERSION = 6dbc1d9ccf4462e97a3c8dd3cbebc83f7aa5e671
1010
HOTKEYD_SITE = $(call github,jens-maus,hotkeyd,$(HOTKEYD_VERSION))
1111
HOTKEYD_LICENSE = GPL-3.0
1212
HOTKEYD_LICENSE_FILES = LICENSE
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
sha256 4f57f762991ca6455476f2ad9902595abaff1ddd600892c7f0797ecbe2cd1f37 fc20eb4e650bf793bd6b3d804a63b67085c55f08.tar.gz
22
sha256 f26e1a7fb1f01005767792706dae81db6de8ee7b8b01881224a1a9a44c277ebb stable_20250127.tar.gz
3-
sha256 ac26e508abd56e9f8b89872b6e10c49fc823bcc70d8068a5d8504c1a7c4ff045 linux-6.18.38.tar.xz
3+
sha256 a7a7e3d2ae9d95e74197223a8d4eb5f6be7aac21b6e6de27e9685d001c1f8cb0 linux-6.18.39.tar.xz
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
sha256 4f57f762991ca6455476f2ad9902595abaff1ddd600892c7f0797ecbe2cd1f37 fc20eb4e650bf793bd6b3d804a63b67085c55f08.tar.gz
22
sha256 f26e1a7fb1f01005767792706dae81db6de8ee7b8b01881224a1a9a44c277ebb stable_20250127.tar.gz
3-
sha256 ac26e508abd56e9f8b89872b6e10c49fc823bcc70d8068a5d8504c1a7c4ff045 linux-6.18.38.tar.xz
3+
sha256 a7a7e3d2ae9d95e74197223a8d4eb5f6be7aac21b6e6de27e9685d001c1f8cb0 linux-6.18.39.tar.xz

0 commit comments

Comments
 (0)