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

rpi-eeprom_git: Update recipe to latest rpi-eeprom repo #1240

Merged
merged 1 commit into from
Nov 14, 2023
Merged

rpi-eeprom_git: Update recipe to latest rpi-eeprom repo #1240

merged 1 commit into from
Nov 14, 2023

Conversation

mdsketch
Copy link
Contributor

  • What I did

I upped the commit version to the latest release of https://github.com/raspberrypi/rpi-eeprom

This will allow updating the pi4 to the latest version eeprom. It does not support the pi5 (but it could with some more editing).

  • How I did it

I had to change the directories that are installed as they changed upstream. I matched the compatibility that upstream provides.

Also removed the patch as it's already changed. Here is the upstream change that does the same thing as the patch https://github.com/raspberrypi/rpi-eeprom/blob/5ec5c003bacc73847aadad712aa1fbdace8f1c4e/rpi-eeprom-update#L122

and here is the actual patch commit raspberrypi/rpi-eeprom@55ca589

PR is the same as #1239 but I followed the correct guidelines

@kraj
Copy link
Collaborator

kraj commented Oct 26, 2023

Can you do a rebase on master ( instead of rebase ) so we can avoid unnecessary merge commits ?

@mdsketch
Copy link
Contributor Author

Can you do a rebase on master ( instead of rebase ) so we can avoid unnecessary merge commits ?

Done, sorry about that.

@agherzan
Copy link
Owner

agherzan commented Nov 1, 2023

This looks good. Two small requests to maintain the history assumptions and contribution guidelines:

  1. squash the commits while maintaining the git log - in essence they are one logical change
  2. I would reword the subject for the resulting commit to maintain the current format: " rpi-eeprom: Update to 2023.10.18-2712"
    Thanks once again for this.

@mdsketch
Copy link
Contributor Author

mdsketch commented Nov 1, 2023

ok I think I did it right, let me know if you need anything else changed

@agherzan
Copy link
Owner

The commit ended up pretty messed up. Here is what I propose to change it to:

rpi-eeprom: Update to 2023.10.18-2712

This follows the current latest release of rpi-eeprom:
https://github.com/raspberrypi/rpi-eeprom

This also removes a patch that is already in upstream.
https://github.com/raspberrypi/rpi-eeprom/blob/5ec5c003bacc73847aadad712aa1fbdace8f1c4e/rpi-eeprom-update#L122
https://github.com/raspberrypi/rpi-eeprom/commit/55ca589

Signed-off-by: Matthew Draws <[email protected]>

@mdsketch
Copy link
Contributor Author

Yup makes more sense, I had everything from both commit messages in there

Copy link
Owner

@agherzan agherzan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this. Approved and kicked the CI.

@agherzan agherzan enabled auto-merge (rebase) November 14, 2023 15:36
@agherzan agherzan merged commit eb79172 into agherzan:master Nov 14, 2023
17 checks passed
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.

3 participants