From 0489f7f40c4f39d79e8b3a4d15bde9f3dea05705 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Correa=20G=C3=B3mez?= Date: Fri, 28 Jul 2023 13:31:10 +0200 Subject: [PATCH] aportgen: device: rename modules to modules-initfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The extra verbosity can be useful here. See https://gitlab.com/postmarketOS/pmaports/-/merge_requests/4169#note_1489955273 for more details Fixes ad85c7bc173ca89a876593957fc36e4177116f8a Signed-off-by: Pablo Correa Gómez Reviewed-by: Oliver Smith Link: https://lists.sr.ht/~postmarketos/pmbootstrap-devel/%3C20230728113116.31529-1-pabloyoyoista@postmarketos.org%3E --- pmb/aportgen/device.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pmb/aportgen/device.py b/pmb/aportgen/device.py index 3ab65669..e296ac41 100644 --- a/pmb/aportgen/device.py +++ b/pmb/aportgen/device.py @@ -231,19 +231,19 @@ def generate_deviceinfo(args, pkgname, name, manufacturer, year, arch, handle.write(line.lstrip() + "\n") -def generate_modules(args): +def generate_modules_initfs(args): content = """\ # 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, # 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 - # requirements for modules into the initramfs, one modules.$variant file - # should be created for each of them. + # requirements for modules into the initramfs, one modules-initfs.$variant + # file should be created for each of them. """ # Write to file 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: for line in content.rstrip().split("\n"): handle.write(line.lstrip() + "\n") @@ -277,7 +277,7 @@ def generate_apkbuild(args, pkgname, name, arch, flash_method): makedepends="devicepkg-dev" source=" deviceinfo - modules + modules-initfs " build() {{ @@ -315,5 +315,5 @@ def generate(args, pkgname): generate_deviceinfo(args, pkgname, name, manufacturer, year, arch, chassis, has_keyboard, has_external_storage, flash_method, bootimg) - generate_modules(args) + generate_modules_initfs(args) generate_apkbuild(args, pkgname, name, arch, flash_method)