summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge pull request #785 from ricardosalveti/sync-dunfellAnatoliy Odukha2020-11-036-146/+0
|\ | | | | Sync recipe/append removals from the dunfell branch
| * softhsm: remove since it was added to meta-openembedded last year.Patrick Vacek2020-10-301-26/+0
| | | | | | | | | | | | It appears to be an almost straight copy of this recipe. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
| * libssh2: Remove redundant bbappend.Patrick Vacek2020-10-301-2/+0
| | | | | | | | | | | | The version in meta-openembedded already supports a native build. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
| * gpgme: Remove redundant bbappend.Patrick Vacek2020-10-301-1/+0
| | | | | | | | | | | | The version in poky already supports a native build. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
| * lshw: remove since it's been in meta-openembedded for a long time.Patrick Vacek2020-10-303-117/+0
|/ | | | | | And it's a newer version at that! Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
* Merge pull request #778 from ricardosalveti/masterPatrick Vacek2020-10-191-1/+1
|\ | | | | layer.conf: add gatesgarth to LAYERSERIES_COMPAT
| * layer.conf: add gatesgarth to LAYERSERIES_COMPATRicardo Salveti2020-10-161-1/+1
|/ | | | Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
* Merge pull request #777 from ricardosalveti/fitPatrick Vacek2020-10-162-3/+8
|\ | | | | ostree-kernel-initramfs: add back initramfs fit workaround
| * ostree-kernel-initramfs: add back initramfs fit workaroundRicardo Salveti2020-10-152-3/+8
|/ | | | | | | | | | | Previous initramfs fit specific workaround was removed as part of commit 6eecf1593d, causing ostree to provide an init argument as part of the kernel command line arguments when it is not really needed. Bring back the workaround by simply generating an empty file in case kernel image type is fit and initramfs is also used by the target. Signed-off-by: Ricardo Salveti <ricardo@foundries.io>
* Merge pull request #774 from wilddom/fix-chmodAnatoliy Odukha2020-09-231-4/+4
|\ | | | | image_types_ostree: fix chmod
| * image_types_ostree: fix chmodDominik Wild2020-09-171-4/+4
|/ | | | Signed-off-by: Dominik Wild <dominik.wild@glutz.com>
* Merge pull request #772 from ↵Patrick Vacek2020-09-072-2/+6
|\ | | | | | | | | liuming50/introduce-OSTREE_MULTI_DEVICETREES_SUPPORT sota: introduce OSTREE_MULTI_DEVICETREE_SUPPORT
| * sota: introduce OSTREE_MULTI_DEVICETREE_SUPPORTMing Liu2020-09-032-2/+6
|/ | | | | | | | | | | | | | | ostree supports multiple devicetrees provided that there is no /lib/modules/$kversion/devicetree installed on rootfs, in which case, a uboot variable 'fdtdir' would be written to /boot/loader/uEnv.txt instead of fdt_file. Introduce OSTREE_MULTI_DEVICETREE_SUPPORT to control that, when it's set to '0', there is no functional changes with current implementation, while it's set to '1', then /lib/modules/$kversion/devicetree would not be installed and the end users need set their own fdtfile/fdt_file in boot script to locate the devicetree in 'fdtdir'. Signed-off-by: Ming Liu <ming.liu@toradex.com>
* Merge pull request #771 from shr-project/jansa/masterPatrick Vacek2020-08-311-2/+2
|\ | | | | networkd-dhcp-conf: fix REQUIRED_DISTRO_FEATURES
| * networkd-dhcp-conf: fix REQUIRED_DISTRO_FEATURESMartin Jansa2020-08-291-2/+2
|/ | | | | | | | | | | | | | | * it's REQUIRED_DISTRO_FEATURES not REQUIRED_DISTRO_FEATURES_ * inherit features_check to actually respect REQUIRED_DISTRO_FEATURES and fix: ERROR: networkd-dhcp-conf-1.0-r1 do_package_qa: QA Issue: networkd-dhcp-conf: recipe doesn't inherit features_check [unhandled-features-check] * fix: commit 4ae9917bf2475c118e8015ec7a2ce10bd01a0124 Author: Mykhaylo Sul <ext-mykhaylo.sul@here.com> Date: Fri Nov 1 11:44:44 2019 +0100 OTA-3988: Don't build the networkd-dhcp recipe if systemd is not included into the disto feature list Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Merge pull request #766 from advancedtelematic/feat/2020.9Patrick Vacek2020-08-271-4/+4
|\ | | | | aktualizr: Upgrade to 2020.9 release.
| * aktualizr: Upgrade to 2020.9 release.feat/2020.9Patrick Vacek2020-08-261-4/+4
|/ | | | Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
* Merge pull request #765 from shr-project/jansa/masterPatrick Vacek2020-08-181-1/+1
|\ | | | | image_repo_manifest.bbclass: fix build when there is no repo on host
| * image_repo_manifest.bbclass: fix build when there is no repo on hostMartin Jansa2020-08-181-1/+1
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * failing "which repo" causes the run.buildinfo_manifest task to fail before it even reaches the test for empty repotool variable: dash -x some-image/1.0-r2/temp/run.buildinfo_manifest.80233 + export systemd_system_unitdir=/usr/lib/systemd/system + export systemd_unitdir=/usr/lib/systemd + export systemd_user_unitdir=/usr/lib/systemd/user + buildinfo_manifest + which repo + repotool= + bb_sh_exit_handler + ret=1 + [ 1 != 0 ] + echo WARNING: exit code 1 from a shell command. WARNING: exit code 1 from a shell command. + exit 1 causing nasty long python exception from do_image task with this fix, it just shows an warning again: dash -x some-image/1.0-r2/temp/run.buildinfo_manifest.80233 + export systemd_user_unitdir=/usr/lib/systemd/user + buildinfo_manifest + which repo + true + repotool= + [ -n ] + bbwarn Android repo tool not found; manifest not copied. + [ -p some-image/1.0-r2/temp/fifo.80233 ] + echo WARNING: Android repo tool not found; manifest not copied. WARNING: Android repo tool not found; manifest not copied. + ret=0 + trap 0 + exit 0 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Merge pull request #762 from liuming50/fix-a-repo-tool-failed-issuePatrick Vacek2020-08-111-2/+3
|\ | | | | image_repo_manifest.bbclass: explicitly call python3
| * image_repo_manifest.bbclass: explicitly call python3Ming Liu2020-08-101-2/+3
|/ | | | | | | | | | | | Now we have changed to inherit python3native to provide python3 binary for repo, then we need explicitly call python3 to execute repo, or else it will firstly try to locate python which will fail if python is not in HOSTTOOLS. This fixes a following warning: | Android repo tool failed to run; manifest not copied Signed-off-by: Ming Liu <ming.liu@toradex.com>
* Merge pull request #759 from advancedtelematic/feat/headersPatrick Vacek2020-08-071-2/+4
|\ | | | | aktualizr: Bump to latest and install headers in dev package.
| * aktualizr: Bump to latest and install headers in dev package.feat/headersPatrick Vacek2020-08-061-2/+4
| | | | | | | | Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
* | Merge pull request #760 from advancedtelematic/fix/master/rpi-bootfiles-appendPatrick Vacek2020-08-071-2/+3
|\ \ | |/ |/| sota_raspberrypi: Use new variable for bootfiles path.
| * sota_raspberrypi: Use new variable for bootfiles path.fix/master/rpi-bootfiles-appendPatrick Vacek2020-08-071-2/+3
|/ | | | | | | | This was changed in f046b4128c9ca3420614887006101fa2b10fc6e7 of meta-raspberrypi. This also requires e947e8590f74477505c754d016d99fc71cadf4e1 in meta-updater-raspberrypi. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
* Merge pull request #757 from advancedtelematic/fix/pythonnativePatrick Vacek2020-08-034-1/+7
|\ | | | | Inherit python3native instead of using HOSTTOOLS.
| * Inherit python3native instead of using HOSTTOOLS.fix/pythonnativePatrick Vacek2020-08-034-1/+7
| | | | | | | | Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
* | Merge pull request #754 from shr-project/jansa/masterPatrick Vacek2020-07-301-4/+4
|\ \ | | | | | | nfs-utils: don't add nfs-home-mount.service without sota enabled
| * | nfs-utils: don't add nfs-home-mount.service without sota enabledMartin Jansa2020-07-261-4/+4
| |/ | | | | | | | | | | | | | | | | | | | | * nfs-home-mount.service is installed by do_install_append_sota, so only when sota is enabled but it was always added to SYSTEMD_SERVICE_ even when sota wasn't enabled resulting in do_patch failure: nfs-utils-2.5.1-r0 do_package: SYSTEMD_SERVICE_nfs-utils value nfs-home-mount.service does not exist * use sota override everywhere Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Merge pull request #756 from advancedtelematic/fix/restore-bootloader-optionPatrick Vacek2020-07-291-1/+4
|\ \ | |/ |/| qemucommand: Restore custom booloader parameter.
| * qemucommand: Restore custom booloader parameter.fix/restore-bootloader-optionPatrick Vacek2020-07-291-1/+4
|/ | | | | | | The functionality was (presumably unintentionally) removed, but the option was still present. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
* Merge pull request #753 from liuming50/fix-nfs-utils-issuesPatrick Vacek2020-07-142-0/+38
|\ | | | | nfs-utils: fix nfs systemd daemons runtime issues
| * nfs-utils: fix nfs systemd daemons runtime issuesMing Liu2020-07-102-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nfs-mountd.service and nfs-statd.service rely on /var/lib/nfs to be present in rootfs, or else they would run into problems for some files missing in it. But a ostree/ota rootfs does not have that directory (removed during do_image), to fix that, we now copy them to /var/local/lib/nfs and mount it to /var/lib/nfs at runtime, which is done in nfs-home-mount.service. nfs-mountd.service and nfs-statd.service need run after nfs-home-mount.service. Signed-off-by: Ming Liu <ming.liu@toradex.com>
* | Merge pull request #748 from advancedtelematic/feat/2020.8Patrick Vacek2020-07-131-4/+4
|\ \ | |/ |/| aktualizr: Bump to 2020.8 release.
| * aktualizr: Bump to 2020.8 release.feat/2020.8Patrick Vacek2020-07-091-4/+4
|/ | | | Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
* Merge pull request #745 from antznin/fix-dtb-deploymentPatrick Vacek2020-07-071-1/+4
|\ | | | | ostree-kernel-initramfs: fix devicetree deployment
| * ostree-kernel-initramfs: fix devicetree deploymentantznin2020-07-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the changes in ostree's deployment of the kernel, initramfs and devicetree in /lib/modules/$kver, the deployment method of the device tree also changed. Instead of picking the first device tree it finds at a given location, ostree looks at a file named devicetree, next to kernel and initramfs in /lib/modules/$kver. This commit modifies ostree-kernel-initramfs to deploy the devicetree from the sota-defined variable OSTREE_DEVICETREE. It will pick the first one from the list of device trees that OSTREE_DEVICETREE defines, and copy it to /lib/modules/$kver. Note that since OSTREE_DEVICETREE equals to KERNEL_DEVICETREE when it isn't explicitly defined, it could indeed be a list of device trees. Signed-off-by: antznin <agodard@witekio.com>
* | Merge pull request #746 from liuming50/fix-a-naming-issuePatrick Vacek2020-07-071-1/+1
|\ \ | |/ |/| image_types_ota.bbclass: change IMAGE_BASENAME to PN
| * image_types_ota.bbclass: change IMAGE_BASENAME to PNMing Liu2020-07-041-1/+1
|/ | | | | | | | | When setting intertask dependencies, we should use PN instead of IMAGE_BASENAME to refer to a image recipe, since PN is generated from recipe file name, while IMAGE_BASENAME is a variable that could be changed, it's not guaranteed to always equal to PN. Signed-off-by: Ming Liu <ming.liu@toradex.com>
* Merge pull request #744 from shr-project/jansa/masterPatrick Vacek2020-07-021-0/+5
|\ | | | | ostree-kernel-initramfs: skip recipe when OSTREE_KERNEL is not defined
| * ostree-kernel-initramfs: skip recipe when OSTREE_KERNEL is not definedMartin Jansa2020-07-011-0/+5
|/ | | | | | | | | | | | | | | | | * otherwise it fails with useless error: ostree-kernel-initramfs/0.0.1-r0/temp/run.do_install.3011' failed with exit code 1: cp: -r not specified; omitting directory 'tmp-glibc/deploy/images/qemux86/' WARNING: exit code 1 from a shell command. because of cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} $kerneldir/vmlinuz in do_install will try to copy whole ${DEPLOY_DIR_IMAGE}/ when ${OSTREE_KERNEL} is empty as reported in: https://github.com/advancedtelematic/meta-updater/pull/740#issuecomment-651952735 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Merge pull request #742 from antznin/fix/device-tree-selectionPatrick Vacek2020-06-301-1/+1
|\ | | | | ostree-kernel-initramfs: deploy dtbs from OSTREE_DEVICETREE
| * ostree-kernel-initramfs: deploy dtbs from OSTREE_DEVICETREEantznin2020-06-301-1/+1
|/ | | | Signed-off-by: antznin <agodard@witekio.com>
* Merge pull request #739 from shr-project/jansa/masterPatrick Vacek2020-06-291-0/+1
|\ | | | | ostree-kernel-initramfs: fix parsing for MACHINEs which don't define …
| * ostree-kernel-initramfs: fix parsing for MACHINEs which don't define ↵Martin Jansa2020-06-261-0/+1
|/ | | | | | | | | | | | | INITRAMFS_IMAGE * when INITRAMFS_IMAGE isn't defined at all, the "d.getVar('INITRAMFS_IMAGE') == ''" part doesn't do anything useful, because the unexpanded version of this ends in do_install[depends] variable and breaks parsing: meta-updater/recipes-sota/ostree-kernel-initramfs/ostree-kernel-initramfs_0.0.1.bb:do_install[depends], dependency ''][d.getVar('INITRAMFS_IMAGE') in 'virtual/kernel:do_deploy ${@['${INITRAMFS_IMAGE}:do_image_complete', ''][d.getVar('INITRAMFS_IMAGE') == '']} virtual/fakeroot-native:do_populate_sysroot' does not contain exactly one ':' character. Task 'depends' should be specified in the form 'packagename:task' Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Merge pull request #736 from advancedtelematic/feat/secondary-aktualizr-infoPatrick Vacek2020-06-233-9/+9
|\ | | | | Put aktualizr-info in a separate package and use it in Secondaries.
| * Put aktualizr-info in a separate package and use it in Secondaries.feat/secondary-aktualizr-infoPatrick Vacek2020-06-233-9/+9
|/ | | | | | | | | We did the work a while ago to make aktualizr-info work for Secondaries, but until now we weren't putting the tool into the secondary-image we use for testing. Now it's there. Actually, it's in every image that inherits from sota.bbclass, which is probably a good thing. Signed-off-by: Patrick Vacek <patrickvacek@gmail.com>
* Merge pull request #681 from liuming50/introduce-ostree-kernel-initramfsPatrick Vacek2020-06-224-26/+60
|\ | | | | Introduce ostree kernel initramfs
| * meta: introduce ostree-kernel-initramfs recipeMing Liu2020-06-184-26/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We package kernel image, devicetrees, initramfs and install them to /usr/lib/modules/${KERNEL_VERSION}, which is the preferred location according to ostree's new implementation, this could simplify the deployment. Reference: https://github.com/ostreedev/ostree/commit/3ab0d5e6644885440bac6abd17b6d2637df5435f To let initramfs-ostree-image be able to be depended by ostree-kernel-initramfs, it must inherit nopackages to avoid a annoying QA warning like the follows: | WARNING: initramfs-ostree-image-0.0.1-r0 do_package: Manifest ...initramfs-ostree-image.packagedata | not found in colibri_imx6 armv7ahf-neon-imx armv7at2hf-neon-imx armv7at2hf-neon armv7ahf-neon armv7at2hf-vfp | armv7ahf-vfp armv6thf-vfp armv6hf-vfp armv5tehf-vfp armv5ehf-vfp armv5thf-vfp armv5hf-vfp allarch | x86_64_x86_64-nativesdk (variant '')? Also we need define OSTREE_KERNEL, OSTREE_DEPLOY_DEVICETREE and OSTREE_DEVICETREE in sota.bbclass so they could be accessed in other recipes as well as in image recipes. Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Ming Liu <ming.liu@toradex.com>
* | Merge pull request #722 from liuming50/fix-network-configuration-namingPatrick Vacek2020-06-2212-15/+15
|\ \ | |/ |/| meta: change virtual/network-configuration to network-configuration