summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
5 hoursovmf-shell-image: image is only buildable on x86-64master-nextRoss Burton1-0/+1
This image is only buildable for x86-64, so add a COMPATIBLE assignment to ensure it isn't attempted on others. (From OE-Core rev: a954f840f073c2dc2b6f49f173baeab1d4ed2278) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hourscore-image-sato-sdk-ptest: these images need ptestRoss Burton2-0/+6
As this image isn't buildable without ptest (the packages won't exist), depend on the ptest DISTRO_FEATURE to ensure we don't try and build it. (From OE-Core rev: 5964bfbeb79e78ddd0befe2e474d0d2dc59bd811) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hourslib/oe/package_manager: ensure repodata is wipedRoss Burton1-0/+3
When building package indexes for RPM feeds, delete repodata first to be absolutely sure that the indexes are up to date. We've seen some mysterious failures where the repodata doesn't match the repository, so hopefully this will stop that happening. [ YOCTO #14190 ] (From OE-Core rev: 6271053471ccdb4a5ca4298063ded6a4bad0a669) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursdtc: improve reproducibilityOleksiy Obitotskyy2-0/+38
Makefile override CFLAGS, so -fmacro/debug-prefix-map optiions was omitted and binaries contains absolute patch to sources. (From OE-Core rev: 68f7d500bb909bcacab479d770abd1e36b0829a1) Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hourssocat: upgrade 1.7.3.4 ->1.7.4.1Wang Mingyu1-3/+3
README updated: version updated add descrition of platform specifics - Debian (From OE-Core rev: fae71c54556f0ca2cebb987dd544c4fc4f7381d1) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hourscve-check: replace Looseversion with custom version classLee Chee Yang3-5/+90
The way distutils.version.LooseVersion compare version are tricky, it treat all these ( "1.0-beta2", "1.0-rc1", "1.0A", "1.0p2" and "1.0pre1") as greater version than "1.0". This might be right for "1.0A" and "1.0p1" but not for the rest, also these version could be confusing, the "p" in "1.0p1" can be "pre" or "patched" version or even other meaning. Replace Looseversion with custom class, it uses regex to capture common version format like "1.1.1" or tag format using date like "2020-12-12" as release section, check for following known string/tags ( beta, rc, pre, dev, alpha, preview) as pre-release section, any other trailing characters are difficult to understand/define so ignore them. Compare release section and pre-release section saperately. included selftest for the version class. [YOCTO#14127] (From OE-Core rev: e09e3a77dcb1ca671d427436a61eb12c1f85c8be) Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hourscommon-licenses: Add GPL-3.0-with-bison-exceptionJose Quaresma1-0/+7
(From OE-Core rev: c876a26088719fdfd3883c3de0eb32ee96d1590c) Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hourslibpam: add ptest supportMingli Yu2-1/+47
Add ptest support. (From OE-Core rev: 05f57b8f40daea7f7793e100d96c7bd36c0b5c08) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursgstreamer1.0: fix failing ptestAnuj Mittal2-0/+33
Backport a patch to increase the timeout that might help with the intermittent seek test failure. [YOCTO #14194] (From OE-Core rev: 8b33362d42b3821699c869487d235dee28fb1dc7) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursadwaita-icon-theme: add version 3.34.3 backKai Kang3-0/+71
Newer versions of adwaita-icon-theme can't work well with librsvg 2.40. Boot up the core-image-sato image, and start "Media Player", most of the icons are not showed properly. The source code of librsvg has been adapted to rust, so it is impossible to update librsvg in oe core for now. Then add adwaita-icon-theme 3.34.3 back and set as preferred version. Duplicate one patch as well to fix patch fuzz issue. Ref: 1. https://gitlab.gnome.org/GNOME/adwaita-icon-theme/-/issues/84 2. https://people.gnome.org/~federico/blog/do-not-use-librsvg-2.40.x.html (From OE-Core rev: c3e2f819640f73893b8688c18a2b12fc2c5f9ed9) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursbase: use URI instead of decodeurl when detecting unpack dependenciesRoss Burton1-15/+15
decodeurl() has limitations, primarily that it doesn't handle query parameters at all. If a SRC_URI looks like this: http://example.com/download.tar.gz?something Then the returned path attribute is download.tar.gz?something. This means the filename extension detection fails and required tools are not added to the dependencies. (From OE-Core rev: 4897fc31e533a3e7d20b54c2b039e0143d22c28f) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursdevtool: Fix file:// fetcher symlink directory structureTomasz Dziendzielski1-1/+5
Add relative path if file is under directory. [YOCTO #13738] (From OE-Core rev: 193f7a951f29cfcfa04595e5185eea57522debf4) Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursoeqa/selftest/cases/tinfoil.py: increase timeout 10->60s test_wait_eventYi Fan Yu1-2/+4
The test would timeout on autobuilders. This patch increases the timeout to 60s The test will now also exit as soon as we receive the 2 expected events Expected runtime is around 1s if successful Bug 14158 (From OE-Core rev: e099a4dfac0d35d6b6e395f9566284437e8def66) Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursopensbi: Bump from 0.8 to 0.9Alistair Francis1-1/+1
(From OE-Core rev: c643b7352c3497cf124a4d0bfaa318ff5390f3e8) Signed-off-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursiptables: upgrade 1.8.6 -> 1.8.7Wang Mingyu1-1/+1
(From OE-Core rev: 21be9ba95273a52fe19875d99af86c5c91a81aae) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursgpgme: upgrade 1.15.0 -> 1.15.1Wang Mingyu2-5/+5
refresh the followning patches: 0001-Revert-build-Make-gpgme.m4-use-gpgrt-config-with-.pc.patch (From OE-Core rev: 5b7735f108e9f0e5601642d03d8e5641b0d0c11d) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursbtrfs-tools: upgrade 5.9 -> 5.10Wang Mingyu1-1/+1
(From OE-Core rev: 7f1cda3cdb787a8630bb7160669ddd690d2451de) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursexternalsrc: Fix parsing error with devtool non-git sourcesTomasz Dziendzielski1-0/+4
If srcdir is under poky directory (e.g. devtool poky/build/workspace/sources) and is not a git repository then ${@srctree_hash_files(d)} will run "git rev-parse --git-dir" and detect poky directory as git-dir and run "'git', 'add', '-A', '.'], cwd=s_dir" trying to add srcdir but build dir is in .gitignore and latest git will fail with "The following paths are ignored by one of your .gitignore files: build" which will end with "ExpansionError during parsing". In this commit I added a check if git_dir is the same as git-dir from TOPDIR (which will detect poky directory) and if yes, then treat srcdir as non-git sources. (From OE-Core rev: 5db4aec13b9498799d1e9276ef5573702f29dbc4) Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hourspulseaudio: upgrade 14.0 -> 14.2Wang Mingyu2-6/+6
refresh 0002-do-not-display-CLFAGS-to-improve-reproducibility-bui.patch (From OE-Core rev: ebdd0ad4149e2f59012c66e4e261c2bc3404deb7) Signed-off-by: Wang Mingyu <wangmy@cn.fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursnewlib: Update licenceAlejandro Hernandez Samaniego1-2/+2
- libgloss: - (22) New tcl license for csky-* targets - (23) New license for csky-* targets, states itself as FreeBSD license but text matches GPL (648365e0) - (24) New BSD-2 license for risc-v targets newlib: - New license for csky-* targets, states itself as FreeBSD license but text matches GPL (648365e0) - (53) arm targets FreeBSD - (54) arm targets BSD-2-Clause-FreeBSD (From OE-Core rev: 2091a54ad2e0cefecd765636f35c0b5b8fa00af2) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hourssystemd: resolve executable path if it is relativeMingli Yu2-0/+40
Backport a patch to fix the below systemd-analyze issue: # systemd-analyze --man=false verify /lib/systemd/system/initrd-cleanup.service initrd-cleanup.service: Command systemctl is not executable: No such file or directory # which systemctl /bin/systemctl # cat /lib/systemd/system/initrd-cleanup.service [snip] [Unit] Description=Cleaning Up and Shutting Down Daemons DefaultDependencies=no AssertPathExists=/etc/initrd-release OnFailure=emergency.target OnFailureJobMode=replace-irreversibly After=initrd-root-fs.target initrd-fs.target initrd.target [Service] Type=oneshot ExecStart=systemctl --no-block isolate initrd-switch-root.target (From OE-Core rev: aa4d56fc5f7d772df86220f44fe15f7689a3093a) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursigt-gpu-tools: add procps-lib to RDEPENDSChen Qi1-1/+1
Build error occurs as below: ERROR: igt-gpu-tools-1.25+gitAUTOINC+d16ad07e7f-r0 do_package_qa: QA Issue: /usr/lib/libigt.so.0 contained in package igt-gpu-tools requires libprocps.so.8(LIBPROCPS_0)(64bit), but no providers found in RDEPENDS_igt-gpu-tools? [file-rdeps] Add procps-lib to RDEPENDS to solve this issue. (From OE-Core rev: f4fe7a48f5f276ea65f9c6fc3bcce0ce7ecc5051) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursqemu-system-native: install qmp python moduleSaul Wold1-0/+4
The qmp python module supports the Qemu Machine Protocol [0]. This module needs to be installed in a known location so the qemurunner python script can find the qmp module. This change causes it to be installed in the recipe-sysroot-native of the target image and that directory can be added to the python sys.path that needs to use the qmp.py module. [0] https://github.com/qemu/qemu/blob/master/docs/interop/qmp-spec.txt (From OE-Core rev: 34bf3a4455da498f6e48b1da281796cbbd321e40) Signed-off-by: Saul Wold <saul.wold@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursCustomize prompt string for SDKsKai Kang3-0/+3
Introduce a new variable SDK_PS1 to customize prompt string for SDKs when source script environment-setup-script. The prompt string of SDKs is set by default with something looks like: SDK-poky-glibc-x86_64--cortexa57-qemuarm64$ (From OE-Core rev: b152e617bf7ad52530ddd64b7f4f7ffabd479b7f) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursbitbake: fetch/git: download LFS content too during do_fetchMatt Hoosier2-11/+61
Insert an explicit pass to fetch all blobs needed by Git LFS, during the fetch() function. This avoids the default behavior of Git LFS to wait until 'git checkout' to begin downloading the blobs pointed to by LFS records. Network access is not allowed at that point in the recipe's lifecycle. [YOCTO #14191] (Bitbake rev: e190ba7cc760b9c6810f25f10e823bb640023920) Signed-off-by: Matt Hoosier <matt.hoosier@garmin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursbitbake: tests/fetch: add test for empty query parametersRoss Burton1-0/+19
To exercise the previous patch, add a test case. (Bitbake rev: efdf6d5c4cd8155bc54dc667346f58dccb138e07) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursbitbake: fetch2: handle empty elements in _param_str_splitRoss Burton1-1/+1
_param_str_split is used to split ?foo=1;bar=2 into a dictionary, but throws an exception if a lone semicolon is used as the value doesn't split into two items. Fix by checking that the result of the first split has content. (Bitbake rev: 7662f8c8676d87cb318f811423cc02fe8cb146f6) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursbitbake: fetch2/perforce: Fix localfile to include ud.moduleRichard Purdie1-1/+2
As reported by Katu Txakur, the output depends on the module path set so this needs to be accounted for in localfile. (Bitbake rev: 9861ed37bb1c5d09c3b4852d2a252e3f3c86ab14) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
5 hoursbitbake: fetch2/wget: Update user-agentChristophe Priouzeau1-3/+8
With the usage of enterprise proxy, the user-agent defined are too old and refused by proxy configuration. Updating to something more modern is desirable. (Bitbake rev: 7001fdd7c4dca372cbebd8fd2c0b03c5d43f9400) Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com> Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursreleases: conf: add link to 3.1.5, update to include 3.2.1 & 3.1.5HEADmasterMichael Halstead3-6/+7
(From yocto-docs rev: 5c94f8183733bf266cd6153434b5eed22d1914c6) Signed-off-by: Michael Halstead <mhalstead@linuxfoundation.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursbuild-appliance-image: Update to master head revisionRichard Purdie1-1/+1
(From OE-Core rev: 79821d5a185e25384f5b6b5158b238bbee17c79e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursoeqa/selftest: binutils-cross-x86_64 -> libgcc-initialRobert Yang1-1/+1
The binutils-cross-x86_64 is not avaliable for non x86-64 machines. (From OE-Core rev: 02385b180bc4a1af7120e85a9998566bfcb85977) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursrt-tests/hwlatdetect: upgrade 1.9 -> 1.10Anuj Mittal5-58/+7
(From OE-Core rev: a831789158881bade4e431d88f54e4ec926d9fbe) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursmeson: upgrade 0.56.0 -> 0.56.2Anuj Mittal5-5/+5
(From OE-Core rev: 53a56bd497451552256fec335e9b241dcba16a1a) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursgit: upgrade 2.29.2 -> 2.30.0Anuj Mittal1-2/+2
(From OE-Core rev: 34264c95e6489ee68d06e892aa5a7027b000dd93) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hourssudo: upgrade 1.9.4p1 -> 1.9.5p1Anuj Mittal2-3/+3
License-Update: copyright years changed (From OE-Core rev: b72b3e04457928235843173981fd0a20ef1b00ae) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursresolvconf: upgrade 1.83 -> 1.87Anuj Mittal1-3/+3
(From OE-Core rev: 5240708714eaf7e6e769bc23809d85b18c94406d) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hourspython3-numpy: upgrade 1.19.4 -> 1.19.5Anuj Mittal1-1/+1
(From OE-Core rev: 35930079978923242025462496aa10cd36ec033f) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hourspython3-hypothesis: upgrade 5.43.3 -> 6.0.2Anuj Mittal1-1/+1
(From OE-Core rev: c86ad19993b851a2c714eaf53330d83c28ad9cbd) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hourspython3-dbusmock: upgrade 0.19 -> 0.22.0Anuj Mittal1-1/+1
(From OE-Core rev: 93777c3b4fd56aa50eceedb92c67446040f87837) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursdiffstat: upgrade 1.63 -> 1.64Anuj Mittal1-3/+2
License-Update: copyright years changed (From OE-Core rev: 503eb1a94a7455762faec8319aa9f7f25ad7126a) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursacpica: upgrade 20201217 -> 20210105Anuj Mittal1-2/+2
License-Update: copyright years changed (From OE-Core rev: b19a0aad639ce6aeb8f56860f230ff1e1b3e48de) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursnewlib: Upgrade 3.3.0 -> 4.1.0Alejandro Hernandez Samaniego3-1/+1
(From OE-Core rev: 48c7474a50181f8983c180693363b40833c3fe01) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursdevtool: Fix source extraction for gcc shared sourceTomasz Dziendzielski1-4/+26
If do_patch task is disabled then prepare do_configure dependencies to fetch external sources and create symlink to ${S} in devtool workspace. [YOCTO #13036] (From OE-Core rev: 9e47319bfe62d289b90f7545a64dbdc1cbde7f1d) Signed-off-by: Tomasz Dziendzielski <tomasz.dziendzielski@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hourstoolchain-shar-relocate.sh: Fix handling files with colonsOleksiy Obitotskyy yIEf0zt.mo1-1/+1
Files could contain colons in name and we should not use colons (':') as field separator. E.g. perl/python man pages packages. (From OE-Core rev: 50d2ed0689f1aed6f33b4992d37e2e991c99eb07) Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursflex: Fix --noline option behaviorOleksiy Obitotskyy2-0/+33
Option --noline or -L does not handled properly. So generated code contains #line directives with file absolute path and prevents to create reproducible builds. (From OE-Core rev: 0bf2cb7dc2123f220accf1542c2ae4c4b4b8275a) Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hourswic: Optimise fstab modification for ext2/3/4 and msdos partitionsPaul Barker2-8/+28
The fix for [Yocto #13994] required the rootfs directory to be copied (using hardlinks if possible) when modifying the fstab file under wic. We can optimise this copy away for filesystems where we have the tools to modify the contents of the partition image after it is created. For ext2/3/4 filesystems we have the debugfs tool and for msdos/vfat filesystems we have the mcopy tool. So for any of these filesystems we skip the modification of the fstab file in the rootfs directory (and skip the associated copy unless it is otherwise necessary) and update the contents of fstab directly in the partition image. (From OE-Core rev: 5fb8ae0e9159597d7eaa9307a3a8543800bf9405) Signed-off-by: Paul Barker <pbarker@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hourswic: Copy rootfs dir if fstab needs updatingPaul Barker3-29/+29
By default, wic updates the /etc/fstab in the rootfs to include details of additional partitions described in the selected wks file. If this modification is performed in place, other tasks which create an image file from the rootfs directory (e.g. do_image_tar and do_image_ext4) will pick up the modified fstab file which would not be appropriate for those images as they do not include the additional partitions described in the wks file. wic does undo modifications to the fstab file once it has finished creating the filesystem image, however this leaves open a race condition if one of the other tasks reads the contents of the fstab file from the rootfs directory between the point where wic modifies the fstab file and the point where wic restores the files original content. This could be solved by adding a lockfile for tasks which use the rootfs directory to ensure that no other such task is reading the rootfs directory while do_image_wic is running. This would serialize several do_image_* tasks and result in slower builds, especially for large images. Another drawback of this solution is that it is hard to selectively optimise - adding lockfiles to do_image_* tasks would result in these tasks always being serialized even if no fstab modification will take place. An alternative solution is to copy the rootfs directory when fstab needs to be modified. The code to do this in wic already exists as it is needed when including or excluding content in the rootfs. This still results in an impact on build times but the copy uses hardlinks if possible (so little data is actually copied) and we can make selective optimisations to improve things. The rootfs copy will only take place if fstab modification is required (or if it was already needed to include or exclude rootfs content). We can also follow up with further optimisations after this commit. So this second solution is chosen. Fixes [Yocto #13994] (From OE-Core rev: ce682a73b7447652f898ce1d1d0416a456df5416) Signed-off-by: Paul Barker <pbarker@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hourswic: Update pseudo db when excluding content from rootfsPaul Barker1-5/+8
To exclude content from the rootfs, wic makes a copy (using hardlinks if possible) of the rootfs directory and associated pseudo db, then removes files & directories as needed. However if these files and directories are removed using the python functions os.remove and shutil.rmtree, the copied pseudo db will not be updated correctly. For files copied from the original rootfs, if hardlinks were used successfully when copying the rootfs this should mean that the relevant inodes can't be reused and so the risk of pseudo aborts should be avoided. However, this logic doesn't apply for directories (as they can't be hardlinked) or for files added via the '--include-path' argument (as they weren't present in the original rootfs) and so there remains some risk of inodes being reused and the pseudo db becoming corrupted. To fix this, use the 'rm' command under pseudo when removing files & directories from the copied rootfs to ensure that the copied pseudo db is updated. (From OE-Core rev: d5db7e268947f0392c2126137571a44acd29ccd6) Signed-off-by: Paul Barker <pbarker@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
48 hoursimage_types_wic: Move wic working directoryPaul Barker1-1/+7
By default the wic working directory is placed under the output directory. When invoking wic under bitbake, the wic output directory is added to PSEUDO_PATHS_IGNORE to avoid issues with files being removed from outside a pseudo environment (see oe-core commit ad8f5532ff). However, wic will copy the rootfs directory into its working directory if it needs to add or remove content before creating a filesystem image. This copy of the rootfs directory must be tracked by pseudo in order to keep the permissions correct in the resulting image. So we can't have the wic working directory under a path in PSEUDO_PATHS_IGNORE unless we like broken permissions. To fix this the new '-w' argument to wic is used to move the working directory away from the output directory. Note that wic deletes the temporary working directory automatically when it finishes creating an image so users won't normally see the 'tmp-wic' directory under WORKDIR. Fixes [Yocto #14129] (From OE-Core rev: 4d07169499c47fa9dc759e6f81843416a6dc25c5) Signed-off-by: Paul Barker <pbarker@konsulko.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>