summaryrefslogtreecommitdiffstats
path: root/meta
Commit message (Collapse)AuthorAgeFilesLines
* epiphany: Add missing dependency on gnutlsKhem Raj2021-04-201-1/+1
| | | | | | | | | This was being pulled in by other dependencies thus far (From OE-Core rev: de944399fa3dadecd3faa5054145fe0cd7adbbf7) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* btrfs-tools: Try to follow style guideRobert Joslyn2021-04-201-3/+4
| | | | | | | | | Cosmetic changes to better follow the style guide. (From OE-Core rev: e478013830700580c25877ab55b70ff73072bb81) Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* btrfs-tools: Add PACKAGECONFIG optionsRobert Joslyn2021-04-201-2/+16
| | | | | | | | | | | | | | | | | | Add options to make it easier to control which features are enabled. All of these default to enabled by upstream, so keep them enabled to maintain previous behavior. The convert option also supports reiserfs, but no recipes exist in the layer index. Limit the option to ext filesystems until someone cares enough to make reiserfs recipes. Remove acl and attr from DEPENDS, as they do not apper to be needed. Add zlib since it is required. (From OE-Core rev: 7452cab85b65ce4b6e8309ab85ad40555c24435f) Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* btrfs-tools: Update to 5.11.1Robert Joslyn2021-04-201-3/+6
| | | | | | | | | | | Update licensing, as libtrfsutil is under LGPLv3+. Note that libtrfsutil is in the process of being relicensed to LGPLv2.1+: https://github.com/kdave/btrfs-progs/issues/323 (From OE-Core rev: 0f75bb0e4d99c658302e28435d055b4f99dcc247) Signed-off-by: Robert Joslyn <robert.joslyn@redrectangle.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* autoconf-archive: update to 2021.02.19Oleksandr Kravchuk2021-04-201-2/+1
| | | | | | | (From OE-Core rev: f7417480667e7a06206239e3aac48dd1149d42fb) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oeqa/runtime/cases: Only disable/enable for current bootWes Lindauer2021-04-202-4/+4
| | | | | | | | | | | | | | | | | | Previously doing a stop/start worked, but using a disable/enable does not work on a read-only rootfs. Add a --runtime flag to systemctl so that systemd only modifies the current boot and does not attempt to write to the filesystem. This also keeps the test from making a permanent (one could argue policy) change to the running system being tested. i.e. What if the image being tested had intentionally disabled the timesyncd service in preference to using chrony or ntpd? The test shouldn't assume that the user wants the timesyncd service enabled. (From OE-Core rev: 43dd83b6a325589368c980a3f17cab90935aaeb0) Signed-off-by: Wes Lindauer <wesley.lindauer@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* python3-setuptools: update to 56.0.0Oleksandr Kravchuk2021-04-181-1/+1
| | | | | | | (From OE-Core rev: 589a5695befb887f290746a3fc85d291fcb881ff) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* python3: Upgrade 3.9.2 -> 3.9.4Alejandro Enedino Hernandez Samaniego2021-04-182-13/+13
| | | | | | | | | | | - Rebased patch 0001-test_locale.py-correct-the-test-output-format Maintainer needs to sign CLA and resubmit - configure now explicitly requires autoconf-archive to be present (From OE-Core rev: 34cb8f2a2ed36ad929dca9055c96f2f843656b8f) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* python3: Improve logging, syntax and update deprecated modules to ↵Alejandro Enedino Hernandez Samaniego2021-04-182-48/+71
| | | | | | | | | | | | | | | | | | | | | create_manifest The imp module has een deprecated by upstream python, drop its usage (imp.get_tag) in favor of sys.implementation.cache_tag. Avoid incorrectly getting dependencies for running script and multiprocessing module. Improve logging behavior of the create_manifest task: - Use indentation. - Logs on temp directory. - Use a proper debug flag. - Standarize syntax. (From OE-Core rev: a3ac339f5b8549a050308ba94c4ef9093f10e303) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: Fix build on mips/muslKhem Raj2021-04-182-0/+37
| | | | | | | (From OE-Core rev: b4a0d8799af0a3d1b685dd7200b545fdb2c79d64) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gstreamer1.0-plugins-base: Use bb.utils.filter to reduce codeOtavio Salvador2021-04-181-6/+1
| | | | | | | (From OE-Core rev: ec3a1cb77131a3cf61fc005c84295d282a2eb80a) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gstreamer1.0-plugins-base: Add 'viv-fb' OpenGL Window System optionOtavio Salvador2021-04-181-0/+2
| | | | | | | | | | This adds the 'viv-fb' PACKAGECONFIG option to allow Vivante GPU window system to work. (From OE-Core rev: 846564f1a999ea044f580bd61f7bcd527af62dce) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* python3-pygobject: upgrade 3.38.0 -> 3.40.1zhengruoqin2021-04-181-1/+1
| | | | | | | (From OE-Core rev: 3a274301edc359fba086e36da1272af93d59d178) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* maintainers.inc: Modify email addresszangrc2021-04-181-18/+18
| | | | | | | | | | zangrc.fnst@cn.fujitsu.com -> zangrc.fnst@fujitsu.com wangmy@cn.fujitsu.com -> wangmy@fujitsu.com (From OE-Core rev: 6e8562e5b924e6c10625c2e9b660eed89fdfbdf4) Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mesa: upgrade 21.0.1 -> 21.0.2wangmy2021-04-183-1/+1
| | | | | | | (From OE-Core rev: 58ad359da1b05820ea3dc4ae3f789ccb8991fc32) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* go: update SRC_URI to use https protocolwangmy2021-04-181-1/+1
| | | | | | | (From OE-Core rev: 2a1eb731ed3bcb049192550e362b771c3a9ea6eb) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* parselogs: ignore floppy error on qemu-system-x86 at boot stageYanfei Xu2021-04-181-0/+2
| | | | | | | | | | | | | | | | | | | | | We can disable floppy drive by BIOS on a hardware, but an empty floppy drive is connected by default on qemu-system-x86. Linux usually detect the device and modprode the matched floppy.ko at the boot stage. Due to we don't specify a floppy deivce in qemu boot arguments, then the errors about floppy reading comes out. It is harmless and normal, so we could ignore this error message on qemux86. Seen if kernel-modules is included in the image which pulls in the relavent kernel module. https://lists.gnu.org/archive/html/qemu-devel/2021-04/msg01402.html (From OE-Core rev: 3359f23ee9351c70997d5e0a17d17d1e47d59623) Signed-off-by: Yanfei Xu <yanfei.xu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oeqa/runtime: space neededJon Mason2021-04-181-2/+2
| | | | | | | | | | | | | Messages are currently being printed as: Test requires dropbear, oropenssh-sshd to be installed but should be Test requires dropbear, or openssh-sshd to be installed Adding the space after the 'or' corrects this. (From OE-Core rev: 51596e0f8cebe1607ab64ffb018d51e815c0ee4b) Signed-off-by: Jon Mason <jdmason@kudzu.us> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* man-pages: upgrade 5.10 -> 5.11wangmy2021-04-181-1/+1
| | | | | | | (From OE-Core rev: 40b0cd87c6677220168bfa029e68437b43d51df5) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mpg123: upgrade 1.26.4 -> 1.26.5wangmy2021-04-181-1/+1
| | | | | | | (From OE-Core rev: f277c3bbde507ae1830b1ba6c5ce9c0878f42491) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* groff: not ship /usr/bin/grap2graphMingli Yu2021-04-181-0/+4
| | | | | | | | | | | | | | | | | | | | grap2graph which converts a GRAP diagram into a cropped image fails to run as below: $ grap2graph /usr/bin/grap2graph: line 89: convert: command not found /usr/bin/grap2graph: warning: falling back to old '-crop 0x0' trim method /usr/bin/grap2graph: line 104: convert: command not found /usr/bin/grap2graph: line 103: grap: command not found Considering we don't often need to convert a GRAP diagram into a cropped image and the recipe ImageMagick which provides convert command is in meta-oe layer, so don't ship the related files to avoid the confusion about the above run time error. (From OE-Core rev: 251be7279a475ee18c0c53fe9795bb37bffc2b45) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* icu: upgrade 68.2 -> 69.1wangmy2021-04-182-5/+5
| | | | | | | | | refresh 0001-icu-Added-armeb-support.patch (From OE-Core rev: 6b22fce3a8a3567c794d0d701ffd14b61ea859c8) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libdrm: upgrade 2.4.104 -> 2.4.105zhengruoqin2021-04-182-32/+1
| | | | | | | | | | 0001-meson-Also-search-for-rst2man.py.patch removed since it is included in 2.4.105 (From OE-Core rev: 7871f85a9fe610f600c4234fce38d24808f5a2fd) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* librepo: upgrade 1.13.0 -> 1.14.0zhengruoqin2021-04-181-1/+1
| | | | | | | (From OE-Core rev: 7017725b14888c9668efcad92bca46b4d1ce9a68) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libdazzle: upgrade 3.38.0 -> 3.40.0zhengruoqin2021-04-181-1/+1
| | | | | | | (From OE-Core rev: 5c184382bd9e952d91993bd29320357360d79cb3) Signed-off-by: Zheng Ruoqin <zhengrq.fnst@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libcomps: upgrade 0.1.15 -> 0.1.16wangmy2021-04-182-4/+4
| | | | | | | | | refresh 0001-Add-crc32.c-to-sources-list.patch (From OE-Core rev: f1f66e20eeea7bb1c370991490d34f868cd8a964) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libcap: upgrade 2.48 -> 2.49wangmy2021-04-181-2/+2
| | | | | | | | | License-Update: add description of GPL v2.0 (From OE-Core rev: 2a02e5622d07146687f72615e9bcb8612cce03e3) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sanity: Add error check for '%' in build pathRichard Purdie2021-04-181-0/+2
| | | | | | | | | | | | | It has been reported that '%' characters in build paths break with python exceptions, probably due to confusion with python string escaping. Whilst it is probably fixable, showing the user a human readable error is better given it doesn't work. [YOCTO #14282] (From OE-Core rev: 31a3cf78452270131a657be45e76569515cff7ef) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* insane: clean up some more warning messagesRoss Burton2021-04-181-6/+6
| | | | | | | (From OE-Core rev: 2abe18682192e7b38b9af5a5043906f2f069648f) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* binutils: rename BRANCH varArmin Kuster2021-04-181-8/+2
| | | | | | | | | | | | | | | | | | | If BRANCH is defined in local.conf then that name is used to d/l sources for binutils. You will get this error: Fetcher failure for URL: 'git://sourceware.org/git/binutils-gdb.git;branch=hardknott;protocol=git'. Unable to fetch URL from any source. Rename to SRCBRANCH like glibc has to avoid the more common variable name BRANCH. (From OE-Core rev: 40d18272cd765420080fffc0e4bde7e3e79982af) Signed-off-by: Armin Kuster <akuster808@gmail.com> -- V2] Remove commented out BINUPV and function Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Revert "inittab: Add getty launch on hvc0 for qemuppc64"Kevin Hao2021-04-182-7/+0
| | | | | | | | | | | | This reverts commit ed69ef20167da0986bc9363d1a91e62001995af4. The console entry has already been added into /etc/inittab based on the SERIAL_CONSOLES. So drop this redundant entry. (From OE-Core rev: 633f0c6b74e3caa2bae52ca60c61b811b7b2215d) Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sysvinit-inittab/start_getty: Check /sys for the tty device existenceKevin Hao2021-04-181-41/+3
| | | | | | | | | | | | The hvc tty driver doesn't populate a file like /proc/tty/driver/serial, so the current implementation of start_getty doesn't work for the hvc console. By checking the /sys/class/tty/ for the tty device existence, it should support more console types and also make the codes more simple. (From OE-Core rev: 670ceef0f6584ece5ce4176610255226a6148570) Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* modutils-initscripts: Bail out when no module is installedKevin Hao2021-04-181-0/+1
| | | | | | | | | | Fix the following warning when boot with a core-image-minimal rootfs: depmod: can't change directory to 'lib/modules/5.10.25-yocto-standard': No such file or directory (From OE-Core rev: c34650400182a1104a5fbe03e54f5cea69eb1900) Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libtool: make sure autoheader run before automakeMingli Yu2021-04-182-0/+36
| | | | | | | | | | | | | | When use automake to generate Makefile.in from Makefile.am, there comes below race: | configure.ac:45: error: required file 'config-h.in' not found It is because the file config-h.in in updating process by autoheader, so make automake run after autoheader to avoid the above race. (From OE-Core rev: 1fc0a4a98e65db7efba8bb5cb835101ea5dd865b) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kmod: do not symlink config.guess/config.sub during autoreconfGavin Li2021-04-181-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was encountering the following race condition on poky: - automake-native does do_install. - automake-native does do_populate_sysroot. This hardlinks config.guess and config.sub into ${D}. - kmod-native does do_configure. This runs `autoreconf`, which runs `automake --add-missing` (symlinks config.guess/config.sub from recipe-sysroot-native to build dir), then runs `gnu-configize` (copies _its own_ config.guess/config.sub _on top_ of the already existing ones). Since the destinations already had symlinks, the copy would overwrite config.guess/config.sub in recipe-sysroot-native, which would in turn overwrite the same in ${D} due to being hardlinked. - automake-native does do_package. The outhash is thus calculated on the clobbered config.guess/config.sub files. With hash equivalency enabled, the different outhash produced a different unihash, which kept me from reusing sstate between my laptop and my build server. This race condition would happen only on the build server (BB_NUMBER_THREADS = 32) but never on my laptop (BB_NUMBER_THREADS = 6). I didn't see the --install and --symlink flags being used by any other recipe, so I removed them, and that fixed the issue. (From OE-Core rev: 89d675efd633b495daa4a3a57420b9c309497035) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pango: re-enable ptestSaul Wold2021-04-181-0/+2
| | | | | | | | | | The run-ptest script got accidently dropped from the SRC_URI during a past update and ptest patch. (From OE-Core rev: 4479f810c1a3ab2badf4f9610c309bc0e23e2a5f) Signed-off-by: Saul Wold <saul.wold@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* systemd: upgrade 247.4 -> 247.6Anthony Bagwell2021-04-184-1/+1
| | | | | | (From OE-Core rev: 63fbf39b8aa3d94ca2db719d1a53190045dbb86d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* go: upgrade 1.16.2 -> 1.16.3wangmy2021-04-188-4/+4
| | | | | | | | | | | | This is bugfix release in 1.16 series [1] [1] https://github.com/golang/go/issues?q=milestone%3AGo1.16.3+label%3ACherryPickApproved (From OE-Core rev: 84188e7b78aa40b168b526fa5d681a8a21d3b77c) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gstreamer1.0: update patch upstream statusJose Quaresma2021-04-181-1/+4
| | | | | | | (From OE-Core rev: 0bd65127a249ce8a1199d4961e2351dbd6d83dd6) Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cpan-base: set default UPSTREAM_CHECK_REGEXKonrad Weihmann2021-04-181-0/+9
| | | | | | | | | | | | | | as cpan release versions are almost always follow an a.b version scheme, it's better to filter out beta releases such as a.b.c. Use the first resource fetched from https://cpan.metacpan.org as base for calculating the needed regex. In case nothing can be calculated fall back to nothing. Add this to cpan-base to enable it for new & old style cpan integration. (From OE-Core rev: 3df2cf383b58a3100bd78ebb0369047221121512) Signed-off-by: Konrad Weihmann <kweihmann@outlook.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* glslang: strip whitespace in pkgconfig fileRoss Burton2021-04-181-11/+11
| | | | | | | | | | Whilst pkg-config is fine with .pc files containing leading whitespace, pkgconf is less forgiving. (From OE-Core rev: 14bfe5f15f78c1bc049868633fd6fa19feb5a70c) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* ltp: fix empty ltp-dev packageJonas Höppner2021-04-181-1/+1
| | | | | | | | | | | | | Currently the headers are not installed and the ltp-dev package is empty. This patch adds an include-install make target in the do_install step to install them in sysroot which ends up as a working ltp-dev package. (From OE-Core rev: f6943da4444cd71053650be0c9212bc25ac53137) Signed-off-by: Jonas Höppner <jonas.hoeppner@garz-fricke.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cross-canadian: Whitelist "mingw32" as TARGET_OSAnatol Belski2021-04-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | If a recipe inherits cross-canadian and contains "nativesdk" in BBCLASSEXTEND and meta-mingw is included and multiconfig is enabled, bitbake will generate the correspending recipe. As meta-mingw sets SDK_OS to "mingw32", that's what TARGET_OS will be set to as well. Thus, currently such a recipe won't pass the check and fail with a message: Building cross-candian for an unknown TARGET_SYS (x86_64-mysdk-mingw32), please update cross-canadian.bbclass Even when building an SDK targeting Linux, but the mentioned conditions are met, bitbake will try to generate the corresponding recipe and fail. As the described combination seems valid, including "mingw32" into the whitelist unconditionally as a fix is suggested. (From OE-Core rev: d9306e8f9dbdbd30382f0bc0f0a1af75e702a2aa) Signed-off-by: Anatol Belski <anbelski@linux.microsoft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-core-tools-testapps.bb: Remove kexec for riscv32Mingli Yu2021-04-181-0/+1
| | | | | | | | | kexec is not yet ported to riscv32. (From OE-Core rev: f1e7da7737b3d6df27cc5af002fd1eb0c202d0b4) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-core-tools-profile: Remove valgrind for riscv32Mingli Yu2021-04-181-0/+1
| | | | | | | | | valgrind is not yet ported to riscv32. (From OE-Core rev: df70bc4c60838af1dd7e7f31aba43e8d190def77) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libxshmfence: Build fixes for riscv32Mingli Yu2021-04-182-1/+42
| | | | | | | | | | | | | | | | | NR_futex is not defined by newer architectures e.g. riscv32 as they only have 64bit variant of time_t. Glibc defines SYS_futex interface based on __NR_futex, since this is used in applications, such applications start to fail to build for these newer architectures. Define a fallback to alias __NR_futex to __NR_futex_time64 to make SYS_futex keep working. Reference: https://git.openembedded.org/openembedded-core/commit/?id=7a218adf9990f5e18d0b6a33eb34091969f979c7 (From OE-Core rev: 81599bf32135187b34726d41e9f619d22ca1bdd1) Signed-off-by: Mingli Yu <mingli.yu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* arch-armv6m.inc: fix access rightsUlrich Ölmann2021-04-181-0/+0
| | | | | | | (From OE-Core rev: 2f7ebe444c2a78ef149b8c5f0f005ab23f24a176) Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* externalsrc: Detect code changes in submodulesDouglas Royds2021-04-181-5/+6
| | | | | | | | | | | | | | | | Further to 50ff9afb39, only detect code changes in submodules that are subdirectories of the EXTERNALSRC directory. The (undocumented) git submodule--helper returns a path for each submodule relative to the top of the repo. Don't add submodules that are not within our source subtree. [YOCTO #14333] (From OE-Core rev: 1c18225d3ef94a41fc073ae87c163b68e6d46571) Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Revert "externalsrc: Detect code changes in submodules"Douglas Royds2021-04-181-9/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4525310d49d115a37705f04ac5c03d639e5e8f8c. Further to 50ff9afb39, only detect code changes in submodules that are subdirectories of the EXTERNALSRC directory. The (undocumented) git submodule--helper returns a path for each submodule relative to the top of the repo. Don't add submodules that are not within our EXTERNALSRC subtree. If we unpack one git repo inside another, like this: SRC_URI = "git://${GIT_SERVER}/repo1;name=repo1;destsuffix=repo1 \ git://${GIT_SERVER}/repo2;name=repo2;destsuffix=repo1/repo2 \ " Git status reports, for repo1: Untracked files: (use "git add <file>..." to include in what will be committed) repo2/ If we run `devtool modify` on this recipe, do_patch runs with: PATCHTOOL = "git" PATCH_COMMIT_FUNCTIONS = "1" The `patch_task_postfunc` (patch.bbclass, line 82) runs a `git add .` on the top-level repo1, leaving the checkout in an invalid state. The following git warning does not appear in the log: $ git add . warning: adding embedded git repository: repo2 hint: You've added another git repository inside your current repository. hint: Clones of the outer repository will not contain the contents of hint: the embedded repository and will not know how to obtain it. hint: If you meant to add a submodule, use: hint: hint: git submodule add <url> repo2 hint: hint: If you added this path by mistake, you can remove it from the hint: index with: hint: hint: git rm --cached repo2 hint: hint: See "git help submodule" for more information. $ git submodule status fatal: no submodule mapping found in .gitmodules for path 'repo2' No further git submodule commands can be run on the checkout. We could enhance the `patch_task_postfunc` to look for any embedded git checkouts and add them as submodules, but this seems unnecessary complexity for an obscure edge-case. Although the git repo is left in an invalid state with respect to the submodules, it still serves the purpose required by devtool: To take further commits, and generate patch files from them. We are still able to run these commands to examine any submodules, where git submodule--helper reports paths relative to the top of the checkout: $ git ls-files --stage | grep ^160000 160000 5feee12d6e974dd8c0614cf5b593380b046439a5 0 repo2 $ git submodule--helper list 160000 5feee12d6e974dd8c0614cf5b593380b046439a5 0 repo2 When a recipe sets EXTERNALSRC to a subdirectory of the git checkout, we test for the existence of the reported submodule paths within the EXTERNALSRC directory. The latest versions of git submodule--helper accept a path to a subdirectory and correctly report no submodules within that subdirectory. Regrettably, we still support git versions that don't accept a path to a subdirectory. [YOCTO #14333] (From OE-Core rev: 2055718fdd19f925e236d67823017323bbd92a4b) Signed-off-by: Douglas Royds <douglas.royds@taitradio.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* assimp: BBCLASSEXTEND to native and nativesdkSamuli Piippo2021-04-181-0/+2
| | | | | | | | | At least some Qt tooling depends on assimp. (From OE-Core rev: 49c6742eba328236cb73c0ac59b6288f29c46c81) Signed-off-by: Samuli Piippo <samuli.piippo@qt.io> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-30 20:47:34 +0000