Accepting request 1244773 from Base:System
OBS-URL: https://build.opensuse.org/request/show/1244773 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dtc?expand=0&rev=43
This commit is contained in:
commit
8c3988b396
36
ce1d858.patch
Normal file
36
ce1d858.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From ce1d8588880aecd7af264e422a16a8b33617cef7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: David Gibson <david@gibson.dropbear.id.au>
|
||||||
|
Date: Wed, 5 Feb 2025 13:39:43 +1100
|
||||||
|
Subject: [PATCH] tests: When building .so from -O asm output mark as
|
||||||
|
non-executable stack
|
||||||
|
|
||||||
|
For certain tests, we take the output from dtc -O asm and build it into
|
||||||
|
a .so shared library which we then dlopen() for further tests. Because we
|
||||||
|
don't mark it otherwise, it's treated as requiring an executable stack,
|
||||||
|
which dlopen() refuses to open as of glibc-2.41.
|
||||||
|
|
||||||
|
Of course, the library is pure data, no code, so it certainly doesn't need
|
||||||
|
an executable stack. Add the -znoexecstack linker option to avoid the
|
||||||
|
error.
|
||||||
|
|
||||||
|
Fixes: https://github.com/dgibson/dtc/issues/163
|
||||||
|
|
||||||
|
Reported-by: Xi Ruoyao <xry111@xry111.site>
|
||||||
|
Signed-off-by: David Gibson <david@gibson.dropbear.id.a>
|
||||||
|
---
|
||||||
|
tests/run_tests.sh | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
|
||||||
|
index 937b1288..f0b51c04 100755
|
||||||
|
--- a/tests/run_tests.sh
|
||||||
|
+++ b/tests/run_tests.sh
|
||||||
|
@@ -201,7 +201,7 @@ run_dtc_test () {
|
||||||
|
}
|
||||||
|
|
||||||
|
asm_to_so () {
|
||||||
|
- $CC -shared -o $1.test.so "$SRCDIR/data.S" $1.test.s
|
||||||
|
+ $CC -shared -Wl,-znoexecstack -o $1.test.so "$SRCDIR/data.S" $1.test.s
|
||||||
|
}
|
||||||
|
|
||||||
|
asm_to_so_test () {
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9532f10098455711a4da37816fd567dfc8523bb01f59ad6c44887a112e553d9e
|
|
||||||
size 215129
|
|
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmbAYRgACgkQzQJF27ox
|
|
||||||
2Gd9wRAApNwkb6UW+sVhFxzKdERalPkYeY3+8mh5M6iUUwTyU0MTxWbaQ3YCSOtE
|
|
||||||
4rjHzqHjdwU02DQT5KsWFJQRuP8kbaMdtM1IK2pq+bSUM6YdnQ6gPjrvuZqWVrvB
|
|
||||||
TRrGpd95T3jml5xRoim1w89wyYHqmdCsnutQ+iu0hea+Y4tfGZZaO0qqhMMGvROf
|
|
||||||
WWTv833EjsFm9xmER1DoqqYM5tHHgVoecmojQnytqS9jPaKOZm5sVoSUTYZa0sT7
|
|
||||||
UgF96DayPyO8ZYAAKfmtQKJxnK+CsKfYaCMb+C+qDLDQk08pEZeYcs+EXN6Z/+pY
|
|
||||||
+rbSXyavZhnsHckuj4E5s0Rubn4SEpnFWU5mpeE5NSZZUyuQQjgdLjikCBh+gsDy
|
|
||||||
8abZZqCCQlxpX8wEnkqOGmTAsDNBhl8YHDw583Op6ioxhFKeLs6WJO5dRAoLV0cA
|
|
||||||
UljRXgzcFIwTnxKNu9IyoM3yuC9dR61WnSVGrujzd5t76y4b94/F6RI5de8TuUTZ
|
|
||||||
p4obIc5LYU0LWI3b6IuVT6TrqhljumELjBDS9UijTr61bzEr12om3Wb3OVZraX53
|
|
||||||
A51QGdQiG+OVJW67LWPSuCAZ9p32DtqMdUdtouzyryrPOR/y4VKpuigUkYl+g/7p
|
|
||||||
TpRE1bvUb9uBxjfWy+jE3vZQCBgeaNOGwNlzJe1QbNyY9QowJKg=
|
|
||||||
=zsJV
|
|
||||||
-----END PGP SIGNATURE-----
|
|
3
dtc-1.7.2.tar.gz
Normal file
3
dtc-1.7.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f200e5ebd7afd20d4b3804a3085af0870fcf3c194f8d7f0f6985cf8bbb4ac0f4
|
||||||
|
size 215315
|
16
dtc-1.7.2.tar.sign
Normal file
16
dtc-1.7.2.tar.sign
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmcq3jgACgkQzQJF27ox
|
||||||
|
2GcmdQ/7Btlr2522CggQiswiZN6ua+L5a8i1m6kI+TTE9dh6pkfMpZH86pn9ykVt
|
||||||
|
5P0RfEfFOlL90lSBuQ9smTXWGvYoVRQM7o6ZetTCHtDNexdamUFUSmQF68ENfBSc
|
||||||
|
7UOKzjw1S7A1Fin3CD5SiJxw1D4/3/XcOznGyPZ8Yy8I8JtWexzcAKg913jGxIV5
|
||||||
|
DAbIzf4YAADJtI/d98p0OjPEpNyzaFGbZTMi63KnnZlhZf4X8HAhhHOyK0hY/VkL
|
||||||
|
MklHYhFWEjTHWF9UGH78o057mpdEImP5RSjHOd3FBZO2Uc4SW9K9QPUB2DsXeB91
|
||||||
|
fNMmEnk6mfQRfpqoCruTTdVR8XffQz7KEUfwiszV20YJPPC7DBM9CzEH7lE0gS+b
|
||||||
|
8t94AcAwfKnSZjpPc49P9gh3eujrGdGWJWO8qakwrtScsNTzZPld5R6az7icJNVh
|
||||||
|
f3ZCPaBRR5vFXXHYEt2Ny30KkR+hYm1MI1yLhwSd4jHceVwDmd/POkbXKUG65ePY
|
||||||
|
0awl3jgWq8HUDscLhKjwD/Nsgc39GoaaS4zlSq7MZOx3L7vK3eMYKQvs19ykUwO1
|
||||||
|
C+3ys6hBBZdK6fUHzIJmQhShNl5ID7nmfNl59ZfBWeb+SCil9jsLBtDD4gUzNZuZ
|
||||||
|
SVNrJJawF5/t4tLNzXetn6l78vwpQfX/5HofpNUG2tH2AUcF57o=
|
||||||
|
=mhgH
|
||||||
|
-----END PGP SIGNATURE-----
|
13
dtc.changes
13
dtc.changes
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Feb 7 15:24:23 UTC 2025 - Guillaume GARDET <guillaume.gardet@opensuse.org>
|
||||||
|
|
||||||
|
- Update to 1.7.2:
|
||||||
|
* pylibfdt: Don't emit warnings from swig generate C code
|
||||||
|
* fdtoverlay: provide better error message for missing /__symbols__
|
||||||
|
* pylibfdt/libfdt.i: Use SWIG_AppendOutput
|
||||||
|
* Escape spaces in depfile with backslashes.
|
||||||
|
* libfdt.h: whitespace consistency fixups
|
||||||
|
* libfdt.h: typo and consistency fixes
|
||||||
|
- Revert previous commit and use upstream fix for glibc 2.41:
|
||||||
|
* ce1d858.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Feb 4 12:27:13 UTC 2025 - Andreas Schwab <schwab@suse.de>
|
Tue Feb 4 12:27:13 UTC 2025 - Andreas Schwab <schwab@suse.de>
|
||||||
|
|
||||||
|
7
dtc.spec
7
dtc.spec
@ -18,7 +18,7 @@
|
|||||||
|
|
||||||
%define sover 1
|
%define sover 1
|
||||||
Name: dtc
|
Name: dtc
|
||||||
Version: 1.7.1
|
Version: 1.7.2
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: Device-tree compiler
|
Summary: Device-tree compiler
|
||||||
License: GPL-2.0-or-later
|
License: GPL-2.0-or-later
|
||||||
@ -28,6 +28,8 @@ Source1: https://mirrors.edge.kernel.org/pub/software/utils/dtc/dtc-%{ver
|
|||||||
Source20: baselibs.conf
|
Source20: baselibs.conf
|
||||||
# From http://gibson.dropbear.id.au/
|
# From http://gibson.dropbear.id.au/
|
||||||
Source21: dtc.keyring
|
Source21: dtc.keyring
|
||||||
|
# PATCH-FIX-UPSTREAM - https://github.com/dgibson/dtc/commit/ce1d858
|
||||||
|
Patch1: ce1d858.patch
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
BuildRequires: libyaml-devel
|
BuildRequires: libyaml-devel
|
||||||
@ -59,7 +61,7 @@ Obsoletes: libfdt1-devel < %{version}-%{release}
|
|||||||
This package provides development files for libfdt
|
This package provides development files for libfdt
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%make_build EXTRA_CFLAGS="%{optflags} -pie" LDFLAGS="%{optflags}"
|
%make_build EXTRA_CFLAGS="%{optflags} -pie" LDFLAGS="%{optflags}"
|
||||||
@ -72,7 +74,6 @@ rm -f %{buildroot}/%{_libdir}/*.a
|
|||||||
|
|
||||||
%check
|
%check
|
||||||
export EXTRA_CFLAGS="%{optflags}"
|
export EXTRA_CFLAGS="%{optflags}"
|
||||||
export CC="gcc -Wa,--noexecstack"
|
|
||||||
%make_build check
|
%make_build check
|
||||||
|
|
||||||
%files
|
%files
|
||||||
|
Loading…
x
Reference in New Issue
Block a user