Skip to content

Commit f022e5c

Browse files
committed
Merge branch 'main' into R4
2 parents e0fc927 + b09768a commit f022e5c

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

package/cimplog/Config.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ if BR2_PACKAGE_CIMPLOG
1010
default n
1111

1212
config BR2_PACKAGE_CIMPLOG_LEVEL_DEFAULT
13-
string "default log level Error(0), Info(1) and Debug(2)
13+
string "default log level Error(0), Info(1) and Debug(2)"
1414
default "0"
1515
endif

package/wpe/wpewebkit/wpewebkit.mk

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ endif
1212
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_28),y)
1313
# This is the wpe-2.28-soup3 branch tip.
1414
WPEWEBKIT_VERSION = 2.28
15-
WPEWEBKIT_VERSION_VALUE = a1e044ed9a8d162b2effb30d0489357919a70544
15+
WPEWEBKIT_VERSION_VALUE = e66cae2d3edad330166725dabf1dd79074a2b89b
16+
endif
17+
18+
ifeq ($(BR2_PACKAGE_WPEWEBKIT2_38),y)
19+
WPEWEBKIT_VERSION = 2.38
20+
WPEWEBKIT_VERSION_VALUE = 4cafd7d5a91337d86eb5f08119d966a7c5ee4f18
1621
endif
1722

1823
WPEWEBKIT_SITE = $(call github,WebPlatformForEmbedded,WPEWebKit,$(WPEWEBKIT_VERSION_VALUE))

0 commit comments

Comments
 (0)