summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
Commit message (Collapse)AuthorAgeFilesLines
* keymaps: tighten package write dependencyJonas Bonn2019-02-251-1/+1
| | | | | | | | | | | | | | The dependency on systemd-systemctl-native is only needed if _both_ systemd and sysvinit are in play. (From OE-Core rev: 3ea08f4b24f8a49c3d5039b62b39d6419cfe234c) (From OE-Core rev: a1031ce496f6d8b54169ae9ae0e928032631d5df) Signed-off-by: Jonas Bonn <jonas@norrbonn.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: Fix passing null to printf formatsKhem Raj2019-02-062-0/+35
| | | | | | | | | | | | | | Backport a patch that helps with this error which is found by gcc9 (From OE-Core rev: 93419fb569b827056a422614d3dc29cd41b2b6bb) (From OE-Core rev: 47731b43e6d287b3b03347ae94b99dea515d9a56) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* v86d: Make cross compilation working on more architecturesSerhey Popovych2018-11-073-20/+36
| | | | | | | | | | | | | | | | | | Since commit 709c603dec19 ("v86d: Accept aarch64 as build host") we support cross compilation on aarch64 host in addition to x86 host. However building on hosts different than two above will fail. Make cross compilation support more generic by checking for TARGET_ARCH in v86d configure script with fallback to `uname -m` when not present in environment and pass TARGET_ARCH explicitly in do_configure(). Cross build for x86 tested on IBM Power 8 machine with RHEL7. Should work on aarch64 and rest too. (From OE-Core rev: 69f7579eb36c00b557225377e1a3cc61b103be23) Signed-off-by: Serhey Popovych <serhe.popovych@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* lrzsz: fix CVE-2018-10195Ross Burton2018-09-112-0/+29
| | | | | | | | | | | | "Integer overflow in src/zm.c:zsdata() causes crash in sz and can leak information to receiver." Take a patch from Fedora to resolve CVE-2018-10195. (From OE-Core rev: a7b50fcee9a295de57f743fa3637905992da722e) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* eee-acpi-scripts: remove the recipeAlexander Kanavin2018-09-104-129/+0
| | | | | | | | | Asus EEEPc hardware is well obsolete, upstream repo is now gone. (From OE-Core rev: 2ac9d94a4d9b88d56ac6af1dd4d7f3d383439a12) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pciutils: 3.6.1 -> 3.6.2Robert Yang2018-08-231-2/+2
| | | | | | | (From OE-Core rev: 3347b7e5641646348e06a6f4c603d83c6be867c9) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: patch for CVE-2018-1000205Changqing Li2018-08-233-1/+206
| | | | | | | (From OE-Core rev: a8db39548d9985962e4f8764b10856af5226d210) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Fix inconsistent indentationAlexander Hedges2018-08-231-27/+27
| | | | | | | | | This removes some extra spaces. (From OE-Core rev: 146ebbc71183e432905b17a127162aba0b464b50) Signed-off-by: Alexander Hedges <ahedges@ethz.ch> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* acpid: upgrade 2.0.29 -> 2.0.30Maxin B. John2018-08-231-2/+2
| | | | | | | (From OE-Core rev: 125b5e2db55900c939ecdcd7d38cd8c9f40a41a2) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pcmciautils: remove from oe-coreRoss Burton2018-08-155-196/+0
| | | | | | | | | | PCMCIA is pretty rare these days, so now that the recipe is in meta-oe we can remove it from oe-core. (From OE-Core rev: 0f8dcb9c717201c4b1edf4fa55880b432bfb7723) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Fix pylibfdt generationJoshua Watt2018-08-021-0/+3
| | | | | | | | | | | | | | | | | | u-boot attempts to build a Python library called pylibfdt. By default, u-boot would attempt to use the build host's Python interpreter, which causes numerous problems, not least of which is that it fails if the host doesn't have the Python development package installed (complaining about not being able to find Python.h) Rectify this situation by including the proper build time dependencies for pylibfdt and passing the proper arguments to make. [YOCTO #12867] (From OE-Core rev: 3b0b16300b351878790729d6270cd113bca73eff) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* usbutils: upgrade to 010Ross Burton2018-07-302-28/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade to 010. usbutils uses libusb1 not the older libusb-compat library. Refresh (and submit upstream) the bashism removal for usb-devices. Fix LICENSE as lsusb.py is GPLv2 or v3, and set per-package LICENSE fields as appropriate. The actual license texts are missing from the 010 tarball (fixed in git) so point at the SPDX statements in the source files instead. Remove FILES_${PN}-dev as usbutils.pc doesn't exist anymore. Remove lsusb.py hashbang change as this doesn't cause any problems now (installed hashbang is /usr/bin/env python3). Remove spurious zlib build dependency that isn't required. Remove spurious RDEPENDS_${PN}-ptest, which doesn't exist. (From OE-Core rev: 889a86d8c044c0a9c6064a542f25e7fecef48234) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2.inc: set GRUBPLATFORM_arm to efiMingli Yu2018-07-261-1/+1
| | | | | | | | | | | | | | | | | | | | | * grub-efi support on arm is enabled as below commit: commit 65f9fb788371a9a08e3b0e6febecb9cc2aaeefe7 Author: Kristian Amlie <kristian.amlie@northern.tech> Date: Tue Jul 10 16:07:12 2018 +0200 grub-efi: Provide target architecture for 32-bit ARM. * But it fails on arm as below: | grub-mkimage: error: cannot open `./grub-core//serial.mod': No such file or directory. Set GRUBPLATFORM_arm = "efi" to fix the above error (From OE-Core rev: 6ad431974d96aec29d12079be8b94c479b91c446) Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: fix build with new binutilsRoss Burton2018-07-262-1/+78
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pciutils: upgrade 3.5.6 -> 3.6.1Ross Burton2018-07-241-2/+2
| | | | | | | (From OE-Core rev: 2ed00ce1acb19f351149c02f25267b111991e8f7) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Upgrade to 2018.07 releaseMarek Vasut2018-07-184-2/+2
| | | | | | | | | | | | | | This upgrades the U-Boot from 2018.05 to 2018.07 release. (From OE-Core rev: ac269c7378e8f98bc433e76cb94a6729407a97b6) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Add missing dependency on flex and bison nativeMarek Vasut2018-07-183-2/+3
| | | | | | | | | | | | | | | The U-Boot build, in particular the Kconfig, depends on bison and flex native. Add the missing dependencies. (From OE-Core rev: 71309a5c91209d4afaee874889fa7eefb266185f) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: Provide target architecture for 32-bit ARM.Kristian Amlie2018-07-151-0/+3
| | | | | | | | (From OE-Core rev: 65f9fb788371a9a08e3b0e6febecb9cc2aaeefe7) Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gnu-efi: update to 3.0.8Yi Zhao2018-06-293-16/+18
| | | | | | | (From OE-Core rev: 91dad340e32271d5db681bae34ed5599310e8703) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pcmciautils: depend on bison-nativeChristopher Larson2018-06-271-1/+1
| | | | | | | | | pcmciautils needs yacc as well as lex. (From OE-Core rev: dd5208ae22d47504443785daece4bff6331d8904) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* acpid: upgrade to 2.0.29Maxin B. John2018-06-181-2/+2
| | | | | | | | | 2.0.28 -> 2.0.29 (From OE-Core rev: 6dc9857562b87b690ffa4e4d9ff57a4e5de4b4be) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: replace Alex Kanavin's @intel email address with a personal oneAlexander Kanavin2018-06-071-1/+1
| | | | | | | | | | As I will be leaving Intel, this address will no longer be valid, so swap it for my personal one for now. (From OE-Core rev: 08c9db07560b85dc24f27e2aa1542b17101751e5) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Upgrade to 2018.05 releaseMarek Vasut2018-05-294-1/+1
| | | | | | | | | | | | | This upgrades the U-Boot from 2018.03 to 2018.05 release. (From OE-Core rev: 8e8cea4569ffa8ea81b7e99f98f9dab203614d22) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Cc: Ross Burton <ross.burton@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* pciutils: move ASNEEDED over-ride into the pciutils recipeAndre McCurdy2018-05-151-0/+2
| | | | | | | | | | | | Move the recipe specific over-ride for ASNEEDED into the recipe to make it more apparent that the over-ride is being applied (and that it should be re-checked on version updates, etc). (From OE-Core rev: b7b63b2681a1de0ecb0e09612913370cb9934d38) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub2: fix build with gcc8Martin Jansa2018-05-112-0/+75
| | | | | | | (From OE-Core rev: 3eca7aa8196ef8ed682659ff47f3f1e3b2c6867d) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: add grub target and image for aarch64Ricardo Salveti2018-05-041-0/+3
| | | | | | | | | | | Add missing target and image for aarch64, as the current revision is already fully compatible with ARMv8. (From OE-Core rev: 43dc32aa00c87f62dcf9a857d4e32469ce27c9e9) Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Upgrade to 2018.03 releaseMarek Vasut2018-05-045-23/+2
| | | | | | | | | | | | | | This upgrades the U-Boot from 2018.01 to 2018.03 release and drops patches accepted upstream, getting the patch count to zero. (From OE-Core rev: c1d680326cabd10d0940827e8dfdc884f67b1e9a) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Ross Burton <ross.burton@intel.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* usbutils: use update-alternatives for lsusbRicardo Salveti2018-04-201-1/+4
| | | | | | | | | | | lsusb can also be provided by busybox (CONFIG_LSUSB), so use update-alternatives to handle the conflict. (From OE-Core rev: 3c9ab895f937a7e232780c7cb697e102b5f9aaa8) Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: refresh patchesRoss Burton2018-03-111-7/+7
| | | | | | | | | | | | | | | | | | | | | 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: 7e8273cb55df71eaaf2cd50db076b73229ef7566) 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>
* pcmciautils: drop duplicate chunk from pcmciautils-018/makefile_race.patchAlexander Kanavin2018-03-111-14/+0
| | | | | | | | | | The new rule was patched into the makefile twice. (From OE-Core rev: c52228f4d0711ab7d75f9f860f637c6351dccd63) 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>
* pciutils: refresh patchesRoss Burton2018-03-111-13/+13
| | | | | | | | | | | | | | | | | | | | | 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: 7d56245a4859727f85dc5ae6f881d0783dee1ce1) 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>
* grub: refresh patchesRoss Burton2018-03-091-10/+7
| | | | | | | | | | | | | | | | | | | | | 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: 856a70cf6ca9137d5c07c2aa9ef447032589504d) 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>
* usbutils: drop upstreamed patchRoss Burton2018-03-072-29/+0
| | | | | | | | | | This has been fixed upstream since 008, albeit slightly differently so the patch continued to apply. (From OE-Core rev: e65ec7a68de6a0d409a5750b2fbd7ebca9acf5a3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: if installed and EFI_PROVIDER, install as bootx64 or bootia32California Sullivan2018-03-061-5/+8
| | | | | | | | | | This way we could theoretically support multiple bootloaders, and we keep the convention of boot(x64|ia32). (From OE-Core rev: 8d158bb4382fd4ef31d37ea5558e07d5eb33145e) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: install to /boot/California Sullivan2018-03-062-8/+28
| | | | | | | | | Since /boot/ will be recipe/package controlled now we can't just deploy. (From OE-Core rev: f9c3405a99f3c0fd922d21bea7bb0bd0dd3a2ab2) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: create recipe for configurationCalifornia Sullivan2018-03-061-0/+29
| | | | | | | | | | This makes use of the grub-efi-cfg bbclass that was split out to create a grub.cfg file just like the old one. (From OE-Core rev: eff14ba3e49d77bfc8167a19a0f58563270f2a51) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot-mkimage: Add dependency on dtcOtavio Salvador2018-03-041-0/+2
| | | | | | | | | | | | The dtc is used when generating images which use Device Tree and we must use the OE version to avoid relying on the host one. Reported-by: Renato Caldas <rm.santos.caldas@gmail.com> (From OE-Core rev: 14ee34e85f2b4768fb4488f8e708e678b0e23d5d) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* usbutils: Split out lsusb.pyMartin Hundebøll2018-02-161-0/+8
| | | | | | | | | | | | | | | | | | | The pretty-printing "lsusb.py" script shipped by usbutils is currently useless, as it doesn't runtime depend on python, and has unversioned python in the shebang. Avoid adding a python dependency to current configurations with usbutils buy splitting lsusb.py into a usbutils-python package, and make it runtime depend on python3-core. Make the script usable by replacing the shebang with a direct call to ${bindir}/python3. (From OE-Core rev: 42af9fedd31ecf5c6210d2f85f20540f85da59f4) Signed-off-by: Martin Hundebøll <mnhu@prevas.dk> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libacpi: update libacpi_fix_for_x32.patch to use libdirRicardo Salveti2018-02-162-21/+11
| | | | | | | | | | | | Prefix plus base_libdir generates an invalid path when building with usrmerge, so change libacpi_fix_for_x32.patch to use libdir instead as it provides the right path in both cases. (From OE-Core rev: c46d50c82d8ad27aaa75b974fa80838ff3a81386) Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: add configfile as default built-inRicardo Salveti2018-02-061-1/+1
| | | | | | | | | | | | The module configfile allows loading a custom grub configuration file from block devices, which can be used to customize the default grub menu when creating images with wic (via configfile argument). (From OE-Core rev: 6b297ccf04683380d0a894253a78424f4398782d) Signed-off-by: Ricardo Salveti <ricardo@opensourcefoundries.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/recipes: Convert SkipPackage -> SkipRecipeRichard Purdie2018-01-261-1/+1
| | | | | | | | | | The new name is much more consistent with what this actually means. We put the pieces in place to rename everything a while back but looks like we forgot to actually do it! Fix that now. (From OE-Core rev: af9612f5d6b848fceea22d10ee964437299be776) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Fix device mapper dependencyRobert Joslyn2018-01-221-1/+1
| | | | | | | | | | | The lvm2 recipe in meta-oe was split, so the libdevmapper library is provided by the libdevmapper recipe rather than lvm2. (From OE-Core rev: 68a3ae195998f96e2d8678a6a3733117d490787d) Signed-off-by: Robert Joslyn <robert_joslyn@selinc.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Upgrade to 2018.01 releaseMarek Vasut2018-01-226-72/+1
| | | | | | | | | | | | | This upgrades the U-Boot from 2017.11 to 2018.01 release and drops patches accepted upstream. (From OE-Core rev: df61422d3852b96d084749c0b287ea074f7e48bf) Signed-off-by: Marek Vasut <marex@denx.de> Cc: Otavio Salvador <otavio@ossystems.com.br> Cc: Ross Burton <ross.burton@intel.com> Cc: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub/grub-efi: fix conflictHongxu Jia2018-01-193-13/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While installing grub and grub-efi, there are conflict files in ${sysconfdir} ${datadir} ${bindir} ${sbindir}. - Since all of the conflicted files are tools which is common for grub and grub-efi, we split them (except grub-editenv) to grub-common in grub. - The package grub-common runtime depends grub-editenv - The package grub-editenv runtime provides grub-efi-editenv - Remove SYSROOT_DIRS_BLACKLIST - The recipe grub-efi does not generate the duplicated files and use runtime depends grub-common to instead Debian and Fedora do the similar thing. Debian use a common package grub-common for both of pc bios and efi, and use package grub-pc-bin for pc bios, grub-efi-amd64-bin for efi. Both of grub-pc-bin and grub-efi-amd64-bin requires grub-common. https://packages.debian.org/sid/grub-common https://packages.debian.org/jessie/grub-pc-bin https://packages.debian.org/jessie/grub-efi-amd64-bin Fedora use a common package grub2-tools for both of pc bios and efi, and use package grub2 for pc bios, grub2-efi-modules for efi. Both of grub2 and grub2-efi-modules requires grub2-tools. https://www.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/g/grub2-tools-2.02-0.34.fc24.x86_64.html https://www.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/g/grub2-2.02-0.34.fc24.x86_64.html https://www.rpmfind.net/linux/RPM/fedora/devel/rawhide/x86_64/g/grub2-efi-modules-2.02-0.34.fc24.x86_64.html [YOCTO #11639] (From OE-Core rev: 6fd0bc313c6035b7de5b7a62cbbcd1d6f546c7f9) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* usbutils: 008 -> 009Huang Qiyu2018-01-191-2/+2
| | | | | | | | | | Upgrade usbutils from 008 to 009. (From OE-Core rev: 09cce431ea629888b3ab848ac8cc0ea7627a8707) Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* v86d: use snapshot.debian.orgRoss Burton2018-01-191-1/+1
| | | | | | | (From OE-Core rev: 0ae81112acfdbae4ccf6ceef3382c568fab99bfd) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub-efi: Fix DEPENDSRichard Purdie2018-01-131-1/+1
| | | | | | | | | We need to append to DEPENDS else the dependencies on bison/flex-native are lost, potentially resulting in build failures. (From OE-Core rev: bead76b50dc60e1b6b39fa5b659a7af44ff91adc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot: Add Upstream-Status line missed from merged patchRichard Purdie2018-01-031-0/+4
| | | | | | (From OE-Core rev: ce8e782140eae9456e42c150fd1ff738b431e247) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* u-boot-fw-utils: Fix broken makefile in v2017.11.Kristian Amlie2018-01-022-0/+38
| | | | | | | | | | | | | See the patch for details. This patch has already been applied upstream, but we need it for v2017.11. Upstream-Status: Accepted [http://git.denx.de/?p=u-boot.git;a=commit;h=ded84f90a1066eef5f34daa4539273de64f7b811] (From OE-Core rev: bb6a45bc7e122c61386d0657e7c97895d1697bd7) Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* grub: Move grub-editenv packaging to grub2.incOtavio Salvador2017-12-102-5/+7
| | | | | | | | | | | | The editenv utility must be available on grub and grub-efi so we better have it inside the grub2.inc file to avoid the duplication of metadata. (From OE-Core rev: ebdd054ad85b19d47dd20eab0ba3f31ef5141140) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-15 13:10:06 +0000