This allows re-enabling parallel file classification in rpm
in particular, as otherwise libmagic calls out to external
executables, which isn't implemented in a thread-safe way.
(From OE-Core rev: 0515567a846adc5302384cb0a6bfcdb6dd1d8431)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
file-native when built on a Debian 10 host will embed a dependency to
'libbz2.so.1.0' (instead of 'libbz2.so.1'). This can cause issues
when sharing the sstate between hosts e.g.:
recipe-sysroot-native/usr/lib/rpm/rpmdeps:
error while loading shared libraries: libbz2.so.1.0: \
cannot open shared object file: No such file or directory
To avoid this situation, let's add the bzip2-replacement-native to the
file recipe's DEPENDS_class-native .
Details in https://bugzilla.yoctoproject.org/show_bug.cgi?id=13915 .
(From OE-Core rev: 4a996574464028bd5d57b90920d0887d1a81e9e9)
Signed-off-by: Jan-Simon Moeller <dl9pf@gmx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is no reason to set PACKAGECONFIG_class-native to the same value
as the default PACKAGECONFIG.
(From OE-Core rev: 276a21cbbfc929f718fd758b64e3e0567534fd41)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A few options of file configure are set to auto, which can lead to
unpredictable effects when something in the sysroot does provide
things that satisfy the autotools checks.
In the worst case this will lead to package-qa failures as libraries are
not set in RDEPENDS but configured for the tool.
To mitigate changes of accidental configure set explicit options via
newly introduced PACKAGECONFIG variables for bzip, lzma and zlib
support, where the default is just zlib, as it was before
(From OE-Core rev: a2236917395239eba7a8358ca4de61fd0d25b27f)
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add missing leading spaces or replace += usage with a leading space.
(From OE-Core rev: 91f464177ed7ed59a4405a39a366b387338ae923)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As we apply the same patches to native and target builds of file, we can verify
that the patches are not breaking by executing the test suite during the build
of file-native.
(From OE-Core rev: 03591b9945bf04baca794e221b93ac66568b0609)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This tag has been removed, so we don't need to work around it anymore.
(From OE-Core rev: 1ab9fc04d6666de0c5c176f546f64c11dffe2106)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
file will automatically enable seccomp if the seccomp headers are available, but
the build will fail on Opensuse Tumbleweed because the include paths are wrong.
Enabling seccomp is a bad idea because it interacts badly with pseudo (causing
build failures), so explicitly and globally disable seccomp.
(From OE-Core rev: a752faa152df031df5acaa40491299ac115109a4)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream now adds this automatically when required.
(From OE-Core rev: 26e87532874acde8e653769a8a7b87f2b6d366fb)
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade to 5.36.
Drop debian-742262.patch, this appears to have been fixed properly upstream some
releases ago.
(From OE-Core rev: cf6a32debcde5bfde94126c3b4200800d672e605)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Distros which have glibc 2.28 on them otherwsise fail
to build due to some syscall mismatches
(From OE-Core rev: 990a9c944375146bb3f0208b30e8b7f50239cef5)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The version 5.33 introduced a regression bug for determining the DB file
type. Backport a patch from upstream to fix it.
Before apply the patch:
$ file aliases.db
aliases.db: created: Thu Jan 1 00:38:24 1970, modified: Thu Jan 1 00:00:00 1970
After apply the patch:
$ file aliases.db
aliases.db: Berkeley DB (Btree, version 9, native byte-order)
(From OE-Core rev: 99e50d9e53ab23fc643c46378fa8c36190995335)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop 0001-Add-P-prompt-into-Usage-info.patch since it is already fixed
upstream.
(From OE-Core rev: 02f8aff020762e77bf49587115f6b8fbc96296c9)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1. Upgrade file from 5.30 to 5.31
2. Rebase the following patch file.
debian-742262.patch
(From OE-Core rev: f38290ec2a727427a6481e4dafb02ecd8a60fad1)
Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This reverts commit adb71e06768adadda7b69c3b5e81ca3ad67237f4.
Upstream restored the original hashes.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Machines that cloned a while ago will have the commit, but new
deployments won't because it seems the upstream changed/rebased
and the old commit ID has been garbage-collected away. Hence
the fetch fails to check out the named commit ID.
Both the old (gone) commit, and the "new" commit show the same
dates and commit log and point at 5.30, so hopefully this is
the right thing to do. A git diff of the two seems to only show
a blanket uprev of CVS tags and deletion of a couple autogen'd
files, and no real source changes.
Cc: Christos Zoulas <christos@zoulas.com>
(From OE-Core rev: adb71e06768adadda7b69c3b5e81ca3ad67237f4)
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
when using a toolchain not shipped by OE core such as linaro we
can't be sure what the std will be set to. Set to compile as c99
which is the lowest version supported.
(From OE-Core rev: e544ca08a2bcb5a8d98671e63f6c8b7b21c562ea)
Signed-off-by: Jack Mitchell <jack@embed.me.uk>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To avoid races over the file binaries being replaced mid-build we made
file-native an assume-provided binary and check for it at startup, but target
file still needs a native file binary of the same version to compile the magic
data.
The least invasive way of doing this is to build a native file don't put it on
PATH, and tell the target build where to find the native binary. We do however
want the native libmagic to be installed normally (as for example rpm and
subversion need it) so we can't use NATIVE_PACKAGE_PATH_SUFFIX as that change
libdir.
[ YOCTO #8144 ]
(From OE-Core rev: d48c0191871ce6b6fbf17d89b8f9d2750b64d671)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Remove backported patch:
- 0001-Fix-bug-with-long-options-and-explicitly-number-them.patch \
- 0002-fix-bug-with-5.23-long-options.patch \
* Use git repo rather than tarball since the original SRC_URI is not
stable, it is not reachable sometimes.
(From OE-Core rev: 18d52e57299043953757e78c23205570440f039c)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport two patches to fix bug with long options:
* 0001-Fix-bug-with-long-options-and-explicitly-number-them.patch
* 0002-fix-bug-with-5.23-long-options.patch
(From OE-Core rev: df6ddc4bf9795212fda87f9d401893eb254074da)
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>
* Upgrade to 5.21.
* The debian-742262.patch is still needed.
(From OE-Core rev: 9f336e07df7e273c55f0c7a451604a3500b4c6ab)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
"file" command in exported SDK doesn't work:
...
$ file sysroots/
file: could not find any valid magic files!
...
In oe-core commit 68d548cbae729eaea8ce1403dc95ff63c4a7375c,
it added wrapper to file-native. Do the same thing for
nativesdk-file.
(From OE-Core rev: 69a3ab38d1c725c2b575065739cae4a3b45015a2)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
I can't find the reason from the log why we need them, and they are out
of date, so remove them, then file would use the one from its package.
(From OE-Core rev: 4c67bab18ba82a2e8446ff11482a234ec7e4cc35)
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 awk pattern was checked *before* the Perl pattern, so the perl
script with BEGIN{...} would be reported as awk, this patch fixes it.
(From OE-Core rev: 99de944c9e9dd70e8319c3d27bb61d3c781a29f3)
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>
After e8d2a2a3646f964ec61ece62e14788cd7184dd01 [OE-Core], file --version
returns file-5.14 instead of file.real-5.14 so the patch is no longer
necessary and causes the build to fail with the following:
| Cannot use the installed version of file (file-5.14) to
| cross-compile file 5.14
| Please install file 5.14 locally first
(From OE-Core rev: f89f705da9bffd9d10628e90a415db4411d22b4e)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
