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

linux: initramfs: use initramfs config file(s) and directory structure #4218

Merged
merged 2 commits into from
Mar 5, 2020

Conversation

dhewg
Copy link
Contributor

@dhewg dhewg commented Feb 20, 2020

This was a PR created by @mglae at my fork (for whatever reason).
Cleaned up and rebased .

@MilhouseVH
Copy link
Contributor

Do we still need cpio:host?

The two configs:

packages/linux/initramfs.conf 
projects/Generic/linux/initramfs.x86_64.conf

I'm wondering if they should be associated with the initramfs package, rather than linux?

They should also be in a config sub-dir, ie.

packages/initramfs/config/initramfs.conf 
projects/Generic/packages/initramfs/config/initramfs.x86_64.conf

(Yes, the location of the linux kernel configs is a historical anachronism)

@dhewg
Copy link
Contributor Author

dhewg commented Feb 20, 2020

Indeed, it looks like we don't need the cpio dependency anymore, linux's usr/gen_init_cpio.c creates the archive itself. Removed it.
Also moved the config files to initramfs/config

@MilhouseVH
Copy link
Contributor

@dhewg thanks for updating the PR, however you've created:

projects/Generic/initramfs/config/initramfs.x86_64.conf

when this should be:

projects/Generic/packages/initramfs/config/initramfs.x86_64.conf

in order to maintain the correct package hierarchical structure.

I'd rather we don't create more package-specific subdirs in the root of each project (or device) - kodi and linux are pretty much the only two that do this, for legacy reasons (and we could/should tidy them up at some point, certainly kodi).

@MilhouseVH
Copy link
Contributor

Tested with Generic and RPi2 builds, all looks good to me - thanks!

@MilhouseVH
Copy link
Contributor

MilhouseVH commented Feb 25, 2020

@HiassofT can you rebase this ('cpio` was bumped in #4210)

@HiassofT
Copy link
Member

@MilhouseVH no, that's not my PR :-)

@MilhouseVH
Copy link
Contributor

Doh, sorry! Ping @dhewg 😄

mglae and others added 2 commits February 26, 2020 06:42
Cpio file is generated as part of the kernel build process. No need
to force fakeroot cpio build any more.
@dhewg
Copy link
Contributor Author

dhewg commented Feb 26, 2020

Done ;)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants