From b714ea8aefe99a7c3fc3dffb55b7c9d9690a4bce Mon Sep 17 00:00:00 2001 From: Minecrell Date: Fri, 27 May 2022 17:48:37 +0200 Subject: [PATCH] device-*: Drop file system modules from deviceinfo_modules_initfs (MR 3166) File system modules are included by default in postmarketos-mkinitfs and loaded dynamically when needed. [ci:skip-build]: already built successfully in CI --- device/community/device-asus-me176c/APKBUILD | 4 ++-- device/community/device-asus-me176c/deviceinfo | 2 +- device/main/device-qemu-aarch64/APKBUILD | 4 ++-- device/main/device-qemu-aarch64/deviceinfo | 2 +- device/main/device-qemu-amd64/APKBUILD | 4 ++-- device/main/device-qemu-amd64/deviceinfo | 2 +- device/testing/device-microsoft-surface-rt/APKBUILD | 4 ++-- device/testing/device-microsoft-surface-rt/deviceinfo | 2 +- device/testing/device-pine64-pinephonepro/APKBUILD | 4 ++-- device/testing/device-pine64-pinephonepro/deviceinfo | 2 +- device/testing/device-surftab-wintron7.0/APKBUILD | 4 ++-- device/testing/device-surftab-wintron7.0/deviceinfo | 2 +- device/testing/device-tablet-x64uefi/APKBUILD | 4 ++-- device/testing/device-tablet-x64uefi/deviceinfo | 2 +- device/testing/device-tablet-x86uefi/APKBUILD | 4 ++-- device/testing/device-tablet-x86uefi/deviceinfo | 2 +- device/testing/device-trekstor-surftabduow1/APKBUILD | 4 ++-- device/testing/device-trekstor-surftabduow1/deviceinfo | 2 +- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/device/community/device-asus-me176c/APKBUILD b/device/community/device-asus-me176c/APKBUILD index bc4a7897c..6a79e947b 100644 --- a/device/community/device-asus-me176c/APKBUILD +++ b/device/community/device-asus-me176c/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-asus-me176c pkgdesc="ASUS MeMO Pad 7 (ME176C(X))" pkgver=4 -pkgrel=0 +pkgrel=1 _commit=3155254999ac36c3051a2118c415de25a072c0f6 url="https://postmarketos.org" license="MIT" @@ -62,6 +62,6 @@ phosh() { sha512sums=" 75243e3d0bc9a352465683ec8cf8b83566e4131bb7fae0f388267a62bdbf4691c955ed034b30df550f921b771080688123ae8db144b72f786bf1677ef1d83f57 3155254999ac36c3051a2118c415de25a072c0f6.tar.gz -8dfeb1d928aa3ac94e9015d4b98713ec4d56eab68a7aee8cb7ce6a877b3d015670800bae456190ae57bcb35047738de5559460f2f7b785987f1394b605119ae5 deviceinfo +c8bb189b08035e647e07dec120a6e166d871c17a227987387228c8bf6ff264e029f950c69bb560d3062cee0e27e4fb93449523592558108690a82c6d40931de1 deviceinfo 3823556d741a352fc7f43567d7218255a27c45c2c5d4d4bdf23f4d26ce2828c5a1c642519b84fef7f59756c990e6a199d72e6ba0c277939b08a40526c3ff3714 phoc.ini " diff --git a/device/community/device-asus-me176c/deviceinfo b/device/community/device-asus-me176c/deviceinfo index 5ffa1f948..1ad142636 100644 --- a/device/community/device-asus-me176c/deviceinfo +++ b/device/community/device-asus-me176c/deviceinfo @@ -6,7 +6,7 @@ deviceinfo_name="ASUS MeMO Pad 7 (ME176C(X))" deviceinfo_codename="asus-me176c" deviceinfo_manufacturer="ASUS" deviceinfo_year="2014" -deviceinfo_modules_initfs="vfat nls_cp437 nls_iso8859_1 nls_utf8 goodix" +deviceinfo_modules_initfs="goodix" deviceinfo_arch="x86_64" # Device related diff --git a/device/main/device-qemu-aarch64/APKBUILD b/device/main/device-qemu-aarch64/APKBUILD index 4ee1bb03d..5360714a7 100644 --- a/device/main/device-qemu-aarch64/APKBUILD +++ b/device/main/device-qemu-aarch64/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Daniele Debernardi pkgname=device-qemu-aarch64 pkgver=2.4 -pkgrel=2 +pkgrel=3 pkgdesc="Simulated device in QEMU (aarch64)" url="https://postmarketos.org" arch="aarch64" @@ -65,7 +65,7 @@ kernel_lts() { } sha512sums=" -e4cdfa595de658a1baa45af4071bbc1be1dfe5317f867b9c504475806906b9c98d4c17ec80d2c1dc4fada90f3c3f1fdccf768d24405b411c5a797f7435bf2739 deviceinfo +7dbe34f2aa8f30ab5284007d43c49e2a3c74135dcabcf1f5915afbceb645277152099c808dac5c004db51be9abb34b2976c7336d0f52ed143b23c4d6cdeb061e deviceinfo 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad mce-display-blanking.conf de794566118f1744d068a94e6a75b61d43f6749a4b0871a5270fa7a2048164d609c71fcffa61845c2a7dd4cb5fbeb72c0e4f8b73b382f36d6ff0bcc9b8a5ae25 weston.ini " diff --git a/device/main/device-qemu-aarch64/deviceinfo b/device/main/device-qemu-aarch64/deviceinfo index c7d13094f..97b108081 100644 --- a/device/main/device-qemu-aarch64/deviceinfo +++ b/device/main/device-qemu-aarch64/deviceinfo @@ -5,7 +5,7 @@ deviceinfo_format_version="0" deviceinfo_name="QEMU aarch64" deviceinfo_manufacturer="QEMU" deviceinfo_codename="qemu-aarch64" -deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input evdev crc32c_generic" +deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input evdev" deviceinfo_arch="aarch64" # Device related diff --git a/device/main/device-qemu-amd64/APKBUILD b/device/main/device-qemu-amd64/APKBUILD index ecd8248bd..fbd23e9b1 100644 --- a/device/main/device-qemu-amd64/APKBUILD +++ b/device/main/device-qemu-amd64/APKBUILD @@ -3,7 +3,7 @@ # Co-Maintainer: Daniele Debernardi pkgname=device-qemu-amd64 pkgver=2.5 -pkgrel=2 +pkgrel=3 pkgdesc="Simulated device in QEMU (x86_64)" url="https://postmarketos.org" arch="x86_64" @@ -64,7 +64,7 @@ kernel_lts() { } sha512sums=" -dfcce68acdffeede5553b52da7f5836ff6ebb43e740801c277f8fa010920cff2bbb9677ccf84bd9b3523a254fe370d1d7383ede099bc5ba04e3e83c2ae50cecd deviceinfo +0c9b4b50073dc6bf6bfecb07370254f0dd8a277acbc1d90a605c7891e7d00c1c211545b296b7a1a7a6e00bce05a4197102fcfa449f113f2b500d8879ad29c6bf deviceinfo 99d32eed6c5cda59e91516e982c5bd5165ff718133e2411a0dbba04e2057d1dfad49a75e5cc67140d0e0adcbe1383671bd2892335929b782a5b19f5472e635ad mce-display-blanking.conf 47b27c7572b8737988488f7eb23b9e68f9a944e22baafe1c78355d2514a2554cf41d99b29fca12238eb13a6f5d53f00ca89b94e534e8461ebab72256dcf0f142 weston.ini " diff --git a/device/main/device-qemu-amd64/deviceinfo b/device/main/device-qemu-amd64/deviceinfo index 5b7e63004..01931e179 100644 --- a/device/main/device-qemu-amd64/deviceinfo +++ b/device/main/device-qemu-amd64/deviceinfo @@ -5,7 +5,7 @@ deviceinfo_format_version="0" deviceinfo_name="QEMU amd64" deviceinfo_manufacturer="QEMU" deviceinfo_codename="qemu-amd64" -deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input evdev crc32c_generic" +deviceinfo_modules_initfs="virtio_pci virtio_blk virtio-gpu virtio_input evdev" deviceinfo_arch="x86_64" # Device related diff --git a/device/testing/device-microsoft-surface-rt/APKBUILD b/device/testing/device-microsoft-surface-rt/APKBUILD index 6db291a31..ab46706bf 100644 --- a/device/testing/device-microsoft-surface-rt/APKBUILD +++ b/device/testing/device-microsoft-surface-rt/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-microsoft-surface-rt pkgdesc="Microsoft Surface RT" pkgver=6 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="armv7" @@ -78,7 +78,7 @@ phosh() { } sha512sums=" -30b2265fee16faca4f5256adb6453989d1fe4b1c6f4c902e6f5397249ea218e9b1e8e118e039a0a9b0c446edfd6c58857a7562c5b855648e8ba428da33b51436 deviceinfo +843b82db45fa110cc46f1abaf4f1c8b9e33edbf48233533e6748241b857ff2b5edfdff03520c2eac09e11a82a1ddcb67bd0cd71be324a08fd49352ca16b34f63 deviceinfo 40b507176edce2d141ff707aecad6f8d9636b828084e84d0015886d5e371127285bc80398fc13c1b88a7740c5b4694d2011286138249c95d27db0d9df3ca102f grub.cfg 0c7640df35d29a5c2e168d1e54b73a90d903e51b16d67ad08c3ccb41972209086844357f82cf6a2b6de977ebfb7e1099da01db71dc0733e90662ba315f0cd1d0 initfs-hook.sh 34f6eb789d4688985a262c519017e0712a90ca5acf89e6b3f39e33792a7982155261c6b4f0dbf41595b512da9dc7c9002adb69a550e80be349a374d086799916 pointercal diff --git a/device/testing/device-microsoft-surface-rt/deviceinfo b/device/testing/device-microsoft-surface-rt/deviceinfo index 1e159e865..1b955550e 100644 --- a/device/testing/device-microsoft-surface-rt/deviceinfo +++ b/device/testing/device-microsoft-surface-rt/deviceinfo @@ -8,7 +8,7 @@ deviceinfo_manufacturer="Microsoft" deviceinfo_codename="microsoft-surface-rt" deviceinfo_year="2012" deviceinfo_dtb="tegra30-microsoft-surface-rt-efi" -deviceinfo_modules_initfs="nls-cp437 nls-iso8859-1 vfat surface-rt-ec hid-generic i2c-hotplug-gpio i2c-hid-of lvds-codec panel-lvds" +deviceinfo_modules_initfs="surface-rt-ec hid-generic i2c-hotplug-gpio i2c-hid-of lvds-codec panel-lvds" deviceinfo_arch="armv7" # Device related diff --git a/device/testing/device-pine64-pinephonepro/APKBUILD b/device/testing/device-pine64-pinephonepro/APKBUILD index 30580fdfc..186708a0e 100644 --- a/device/testing/device-pine64-pinephonepro/APKBUILD +++ b/device/testing/device-pine64-pinephonepro/APKBUILD @@ -3,7 +3,7 @@ pkgname=device-pine64-pinephonepro pkgdesc="PINE64 PinePhone Pro" pkgver=2.1 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="aarch64" @@ -101,7 +101,7 @@ nonfree_firmware() { } sha512sums=" -18af46496eba898e7642ffed02d2d8dd4c9652c304eb2730fd042ca9d71da570b9c51446d9055ced1ea47e94a00c2590cdf9115f3a6d7219d457ce2d5eb8fc69 deviceinfo +195ea87f346e09b781d7925bcb7752a25d27f4396e1512ae15582526c062261516f918703c633730f56becb9f5c94020cc46ef6dc9d960b4a29208f03e3b70b8 deviceinfo e69752fc7f2b8552ba2e1e6da5b6bec0e284c7f14bc09576c862faeb5154a44522535a919ae5aca33a22fd14557e802595a7c96c59b9362c5ac5b991a8eac5fc grub.cfg 0f9357d4eea089628fbceb1e3e96d21a3f4329aeb6743158a6f877f967ef274506404eba949d5f01b7e1adea149f9a3aef992a5e8cd4181f93ab00909b1c5ecd grub_early.cfg ac22c856af81d00aa6a349b68cf9e8645bf38277d9aafd07f1f46f5f932f48d37b9dfdcc8772fff4027f914c9b4c3b4a11c51bd9f2aa1abbc53abd3f54adb818 HiFi.conf diff --git a/device/testing/device-pine64-pinephonepro/deviceinfo b/device/testing/device-pine64-pinephonepro/deviceinfo index dcc6191b5..76ce97d3e 100644 --- a/device/testing/device-pine64-pinephonepro/deviceinfo +++ b/device/testing/device-pine64-pinephonepro/deviceinfo @@ -6,7 +6,7 @@ deviceinfo_name="PINE64 PinePhone Pro" deviceinfo_manufacturer="PINE64" deviceinfo_codename="pine64-pinephonepro" deviceinfo_year="2021" -deviceinfo_modules_initfs="gpu_sched dw_wdt fusb302 panel_himax_hx8394 goodix_ts vfat nls_cp437 nls_ascii" +deviceinfo_modules_initfs="gpu_sched dw_wdt fusb302 panel_himax_hx8394 goodix_ts" deviceinfo_arch="aarch64" # Device related diff --git a/device/testing/device-surftab-wintron7.0/APKBUILD b/device/testing/device-surftab-wintron7.0/APKBUILD index a7c26f359..30d8d9fea 100644 --- a/device/testing/device-surftab-wintron7.0/APKBUILD +++ b/device/testing/device-surftab-wintron7.0/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-surftab-wintron7.0 pkgdesc="TrekStor SurfTab wintron 7.0" pkgver=0.5 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="x86_64" @@ -33,6 +33,6 @@ nonfree_firmware() { } sha512sums=" -24985b2bbe4b078ed9680df33476db404424ce5a379441d4cfc0fb5df8e6fe2356898c341a4197b05a8467f3e401d1acecf9b18fb891cc182aac0e189d915b22 deviceinfo +9204741b6a06c2cf8c29877e13e612a02621b25af3de8d627448f23042a436a4b97e2ebf3614df89314c603342595a6381871054dfb1367b89e9143997d04085 deviceinfo 11fa2ef0a8434bdd6ff266f17585ae3f5ec7724a2053ec62c831845dc7cf6d74e690cdb3e67f84c7183e16f0d6a168275942490927143b1287330b45286f27e9 grub.cfg " diff --git a/device/testing/device-surftab-wintron7.0/deviceinfo b/device/testing/device-surftab-wintron7.0/deviceinfo index d8112460c..e9c56d6ac 100644 --- a/device/testing/device-surftab-wintron7.0/deviceinfo +++ b/device/testing/device-surftab-wintron7.0/deviceinfo @@ -6,7 +6,7 @@ deviceinfo_name="TrekStor SurfTab wintron 7.0" deviceinfo_manufacturer="TrekStor" deviceinfo_codename="surftab-wintron7.0" deviceinfo_year="2015" -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_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" deviceinfo_arch="x86_64" # Device related diff --git a/device/testing/device-tablet-x64uefi/APKBUILD b/device/testing/device-tablet-x64uefi/APKBUILD index 9bb7f21af..2dff3e94c 100644 --- a/device/testing/device-tablet-x64uefi/APKBUILD +++ b/device/testing/device-tablet-x64uefi/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-tablet-x64uefi pkgdesc="Various tablets with atom CPU" pkgver=0.3 -pkgrel=3 +pkgrel=4 url="https://postmarketos.org" license="MIT" arch="x86_64" @@ -57,7 +57,7 @@ package() { } sha512sums=" -b246103f5ac80af0501579420bfe647f914ae555d25c6559589f60606aa78383409ebd148f5e9c73ddec7a247f04969a9ace7d17c76723845bee68acb20d532f deviceinfo +ab7a47ec92593c6008fb11d958397ffa77e506c7669c972294276dd898ef415983d4c28e5de261aacafe7717d1d5934c4c0dbfb1267a164a38ab79594b193363 deviceinfo e15beaf385a350a7c36be249cf9495e4622f7888c8def6ac47359ebd2ef2c994f954abec8ccb16b402269f949e6f6016d41711e6596f46ba3dad240f84ba163f grub.cfg 0f9357d4eea089628fbceb1e3e96d21a3f4329aeb6743158a6f877f967ef274506404eba949d5f01b7e1adea149f9a3aef992a5e8cd4181f93ab00909b1c5ecd grub_early.cfg " diff --git a/device/testing/device-tablet-x64uefi/deviceinfo b/device/testing/device-tablet-x64uefi/deviceinfo index bf40429c2..afaf22f1c 100644 --- a/device/testing/device-tablet-x64uefi/deviceinfo +++ b/device/testing/device-tablet-x64uefi/deviceinfo @@ -5,7 +5,7 @@ deviceinfo_format_version="0" deviceinfo_name="Various tablets with atom CPU" deviceinfo_manufacturer="Various" deviceinfo_codename="tablet-x64uefi" -deviceinfo_modules_initfs="jbd2 mbcache scsi_mod sd_mod sg libata sd ahci libahci usb_storage usb xhci_hcd ehci_hcd uas xhci_pci ehci_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 ehci_pci" deviceinfo_arch="x86_64" deviceinfo_gpu_accelerated="true" diff --git a/device/testing/device-tablet-x86uefi/APKBUILD b/device/testing/device-tablet-x86uefi/APKBUILD index 008edc922..7c53dff1b 100644 --- a/device/testing/device-tablet-x86uefi/APKBUILD +++ b/device/testing/device-tablet-x86uefi/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-tablet-x86uefi pkgdesc="Various tablets with atom CPU" pkgver=3 -pkgrel=0 +pkgrel=1 url="https://postmarketos.org" license="MIT" arch="x86_64" @@ -36,7 +36,7 @@ x11() { } sha512sums=" -ba983dcd9980ccf7477cfa8f2f2f5235a26425fd5364c6c0c6686814f86c1db6975f77cafb7152f3c1ad933a3a1cca0223f82a1ec15d73cce2abda86b3d6d444 deviceinfo +c9c81c6b57211c260a7a834c880068e5dec2a70a4502d0b4df7962c45d2f6019e7082bccbcc1eb7cee23adb7f05bc38f638010802e41279107cc7740d80e3fbe deviceinfo 2d951d71102181db85a2468fd770ee3a7958c06b14e27e52e0d4ff0e9b88f3ab3c5c9b15c8a938d1cd2ae0c94ad2aad7001f1b6fe943f96a38602085f481a4cf grub.cfg e8f734a2f8d154813dbb493f0d58af50a7f624ffed41967a81493b975a6211efc6d30743b23825562cfd126791cbdd3348bfbed32eeece9b8acec0a37c3c51b6 phoc.ini " diff --git a/device/testing/device-tablet-x86uefi/deviceinfo b/device/testing/device-tablet-x86uefi/deviceinfo index 4268a8530..d221c1e5d 100644 --- a/device/testing/device-tablet-x86uefi/deviceinfo +++ b/device/testing/device-tablet-x86uefi/deviceinfo @@ -5,7 +5,7 @@ deviceinfo_format_version="0" deviceinfo_name="Various tablets with atom CPU" deviceinfo_manufacturer="Various" deviceinfo_codename="tablet-x86uefi" -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_modules_initfs="jbd2 mbcache scsi_mod sd_mod sg libata sd ahci libahci usb_storage usb xhci_hcd ehci_hcd uas xhci_pci" deviceinfo_arch="x86_64" # Device related diff --git a/device/testing/device-trekstor-surftabduow1/APKBUILD b/device/testing/device-trekstor-surftabduow1/APKBUILD index 80b91a8a7..f3818d243 100644 --- a/device/testing/device-trekstor-surftabduow1/APKBUILD +++ b/device/testing/device-trekstor-surftabduow1/APKBUILD @@ -2,7 +2,7 @@ pkgname=device-trekstor-surftabduow1 pkgdesc="Trekstor Surftab Duo W1" pkgver=0.3 -pkgrel=1 +pkgrel=2 url="https://postmarketos.org" license="MIT" arch="x86_64" @@ -23,6 +23,6 @@ package() { } sha512sums=" -def261b9ced867fe64506afa04818637c7a3667d26ec665245780dd990fa01c4f0612c57eb678fb5e6f010cf016bad58b21d0c7f1cdcc2af47562c9fcc2f0ca9 deviceinfo +88233449fc503cd1ad2a1a7da8dd03abe434c56cc0e6ee61094bcb38571547a0301c8c7d937053980971f801343cf8022836f900dac8e23c79193c450ae21b0f deviceinfo 11fa2ef0a8434bdd6ff266f17585ae3f5ec7724a2053ec62c831845dc7cf6d74e690cdb3e67f84c7183e16f0d6a168275942490927143b1287330b45286f27e9 grub.cfg " diff --git a/device/testing/device-trekstor-surftabduow1/deviceinfo b/device/testing/device-trekstor-surftabduow1/deviceinfo index 8f9821f70..8bf4bf3a1 100644 --- a/device/testing/device-trekstor-surftabduow1/deviceinfo +++ b/device/testing/device-trekstor-surftabduow1/deviceinfo @@ -7,7 +7,7 @@ deviceinfo_name="Trekstor Surftab Duo W1" deviceinfo_manufacturer="Trekstor" deviceinfo_codename="trekstor-surftabduow1" deviceinfo_year="2015" -deviceinfo_modules_initfs="i915 usbhid hid_generic jbd2 sdhci sdhci-pci sdhci_acpi mmc_core mmc_block 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_modules_initfs="i915 usbhid hid_generic jbd2 sdhci sdhci-pci sdhci_acpi mmc_core mmc_block mbcache scsi_mod sd_mod sg libata sd ahci libahci usb_storage usb xhci_hcd ehci_hcd uas xhci_pci" deviceinfo_arch="x86_64" # Device related