From 2c57359b8a41c0b0609623a8216ff71fbdc124e1 Mon Sep 17 00:00:00 2001 From: lambdadroid Date: Wed, 9 Oct 2019 17:10:22 +0200 Subject: [PATCH] main/postmarketos-mkinitfs: include ext4 and usb_f_rndis in initramfs (!673) The initramfs needs ext4 (to mount the rootfs) and usb_f_rndis (to enable USB networking on devices that use USB configfs). If these are built as modules, they need to be included in initramfs. [ci:skip-build]: already built successfully in CI --- device/device-surftab-wintron7.0/APKBUILD | 4 ++-- device/device-surftab-wintron7.0/deviceinfo | 2 +- device/device-tablet-x64uefi/APKBUILD | 4 ++-- device/device-tablet-x64uefi/deviceinfo | 3 +-- main/postmarketos-mkinitfs/APKBUILD | 6 +++--- main/postmarketos-mkinitfs/init.sh.in | 2 +- main/postmarketos-mkinitfs/mkinitfs.sh | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) diff --git a/device/device-surftab-wintron7.0/APKBUILD b/device/device-surftab-wintron7.0/APKBUILD index 5ad153ed1..ab1a27ceb 100644 --- a/device/device-surftab-wintron7.0/APKBUILD +++ b/device/device-surftab-wintron7.0/APKBUILD @@ -2,7 +2,7 @@ pkgname="device-surftab-wintron7.0" pkgdesc="TrekStor SurfTab wintron 7.0" pkgver=0.3 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="x86_64" @@ -32,5 +32,5 @@ nonfree_firmware() { mkdir "$subpkgdir" } -sha512sums="1dc0d206905aad9de0efc7284bdb8b27f739d0657d848a616c7df89a7bd982c579a492590e1413a88c772d81d5222847c683bbb8ecdcfb410e31bd9e568bc5fb deviceinfo +sha512sums="27c4941de46973dace7147fd65ceb447fde36e5b1350f5db2296de9ef8c68cce24580c9391f805b9b919679f66ad01c9c70826da6ffe3506870ec2ccbd5d8fee deviceinfo 8b77755eb59c07f84cb00439f09e0f4bbc2fdf6da8e41160bb1967463c0e098d012a18465891a5d0fc64a37712ba3840a110aa7a371da90c23b4fcd7ac63c004 grub.cfg" diff --git a/device/device-surftab-wintron7.0/deviceinfo b/device/device-surftab-wintron7.0/deviceinfo index c3e3435a2..b76278757 100644 --- a/device/device-surftab-wintron7.0/deviceinfo +++ b/device/device-surftab-wintron7.0/deviceinfo @@ -7,7 +7,7 @@ deviceinfo_manufacturer="TrekStor" deviceinfo_codename="surftab-wintron7.0" deviceinfo_date="" deviceinfo_dtb="" -deviceinfo_modules_initfs="usbhid jbd2 sdhci sdhci-pci sdhci_acpi mmc_core mmc_block mbcache ext4 scsi_mod sd_mod sg +deviceinfo_modules_initfs="usbhid jbd2 sdhci sdhci-pci sdhci_acpi mmc_core mmc_block mbcache scsi_mod sd_mod sg libata ahci libahci usb_storage xhci_hcd ehci_hcd uas xhci_pci fat vfat nls_cp437 nls_utf8" deviceinfo_arch="x86_64" diff --git a/device/device-tablet-x64uefi/APKBUILD b/device/device-tablet-x64uefi/APKBUILD index c2fb1fedc..3b6a7bef6 100644 --- a/device/device-tablet-x64uefi/APKBUILD +++ b/device/device-tablet-x64uefi/APKBUILD @@ -2,7 +2,7 @@ pkgname="device-tablet-x64uefi" pkgdesc="Various tablets with atom CPU" pkgver=0.1 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="x86_64" @@ -33,6 +33,6 @@ package() { "$pkgdir"/boot/EFI/Boot/bootx64.efi } -sha512sums="3f299fa22b338a19b2efacdab70dbf6848c9e1572983bec9dcfbcda97f62f98ecec7a5eab73b849e5e66fda85fc82daaa522280f2127b0a3c011e57919c90f77 deviceinfo +sha512sums="9e030883d317802e3875151699b219c71642b8202ba35f3fd049b92ddadb1489da2d5b692ca34bef1776c13e54df70bf71c84eb86d6c1561f56d08eb723ef652 deviceinfo 838a0a66d5513fb8f6d1a8d20743f25f24298e35a942b2a71e7f0b4aaaf35bd22a3ec245e993f1551fe60ce6e2eac7df1a4631d3e02ebc593965ce284002cffc loader.conf c4a8a1f19d8ba7340f2e54b5ab2066af2d7bff2ba2a86aabbf0aeb0836223bb4f3201a6ca8c8feeba91867af9884587be3d3cd0a5f0af6f90152134a955a8630 postmarketos.conf" diff --git a/device/device-tablet-x64uefi/deviceinfo b/device/device-tablet-x64uefi/deviceinfo index 9cf470bd4..00a4760f3 100644 --- a/device/device-tablet-x64uefi/deviceinfo +++ b/device/device-tablet-x64uefi/deviceinfo @@ -7,7 +7,7 @@ deviceinfo_manufacturer="Various" deviceinfo_codename="tablet-x64uefi" deviceinfo_date="" deviceinfo_dtb="" -deviceinfo_modules_initfs="jbd2 mbcache ext4 scsi_mod sd_mod sg libata sd ahci libahci usb_storage usb xhci_hcd ehci_hcd uas xhci_pci fat vfat nls_cp437 nls_utf8" +deviceinfo_modules_initfs="jbd2 mbcache scsi_mod sd_mod sg libata sd ahci libahci usb_storage usb xhci_hcd ehci_hcd uas xhci_pci fat vfat nls_cp437 nls_utf8" deviceinfo_arch="x86_64" # Device related @@ -22,4 +22,3 @@ deviceinfo_dev_keyboard="" # Bootloader related deviceinfo_flash_method="none" deviceinfo_boot_filesystem="fat16" - diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index 692293093..40dfab977 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -1,5 +1,5 @@ pkgname=postmarketos-mkinitfs -pkgver=0.7.16 +pkgver=0.7.17 pkgrel=0 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://postmarketos.org" @@ -24,6 +24,6 @@ package() { mkdir -p "$pkgdir/etc/postmarketos-mkinitfs/hooks/" } -sha512sums="3b7d697381a45a6a165d195d25a26e71773794ebc4a0d8b425321e5bb68a02405028d9712848982b2573474b7b1ee2560091c41f7f51b9e2e962eeb5204a72aa init.sh.in +sha512sums="8be7f29394f8cd4e1c4b93f018f6314350f7e37e20d242c97284c1b112a106f882318a101bc0c70b391590b969023901580c677ee9f869850e90e69171a44e80 init.sh.in 39154fa1f4874d1bbe3b6fef20e15f6d353fd720a3b7a4fd2332bae7bff460a1546c7a220deaef1e10ed988731bceaefd2aaaee731961810728b511cd8fb8823 init_functions.sh -77ed5cd5eed0156b3018ec9f9f68f97601f20f5d2aee2a4a7d2f5a51804212188f75f4f57b105034f016c9d1c02c4a46694bfa3e5fc27a013f7cb5a2a392ddff mkinitfs.sh" +c9151771ffed846e88618e59e19f5bf6a9aa7d923de1194f3a9cd9d18fa3ed0d1e45622ecb81ef2d23295a25114dacf5cbdde5a23f8b4a376bf1f73cd8f3f0b3 mkinitfs.sh" diff --git a/main/postmarketos-mkinitfs/init.sh.in b/main/postmarketos-mkinitfs/init.sh.in index a1124facb..5fe5d2bb8 100644 --- a/main/postmarketos-mkinitfs/init.sh.in +++ b/main/postmarketos-mkinitfs/init.sh.in @@ -15,7 +15,7 @@ mount_proc_sys_dev setup_log setup_firmware_path # shellcheck disable=SC2154,SC2086 -[ -d /lib/modules ] && modprobe -a ${deviceinfo_modules_initfs} ext4 +[ -d /lib/modules ] && modprobe -a ${deviceinfo_modules_initfs} ext4 usb_f_rndis setup_mdev mount_subpartitions diff --git a/main/postmarketos-mkinitfs/mkinitfs.sh b/main/postmarketos-mkinitfs/mkinitfs.sh index cfb2e751e..1d3e1e83c 100644 --- a/main/postmarketos-mkinitfs/mkinitfs.sh +++ b/main/postmarketos-mkinitfs/mkinitfs.sh @@ -86,7 +86,7 @@ get_modules_by_name() echo "with 'y' instead of 'm' (module)." } >&2 - MODULES="dm_crypt \ + MODULES="dm_crypt ext4 usb_f_rndis \ ${deviceinfo_modules_initfs}" modprobe \ -a \