Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Composefs #1

Open
wants to merge 19 commits into
base: ostree
Choose a base branch
from
Open

Composefs #1

wants to merge 19 commits into from

Conversation

ldts
Copy link

@ldts ldts commented Apr 22, 2024

No description provided.

taken from meta-openembedded/meta-oe layer revision 4e9df16a

Signed-off-by: Jose Quaresma <[email protected]>
github-releases is not supported on kirkstone

| Could not inherit file classes/github-releases.bbclass

Signed-off-by: Jose Quaresma <[email protected]>
Added to fix the lack of systemd in the initramfs [1]
but look like is not need anymore.

[1] foundriesio@17d647d

Signed-off-by: Jose Quaresma <[email protected]>
@ldts
Copy link
Author

ldts commented Apr 22, 2024

will leave it at that. Did a bit of cleaning up

@ldts ldts force-pushed the composefs branch 7 times, most recently from c0e44ee to 107235a Compare April 26, 2024 08:12
ldts added 2 commits May 1, 2024 01:16
Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
@ldts ldts force-pushed the composefs branch 3 times, most recently from 0453b29 to 45f11cf Compare April 30, 2024 23:40
ldts added 5 commits May 1, 2024 19:54
Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
Do not include /dev/root in fstab when composefs usage is enabled so
that the "systemd-remount-fs" service does not try to remount it; this
prevents error messages during boot

Signed-off-by: Rogerio Guerra Borin <[email protected]>
Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
Signed-off-by: Jorge Ramirez-Ortiz <[email protected]>
Use this script to find the openssl object based on the fs-verity hash:

openssl="usr/bin/openssl"
read -p "Find the openssl repo file "
output=`ls -lat /sysroot/ostree/deploy/lmp/deploy/`
tmp=$(echo "$output" | grep '\.origin$' | awk -F'/' '{print $(NF-1)}')
deploy=$(echo "$tmp" | awk '{gsub(/.origin$/, "", $NF); print $NF}')
measure=`fsverity measure /sysroot/ostree/deploy/lmp/deploy/$deploy/${openssl}`
value=$(echo "$measure" | awk -F':' '{print $2}' |awk '{print $1}')
echo "openssl: hash = $value"
repo=`find /sysroot/ostree/repo -exec fsverity measure 2>/dev/null {} \; | egrep "${value}" | awk '{print $2}'`
echo "openssl: repo  = $repo"

Then just manually alter the repo object and check if fs-verity triggers
quaresmajose added a commit that referenced this pull request Jul 2, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Jul 15, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Jul 15, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Jul 16, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Jul 16, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
@quaresmajose quaresmajose force-pushed the ostree branch 2 times, most recently from 40327b8 to 67ade03 Compare August 22, 2024 10:35
quaresmajose added a commit that referenced this pull request Aug 22, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Sep 23, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Sep 23, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Sep 30, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Sep 30, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Oct 8, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Oct 9, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Oct 14, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Oct 14, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Oct 16, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Oct 16, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Oct 29, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Oct 29, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Oct 31, 2024
ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch' on target directory '/srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /srv/oe/build/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch
patching file lib/zlib/inflate.c
Hunk #1 FAILED at 455.
1 out of 1 hunk FAILED -- rejects in file lib/zlib/inflate.c
Patch lib-zlib-Fix-a-bug-when-getting-a-gzip-header-extra-field.patch can be reverse-applied

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-accept-filesystem-path-to-the-RoT-key.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-accept-filesystem-path-to-the-RoT-key.patch
patching file arch/arm/dts/Makefile
Hunk #1 succeeded at 1549 with fuzz 2 (offset 174 lines).
patching file arch/arm/dts/k3-binman.dtsi
Hunk #1 FAILED at 13.
1 out of 1 hunk FAILED -- rejects in file arch/arm/dts/k3-binman.dtsi
patching file board/ti/common/Kconfig
Hunk #1 FAILED at 49.
1 out of 1 hunk FAILED -- rejects in file board/ti/common/Kconfig
Patch k3-accept-filesystem-path-to-the-RoT-key.patch does not apply (enforce with -f)

ERROR: u-boot-ti-staging-1_2024.04+git-r0 do_patch: Applying patch 'k3-set-env-variable-device_type.patch' on target directory '/lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/git'
CmdError('quilt --quiltrc /lmp/build-lmp-am62xx-evm-scarthgap-next/tmp-lmp/work/am62xx_evm-lmp-linux/u-boot-ti-staging/2024.04+git/recipe-sysroot-native/etc/quiltrc push', 0, 'stdout: Applying patch k3-set-env-variable-device_type.patch
patching file arch/arm/mach-k3/common.c
Hunk #1 succeeded at 570 (offset -30 lines).
Hunk foundriesio#2 FAILED at 613.
1 out of 2 hunks FAILED -- rejects in file arch/arm/mach-k3/common.c
Patch k3-set-env-variable-device_type.patch does not apply (enforce with -f)

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Nov 7, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Nov 11, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Nov 15, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Nov 19, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Nov 19, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Nov 19, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Nov 21, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
quaresmajose added a commit that referenced this pull request Nov 22, 2024
- Update patches with devtool

| Applying patch 0001-85-nm-unmanaged.rules-do-not-manage-docker-bridges.patch
| patching file data/85-nm-unmanaged.rules
| Hunk #1 succeeded at 30 with fuzz 2 (offset 4 lines).

Signed-off-by: Jose Quaresma <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants