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

[Bug]: uboot-patch preview is empty while it is not #7912

Open
1 of 2 tasks
ig3 opened this issue Mar 5, 2025 · 3 comments
Open
1 of 2 tasks

[Bug]: uboot-patch preview is empty while it is not #7912

ig3 opened this issue Mar 5, 2025 · 3 comments
Labels
Bug Something isn't working as it should

Comments

@ig3
Copy link

ig3 commented Mar 5, 2025

What happened?

I am attempting to create a patch for u-boot with command $ ./compile.sh nanopi-r2s-plus uboot-patch DEBUG=yes, with 'userpatches/config-nanopi-r2s-plus.conf':

BOARD=nanopi-r2s-plus
BRANCH=current
BUILD_DESKTOP=no
BUILD_MINIMAL=yes
KERNEL_BTF=no
KERNEL_CONFIGURE=no
RELEASE=bookworm

The compile script runs until it prompts me to make my changes and press ENTER.

In another window, I added a new file in configs with ownership and permissions consistent with existing files (i.e. owned by root.root and rw-rw-r--).

I pressed ENTER in the window running compile.sh.

The script produced output that appears to indicate an empty patch file:

Press ENTER to show a preview of your patch, or type 'stop' to stop patching...
[🌱] OK, here's how your diff looks like [ showing patch diff ]
[🐛] DIR_BATCAT is not set, using default [ batcat ]
[🐛] Running batcat [ batcat version 0.25.0 ]
[🐛] Running batcat bat 0.25.0 (25f4f96) [ batcat ]
[🐛] Calling batcat [ COLUMNS: 60 | --file-name /home/ian/ig3/armbian-build/output/patch/u-boot-rockchip64-current.patch - ]
───────┬────────────────────────────────────────────────────
       │ File: /home/ian/ig3/armbian-build/output/patch/
       │ u-boot-rockchip64-current.patch   <EMPTY>
───────┴────────────────────────────────────────────────────
[🐛] wait_for_disk_sync: after running batcat [ sync start, timeout_seconds:30 ]
[🐛] wait_for_disk_sync: after running batcat [ sync done worked: 1 sync_timeout: 0 ]
[🚸] Are you happy with this patch? [ Type 'yes' to accept, 'stop' to stop patching, or anything else to keep patching ]
Are you happy with the diff above? Type 'y' or 'yes' to accept, 'stop' to stop patching, anything else to keep patching: stop

So I stopped (i.e. I entered 'stop'). Then I checked to confirm nothing had been produced in the output/patches directory.

What I expected is that a patch file would be produced for the creation of the config file I had created.

In previous attempts I created other files. I have not attempted to change any existing files because for the change I am trying to implement I don't need to change existing files.

How to reproduce?

Check out armbian/build branch main, commit 533fc7d (Feb 20 2025 - so reasonably recent)

Run the 'uboot-patch' command via compile.sh and add a file in the relevant u-boot config directory.

log-uboot-patch-bc158496-89bb-4c22-9c3e-5bb8ceed0dac.log

Branch

main (main development branch)

On which host OS are you running the build script and observing this problem?

Ubuntu 22.04 Jammy

Are you building on Windows WSL2?

  • Yes, my Ubuntu/Debian/OtherOS is running on WSL2

Relevant log URL

No response

Code of Conduct

  • I agree to follow this project's Code of Conduct
@ig3 ig3 added the Bug Something isn't working as it should label Mar 5, 2025
Copy link
Contributor

github-actions bot commented Mar 5, 2025

Jira ticket: AR-2625

@EvilOlaf
Copy link
Member

EvilOlaf commented Mar 5, 2025

https://forum.armbian.com/topic/50256-patch-u-boot/#comment-213866

Alright, there seems to be a cosmetic bug. New files aren't shown for whatever reason in the patchfile preview. However if you press y to finish up patching the patchfile in the output folder looks just fine.

@ig3
Copy link
Author

ig3 commented Mar 5, 2025

I hadn't tried accepting the patch. Having done so, I confirm - a patch file is produced with the content I was expecting.

Thanks for the quick response.

@EvilOlaf EvilOlaf changed the title [Bug]: uboot-patch fails to generate patch file [Bug]: uboot-patch preview is empty while it is not Mar 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug Something isn't working as it should
Development

No branches or pull requests

2 participants