Accepting request 1082392 from home:ptesarik:branches:Kernel:kdump

- Update to c294e5bf89cab01f3c5316474cfc5104af7e6a60
  o Build on RISC-V 64 and 32-bit Arm and IBM POWER.
- Drop upstreamed patches:
  o eppic-Fix-eppic_getnxtfct.patch
  o eppic-crash-INCDIR.patch

OBS-URL: https://build.opensuse.org/request/show/1082392
OBS-URL: https://build.opensuse.org/package/show/Kernel:kdump/eppic?expand=0&rev=29
This commit is contained in:
Petr Tesařík 2023-04-24 08:50:21 +00:00 committed by Git OBS Bridge
parent fbd0f48232
commit 0d5f5dc470
6 changed files with 13 additions and 65 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6bbe3d834c7307617bb7d90da7e3a1bedc395e99dff7f3859d4407c2aaaa0a6c
size 90596

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d4d86e6abce78f905a755229fc2644d9e33a1b511931ec1b04d45b7ef45af8d4
size 90812

View File

@ -1,25 +0,0 @@
From: Petr Tesarik <petr@tesarici.cz>
Date: Thu, 13 Apr 2023 11:54:25 +0200
Subject: Fix name length condition in eppic_getnxtfct()
Upstream: sent, https://github.com/lucchouina/eppic/pull/9
Comparisons like 'A > B > C' do not have their mathematical meaning.
Instead, 'MAX_SYMNAMELEN-5 > l' evaluates to 0 or 1, which is never
greater than 5, and the condition is always false.
---
libeppic/eppic_func.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libeppic/eppic_func.c b/libeppic/eppic_func.c
index 7912b34..b0a73c7 100644
--- a/libeppic/eppic_func.c
+++ b/libeppic/eppic_func.c
@@ -776,7 +776,7 @@ eppic_getnxtfct(void)
int l=strlen(nxtfunc->name);
- if(MAX_SYMNAMELEN-5 > l > 5 ) {
+ if(MAX_SYMNAMELEN-5 > l && l > 5 ) {
if(!strcmp(nxtfunc->name+l-5, "_help")) {

View File

@ -1,34 +0,0 @@
From: Petr Tesarik <petr@tesarici.cz>
Date: Thu, 13 Apr 2023 14:25:40 +0200
Subject: Use make variable INCDIR to find crash include files
Upstream: sent, https://github.com/lucchouina/eppic/pull/10
This makes no difference when built from within the crash source
tree, but it allows to override the directory from the make command
line when building the extension separately.
---
applications/crash/eppic.mk | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--- a/applications/crash/eppic.mk
+++ b/applications/crash/eppic.mk
@@ -9,6 +9,8 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
+INCDIR=..
+
ifeq ($(TARGET), PPC64)
TARGET_FLAGS = -D$(TARGET) -m64
else
@@ -26,8 +28,8 @@ all:
lib-eppic:
cd libeppic && make
-eppic.so: ../defs.h eppic.c lib-eppic
- gcc -g -Ilibeppic -I.. -nostartfiles -shared -rdynamic -o eppic.so eppic.c -fPIC $(TARGET_FLAGS) $(GDB_FLAGS) -Llibeppic -leppic
+eppic.so: $(INCDIR)/defs.h eppic.c lib-eppic
+ gcc -g -Ilibeppic -I$(INCDIR) -nostartfiles -shared -rdynamic -o eppic.so eppic.c -fPIC $(TARGET_FLAGS) $(GDB_FLAGS) -Llibeppic -leppic
clean:
cd libeppic && make clean

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Apr 24 08:26:22 UTC 2023 - Petr Tesařík <petr@tesarici.cz>
- Update to c294e5bf89cab01f3c5316474cfc5104af7e6a60
o Build on 32-bit Arm and RISC-V.
- Drop upstreamed patches:
o eppic-Fix-eppic_getnxtfct.patch
o eppic-crash-INCDIR.patch
-------------------------------------------------------------------
Thu Apr 13 14:03:26 UTC 2023 - Petr Tesařík <petr@tesarici.cz>

View File

@ -17,7 +17,7 @@
Name: eppic
Version: 4.99.git.1675952960.e0a3b03
Version: 4.99.git.1682279748.c294e5b
Release: 0
Summary: Embeddable Pre-Processor and Interpreter for C
License: GPL-2.0-or-later
@ -25,8 +25,6 @@ Group: Development/Libraries/C and C++
Source: %{name}-%{version}.tar.xz
Source99: %{name}-rpmlintrc
Patch1: %{name}-fix-install.patch
Patch2: %{name}-Fix-eppic_getnxtfct.patch
Patch3: %{name}-crash-INCDIR.patch
BuildRequires: bison
BuildRequires: crash-devel
BuildRequires: flex