From a195b9e3166fa33eb6ee89af8b141fce4b6829cf Mon Sep 17 00:00:00 2001 From: John Crispin Date: Mon, 15 May 2023 08:14:42 +0200 Subject: [PATCH] ucentral-schema: update to latest HEAD 689b111 make crashlog handler generic for pstore items Fixes: WIFI-12590 Signed-off-by: John Crispin --- feeds/ipq807x/ipq807x/config-4.4 | 2 +- feeds/ipq807x/ipq807x/patches/106-pstore.patch | 3 ++- feeds/ucentral/ucentral-client/files/etc/init.d/ucentral | 2 +- feeds/ucentral/ucentral-schema/Makefile | 3 +-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/feeds/ipq807x/ipq807x/config-4.4 b/feeds/ipq807x/ipq807x/config-4.4 index a72ee1604..b8ab4fd67 100644 --- a/feeds/ipq807x/ipq807x/config-4.4 +++ b/feeds/ipq807x/ipq807x/config-4.4 @@ -548,7 +548,7 @@ CONFIG_PROC_PAGE_MONITOR=y # CONFIG_PROC_STRIPPED is not set CONFIG_PSTORE=y CONFIG_PSTORE_RAM=y -# CONFIG_PSTORE_CONSOLE is not set +CONFIG_PSTORE_CONSOLE=y CONFIG_PSTORE_PMSG=y CONFIG_PWM=y CONFIG_PWM_IPQ4019=y diff --git a/feeds/ipq807x/ipq807x/patches/106-pstore.patch b/feeds/ipq807x/ipq807x/patches/106-pstore.patch index e6a08979a..4124eed7c 100644 --- a/feeds/ipq807x/ipq807x/patches/106-pstore.patch +++ b/feeds/ipq807x/ipq807x/patches/106-pstore.patch @@ -45,7 +45,7 @@ Index: linux-4.4.60-qsdk-11f09717303ecd83c3a64e9efe23f25921dc1016/fs/pstore/ram. =================================================================== --- linux-4.4.60-qsdk-11f09717303ecd83c3a64e9efe23f25921dc1016.orig/fs/pstore/ram.c +++ linux-4.4.60-qsdk-11f09717303ecd83c3a64e9efe23f25921dc1016/fs/pstore/ram.c -@@ -466,15 +466,47 @@ static int ramoops_init_prz(struct devic +@@ -466,15 +466,48 @@ static int ramoops_init_prz(struct devic return 0; } @@ -68,6 +68,7 @@ Index: linux-4.4.60-qsdk-11f09717303ecd83c3a64e9efe23f25921dc1016/fs/pstore/ram. + pdata->dump_oops = true; + pdata->record_size = 0x1000; + pdata->pmsg_size = 0x1000; ++ pdata->console_size = 0x1000; + return 0; +} + diff --git a/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral b/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral index 9ff106daf..8488eb3ed 100755 --- a/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral +++ b/feeds/ucentral/ucentral-client/files/etc/init.d/ucentral @@ -21,7 +21,7 @@ start_service() { mkdir -p /tmp/ucentral/ - ucode -l fs /usr/share/ucentral/crashlog.uc + ucode -l fs /usr/share/ucentral/pstore.uc . /lib/functions.sh cp /etc/config-shadow/ucentral /etc/config/ diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index 2a06d4779..7abdcf251 100644 --- a/feeds/ucentral/ucentral-schema/Makefile +++ b/feeds/ucentral/ucentral-schema/Makefile @@ -4,10 +4,9 @@ PKG_NAME:=ucentral-schema PKG_RELEASE:=1 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git -PKG_MIRROR_HASH:=094a7bc11fc0d665ccdf51944f3f8632fb524c448602f13a3ec263a449628b38 PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-05-29 -PKG_SOURCE_VERSION:=5d8e9b0a42e8c4f68f27af9ef8c6c6f2c689110b +PKG_SOURCE_VERSION:=689b111915007dd005beca0664574d0a0421b346 PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause