aportgen: device: rename modules to modules-initfs
The extra verbosity can be useful here.
See https://gitlab.com/postmarketOS/pmaports/-/merge_requests/4169#note_1489955273
for more details
Fixes ad85c7bc17
Signed-off-by: Pablo Correa Gómez <ablocorrea@hotmail.com>
Reviewed-by: Oliver Smith <ollieparanoid@postmarketos.org>
Link: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/%3C20230728113116.31529-1-pabloyoyoista@postmarketos.org%3E
This commit is contained in:
parent
93bf267481
commit
0489f7f40c
|
@ -231,19 +231,19 @@ def generate_deviceinfo(args, pkgname, name, manufacturer, year, arch,
|
||||||
handle.write(line.lstrip() + "\n")
|
handle.write(line.lstrip() + "\n")
|
||||||
|
|
||||||
|
|
||||||
def generate_modules(args):
|
def generate_modules_initfs(args):
|
||||||
content = """\
|
content = """\
|
||||||
# Remove this comment after reading, or the file if unnecessary (CHANGEME!)
|
# Remove this comment after reading, or the file if unnecessary (CHANGEME!)
|
||||||
# This file can contain a list of modules to be included in the initramfs,
|
# This file can contain a list of modules to be included in the initramfs,
|
||||||
# so that they are available in early boot stages. It should have one
|
# so that they are available in early boot stages. It should have one
|
||||||
# module name per line. If there are multiple kernel variants with different
|
# module name per line. If there are multiple kernel variants with different
|
||||||
# requirements for modules into the initramfs, one modules.$variant file
|
# requirements for modules into the initramfs, one modules-initfs.$variant
|
||||||
# should be created for each of them.
|
# file should be created for each of them.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
# Write to file
|
# Write to file
|
||||||
pmb.helpers.run.user(args, ["mkdir", "-p", args.work + "/aportgen"])
|
pmb.helpers.run.user(args, ["mkdir", "-p", args.work + "/aportgen"])
|
||||||
path = args.work + "/aportgen/modules"
|
path = args.work + "/aportgen/modules-initfs"
|
||||||
with open(path, "w", encoding="utf-8") as handle:
|
with open(path, "w", encoding="utf-8") as handle:
|
||||||
for line in content.rstrip().split("\n"):
|
for line in content.rstrip().split("\n"):
|
||||||
handle.write(line.lstrip() + "\n")
|
handle.write(line.lstrip() + "\n")
|
||||||
|
@ -277,7 +277,7 @@ def generate_apkbuild(args, pkgname, name, arch, flash_method):
|
||||||
makedepends="devicepkg-dev"
|
makedepends="devicepkg-dev"
|
||||||
source="
|
source="
|
||||||
deviceinfo
|
deviceinfo
|
||||||
modules
|
modules-initfs
|
||||||
"
|
"
|
||||||
|
|
||||||
build() {{
|
build() {{
|
||||||
|
@ -315,5 +315,5 @@ def generate(args, pkgname):
|
||||||
generate_deviceinfo(args, pkgname, name, manufacturer, year, arch,
|
generate_deviceinfo(args, pkgname, name, manufacturer, year, arch,
|
||||||
chassis, has_keyboard, has_external_storage,
|
chassis, has_keyboard, has_external_storage,
|
||||||
flash_method, bootimg)
|
flash_method, bootimg)
|
||||||
generate_modules(args)
|
generate_modules_initfs(args)
|
||||||
generate_apkbuild(args, pkgname, name, arch, flash_method)
|
generate_apkbuild(args, pkgname, name, arch, flash_method)
|
||||||
|
|
Loading…
Reference in New Issue