Both shadow and util-linux packages provides 'nologin' binary in ${base_sbindir}
and ${sbindir} respectively, this leads to conflict when 'usrmerge' feature is
enabled, where ${sbindir} == ${base_sbindir}. Hance, handle this to alternative
system to resolve the conflict.
(From OE-Core rev: 07d6d0fb4dc689008bb0022d7d2ecc890c9159e5)
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
update-alternative.bbclass might rename the 'reset' binary when LINK_NAME ==
TARGET, This is true (${base_bindir} == ${bindir}) in 'usrmerge' distros.
Hence, suffix with * to properly package the renamed binary.
(From OE-Core rev: ebf5cc1a6fecb0761fd88e113fac785b49bc1a45)
Signed-off-by: Amarnath Valluri <amarnath.valluri@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make sure fsck.cramfs is packaged before fsck so the latter
does not steal the fsck.cramfs binary when building with usrmerge.
(From OE-Core rev: 333e959448c2bc0d2c472e0b7d1dab606ab723e6)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To fix:
file /usr/share/man/man1/eject.1 conflicts between attempted installs
of util-linux-doc-2.29.1-r0.core2_64 and eject-doc-2.1.5-r1.core2_64
and
file /usr/share/man/man1/logger.1 conflicts between attempted installs
of util-linux-doc-2.29.1-r0.core2_64 and inetutils-doc-1.9.4-r0.core2_64
(From OE-Core rev: a65e69d006bceacb042b377f2cd0dd8a3e72ea62)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Let util-linux-bash-completion depend on it, because it uses it.
(From OE-Core rev: 27efae1e0ba8fc6b08117b31c4cb35638afc37e4)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
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>
The su binary is handled by alternatives but the man page wasn't, so
installing both util-linux-doc and shadow-doc produces errors.
Also use d.expand() to neaten the code.
(From OE-Core rev: 70a161ee88d3d54fec6d59039c181b43f1857dc3)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Disable building of mkfs.bfs, which is used to create
BFS file-systems used by SCO UnixWare. This is highly
unlikely to be utilized and there are otherwise no
references to 'bfs' throughout the rest of the tree.
(From OE-Core rev: 3226d89ff743c223181fda90f605c7579337941a)
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Disable building of {mkfs,fsck}.minix, which are used
to support minix file-systems. Minix predates Linux and
support for its file-systems is unlikely to be needed.
No recipes otherwise reference minix, except in patches
to autotools configuration scripts, so there should be no
impact to other recipes.
(From OE-Core rev: fc66762d7c112fb798c2444dd902ce03baf975c4)
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Busybox doesn't provide a similar tool so having it in
a separate package allows to us it in addition to busybox without having
to include all of util-linux.
Before it was part of the top level util-linux package.
Now it is a separate package util-linux-prlimit but the top level package
still RRECOMMENDS it so for most users nothing should change.
(From OE-Core rev: e364ecc1216b04f2b61a88a623d2e9b5199af261)
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Related patches are rebased.
util-linux-ng-2.16-mount_lock_path.patch is removed because there's
no _PATH_MOUNTED_LOCK in the latest codes.
util-linux-native.patch is removed because 2.28 version of util-linux
has taken mkostemp into consideration and provide fallback if mkostemp
fails.
avoid_unsupported_sleep_param.patch is removed and coreutils is added
as a runtime dependency to util-linux-ptest to solve the same problem.
avoid_unsupported_grep_opts.patch is removed and grep is added as a
runtime dependency to util-linux-ptest to solve the sanme problem.
(From OE-Core rev: fccf99d9130f3c5ce358c97c97c52cd74deef25c)
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 util-linux had a lower priority for hwclock than busybox but the
reasoning was lost in the mists of time, with just this enigmatic comment
remaining:
There seems to be problem, atleast on nslu2, with these, until they are
fixed the busybox ones have higher priority.
Chasing the comment back through history it first appeared in the following
oe-classic commit:
commit 5e01906b8433bc6a8c03be2e31758589641124c9
Author: David Karlstrom <daka@thg.se>
Date: Sat Jul 23 13:36:38 2005 +0000
Updated to use update-alternatives and fix some FHS bugs
Which doesn't really give a lot away.
Let's assume that in the past eleven years both hwclock and hardware have
improved, and restore util-linux's hwclock to it's intended priority.
[ YOCTO #9103 ]
(From OE-Core rev: 2ea1a73d264173d9dd8978d82de0d53e2c2164d3)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allow mountpoint to be installed separately from the rest of util-linux,
to conserve disk space, and to minimize the impact of switching to/from
this version of mountpoint.
(From OE-Core rev: ea643811f44774dd9038d76ff01e13f33478c9cb)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=8de5315bd519c21a114bc88b88c6caff32831c03
changed util-linux priority to match busybox (50) which means sometimes
one and sometimes the other wins in image installs. We want util-linux to
win compared to busybox.
The old level (100) does conflict with other utils so pick 80 as a
good intermediate value.
(From OE-Core rev: 97afba61ab5124fab68c97609920d2cb67774174)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use bash-completion.bbclass to package bash completions.
(From OE-Core rev: a6776e2ac597a70cb6105740eed1cf1b28204ad7)
Signed-off-by: George McCollister <george.mccollister@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If pam is not present in DISTRO_FEATURES, then exclude
util-linux-runuser from PACKAGES to avoid its libpam dependency.
(From OE-Core rev: 9ba9807fc7c19938022c37641b171464699fc742)
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Split runuser into its own package (previously provided by util-linux).
runuser is compiled only when DISTRO_FEATURES includes pam and also the
package is created only when runuser exists.
(From OE-Core rev: 35a86d15ed09d64cb999d35db13a2023bcaa51cc)
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The configure script checks for 'readline' availability and enables
it, if available. Now, a PACKAGECONFIG (readline) controls the
feature.
(From OE-Core rev: 574b84132df61d421d2f99e14bdc94649fe83e38)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Patches that are dropped are already available upstream in 2.27 release
(From OE-Core rev: e4b9c8efaff3b869e2944444b16078ec19dce3ea)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In some recipes overly-split -dbg packages were merged into PN-dbg. Unless
there's a very good reason, recipes should have a single -dev and -dbg package.
(From OE-Core rev: a3b000643898d7402b9e57c02e8d10e677cc9722)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 2a1a92ad3a315511df0ff1d2b541226713aab1f9)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Conflicts:
util-linux and ncurses have the same priority 100 for reset
util-linux and procps have the same priority 100 for kill.1
util-linux and procps have the same priority 100 for kill
e2fsprogs and util-linux have the same priority 100 for libblkid.3
e2fsprogs and util-linux have the same priority 100 for blkid.8
e2fsprogs and util-linux have the same priority 100 for findfs.8
e2fsprogs and util-linux have the same priority 100 for fsck.8
Turn down util-linux' priority to fix the conflict, the larger set
of tools should use a lower priority.
[YOCTO #8477]
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The runuser command fails with below error message, add proper PAM
config files to fix the problem. The config files are borrowed from
CentOS 7.0 release.
runuser: Failure setting user credentials
(From OE-Core rev: a6616f1a7b8e30428e61b6437f2f48379efc101d)
Signed-off-by: Shan Hai <shan.hai@windriver.com>
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update alternatives of man pages in several packages.
(From OE-Core rev: 2cff20f423fb9e82b44c68504be605c223bd74fb)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
util-linux creates lastb as a symlink to last during the build.
Just as other applications may provide last, other applications
may provide lastb.
Add alternatives designations for lastb to avoid installation
conflicts with other applications.
(From OE-Core rev: cde6a85fd327407320adaad21203079a8dacbf23)
Signed-off-by: Bryan Evenson <bevenson@melinkcorp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
/usr/share/man/man1/lastb.1
is also provided by sysvinit recipe.
/usr/share/man/man8/nologin.8
is also provided by shadow recipe.
(From OE-Core rev: 8fdf9a355291e7341f9c9a6c219349cf95326171)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
util-linux-native provides /bin/reset and /sbin/nologin. shadow-native
provides /sbin/nologin and ncurses-native provides /bin/reset. This
creates a conlict.
[YOCTO #7484]
This commit fixes the conflict by deleting the /bin/reset and
/sbin/nologin from util-linux-native installation.
Signed-off-by: Caner Altinbasak <caner.altinbasak@gmail.com>
(From OE-Core rev: 56d49ee48f47ea05de26a7e922597413f81b2122)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
util-linux has a number of utility libraries and not noticing a new one being
added in an upgrade results in many of the split-out core tools depending on the
entire package for the library. To prevent this happening in the future do the
library packaging dynamically.
As a side-effect libsmartcols.so is no longer packaged in util-linux so
util-linux-fdisk no longer depends on the full util-linux.
(From OE-Core rev: a7572d7000bbc5739a1f0bec466dbcf856606f12)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport a patch to fix CVE-2014-9114.
The patch has been integrated in util-linux-2.26.
[YOCTO #7180]
(From OE-Core rev: 6a5c24f22621f41b17267a6ebedecec631d0156d)
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>
* busybox installs getopt u-a in base_bindir when GETOPT is enabled, move util-linux
link to the same location to fix calling u-a in read-only images
* remove unused variable usrbinprogs_a
(From OE-Core rev: 8e59d9e2c9c94d8682208ee02a1566864aaf51ff)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
systemd has a build-dependency on util-linux for libmount, and util-linux has an
optional build dependency on systemd.
The features in util-linux that enabling systemd gives you are:
* lslogins can show recent journal entries from the user
* uuidd can use socket activation and has a service file
* fstrim has a service file
* logger can write journal entries
These are not worth the overhead of maintaining two util-linux recipes to
bootstrap the cycle, so disable systemd support in util-linux.
(From OE-Core rev: e9b13af813ac74144fea7479208ae0e699518093)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This change moves readprofile from /sbin -> /usr/sbin to match busybox,
the change allows update-alternative to correctly setup the links
[YOCTO #7225]
(From OE-Core rev: 43424eb3c8bf03a2f9ec331b78dd4040dd39eacd)
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>
fix-configure.patch is removed as it's not appropriate, and the new
version of util-linux has solved the problem this patch is trying to solve.
util-linux-ensure-the-existence-of-directory-for-PAT.patch is removed as
the new version of util-linux has solved the problem this patch is trying
to solve.
util-linux-native.patch is rebased.
util-linux-ng-replace-siginterrupt.patch is rebased.
Add PACKAGECONFIG for 'pylibmount' to build out python bindings for libmount
optionally. util-linux-pylibmount is added to PACKAGES if PACKAGECONFIG has
'pylibmount' in it.
Fix PACAGECONFIG for 'systemd' as the new version has changed things related
to systemd. Now util-linux would have a dependency on systemd if 'systemd' is
in PACKAGECONFIG.
Fix SYSTEMD_PACKAGES, SYSTEMD_SERVICE and SYSTEMD_AUTO_ENABLE variable to match
the new version.
Four lines in do_compile task are deleted because they caused do_compile failure
and nowhere in util-linux are they used. Corresponding files are also removed.
(From OE-Core rev: 264e2fde3a8624c87d2451d2752c9f3ed8911672)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
switch_root is provided by both busybox in /sbin/switch_root and util-linux provides one
in /usr/sbin/switch_root, so move util-linux's to sbin and setup ALTERNATIVE_LINK.
(From OE-Core rev: cac818f0ecd0553b59b967a94766534643fecdf4)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The getopt binary itself is only a few kb, while the util-linux package
is much larger. The lsb package is very small and depends only on
getopt. Break it out into util-linux-getopt in order to reduce the disk
requirements of lsb on systems that don't otherwise bring in util-linux.
(From OE-Core rev: 3626e8df78ffecd29735c1e79eb3ccccec54a663)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Acked-by: Ken Sharp <ken.sharp@ni.com>
Acked-by: Ben Shelton <ben.shelton@ni.com
Acked-by: Brad Mouring <brad.mouring@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We'd like to include the util-linux version of findfs in images without
having to include all of util-linux. To make this possible, break out
findfs into its own package.
(From OE-Core rev: 859bdcc1691ec3fd9e88cf60b5d96f0239d72bce)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We'd like to include the util-linux version of hwclock in images without
having to include all of util-linux. To make this possible, break out
hwclock into its own package.
(From OE-Core rev: 7c0429827d1232c8f1b439a73af6064602ec43e7)
Signed-off-by: Richard Tollerton <rich.tollerton@ni.com>
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
sulogin is provided by both busybox in /sbin/sulogin and util-linux provides one
in /usr/sbin/sulogin, so move util-linux's to sbin and setup ALTERNATIVE_LINK.
[YOCTO #6384]
(From OE-Core rev: a827ca74d27b916df8d40ec8155bc0340f8a0487)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When compiling util-linux, it's possible to encounter the following error.
/bin/sh: line 2:: misc-utils/uuidd.8.tmp: No such file or directory
This is because that the misc-utils directory doesn't exist when trying to
write to misc-utils/uuidd.8.tmp.
When generating misc-utils/uuidd.8 (or anything in PATHFILES), its directory
may not have been created yet. So we need to ensure the existence of the
directory to avoid the compilation error.
[YOCTO #6292]
(From OE-Core rev: b8c0a4f6a319a7cf84530b891707a5887f3caaf4)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Amarnath Valluri
Jussi Kukkonen
Paul Gortmaker
Peter Kjellerstedt
Chen Qi
Andreas Oberritter
Zheng Ruoqin
Joshua Lock
Ross Burton
Patrick Williams
Alexander Kanavin
Pascal Bach
Richard Tollerton
Richard Purdie
George McCollister
Khem Raj
Ioan-Adrian Ratiu
Otavio Salvador
Tudor Florea
Robert Yang
Kai Kang
Bryan Evenson
Matthieu Crapet
Caner Altinbasak
Martin Jansa
Saul Wold
Jackie Huang
Alejandro del Castillo