This patch is ported from a merge request shown below,
and the following represents the original commit text.
------------------------------------------------------
top: In the bye_bye function, replace fputs with the write interface.
When top calls malloc, if a signal is received, it will
call sig_endpgm to process the signal. In the bye_bye function, if the
-b option is enable, the Batch variable is set, the fputs function
will calls malloc at the same time. The malloc function is not reentrant, so
it will cause the program to crash.
(From OE-Core rev: 573f5b2d8fec9f8a4ed17e836ef3feeb6de62e5a)
Signed-off-by: Shaohua Zhan <shaohua.zhan@windriver.com>
------------------------------------------------------
Reference(s):
https://gitlab.com/procps-ng/procps/-/merge_requests/127
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Backport patch from upstream master.
There were three changes needed to apply the patch:
* move NEWS change to start of the file
* change file location from src/ps/ to ps/
* change xmalloc/xcmalloc to malloc/cmalloc
The x*malloc functions were introduced in commit in future version.
584028dbe5
They call the original function plus additionally throw error when out of memory.
https://gitlab.com/procps-ng/procps/-/blob/v4.0.3/local/xalloc.h?ref_type=tags
So this replacement is correct in context of our version.
(From OE-Core rev: 71d0683d625c09d4db5e0473a0b15a266aa787f4)
Signed-off-by: Peter Marko <peter.marko@siemens.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
An automated conversion using scripts/contrib/convert-spdx-licenses.py to
convert to use the standard SPDX license identifiers. Two recipes in meta-selftest
were not converted as they're that way specifically for testing. A change in
linux-firmware was also skipped and may need a more manual tweak.
(From OE-Core rev: ceda3238cdbf1beb216ae9ddb242470d5dfc25e0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is uncertainty about the default branch name in git going forward.
To try and cover the different possible outcomes, add branch names to all
git:// and gitsm:// SRC_URI entries.
This update was made with the script added to contrib in this patch which
aims to help others convert other layers.
(From OE-Core rev: b51c405faf6f8c0365f7533bfaf470d79152a463)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is the result of automated script conversion:
scripts/contrib/convert-overrides.py <oe-core directory>
converting the metadata to use ":" as the override character instead of "_".
(From OE-Core rev: 42344347be29f0997cc2f7636d9603b1fe1875ae)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Move the ps and sysctl tools into its own package. Useful for
size constrained systems that only want the ps and/or sysctl tools.
(From OE-Core rev: 28809742c517a8e3589b9cd22ce8e82b1a983683)
Signed-off-by: Sinan Kaya <okaya@kernel.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop 0001-Fix-out-of-tree-builds.patch since it has been merged
upstream.
(From OE-Core rev: c3df7eec1ba99a34b4037da786863de87073576d)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
procps includes support for listing the owning unit of a process, but
this support is disabled by default. Enable support using
a PACKAGECONFIG that depends on the systemd DISTRO_FEATURE.
(From OE-Core rev: 54a5daca450b8be251c45730ae4c0511811b668a)
Signed-off-by: Daniel McGregor <daniel.mcgregor@vecima.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This CVE is about race conditions in 'ps' which make it unsuitable for security
audits. As these race conditions are unavoidable ps shouldn't be used for
security auditing, so this isn't a valid CVE.
(From OE-Core rev: b3fa0654abf9ac32f683ac174e453ea5e64b6cb8)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The sysctl.conf file for procps is very outdated:
https://git.openembedded.org/openembedded-core/commit/?id=8a9b9a323f4363e27138077e3e3dce8139a36708
(circa 2014)
The origin of this file is hard to determine and due to it's age
is causing a routing issue when both wifi and ethernet are enabled.
This manifested during an update from thud -> warrior due to the
following:
- upstream change in NetworkManager during 1.16 cycle removes the
dynamic setting of rp_filter sysctl when more than one interface
is enabled:
https://cgit.freedesktop.org/NetworkManager/NetworkManager/commit/?id=b1082aa9a711deb96652e5b2fcaefcf399d127b8
- open-embedded updated to NetworkManager 1.16 in March 2019:
https://git.openembedded.org/meta-openembedded/commit/meta-networking/recipes-connectivity/networkmanager?id=5509328af9e4fab267251456f4d6e7bd51df779a
- setting in legacy sysctl.conf sets rp_filter to 1 which blocks
packets with different inbound and outbound addresses.
Documentation of rp_filter setting from kernel.org:
rp_filter - INTEGER
0 - No source validation.
1 - Strict mode as defined in RFC3704 Strict Reverse Path
Each incoming packet is tested against the FIB and if the interface
is not the best reverse path the packet check will fail.
By default failed packets are discarded.
2 - Loose mode as defined in RFC3704 Loose Reverse Path
Each incoming packet's source address is also tested against the FIB
and if the source address is not reachable via any interface
the packet check will fail.
This patch updates the sysctl.conf file to current which doesn't set
the rp_filter mode explicity (2 is the default).
NOTE: The kernel/pid_max=10000 setting has been commented out as this
may not be desired by default.
(From OE-Core rev: f0b5f56b101d98574f81decd9de76222e7f20603)
Signed-off-by: Michael Scott <mike@foundries.io>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Avoid collision of propcs provided w binary with BusyBox-provided
applet in case both are installed to same rootfs, by adding w to
update-alternatives scope via bindir_progs variable
(From OE-Core rev: de4206c6fd0c3be77d71958f532604b65a4dd5be)
Signed-off-by: Niko Mauno <niko.mauno@vaisala.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1. Fix HOMEPAGE. The old one is obsolete.
2. Remove the setting of CPPFLAGS.
It was used to support out-of-tree build. But the problem has been
fixed upstream since commit 90cc5460aa0e9ca10a0d7c8c44064fd14789f750
(build-sys: add $(top_srcdir) to include search dir).
(From OE-Core rev: 201e0b643c44ef599f7b1b0210f21d0023bc0f96)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously, 'pidof' utility has two providers, sysvinit and procps, and
both have the same priority 200. Fix procps to lower the priority of its
'pidof' to 150 to avoid conflict.
(From OE-Core rev: 468f9c9899016c46635c9f39eef3483303a5be81)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In 2ce514a394e1e062172bb097aa92a1792a0f8eaf, "coreutils: fix
ALTERNATIVE_PRIORITY conflict with procps and mktemp" the priority was
lowered from 100 to 30. Unfortunately this lowered coreutils past
busybox which means busybox was ending up in our SDK images. This isn't
what users expect.
1c0cfffee21e99a7356c9046c86628bc0acf654c raises the priority of mktemp
to 200, do the same for procps and make the system consistent.
(From OE-Core rev: 770618eb33fc576f903a4c8011cc2d9f8f78071d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
An rmdir call in do_install_append was trying to remove the
sbindir, however in a system with a merged usr this directory
is not empty and therefore failing to rm it causes an ERROR.
Instead check that sbindir != base_sbindir before trying to
remove the directory.
(From OE-Core rev: 2daab2114a0bee1268ce8f7d973ea81d5a530dfd)
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
General consensus is that the new output format, with the all red
colour and one line per core is too fugly to be left as the default.
Use the configure option to switch it back to the sane default that
we've all become used to seeing for decades.
(From OE-Core rev: e6f57ae4cfad51107a8723cc42aec1ad2fc4c7da)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is now the procps-ng version
cleaned up patches
added to fix up usrbin_execprefix in OE-Core
Add CPPFLAGS to allow seperate build directory works
[YOCTO #6952]
(From OE-Core rev: 8a9b9a323f4363e27138077e3e3dce8139a36708)
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>
Install /etc/sysctl.d/99-sysctl.conf symlink in case of systemd so
that /etc/sysctl.conf is taken into consideration by systemd-sysctl.
(From OE-Core rev: a32869fcbcb5f31741a32fdca14e7f38c2abace6)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is a simple fix, <limits.h> just needs to be included before PATH_MAX is
used.
(From OE-Core rev: 7825fb5cec8c588fce1afa34388381670763b6a1)
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It gets its wrong in detecting 64bit options
and OE we already pass the right options as compiler
defaults
(From OE-Core rev: ec3add1752a410fada04b4788c142b91ef63ffa3)
(From OE-Core rev: 32b826720626ec2d426ff7dbfe5607bc0dbd8082)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.
This doesn't introduce any change in behaviour in its own right.
(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This solves the integration problem with busybox.
Previously, there was a patch in busybox to move 'watch' to /usr/bin.
Such patch is not accepted by upsteam and really not necessary as
our ALTERNATIVE system can easily solve such intergration problem.
(From OE-Core rev: 9e6e2aee21ff59687ddfd0e23fd0add9ee81d397)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
top utiliy fails to read /proc/stat after cpu offline, because Cpu_tot
is still the original cpu numbers when calling cpus_refresh, in which
it is trying to read and sscanf Cpu_tot times /proc/stat.
The patch is from procps-3.2.8-2.fc12.src.rpm
(From OE-Core rev: f24aed8d7e41cce277c6eff4ff5ab07b8e39ffff)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this patch, various procps tool can create "Unknown HZ value"
messages because internal initialization happens in a wrong, random
order.
It has been applied to classic already.
(From OE-Core rev: a746cf196792d1c0646f5e97e87055e0974d753e)
Signed-off-by: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
EXTRA_OEMAKE in the recipe currently discards the
environment CFLAGS when setting CFLAGS passed to make.
We change that to include these options.
(From OE-Core rev: 67924616963fee9cb9f2405d93c74a8cc10b6eab)
Signed-off-by: Joe Slater <jslater@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* All procps tools print a message like this when the kernel
version consists of only two numbers:
| Non-standard uts for running kernel:
| release ... gives version code ...
* Import a patch from Debian to quieten this message.
(From OE-Core rev: ec8c54946572200c4fb779ff1fe2d2848660acab)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pwdx, pgrep and watch may be provided by busybox.
* Use update-alternatives to avoid conflict.
(From OE-Core rev: 68dc2a3fa30c03a196d650de34d0c657a7b85454)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The packaging changes to ncurses could break package feeds,
so bump the PR on everythong that DEPENDS on ncurses.
(From OE-Core rev: be92256917c157284ef8370bb93bbf443849b2e1)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Sysctl is managed by other initscripts in the sysV world and by systemd itself in the systemd world, so drop it from the procps recipe.
This also fixes some style issues and a global FILES assignenment.
(From OE-Core rev: 80650bf4bce83e4e8d785e9a69eac0abbcdc6844)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Revise the install.patch which hardcode the lib paths.
Change ${PN} to ${BPN} in file names.
(From OE-Core rev: 7e3e69d38898876ba3325852bbec04586635e66f)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.
This patch executes:
find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'
against the tree removing the referenced. Thanks to Phil Blundell for
the command.
(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
