0001-opkg-build-remove-numeric-owner-parameter-overzealou.patch
removed since it's included in 0.7.0
(From OE-Core rev: 66b8bb37242c0c1038b9d92a4120ba50ed3ea6af)
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It fixes the issue with different GIDs during ipk creation and image
creation time
(From OE-Core rev: a7f7d6f0c504f3f88801e0ba89a43e9b671fe4d3)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
opkg-utils fetches using a cgit snapshot of a tag, which is not
reproducible as the tag could move, not reliable as a future dynamic
snapshot could have a different checksum, and a waste of CPU load as
these tarballs are built on demand.
Switch opkg-utils to use a proper git clone of the relevant SHA.
(From OE-Core rev: dafd2631a20ffd94e6f21c46938a010e92b57da4)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
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>
OE's packaging functions assume that the opkg-utils python scipts are
always provided by opkg-utils-native, so the scripts should be removed
for class-target only.
(From OE-Core rev: dc243da47e10cc11dce4e2d3b9d59b96e23a0ce2)
Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is a sorting problem with opkg-build where the ipk generated is depending
upon the order of files on disk. The reason is the --sort option to tar only
influences the orders of files tar reads, not those passed by the -T option.
Add in a sort call to resolve this issue. To ensure consistent sorting we
also need to force to a specific locale (C) else the results are still not
deterministic.
(From OE-Core rev: a9b8287984c63420e10329a69f7ac5125f1687f8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
pod2man writes the current date into manpages, and while later
versions of it respect SOURCE_DATE_EPOCH and use that instead,
earlier versions do not. This was found to cause reproducibility
issues.
This patch replaces host version of pod2man with one from
perl-native.
[YOCTO #13755]
(From OE-Core rev: deda455b3c1829003a4cc14520f30e616be93dfb)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- Drop 00001-Switch-all-scripts-to-use-Python-3.x.patch
- Drop 00001-opkg-build-clamp-mtimes-to-SOURCE_DATE_EPOCH.patch
- Drop pipefail.patch
(From OE-Core rev: bf51a4a1312562cc9b5944b7dfccba0b3d11dc3c)
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
opkg-build was failing on hosts where tar < 1.28 and reproducibile builds
were enabled but it was doing this silently and generating corrupted
(empty) ipk files. Add a fix for this (submitted upstream).
The fix requires bash but if you're building ipk files this shoudn't be
a problem.
(From OE-Core rev: ff9ec19b02650a3ae230e4d1bdc99ec686cc4c81)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport a patch from upstream to respect SOURCE_DATE_EPOCH when building ipkgs,
to ensure reproducible archives.
(From OE-Core rev: d50d52188cee7ccc0f40f0bba6da1084410b81cf)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- Drop 0001-opkg-build-do-not-set-mtime-on-data.tar.X.patch
- Drop 0001-opkg-list-fields-fix-to-print-the-fields-again.patch
(From OE-Core rev: 76a7f0d60f5dc38da15f21720cb97bf761562b44)
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Recently Debian-style support for link relocation was added to
'update-alternatives' script, but it fails under circumstances where
host rootfs root directory differs from target rootfs root directory
and two alternative packages provide a symbolic link with source
located in different directories.
An example of the case is busybox provided /bin/rev (symlinking to
/bin/busybox.nosuid) and util-linux provided /usr/bin/rev (symlinking
to /usr/bin/rev.util-linux) in which case following failure occurs
during image recipe's do_rootfs() task:
ERROR: core-image-minimal-1.0-r0 do_rootfs: Postinstall scriptlets of ['util-linux'] have failed. If the intention is to defer them to first boot,
then please place them into pkg_postinst_ontarget_${PN} ().
Deferring to first boot via 'exit 1' is no longer supported.
Details of the failure are in .../tmp/work/qemux86-poky-linux/core-image-minimal/1.0-r0/temp/log.do_rootfs.
ERROR: core-image-minimal-1.0-r0 do_rootfs: Function failed: do_rootfs
Looking in log.do_rootfs file, following relevant lines can be observed:
update-alternatives: renaming rev link from /bin/rev to /usr/bin/rev
mv: cannot stat '/bin/rev': No such file or directory
Mitigate issue by applying patch which adds target root filesystem root
directory path prefix to failing 'mv' calls relevant variable references
(From OE-Core rev: f0912e23629758fe4303284e7db8f4089bb7b4cb)
Signed-off-by: Niko Mauno <niko.mauno@iki.fi>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Support explicit use of pigz when compressing the package contents by
setting:
OPKGBUILDCMD = "opkg-build -Z pigz"
(From OE-Core rev: 631e7bb7d02ca9cb9cb66e6b8395b197525cda55)
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The patch tool will apply patches by default with "fuzz", which is where if the
hunk context isn't present but what is there is close enough, it will force the
patch in.
Whilst this is useful when there's just whitespace changes, when applied to
source it is possible for a patch applied with fuzz to produce broken code which
still compiles (see #10450). This is obviously bad.
We'd like to eventually have do_patch() rejecting any fuzz on these grounds. For
that to be realistic the existing patches with fuzz need to be rebased and
reviewed.
(From OE-Core rev: ca733ba0e28d6d4c199e149ce8ae428397dfa51f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
0.3.5 -> 0.3.6
Patches:
- Add support for tar versions that don't support --sort
- Use local time when setting the modication time on the archives
(From OE-Core rev: fd551c5ad4c82f295470f278c524d55562a67a28)
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We patch opkg-build to ignore hard link count changes when archiving, but in the
last upgrade (oe-core 60c9a97) the patch was refreshed to apply but the result
is that opkg-build loses the ability to switch compressor.
Refresh the patch again so that it just adds the error ignoring logic and
doesn't otherwise change the behaviour of opkg-build.
(From OE-Core rev: e8f99fa61fc00c66d216c5f3e5d37ffc42f2574b)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To make it obvious what is lost when python is disabled, actually delete the
scripts so the user can't attempt to use them.
(From OE-Core rev: 25c8d738b904c8755df203122067afa0047b27ad)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
opkg-utils ends up in any opkg/rpm image with package management as it's the
provider for update-alternatives. If dev-pkgs is enabled then opkg-utils-dev
will get installed, which is empty but will subsequently pull python3-dev into
the image (as opkg-utils-python depends on python3).
As this can result in all of Python appearing in otherwise small images, don't
generate these pointless packages.
(From OE-Core rev: 5da7a0ba47d39612b08b4f71518b8384a3058b3f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The scripts were fixed to be compatible with py3 some time ago,
but the shebang continued to refer to python 2.x.
(From OE-Core rev: bb5718b631151cff840bcfa171ad4f8326c2132e)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
0001-update-alternatives-warn-when-multiple-providers-hav.patch was
removed from SRC_URI without mention in commit 60c9a9704.
001-Makefile-use-defined-bindir-and-mandir-as-installati.patch was
removed from SRC_URI in d6b04e121.
Current opkg does not need either patch.
(From OE-Core rev: 789ec510495ca6eab379ec829e3013c977236966)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bump to latest revision so that update-alternatives could detect priority
conflict.
Also, we could remove the following patch because opkg-utils has already
fixed the problem in another way.
0001-Makefile-use-defined-bindir-and-mandir-as-installati.patch
[YOCTO #8314]
(From OE-Core rev: d6b04e12127dd65b96ac7f4509b829510ef21071)
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>
While both result in the same in this case, postrm
should really be referring to $D as we do everywhere
else.
(From OE-Core rev: 7e459843e0371953d3d9d3ad05b019947ed7ca04)
Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
--ignore-fail-on-non-empty is coreutils specific, and you
are not always going to have coreutils on target systems
especially small ones. They will use the busybox applet which
does not support --ignore-fail-on-non-empty, use pipe and true
to ignore the errorcode from rmdir instead
Fixes upgrade errors on target e.g.
rmdir: unrecognized option '--ignore-fail-on-non-empty'
BusyBox v1.24.1 (2016-12-20 10:41:39 PST) multi-call binary.
Usage: rmdir [OPTIONS] DIRECTORY...
To remove package debris, try `opkg remove update-alternatives-opkg`.
To re-attempt the install, try `opkg install update-alternatives-opkg`.
Collected errors:
* pkg_run_script: package "update-alternatives-opkg" postrm script returned status 1.
* postrm_upgrade_old_pkg: postrm script for package "update-alternatives-opkg" failed
(From OE-Core rev: 5ec8934a495e9b9a782889bc3a84936c8a381165)
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>
If multiple providers for a utility have the same alternatives priority,
which one would be chosen is determined by which one is installed later.
Our alternatives system should be able to detect such problem and warn users
so that potential problems could be avoided.
Modify update-alternatives to warn users when detecting multiple providers
with the same priority.
[YOCTO #8314]
(From OE-Core rev: 06cf956e3441868d69f81d6c034778d855ce1c98)
(From OE-Core rev: 0b413d502868c89b7ddbe50a978317ffa774b3cc)
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>
When uninstalling update-alternatives, it doesn't seem to
make much sense to keep the update-alternatives database
around.
In particular when removing packaging data, e.g. due to
read-only rootfs, update-alternatives is removed from
the target file system. Leaving its database around
serves no purpose in that case as there is no way to
use it afterwards anyway.
This frees close to 700KB of (uncompressed) space in
a busybox based environment.
(From OE-Core rev: b24a63d71b517af701dfedbc7f7b541d25af708f)
Signed-off-by: André Draszik <adraszik@tycoint.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop patches now included in newer SRCREV. Update HOMEPAGE and PV
version to better align with opkg. Current revision include:
* Python 3 compatibility
* Improved error handling
(From OE-Core rev: 4b0b43f473ef12631daa577cdba39906f7d67cab)
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This lets someone use a different update-alternatives-native provider. Without
this available, they'll step on one another in the sysroot unconditionally,
since we need to build opkg-utils-native for ipk based builds regardless.
(From OE-Core rev: 0afb74e23ee9a1fcdd334865a5f7280526785a4c)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix error '[[: not found' if /bin/sh is not bash.
This issue was introduced by the recent addition of tar_ignore_error.patch
to the opkg-utils recipe.
(From OE-Core rev: 2cf2242fc30b3d1ceb538ff5106e000cd888652e)
Signed-off-by: Dominic Sacré <dominic.sacre@gmx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If a the number of hard links decreases or increases while creating the tar
files used for an ipk package, tar fails with error code 1, we use hardlinks
on package/ and packages-split/ to decrease disk usage, sometimes other
parts of the build can cause a change in the link count, since this happens
in a controlled environment we can safely ignore the error and continue to
create the ipk file, fixed some typos from old version.
[YOCTO #7933]
(From OE-Core rev: 80e6f0e5782435157b9a2687ffe6cbd3b3033b47)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
