This workaround is not needed in version 219 since the fix is upstreamed with:
919699ec301ea507edce4a619141ed22e789ac0d
(From OE-Core rev: e3330d0602fb3ad347f028063d25f634a36ea344)
(From OE-Core rev: fdcbbb50a9946733bd204b8db45606c929e43822)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without pkgconfig being present at build time it's possible for the .pc files to
not be installed correctly.
(From OE-Core rev: f049a53078b3876be9fefc1e5f64404a3f378724)
(From OE-Core rev: c6e39f271a737aa867a15f70c2975987e9d7b209)
Signed-off-by: Christophe Guillon <christophe.guillon@st.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
On x32 builds, sysd-syscalls appears malformed since the make-target-directory
appears on the wrong line. This causes races during the build process where you can
see failures like:
Assembler messages:
Fatal error: can't create [...]glibc/2.21-r0/build-x86_64-poky-linux-gnux32/time/gettimeofday.os: No such file or directory
Assembler messages:
Fatal error: can't create [...]glibc/2.21-r0/build-x86_64-poky-linux-gnux32/time/time.os: No such file or directory
The issue is that the carriage return is being escaped when it should
not be. The change to sysd-syscalls with this change:
before:
"""
$(foreach p,$(sysd-rules-targets),$(objpfx)$(patsubst %,$p,time).os): \
$(..)sysdeps/unix/make-syscalls.sh $(make-target-directory)
(echo '#include <dl-vdso.h>';
"""
after:
"""
$(foreach p,$(sysd-rules-targets),$(objpfx)$(patsubst %,$p,time).os): \
$(..)sysdeps/unix/make-syscalls.sh
$(make-target-directory)
(echo '#include <dl-vdso.h>';
"""
which ensures the target directory is correctly created. Only x32 uses the vdso
code which contains the bug which is why the error only really appears on x32.
(From OE-Core rev: ae4729ed6c5e5443c42f8825dd85873f06a3570e)
(From OE-Core rev: c945453a8453dd6dab5aa5a132bea20e73ae4d6d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It is a backport patch, and verified that the patch is in the source.
(From OE-Core rev: 9a3178b4d3c454e76a0af59afc7b326589c4c666)
(From OE-Core rev: 9834785d0b4ee1759d6a469c585a566652cbc38a)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch appears to have been accidently dropped in the move to 219-stable,
probably because it didn't apply. Update the patch and re-add it.
(From OE-Core master rev: 51aaa647b203d0f7ddd2f53f7191c4d2918b09b8)
(From OE-Core rev: 16684ce4072e8cffd321d25303de91fd0e32529c)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These patches are no longer required since 7bfc9891ff
(From OE-Core master rev: e45b8bf579f2050ebdb1aa1a4c2f9c3b530c9ad6)
(From OE-Core rev: d8b4b70df507f2ef82378a7bfa501fe81ad2a21a)
Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk>
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)
(From OE-Core rev: 2665431f75ebc9eb1f47dee7d3ef362dcf5917a9)
Signed-off-by: Bryan Evenson <bevenson@melinkcorp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If an error occurs while the udev cache is being populated, the system
is left in a state where udev is stopped. Remedy this with a clean up
function to restart udev and remove any intermediate files.
(From OE-Core master rev: af911b272ded95884079dc307eeeb1811f0584c9)
(From OE-Core rev: 70214bb02bad6a6f0d6f25ff227d6e380c1b9fb3)
Signed-off-by: Ken Sharp <ken.sharp@ni.com>
Reviewed-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
xargs already formats the inputs to tar correctly, so the
'-T -' argument to tar is unnecessary.
(From OE-Core master rev: d18e1964dede530c5fae6ae349d6a78fa5342382)
(From OE-Core rev: d666072445ec5323a7849ae0c80ba9f293a5464b)
Signed-off-by: Ken Sharp <ken.sharp@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The upstream systemd git repo only contains the main systemd branch that
progresses at a quick pace, continuously bringing both bugfixes and new features.
Distributions usually prefer basing their releases on stabilized versions
that receive the bugfixes but not the features.
(From OE-Core master rev: c21bf9d7bb0cb90392ed50a44c57a3d068b88ef9)
(From OE-Core rev: c3da0d750ce7b45fee9db3e985f585f5fb2e193d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This task is meaningless for uninative-tarball as the package task
has been deleted. Besides, sometimes it would cause problems. To
reproduce, use the following command.
bitbake uninative-tarball -c cleansstate && bitbake uninative-tarball &&
bitbake uninative-tarball -c clean && bitbake uninative-tarball
The error is something like below.
File: 'sstate.bbclass', lineno: 33, function: sstate_installpkg
0029: bb.build.exec_func(f, d)
0030:
0031: for state in ss['dirs']:
0032: prepdir(state[1])
*** 0033: os.rename(sstateinst + state[0], state[1])
0034: sstate_install(ss, d)
0035:
0036: for plain in ss['plaindirs']:
0037: workdir = d.getVar('WORKDIR', True)
Exception: OSError: [Errno 2] No such file or directory
[YOCTO #7597]
(From OE-Core rev: 8f905077aaed3dbeeed04787add1cf725fa87bdc)
(From OE-Core rev: e94864c1589986fb8a59ee86cae0fd3b430ebf09)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After selecting the "install" gummiboot option of a Live image we are
seeing boot failure resulting from the gummiboot entries not being
installed correctly. This seems to be a problem in this init-install-efi.sh
script where it incorrectly installs the gummiboot entries into the root
filesystem, not the boot partition. We fix it by installing the entries in
the boot partition.
(From OE-Core master rev: c9b06c79ed8a082d1b385e9f61721aeeda9bf1af)
(From OE-Core rev: 5d38c46689c9065992838b58e280886f4091f8fd)
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Acked-by: Darren Hart <dvhart@linux.intel.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 master rev: 8fdf9a355291e7341f9c9a6c219349cf95326171)
(From OE-Core rev: 1aaa289be5aeb066e378c2119be9f5ac055d4803)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The orign_path.patch introduced '_dl_strchr' in ldso/ldso/dl-elf.c, and
caused the following undefined referencing compiling error:
| .../libdl.a(libdl.os): In function `search_for_named_library':
| .../dl-elf.c:156: undefined reference to `_dl_strchr'
| collect2: error: ld returned 1 exit status
I found this problem when compiling gdb in static mode using uclibc.
So, add the definition of '_dl_strchr' to fix it. The '_dl_strstr' is
added as well.
And I regenerated a patch to replace the original one.
(From OE-Core master rev: 34b82b8452aa721146f95321cfd1a1fee3f0d6c8)
(From OE-Core rev: c39c0d0426b2f9b2c13403705167e2d8201df1ff)
Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
/etc/volatile.cache is a cached copy of a script (which is
generated by /etc/init.d/populate-volatile.sh) that generates
the volatile filesystem directories. Since volatile.cache is
a generated file, it is not necessarily changed if
populate-volatile.sh is updated. As a result, the stale script
can add/remove the wrong directories on the next system boot.
If initscripts is being upgraded, make sure volatile.cache gets
deleted.
(From OE-Core rev: 1ee8bd05042087ffdced4cb40c55d0e45b06481c)
Signed-off-by: Bryan Evenson <bevenson@melinkcorp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit ea647cd9ee moved the locations
of /run and /var/lock to match the FHS 3 draft specifications.
However, the install doesn't remove the existing directories.
As a result, upgrading a system may result in /run as a softlink
to /var/run and /var/run as a softlink to /run, creating a circular
link.
During pre-install, check for the existence of the old softlinks and
remove them so the new directories can be installed.
(From OE-Core rev: c1ee31acf509b054453f19cab162dadc295e10a4)
Signed-off-by: Bryan Evenson <bevenson@melinkcorp.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed a typo:
name-target-directory -> make-target-directory
There is no name-target-directory, it should be make-target-directory,
this fixed the error:
/bin/bash: /path/to/elf/runtime-linker.T: No such file or directory
Makefile:361: recipe for target '/path/to/elf/runtime-linker.st' failed
(From OE-Core rev: ff1366b0c9db9425d2a29eb823116353f3856dbb)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Glibc test suite contains several c++ files. They are built
with g++ -nostdinc. In this case the location of c++ include files
needs to be specified explicitly, or the programs may fail to build.
The header locations are assumed to be:
sysroot/usr/include/c++/<version>
sysroot/usr/include/c++/<version>/<machine>
The new code parses "configparms" to get the actual CXX and sysroot
used for the glibc test suite, then it queries CXX to determine
CXX <version> and CXX <machine>. With the known values for <version>
and <machine> the code composes a new value for c++-sysincludes
and appends "configparms" with that value.
[YOCTO #7081]
(From OE-Core rev: 15c5e5e83af409509140eaf29d4e10d9db99eb8a)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
DEPENDS doesn't actually add the dependency on patchelf-native to the
populate_sdk task. SDK_DEPENDS does this, but move the append to after
inheriting the base class so it does not get overwritten.
Without this, uninative-tarball fails to build in a clean workspace on a
system without patchelf.
[YOCTO #7467]
(From OE-Core rev: 0631c2b52432ddf86292351d605b65941d2a8be2)
Signed-off-by: Tyler Hall <tylerwhall@gmail.com>
Acked-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This changes the minimum required Linux version from 3.7 back to 3.0.
[YOCTO #7409]
(From OE-Core rev: 31163abc7bedd477c1aad10e6d1f47dbee194513)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add LIC_FILES_CHKSUM to avoid the warning below at rootfs time.
WARNING: The license listed MIT was not in the licenses collected for os-release
(From OE-Core rev: fa98c9c6038b22df406d4088252e76a0d2975199)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When switch to runlevel 1 (Single user mode), tty was not
re-spawn and appears to be a machine hang.
[YOCTO #5336]
(From OE-Core rev: f7c270d073d6f0d1e741e9850c599074ebe79db7)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.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>
Addresses a stall (by prompt) condition of the run.do_configure at when
executed directly from the workdir, like when using the devshell.
[YOCTO 7369]
(From OE-Core rev: deb06c96dccdbc6da0f301653e9781ce2fe8173d)
Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otherwise systemd uses AC_PROG_PATH and finds it in the sysroot or host
system, which won't work on the target.
[YOCTO #7408]
(From OE-Core rev: 294adc0907a359d9c0ad260823188145aab294ad)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since udev version 176 (udev commit 06316d9) udev switched modprobe
explicit rules by the builtin kmod support.
The rule using the builtin kmod support is in
'/lib/udev/rules.d/80-drivers.rules':
DRIVER!="?*", ENV{MODALIAS}=="?*", IMPORT{builtin}="kmod load $env{MODALIAS}"
(From OE-Core rev: a6f256b0d6cf4e76228627eaa00c1dbe02e2e622)
Signed-off-by: Javier Viguera <javier.viguera@digi.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For now, we would meet the following QA error if we build dbus-test in
the same build directory with multilib enabled/disabled.
The steps are as follows:
1. Enable multilib and `bitbake dbus-ptest'
2. Disable multilib and `bitbake dbus-ptest'
The error message is as follows:
ERROR: QA Issue: dbus-test: Files/directories were installed but not shipped
/usr/lib64
/usr/lib64/dbus-test
/usr/lib64/dbus-test/ptest
/usr/lib64/dbus-test/ptest/run-ptest
...
The problem is that the ${D} is not cleaned up at the second build while it
should be.
This patch fixes the above problem.
(From OE-Core rev: e76f8c0d79301b3c67029f18e5dd4325a39d4587)
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>
glibc provides NSS, other libc do not, so only add libnss-mdns to the
zeroconf package group for glibc.
This fixes the build of core-image-sato for e.g. uClibc
(From OE-Core rev: 9a687f73a4422c788dad68d74d992dc68cb80b35)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add licenses point to COMMON_LICENSE_DIR because glibc-collateral.inc is
a recipe that don't provide tarball/repo with LICENSE files.
(From OE-Core rev: 19fa084c92016ef87f6ad60c6985ec0d2bfd5c42)
Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Noticed in this log.do_rootfs error:
Started /OE/build/shr-core/tmp-glibc/sysroots/x86_64-linux/usr/bin/systemctl --root=/OE/build/shr-core/tmp-glibc/work/nokia900-oe-linux-gnueabi/shr-image/2.0-r20/rootfs disable bluetooth.service
Try to find location of bluetooth.service...
Found bluetooth.service in /lib/systemd/system/bluetooth.service
WantedBy=bluetooth.target found in bluetooth.service
rmdir: failed to remove '/OE/build/shr-core/tmp-glibc/work/nokia900-oe-linux-gnueabi/shr-image/2.0-r20/rootfs/etc/systemd/system/bluetooth.target.wants': No such file or directory
Disabled bluetooth.service for bluetooth.target.
Disabled bluetooth.service for dbus-org.bluez.service.
(From OE-Core rev: 0332e19098d7d3d623a04098b43e3b2482af1a17)
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>
The ownership needs to be explicitly set otherwise it inherits the user
and group id of the build user.
(From OE-Core rev: 0752c79282b1cc9699743e719518e6c341d50a3a)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is a backport of an upstream patch that fixes the
"Failed to set file attributes: Inappropriate ioctl for device" message
when the device exists on ext4 filesystems.
No functionality is changed, the patch just removes a potentially misleading
warning.
(From OE-Core rev: 18304e03c8ab8de94b6001a8a5677b57862da0f4)
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@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 by default tries to write the journal to /var/log/journal.
But base-files has a symlink /var/log -> /var/volatile/log. And
/var/volatile is a tmpfs mount in /etc/fstab.
If the journal service started before /var/volatile was mounted (which
was the typical scenario) then the journal would appear empty since
the old location was mounted over.
This change fixes the problem by ensuring that the journal doesn't start
until after the mount happens.
[Yocto #7388]
(From OE-Core rev: 17e8595af2041cfd63adf73b344f7ccad3db7e01)
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There were failures at boot from systemd-tmpfiles-setup.service due to
tmpfiles.d not honoring the ordering of entries in the files.
The patch here fixes the ordering issue which subsequently fixes the
failures on boot.
[Yocto #7393]
(From OE-Core rev: f6da978c5685393c4b6ef14690fe869a80836ba2)
Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The AC_EGREP_CPP macro is looking for a 'yes' string that is likely
to be found in the path where the file is stored. This false positive
match causes variables to be mistakenly set.
The fix is to use a more elaborated string instead.
This has to be done at the configure and the configure.ac files, because
a reconfigure does not happen in the regular build flow.
[YOCTO #6614]
(From OE-Core rev: fd0bf8f95227796435d22aa7a849a74106cf1eef)
Signed-off-by: Benjamin Esquivel <benjamin.esquivel@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Useful when we disable ldconfig in glibc, we need to be able to
turn it off in systemd too, otherwise systemd tries to launch
the service and it fails
Change-Id: I170307f809a13def0cafc282e88d4eafa0313c31
(From OE-Core rev: 9c2eb7f4774356fabf21ff5147a7d34601fb57c8)
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>
On systems where /var/log is not a volatile systemd-tmpfiles creates
duplicate ACL entries. This causes systemd-tmpfiles service to fail.
Also quietly ignore ACL settings on filesystems that don't support ACLs.
Backport the fixes from systemd master to fix these issues.
(From OE-Core rev: 73a045a1b52d8260d60517bbb5d4c74132d03b10)
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
