diff options
| author | Saul Wold <sgw@linux.intel.com> | 2017-09-05 16:22:02 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-11 17:30:29 +0100 |
| commit | 9177ad0f2de1e62c0c8123b8000e429ca603a650 (patch) | |
| tree | b0cea818662825e74af576572b24d7933ffe5026 | |
| parent | 3275a1655d1e226115f46cc3f5bdee24437f6f93 (diff) | |
| download | poky-9177ad0f2de1e62c0c8123b8000e429ca603a650.tar.gz | |
systemtap: Bump SRCREV for 4.12 Linux kernel support
This SRCREV bump brings in support for the 4.12 Linux Kernel, this kernel
also has some newer CONFIG settings. The newer DEBUG_INFO and DEBUG_INFO_DWARF4
settings can be used with systemtap to get the full information. We do not
normally enabled these for a 'production' (standard) kernel, but can be
enabled via menuconfig.
When installing staprun and stapbpf on the target and native ensure we
don't try to create a new group and chown it. There is no need since we
will be running as root, so we add a patch to comment that code out.
(From OE-Core rev: 026403cc7f995ecc32a99f269399a08abc221c77)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch | 62 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.inc | 5 |
2 files changed, 65 insertions, 2 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch new file mode 100644 index 0000000000..9f11648fef --- /dev/null +++ b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch | |||
| @@ -0,0 +1,62 @@ | |||
| 1 | From 3e13a006fe3dff9489269274093bf868532036e2 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Saul Wold <sgw@linux.intel.com> | ||
| 3 | Date: Tue, 5 Sep 2017 16:02:55 -0700 | ||
| 4 | Subject: [PATCH] staprun/stapbpf: don't support installing a non-root | ||
| 5 | |||
| 6 | Since we are in a known environment and installing as root and | ||
| 7 | expect to be running as root, don't create the group or chmod | ||
| 8 | the binaries. | ||
| 9 | |||
| 10 | Upstream-Status: Inappropriate [Embedded] | ||
| 11 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
| 12 | --- | ||
| 13 | stapbpf/Makefile.am | 14 +++++++------- | ||
| 14 | staprun/Makefile.am | 12 ++++++------ | ||
| 15 | 2 files changed, 13 insertions(+), 13 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am | ||
| 18 | index 421b044ef..f7daeb2b2 100644 | ||
| 19 | --- a/stapbpf/Makefile.am | ||
| 20 | +++ b/stapbpf/Makefile.am | ||
| 21 | @@ -39,11 +39,11 @@ git_version.stamp ../git_version.h: | ||
| 22 | |||
| 23 | # Why the "id -u" condition? This way, an unprivileged user can run | ||
| 24 | # make install, and have "sudo stap ...." or "sudo stapbpf ...." work later. | ||
| 25 | -install-exec-hook: | ||
| 26 | - if [ `id -u` -eq 0 ]; then \ | ||
| 27 | - getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ | ||
| 28 | - getent group stapusr >/dev/null \ | ||
| 29 | - && chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \ | ||
| 30 | - && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \ | ||
| 31 | - fi | ||
| 32 | +#install-exec-hook: | ||
| 33 | +# if [ `id -u` -eq 0 ]; then \ | ||
| 34 | +# getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ | ||
| 35 | +# getent group stapusr >/dev/null \ | ||
| 36 | +# && chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \ | ||
| 37 | +# && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \ | ||
| 38 | +# fi | ||
| 39 | endif | ||
| 40 | diff --git a/staprun/Makefile.am b/staprun/Makefile.am | ||
| 41 | index 4073aa01c..2925e34c3 100644 | ||
| 42 | --- a/staprun/Makefile.am | ||
| 43 | +++ b/staprun/Makefile.am | ||
| 44 | @@ -72,9 +72,9 @@ git_version.stamp ../git_version.h: | ||
| 45 | |||
| 46 | # Why the "id -u" condition? This way, an unprivileged user can run | ||
| 47 | # make install, and have "sudo stap ...." or "sudo staprun ...." work later. | ||
| 48 | -install-exec-hook: | ||
| 49 | - if [ `id -u` -eq 0 ]; then \ | ||
| 50 | - getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ | ||
| 51 | - getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \ | ||
| 52 | - chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \ | ||
| 53 | - fi | ||
| 54 | +#install-exec-hook: | ||
| 55 | +# if [ `id -u` -eq 0 ]; then \ | ||
| 56 | +# getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ | ||
| 57 | +# getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \ | ||
| 58 | +# chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \ | ||
| 59 | +# fi | ||
| 60 | -- | ||
| 61 | 2.11.0 | ||
| 62 | |||
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc index a6aedd38a6..3dc688a18f 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.inc +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | LICENSE = "GPLv2" | 1 | LICENSE = "GPLv2" |
| 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 2 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
| 3 | SRCREV = "b8ea350dc13adb6190d9044a5b80110a4c441270" | 3 | SRCREV = "45d0e7a09a15a21078d0ebf2db5175ed9e87014e" |
| 4 | PV = "3.1" | 4 | PV = "3.1" |
| 5 | 5 | ||
| 6 | SRC_URI = "git://sourceware.org/git/systemtap.git \ | 6 | SRC_URI = "git://sourceware.org/git/systemtap.git \ |
| @@ -12,7 +12,8 @@ SRC_URI = "git://sourceware.org/git/systemtap.git \ | |||
| 12 | file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ | 12 | file://0001-Do-not-let-configure-write-a-python-location-into-th.patch \ |
| 13 | file://0001-Install-python-modules-to-correct-library-dir.patch \ | 13 | file://0001-Install-python-modules-to-correct-library-dir.patch \ |
| 14 | file://0001-buildrun-remove-quotes-around-I-include-line.patch \ | 14 | file://0001-buildrun-remove-quotes-around-I-include-line.patch \ |
| 15 | " | 15 | file://0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch \ |
| 16 | " | ||
| 16 | 17 | ||
| 17 | # systemtap doesn't support mips | 18 | # systemtap doesn't support mips |
| 18 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64).*-linux' | 19 | COMPATIBLE_HOST = '(x86_64|i.86|powerpc|arm|aarch64).*-linux' |
