testing/systemtap
SHA256
3
0
Fork 0
forked from pool/systemtap
Code Pull Requests Activity

Accepting request 544008 from home:jones_tony:branches:devel:tools

Browse Source 
- Upgrade to version 3.2. See systemtap.spec for changelog
  Drop patch: systemtap-doc-back-down-gettext-version.diff
- Upgrade to version 3.2
  Changelog: https://sourceware.org/ml/systemtap/2017-q4/msg00096.html
  Drop patch: systemtap-tweak-i386-argument-passing.patch (upstream)
  Add patch: systemtap-change-extra_cflags-escape-processing.patch
  Update keyring.

OBS-URL: https://build.opensuse.org/request/show/544008
OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=90
This commit is contained in:
Tony Jones 2017-11-21 02:55:31 +00:00 committed by Git OBS Bridge
parent a78f35ba30
commit 4fee6ccbe4
12 changed files with 78 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
systemtap-3.1.tar.gz
View File

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

11
systemtap-3.1.tar.gz.asc
View File

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQEcBAABCAAGBQJYpzXOAAoJEH6DYQEm3MLo3cIH/RTF3jAYf6bMqf2ru/VXE+DS
ZyDVBMDyPBQQJy24NB4/smBR3PNZ6IMBVru+GbuacN5yo3CrOIcHERVxugA95e9P
KjMfXAvXs/4S493+VFSmdxkgXghhGl67++jVso2B4qLmqwcJF25Glr69kjGXN5DK
S9ZeaabZCq3UY5hazkHdLE2KMqZT3dxoib7yOO5bnjnTB6kH2BBm25h9RvWYHld8
BSsOkJ2xIKj/vWU8O0t8RMktjSAPMywBKqB0f/jgJTd+SvpkxdQKws21uYv91KrU
Nu2/vGpKLpvIwo0OdHXerdvYzVfUvHrCxBmnaJfH9A980S5W3F4h831gzwlBSkc=
=w+FR
-----END PGP SIGNATURE-----

3
systemtap-3.2.tar.gz Normal file
View File

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

10
systemtap-3.2.tar.gz.asc Normal file
View File

@ -0,0 +1,10 @@
-----BEGIN PGP SIGNATURE-----
iQEcBAABCAAGBQJZ55i6AAoJEH6DYQEm3MLoymMH/iQbkklUGhZBlxQW16xk1X6V
ZlWhPIXScTVGlIv4b/30x2HoQ0LlhivGiChZxEWiGBquP6dEkAE+XE32us/bc5Q3
pr0QdC8K0rLDw1FNC9wY+eWR0RoLOCHDah1gqEiTgBZaC2qbivA4e2riDAvOg2Kq
8drHqH6p9ZCmlRErQKLc9CoQMXpe1RH1fzjzbxfHloq+vHQgF+sFzj45F0sNxY7P
XoyVKHfwSlVFsp+39jNPShojtzNIIzFHPZJGcxl2K+e4Hms1BrOPu4czPhuQFNtP
lNPJiWhmr+ynBEZasT7tGqUMokLqjLwGTiAH7su+2Dm8tr1U2ciP8QrR9bxCRr8=
=0Y0p
-----END PGP SIGNATURE-----

45
systemtap-change-extra_cflags-escape-processing.patch Normal file
View File

@ -0,0 +1,45 @@
From: David Smith <dsmith@redhat.com>
Date: Mon Nov 20 09:51:40 2017 -0600
Subject: change EXTRA_CFLAGS escape processing
Git-commit: c0a01780574234b7c87a7babdc7ee41f33a83983
References: bsc#1067437
Signed-off-by: Tony Jones <tonyj@suse.de>
Fix PR22462 by updating the way we generate the Makefile.
* buildrun.cxx (compile_pass): If the runtime path doesn't have any odd
characters in it, don't bother quoting it in the generated Makefile.
diff --git a/buildrun.cxx b/buildrun.cxx
index 6dc4e5fda..c286a4a80 100644
--- a/buildrun.cxx
+++ b/buildrun.cxx
@@ -36,6 +36,8 @@ extern "C" {
// https://bugs.gentoo.org/show_bug.cgi?id=522908
#define WERROR ("-W" "error")
+#define PATH_ALLOWED_CHARS "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+,-./_"
+
using namespace std;
/* Adjust and run make_cmd to build a kernel module. */
@@ -513,7 +515,18 @@ compile_pass (systemtap_session& s)
#if CHECK_POINTER_ARITH_PR5947
o << "EXTRA_CFLAGS += -Wpointer-arith" << endl;
#endif
- o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;
+
+ // If we've got a reasonable runtime path from the user, we'll just
+ // do '-IDIR'. If there are any sneaky/odd characters in it, we'll
+ // have to quote it, like '-I"DIR"'.
+ if (s.runtime_path.find_first_not_of(PATH_ALLOWED_CHARS, 0) == string::npos)
+ o << "EXTRA_CFLAGS += -I" << s.runtime_path << endl;
+ else
+ {
+ s.print_warning("quoting runtime path in the module Makefile.");
+ o << "EXTRA_CFLAGS += -I\"" << s.runtime_path << "\"" << endl;
+ }
+
// XXX: this may help ppc toc overflow
// o << "CFLAGS := $(subst -Os,-O2,$(CFLAGS)) -fminimal-toc" << endl;
o << "obj-m := " << s.module_name << ".o" << endl;

23
systemtap-doc-back-down-gettext-version.diff
View File

@ -1,23 +0,0 @@
From: Jeff Mahoney <jeffm@suse.com>
Subject: systemtap: back down gettext requirement to 0.19.2
Patch-mainline: Never, requirement of old release
Upstream commit 42973bd25b4 (gettextize to gettext 0.19) doesn't give a
reason to update gettext, but it breaks autoconf on SLES 12.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_SYS_LARGEFILE
AC_CHECK_FUNCS(ppoll)
AC_CHECK_FUNCS(openat)
AM_GNU_GETTEXT(external)
-AM_GNU_GETTEXT_VERSION([0.19.4])
+AM_GNU_GETTEXT_VERSION([0.19.2])
if test "x$GMSGFMT" = "x:"; then
AC_MSG_ERROR([missing gnu /usr/bin/msgfmt])

6
systemtap-docs.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Nov 20 23:06:17 UTC 2017 - tonyj@suse.com
- Upgrade to version 3.2. See systemtap.spec for changelog
Drop patch: systemtap-doc-back-down-gettext-version.diff
-------------------------------------------------------------------
Tue Mar 28 20:04:44 UTC 2017 - jeffm@suse.com

4
systemtap-docs.spec
View File

@ -17,7 +17,7 @@
Name: systemtap-docs
Version: 3.1
Version: 3.2
Release: 0
Summary: Documents and examples for systemtap
License: GPL-2.0+
@ -29,7 +29,6 @@ Source2: systemtap.keyring
Source3: README-BEFORE-ADDING-PATCHES
Source4: README-KEYRING
Patch1: systemtap-docdir-fix.diff
Patch2: systemtap-doc-back-down-gettext-version.diff
BuildRequires: autoconf
BuildRequires: automake
# for documents
@ -59,7 +58,6 @@ This package contains the documents and examples for systemtap.
%prep
%setup -q -n systemtap-%{version}
%patch1 -p1
%patch2 -p1
%build
# fix interpreter

39
systemtap-tweak-i386-argument-passing.patch
View File

@ -1,39 +0,0 @@
From: Jakub Jelinek <jakub@redhat.com>
Date: Tue Mar 21 17:04:08 2017 -0400
Subject: tweak i386 argument passing
Git-commit: 272146660f54786bb61d388f6d3a4eb20e7d9369
References: bsc#1030285
Signed-off-by: Tony Jones <tonyj@suse.de>
gcc PR80115: sys/sdt.h: tweak i386 argument passing
Use %w[arg] to request that widened forms of register names be passed
to the sys/sdt.h macro operand strings, so as to avoid nominating
sub-registers such as %sil within -m32 code, which gcc <= 6 sometimes
buggily did.
diff --git a/includes/sys/sdt.h b/includes/sys/sdt.h
index 3b7eda797..eff315bcd 100644
--- a/includes/sys/sdt.h
+++ b/includes/sys/sdt.h
@@ -82,9 +82,11 @@
# define _SDT_ASM_STRING_1(x) _SDT_ASM_1(.asciz #x)
# define _SDT_ARGFMT(no) %n[_SDT_S##no]@_SDT_ARGTMPL(_SDT_A##no)
+
# ifndef STAP_SDT_ARG_CONSTRAINT
# define STAP_SDT_ARG_CONSTRAINT nor
# endif
+
# define _SDT_STRINGIFY(x) #x
# define _SDT_ARG_CONSTRAINT_STRING(x) _SDT_STRINGIFY(x)
# define _SDT_ARG(n, x) \
@@ -173,6 +175,8 @@ __extension__ extern unsigned long long __sdt_unsp;
#if defined __powerpc__ || defined __powerpc64__
# define _SDT_ARGTMPL(id) %I[id]%[id]
+#elif defined __i386__
+# define _SDT_ARGTMPL(id) %w[id] /* gcc.gnu.org/PR80115 */
#else
# define _SDT_ARGTMPL(id) %[id]
#endif

9
systemtap.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Nov 20 23:01:35 UTC 2017 - tonyj@suse.com
- Upgrade to version 3.2
Changelog: https://sourceware.org/ml/systemtap/2017-q4/msg00096.html
Drop patch: systemtap-tweak-i386-argument-passing.patch (upstream)
Add patch: systemtap-change-extra_cflags-escape-processing.patch
Update keyring.
-------------------------------------------------------------------
Fri Nov 10 12:48:28 UTC 2017 - mpluskal@suse.com

1
systemtap.keyring
View File

@ -1,5 +1,4 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Comment: GPGTools - http://gpgtools.org
mQENBFJWrakBCADZrDaBQdpt/RCpkqbXY4EjqbCgScNlhROmQ73zYr38ZAAifR4l
z2quHwlqbirVMldAFDlpgcF7DGFEI3J7jEaTupB/2FehBwEfMZBRnYu24vgyCHYW

6
systemtap.spec
View File

@ -20,7 +20,7 @@
%define _rundir %{_localstatedir}/run
%endif
Name: systemtap
Version: 3.1
Version: 3.2
Release: 0
Summary: Instrumentation System
License: GPL-2.0+
@ -33,7 +33,7 @@ Source3: README-BEFORE-ADDING-PATCHES
Source4: README-KEYRING
Source5: stap-server.conf
Patch1: systemtap-build-source-dir.patch
Patch2: systemtap-tweak-i386-argument-passing.patch
Patch2: systemtap-change-extra_cflags-escape-processing.patch
BuildRequires: gcc-c++
BuildRequires: glib2-devel
BuildRequires: libcap-devel
@ -144,6 +144,7 @@ systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
%{_bindir}/stapsh
%{_bindir}/stap-merge
%{_bindir}/stap-report
%{_bindir}/stapbpf
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/stapio
%{_libexecdir}/%{name}/stap-env
@ -153,6 +154,7 @@ systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
%{_mandir}/cs/man8/systemtap.8*
%{_mandir}/man8/stapsh.8*
%{_mandir}/cs/man8/stapsh.8*
%{_mandir}/man8/stapbpf.8*
%files server
%defattr(-,root,root)