Adding "doc-pkgs" to IMAGE_FEATURES (in an image recipe) reports a conflict with reset.1 file, present both in util-linux and ncurses-doc packages.
<log>
| Collected errors:
| * check_data_file_clashes: Package util-linux-doc wants to install file /home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/rootfs/usr/share/man/man1/reset.1
| But that file is already provided by package * ncurses-doc
| * opkg_install_cmd: Cannot install package util-linux-doc.
| WARNING: /home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/run.do_rootfs.13877:1 exit 255 from
| opkg-cl -f $INSTALL_CONF_IPK -o $INSTALL_ROOTFS_IPK --force_postinstall --prefer-arch-to-version install `cat $1`
| ERROR: Function failed: do_rootfs (log file is located at /home/matt/tmp/oe-p/build/tmp-eglibc/work/qemux86_64-tiny-linux/test-image/1.0-r3/temp/log.do_rootfs.13877)
</log>
Same issue already occured few months ago:
Re: [OE-core] Clashing man pages
https://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg38590.html
(From OE-Core rev: 67499dbffd0f7241fd199b7fb94edfe2cebe8a9b)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
All dev related items should be packaged in the core PN package not in seperate packages.
(From OE-Core rev: 4bac11ffe389f10ca53b339a31eac167224dbc06)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
readprofile was missing from the alternative configuration, which was
causing readprofile to be packaged into the base util-linux.
(From OE-Core rev: cac08f23aaed87148d1825cca3c7586ab891ef04)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit 91c0f9e3 moves library files to base_libdir for safe while
symbol link libblkid.so, libmount.so and libuuid.so are placed in
libdir, not base_libdir.
Meanwhile, libblkid.la, libmount.la and libuuid.la are placed in
libdir too.
Thus they are missed by related develop package and
collected by util-linux's develop package at last. Fix it.
(From OE-Core rev: 4571c9e963c667bce8b61e88816b34ba74b2aab7)
Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com>
Signed-off-by: Qiang Chen <qiang.chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously, EXTRA_OECONF would be overwritten by EXTRA_OECONF_class-native
and EXTRA_OECONF_class-nativesdk.
As a result, some applications such as `last', `mesg' and `reset' didn't get
compiled.
The patch rewrote EXTRA_OECONF_class-native, EXTRA_OECONF_class-nativesdk
and EXTRA_OECONF variables to fix QA warnings.
usr/share/man/man1/last.1.util-linux does not exist
usr/share/man/man1/mesg.1.util-linux does not exist
usr/bin/last.util-linux does not exist
usr/bin/mesg.util-linux does not exist
bin/reset does not exist
(From OE-Core rev: 4cff0bd254667b145d765e1135f254c1916e2ee8)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
[YOCTO #5338]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In busybox, util-linux and shadow, su has been moved to /usr/bin/,
but lsb cmdchk needs su in /bin.
Move su to /bin could fix this issue.
[YOCTO#5175]
(From OE-Core rev: ba84662bd9fb7575e68c87449e986535a2216b30)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The recipe builds the two utils which are unpackaged.
(From OE-Core rev: a8212a5170940b9ba9ca7a594b65939b06aac86c)
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use alternatives mechanism to prevent confliction of attempted
installing su binary among busybox, shadow and util-linux.
[YOCTO #4926]
(From OE-Core rev: 6190c69a9f78aeef951c39e4c8700e945bbec5f7)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In older versions of util-linux, swapon and swapoff were the
same binary, and it did runtime detection. But since v2.22
which is util-linux commit 6cf8d46ceefe9a7, they are separate
binaries.
This patch is necessary to make the util-linux version of
swapoff work at all - currently in OE swapoff = swapon, which
is clearly broken =)
Probably most OE consumers use the busybox swapoff and hence
this has gone unnoticed.
(From OE-Core rev: 4a15433f12c616f06192a4cda209da29395ceb93)
Signed-off-by: Colin Walters <walters@verbum.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The ??= operator is too weak and it's setting a non-existent PACKAGECONFIG option ('libpam' instead of 'pam').
(From OE-Core rev: 8994ff6650a4c4c2f0b07e5ee6a5f889270151e5)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The PACKAGECONFIG will ensure consistent enabling and disabling of the pam and systemd related
options for configure and the correct dependencies
(From OE-Core rev: 7cde7c639c53724327d981cbc0db5e123607de1c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
util-linux's configure checks for pam_misc.h and if it finds it will
enable runuser, there was a case where it was found via shared state
and then got rebuilt. This makes the build more deterministic.
(From OE-Core rev: df801d65e5b55542d6bd94a179becd79d010b32a)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some of the tools in the util-linux are used for disk and text file
operations in the nativesdk so as to get around different versions
that may exist on the host system.
(From OE-Core rev: 2348ce4fccf0ec4f3bc7aacf953eb03dfac0642a)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove license patch as it is integrated upstream.
Add backports of upstream loopdev regression fixes.
Updated uclibc-__progname-conflict.patch because it didn't apply.
Added bash-completion and partx sub-packages.
(From OE-Core rev: 54629315502247c5751c351b5792838f86dd1ea8)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use ${PN} when specifing service files so that they continue to get packaged
with multilib.
(From OE-Core rev: d394d27b66cbeb4e57017d2a49605243586477ac)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Instead of using util-linux-uuidd in SYSTEMD_PACKAGES use ${PN}-uuidd, as in
multilib configurations util-linux-uuidd doesn't exist.
(From OE-Core rev: 1b840f8f0a52423a2a395b4ff35a6b24b05e6c0b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* when enable busybox installs getopt to ${base_bindir} and
util-linux to ${bindir}, so there is no file conflict, but
because busybox implementation does not support --long used
by lsb_release (which RDEPENDS on util-linux) we need to use
util-linux getopt even when busybox defconfig has it enabled
(From OE-Core rev: 2dcc867247b402bb4223cc7b9861088958599866)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The upstream authors have updated the licenses of a couple subcomponents,
these were GPLv3, but updated to be either GPLv2 or LGPLv2.1 accordingly.
These changes make the util-linux package become completely non-GPLv3.
Cleaned up some white space issue also
[YOCTO #4014]
(From OE-Core rev: 6093fe2694ac5300feaa38fe2eb898ea843f92ee)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[ CQID: WIND00404316 ]
Use alternatives mechanism to prevent sysvlinux and util-linux
man pages from causing conflicts.
(From OE-Core rev: af97a79d017722d0571d552e390f2881efe228e2)
Signed-off-by: Jeffrey C Honig <jeffrey.honig@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The libmount shared library was part of util-linux. This caused
util-linux-mount to RDEPEND on util-linux, so including that would
also drag in all of util-linux and all its recommendations.
To break this circular dependency, add a libmount package that holds
the libmount.so.* files, just like the other libraries built by util-
linux.
(From OE-Core rev: 2e79110e31da940728d42411cad3d019d570fc31)
Signed-off-by: MiLo <milo-software@users.sourceforge.net>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
unit files are added to util-linux itself when selected
(From OE-Core rev: dbabe19d4ee5cc291b5d996e9b828eed3e4484d8)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 'reset' tool from util-linux is a shell script calling 'tput' which is
provided by 'ncurses'. To avoid a 'util-linux' -> 'ncurses' dependency,
'reset' is put into an own subpackage which can be installed on demand.
Because most (all) systems are using 'busybux' which provides an
alternative 'reset' implementation, this should not cause too much
regressions.
(From OE-Core rev: 0ed77fe790a76a530b173eefaba648b1c22a4a3e)
Signed-off-by: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2.21 has some linking issues with gold on uclibc where mount
program does not work. Its some sort of underlinking.
2.22 did not solve that problem completely either
(From OE-Core rev: 61e7de12a8e735c36ca3285f6a77d7b7cb863207)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* 2.22.1 now builds eject which conflicts with eject from eject recipe in meta-oe
(From OE-Core rev: fa5be9499f047f492cc6b07abf16908e321b259e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix the configure-sbindir test, which was not working correctly
add a patch to configure to correctly test if the prefixes are
conatined in libdir so they don't duplicate.
Removed aarch64 patch since it been merged into this version
Rebased util-linux-ng-replace-siginterrupt.patch
(From OE-Core rev: ac807121ce3ba965f3e2a4f664a60ae4e33ce550)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.
[YOCTO #3297]
(From OE-Core rev: 5193485a42dfb3396d0f12aaa7732c5db29d7338)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The chkdupexe utility is fairly worthless and drags perl in as a build dependency
of the whole util-linux recipe. If anybody actually wants to use this script
then we should package it separately, but for the time being let's just delete it.
(From OE-Core rev: 19dd830ff8a1b87499b9a51599265dd436214708)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The configure script uses a hard-coded value for ${usrsbin_execdir},
which is the path that we know as ${sbindir}. Adjust configure to take
this from the environment if it's set there, and have do_configure()
pass it in.
(From OE-Core rev: 6fdca45ec85e226f570917d2d1aaa2aa39ab6b42)
Signed-off-by: Phil Blundell <pb@pbcl.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There were 2 issues with this symlink.
1. Is was installed in base_bindidir but packaged in bindir. Fixed to
be packaged in base_bindir
2. The symlink swapoff was created to point to swapon. The problem is
that swapoff is an alternative so it would end up pointing to
swapoff.util-linux which was an inexistent file. The fix is to create
a symlink swapoff.util-linux to swapon.util-linux.
(From OE-Core rev: 0ff32e8fb5463a23af9966afcb58eb00772af65b)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In addition to switching to the new update-alternatives, it was discovered
that the sln, shutdown, halt, reboot and related commands were never generated.
Remove these from the list. (These appear to have been removed from util-linux
some time ago.)
(From OE-Core rev: 55c01de28a28a4cfe16d36663c190a874ef2e85d)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
OE-Core commit 4a158b6ef125b555225472eefbe1ea226dc47c2c unintentionally
removed the dependencies for util-linux-native on zlib-native and
ncurses-native by getting append and virtclass-native overrides swapped
around; later this was tidied up to remove the append (which did not change
anything functionally). These libraries are required, so add them back in.
(From OE-Core rev: 0038a030e605195284c98bc154f500a1343c252b)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* util-linux auto-detects libudev for lsblk, so
disable it, because it's not listed in DEPENDS.
(From OE-Core rev: f831d4713a24dd56bf09276fb3b293d9c2b508cb)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This updates various checksums for the COPYING files, which moved in the process
no changes to Licenses
Tweak the scanf_cv_alloc_modifier and rebase the patch
(From OE-Core rev: 9cb35b41c803bd0d1904b2dc0e14624fa7ea6e95)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The .pc files were ending up in util-linux-dev, not the correct
subpackage like libuuid1-dev.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Various util-linux programs in base_sbindir (/sbin) linked to libraries
located under exec_prefix (/usr). Since this is not safe, move these
libraries from libdir (/usr/lib) to base_libdir (/lib).
(From OE-Core rev: 91c0f9e35da826055cda6662732c069dc7c31f96)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add patch remove setting CC, LD and LDFLAGS on commandline
since they are passed correctly via configure. Those setting
also caused the configure information about -std=gnu99 from
being passed correctly.
Removed patch that was fixed upstream
Added scanf configuration, since this is a cross-compile target check
libuuid removed an API that e2fsprogs uuidd used (uuid__generate_*),
thus we disable it in this patch and will now provide uuidd from
util-linux.
See http://sourceforge.net/projects/e2fsprogs/forums/forum/7053/topic/4639484
(From OE-Core rev: fdaf4e791fcacb48ea430ec768ad9a6919c65ce0)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* inittab and systemd-serialgetty expects /sbin/getty not agetty
(From OE-Core rev: 9e5c69860e6b687b93e653510ceba8e1f9c6d0f5)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* someone added them to usrbinprogs_a, but without u-a calls added
* similar problem is with chfn chsh newgrp, but those are not built in
current version
(From OE-Core rev: 14bc68b03e65a9236a1c0d16403371d4ef742588)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* nobody replied on
http://lists.linuxtogo.org/pipermail/openembedded-core/2011-September/009409.html
* be aware that all those renames to foo.${PN} are also applied for
native variants so now we have utils like
tmp-eglibc/sysroots/x86_64-linux/usr/bin/flock.util-linux-native
which are not used ie in
package_ipk.bbclass: package_update_index_ipk
because it calls just flock
so if that's problem then we should apply those renames only for
target version (and live with possible overwrites in -native sysroot)
or teach u-a postinst/prerm to happen also for sysroot population
(From OE-Core rev: ecebc85df3714f49a6f196655b83a3fde65167ec)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For those external tools such as Webmin that call mkfs to do formatting
operations, it is useful to have it in its own package to avoid dragging
in the rest of util-linux.
(From OE-Core rev: cceee30de96b2389209fc2c9c474ebbd863ff64a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
[Merged with head]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Recent udev versions require blkid from u-l, not from e2fsprogs. In general all the non fsck related binaries from e2fsprogs are deprecated.
(From OE-Core rev: eb048308ae80d779e904951b032dba5b780898e5)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This will allow systemd to run /sbin/fsck without dragging in all of util-linux
(From OE-Core rev: 4c95779fe1297b06adc705de30dca4e3570084ae)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Matthieu Crapet
MiLo
Saul Wold
Richard Purdie
Mark Hatle
Qiang Chen
Lu Chong
Hongxu Jia
Andrea Adami
Colin Walters
Koen Kooi
Jason Wessel
Jonathan Liu
Ross Burton
Martin Jansa
Jeffrey C Honig
Khem Raj
Enrico Scholz
Robert Yang
Phil Blundell
Andrei Gherzan
Paul Eggleton
Andreas Oberritter
Scott Garman
Otavio Salvador
Matthew McClintock