From e303ea7cf037204e3ad116a2c2d86af15fda85ce Mon Sep 17 00:00:00 2001 From: drebrez Date: Fri, 29 Sep 2017 17:22:20 +0200 Subject: [PATCH] Set framebuffer mode in initramfs for all devices (#652) --- device/device-asus-grouper/APKBUILD | 7 ++----- device/device-asus-grouper/initfs-hook.sh | 4 ---- device/device-fairphone-fp2/APKBUILD | 6 +----- device/device-fairphone-fp2/initfs-hook.sh | 4 ---- device/device-huawei-angler/APKBUILD | 6 +----- device/device-huawei-angler/initfs-hook.sh | 4 ---- device/device-huawei-y530/APKBUILD | 6 +----- device/device-huawei-y530/initfs-hook.sh | 4 ---- device/device-lg-d855/initfs-hook.sh | 4 ---- device/device-lg-hammerhead/APKBUILD | 6 +----- device/device-lg-hammerhead/initfs-hook.sh | 4 ---- device/device-lg-lenok/APKBUILD | 4 ++-- device/device-lg-lenok/initfs-hook.sh | 1 - device/device-lg-mako/APKBUILD | 7 ++----- device/device-lg-mako/initfs-hook.sh | 4 ---- device/device-motorola-titan/APKBUILD | 7 ++----- device/device-motorola-titan/initfs-hook.sh | 4 ---- device/device-samsung-i9100/initfs-hook.sh | 4 ---- device/device-samsung-maguro/APKBUILD | 6 +----- device/device-samsung-maguro/initfs-hook.sh | 4 ---- device/device-samsung-n7100/initfs-hook.sh | 4 ---- device/device-sony-amami/initfs-hook.sh | 4 ---- device/device-sony-aries/initfs-hook.sh | 4 ---- main/postmarketos-mkinitfs/APKBUILD | 6 +++--- main/postmarketos-mkinitfs/init.sh.in | 3 +++ main/postmarketos-mkinitfs/init_functions.sh | 9 +++++++++ 26 files changed, 28 insertions(+), 98 deletions(-) delete mode 100644 device/device-asus-grouper/initfs-hook.sh delete mode 100644 device/device-fairphone-fp2/initfs-hook.sh delete mode 100644 device/device-huawei-angler/initfs-hook.sh delete mode 100644 device/device-huawei-y530/initfs-hook.sh delete mode 100644 device/device-lg-d855/initfs-hook.sh delete mode 100644 device/device-lg-hammerhead/initfs-hook.sh delete mode 100644 device/device-lg-mako/initfs-hook.sh delete mode 100644 device/device-motorola-titan/initfs-hook.sh delete mode 100644 device/device-samsung-i9100/initfs-hook.sh delete mode 100644 device/device-samsung-maguro/initfs-hook.sh delete mode 100644 device/device-samsung-n7100/initfs-hook.sh delete mode 100644 device/device-sony-amami/initfs-hook.sh delete mode 100644 device/device-sony-aries/initfs-hook.sh diff --git a/device/device-asus-grouper/APKBUILD b/device/device-asus-grouper/APKBUILD index 3b8be2640..1600ffe8f 100644 --- a/device/device-asus-grouper/APKBUILD +++ b/device/device-asus-grouper/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-asus-grouper pkgver=1 -pkgrel=4 +pkgrel=5 pkgdesc="Asus Nexus 7 2012 Wifi" url="https://github.com/postmarketOS" arch="noarch" @@ -9,7 +9,7 @@ depends="linux-asus-grouper mkbootimg" makedepends="" install="" subpackages="" -source="deviceinfo initfs-hook.sh 90-android-touch-dev.rules" +source="deviceinfo 90-android-touch-dev.rules" options="!check" build() { @@ -19,12 +19,9 @@ build() { package() { install -D -m644 "$srcdir/deviceinfo" \ "$pkgdir/etc/deviceinfo" - install -D -m644 "$srcdir"/initfs-hook.sh \ - "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh install -D -m644 "$srcdir"/90-android-touch-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules } sha512sums="3bfd3c7cca36a5b95f3727b778fd3187cfb4d962382fb1381488eee7a2cd23d9096628582d95ec71170b1c2cc8735b6a928c11446bdc6c24e10ab5227575db43 deviceinfo -8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52 initfs-hook.sh 05f938784e8f30cdbe9923a5f3e34ce7c539060d3a621741206bc5ed02afd7cbf480b02fbe48a70968e7182f885ab9bfe57c4d1e7c6eefca54a6f7188d2849f2 90-android-touch-dev.rules" diff --git a/device/device-asus-grouper/initfs-hook.sh b/device/device-asus-grouper/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-asus-grouper/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-fairphone-fp2/APKBUILD b/device/device-fairphone-fp2/APKBUILD index c743b9dd5..1637070ff 100644 --- a/device/device-fairphone-fp2/APKBUILD +++ b/device/device-fairphone-fp2/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-fairphone-fp2 pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="Fairphone 2" url="https://github.com/postmarketOS" arch="noarch" @@ -11,7 +11,6 @@ install="" subpackages="" source=" deviceinfo - initfs-hook.sh 90-android-touch-dev.rules bcmdhd.cal " @@ -24,8 +23,6 @@ build() { package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo - install -D -m644 "$srcdir"/initfs-hook.sh \ - "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh install -D -m644 "$srcdir"/90-android-touch-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules install -D -m644 "$srcdir"/bcmdhd.cal \ @@ -33,6 +30,5 @@ package() { } sha512sums="2048492ab05df7b1414dc082414e2c82c451c76b037e436fbf8df4059e95d56306c3239aee2eb0f336c7f7dd59a6b0e9ffccd7b1b0757e6f6d8f9e9aa122ba91 deviceinfo -8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52 initfs-hook.sh 4e6c0b87872f278de5603d821a1e9dab8363db285d1d7fd56e900b33e8533eecb79b1fb6359e58e112e69e714a4f2aee06157b1d6f8d3e26274cd29c93cd659b 90-android-touch-dev.rules 32652ef366694f34dec31f316a38aca96700e3a5a3eac1f8d192e3c5de7b91e480b1c0fcd8e7c80a51692dc3737020ebbb2e5d3779436e82fb18822089c63055 bcmdhd.cal" diff --git a/device/device-fairphone-fp2/initfs-hook.sh b/device/device-fairphone-fp2/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-fairphone-fp2/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-huawei-angler/APKBUILD b/device/device-huawei-angler/APKBUILD index 4ffa10c1f..76e70275a 100644 --- a/device/device-huawei-angler/APKBUILD +++ b/device/device-huawei-angler/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-huawei-angler pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="Huawei Nexus 6P" url="https://github.com/postmarketOS" arch="noarch" @@ -12,7 +12,6 @@ subpackages="" source=" deviceinfo 90-android-touch-dev.rules - initfs-hook.sh bcmdhd.cal " @@ -30,13 +29,10 @@ package() { "$pkgdir/etc/deviceinfo" install -D -m644 "$srcdir"/90-android-touch-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules - install -D -m644 "$srcdir"/initfs-hook.sh \ - "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh install -D -m644 "$srcdir"/bcmdhd.cal \ "$pkgdir"/etc/wifi/bcmdhd.cal } sha512sums="255a6f15a30f41e3db02be591cf41e62f7ac80c1b4dae6ecc174b4f81968a54ffeec8088ded5d44ce36d8a21b4013c79090bed6ed7e115b39ada20975649212b deviceinfo e3472238341e5bdf7249a75e8f38019b145ea3e7a6137a49206945e6829fe8918c876a9caf2b0013357be9bff56d9f23c08900c80de4be93986246239e1b4fc7 90-android-touch-dev.rules -8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52 initfs-hook.sh 61fe1f91d7b0b570b77fcca76503373cbac2515ca3dcc2f2543b910dfaeb1e935a11975f824f6a72001df4e63329356a6aff2d016e9b4f5d8f7b739fee065c4e bcmdhd.cal" diff --git a/device/device-huawei-angler/initfs-hook.sh b/device/device-huawei-angler/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-huawei-angler/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-huawei-y530/APKBUILD b/device/device-huawei-y530/APKBUILD index fefdddfa4..647c56936 100644 --- a/device/device-huawei-y530/APKBUILD +++ b/device/device-huawei-y530/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-huawei-y530 pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="Huawei Ascend Y530" url="https://github.com/postmarketOS" arch="noarch" @@ -11,7 +11,6 @@ install="" subpackages="" source=" deviceinfo - initfs-hook.sh 90-touchscreen-dev.rules " options="!check" @@ -19,12 +18,9 @@ options="!check" package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo - install -D -m644 "$srcdir"/initfs-hook.sh \ - "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh install -D -m644 "$srcdir"/90-touchscreen-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-touchscreen-dev.rules } sha512sums="3d75ec32c6021bfe52239ab279899660553ebfcc81305a02750c91b7c3952f02cf9576fbed9f59ed03e5b0513c16924e4382b6fc176a2b359961892468290fb7 deviceinfo -8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52 initfs-hook.sh 23414d84cbad63472372986c6ce7db0d98a56ab4c060434b62aef420ed3d6259a968fbbdbd4400663f712e33e6bb81a8424ec7667f9959a089b29b93e15156ea 90-touchscreen-dev.rules" diff --git a/device/device-huawei-y530/initfs-hook.sh b/device/device-huawei-y530/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-huawei-y530/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-lg-d855/initfs-hook.sh b/device/device-lg-d855/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-lg-d855/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-lg-hammerhead/APKBUILD b/device/device-lg-hammerhead/APKBUILD index 130f286d6..dec5c3412 100644 --- a/device/device-lg-hammerhead/APKBUILD +++ b/device/device-lg-hammerhead/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-lg-hammerhead pkgver=1 -pkgrel=10 +pkgrel=11 pkgdesc="Google Nexus 5" url="https://github.com/postmarketOS" arch="noarch" @@ -11,7 +11,6 @@ install="" subpackages="" source=" deviceinfo - initfs-hook.sh 90-android-touch-dev.rules udev-v4l-hack.sh profile.sh @@ -26,8 +25,6 @@ build() { package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo - install -D -m644 "$srcdir"/initfs-hook.sh \ - "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh install -D -m644 "$srcdir"/90-android-touch-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules install -D -m644 "$srcdir"/profile.sh \ @@ -39,7 +36,6 @@ package() { } sha512sums="e954e4ad792932bb23acee1a0f864067d6bf5d50372fc8fd99e3faaf5bda1d57a4f29978649d106100cd80cdfc8a1fa496b396d6fa461e08769a75c23f8449af deviceinfo -8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52 initfs-hook.sh ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df 90-android-touch-dev.rules 4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1 udev-v4l-hack.sh d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306 profile.sh diff --git a/device/device-lg-hammerhead/initfs-hook.sh b/device/device-lg-hammerhead/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-lg-hammerhead/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-lg-lenok/APKBUILD b/device/device-lg-lenok/APKBUILD index a825c7e87..72b79f481 100644 --- a/device/device-lg-lenok/APKBUILD +++ b/device/device-lg-lenok/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-lg-lenok pkgver=1 -pkgrel=2 +pkgrel=3 pkgdesc="LG G Watch R" url="https://github.com/postmarketOS" arch="noarch" @@ -28,6 +28,6 @@ package() { } sha512sums="9dba843fba4f942587e858631939c6a08f30c23a08e29028a8739d5ac0a8c5e67e6df18758c3f2e75f48eab9181300438ec604ce259b5d7342ce6a1d0a5e2a66 deviceinfo -e2b0a6c02a0073094439aa7014139fa567b8375b442eaad00d6c1b90a1fd2d9bc73bf4546137fe2dd5c9de03a6ec383173d1b4ad3ab975850484c4e1342cfb74 initfs-hook.sh +d29105805adcd79d4f73c2f2c4483a2c627dc7b70acb77f43d085742ef930407c9b1423f7020c34f38e8a09f40cadd991b9acae23e936c90d6a4c0900250da22 initfs-hook.sh a36ba9017df3b4be233783096c303abafa873dcdf50f6357b82f3c5526fd161a1914dafe143377cb5982955108b987890638b51911d0dd339172554e39a82d9f 90-android-touch-dev.rules f623da68a750ba5dd367d131841aca182b5041292c800e0c919d25187305546e9e42b876cadadc2f56b73e0e6b718a9149a817f5d571e015f7c9467f7387aa61 fb_fix.sh" diff --git a/device/device-lg-lenok/initfs-hook.sh b/device/device-lg-lenok/initfs-hook.sh index c4419acbf..7e2645587 100644 --- a/device/device-lg-lenok/initfs-hook.sh +++ b/device/device-lg-lenok/initfs-hook.sh @@ -1,5 +1,4 @@ #!/bin/sh # set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode echo 320,320 > /sys/class/graphics/fb0/virtual_size diff --git a/device/device-lg-mako/APKBUILD b/device/device-lg-mako/APKBUILD index 41393c345..ac6609a0d 100644 --- a/device/device-lg-mako/APKBUILD +++ b/device/device-lg-mako/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-lg-mako pkgver=2 -pkgrel=10 +pkgrel=11 pkgdesc="Google Nexus 4" url="https://github.com/postmarketOS" arch="noarch" @@ -9,7 +9,7 @@ depends="linux-lg-mako mkbootimg" makedepends="" install="" subpackages="" -source="deviceinfo initfs-hook.sh 90-android-touch-dev.rules profile.sh udev-v4l-hack.sh pointercal fb.modes" +source="deviceinfo 90-android-touch-dev.rules profile.sh udev-v4l-hack.sh pointercal fb.modes" options="!check" build() { @@ -19,8 +19,6 @@ build() { package() { install -D -m644 "$srcdir"/deviceinfo \ "$pkgdir"/etc/deviceinfo - install -D -m644 "$srcdir"/initfs-hook.sh \ - "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh install -D -m644 "$srcdir"/90-android-touch-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules install -D -m644 "$srcdir"/profile.sh \ @@ -32,7 +30,6 @@ package() { } sha512sums="6d1bdf9037a8b19475e315c637b65d8f6785b8b57e05d61c1c088fb57cbd6bf1be2aa0c538ed64c582f49b4e2e16b848db58ac062159a2812221a6d9c1e0b6d7 deviceinfo -8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52 initfs-hook.sh ee25f3d0377f027d108593eb7953b8db49d7f05a5c36a0c8ca7e7849d15e3c217bc1ac97d77a66e28d2db4b81c0f50b905639911276da40321d2b6cca7f797df 90-android-touch-dev.rules d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306 profile.sh 4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1 udev-v4l-hack.sh diff --git a/device/device-lg-mako/initfs-hook.sh b/device/device-lg-mako/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-lg-mako/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-motorola-titan/APKBUILD b/device/device-motorola-titan/APKBUILD index e1230050a..c78f14030 100644 --- a/device/device-motorola-titan/APKBUILD +++ b/device/device-motorola-titan/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-motorola-titan pkgver=1 -pkgrel=11 +pkgrel=12 pkgdesc="Motorola Moto G 2014" url="https://github.com/postmarketOS" arch="noarch" @@ -9,7 +9,7 @@ depends="linux-motorola-titan mkbootimg" makedepends="" install="" subpackages="" -source="deviceinfo 90-android-touch-dev.rules initfs-hook.sh profile.sh udev-v4l-hack.sh" +source="deviceinfo 90-android-touch-dev.rules profile.sh udev-v4l-hack.sh" options="!check" build() { @@ -21,8 +21,6 @@ package() { "$pkgdir/etc/deviceinfo" install -D -m644 "$srcdir"/90-android-touch-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules - install -D -m644 "$srcdir"/initfs-hook.sh \ - "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh install -D -m644 "$srcdir"/profile.sh \ "$pkgdir"/etc/profile.d/00-$pkgname.sh install -D -m644 "$srcdir"/udev-v4l-hack.sh \ @@ -31,6 +29,5 @@ package() { sha512sums="09abd5f4681d9479650cfa64fcbc58528827017757539c3faf142ca92e8537691f9fb88f5d84ece086af7f23be2ac03e196f49ae708a832f1331f40cc96bab29 deviceinfo f37e6324abf0b0fc8a3d360d6d11bb0648090a438a55ca7f04a9d494719e687ce445ae107ace642edf293afb6ca82615bcb5d0ddb6c46c1a7f8ee3c213b7c5c4 90-android-touch-dev.rules -8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52 initfs-hook.sh d04013c17caf77a87ebea167dbe48f7efa9c9d3123c5743d359f3ea8ccc6b268fa021535a4bf8291eb4a352f0c92f6eb527da0db340421f53bc1cc439a453306 profile.sh 4f528656c4febb18742e89552dfe7fdc824ed4ad6ad2777d20b4f55040edd93d8e3ea657baabcdbe77bd0fb4bd3d23e5e0b2dae574f0df6723b2e26216ee81e1 udev-v4l-hack.sh" diff --git a/device/device-motorola-titan/initfs-hook.sh b/device/device-motorola-titan/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-motorola-titan/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-samsung-i9100/initfs-hook.sh b/device/device-samsung-i9100/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-samsung-i9100/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-samsung-maguro/APKBUILD b/device/device-samsung-maguro/APKBUILD index ef8b4aeb5..ff55c070e 100644 --- a/device/device-samsung-maguro/APKBUILD +++ b/device/device-samsung-maguro/APKBUILD @@ -1,6 +1,6 @@ pkgname=device-samsung-maguro pkgver=2 -pkgrel=8 +pkgrel=9 pkgdesc="Google Galaxy Nexus (GSM)" url="https://github.com/postmarketOS" arch="noarch" @@ -12,7 +12,6 @@ subpackages="" source=" deviceinfo bcmdhd.cal - initfs-hook.sh 90-android-touch-dev.rules " options="!check" @@ -26,13 +25,10 @@ package() { "$pkgdir"/etc/deviceinfo install -D -m644 "$srcdir"/bcmdhd.cal \ "$pkgdir"/etc/wifi/bcmdhd.cal - install -D -m644 "$srcdir"/initfs-hook.sh \ - "$pkgdir"/etc/postmarketos-mkinitfs/hooks/00-${pkgname}.sh install -D -m644 "$srcdir"/90-android-touch-dev.rules \ "$pkgdir"/etc/udev/rules.d/90-android-touch-dev.rules } sha512sums="aa0f09fe3c32dc19ff7f012c6ee5a32bdfb333e45ed78ed2074371a520fbd1d2a8d8a24a004e948082b3cc2d9374c5f86427f3b27d8dc1a69d9666966977cfc8 deviceinfo 27e89ef3102a89e99065ea12cd36d8ebe1c7e95f2f7082c0e7e3e280fcd2473aa197538bae18ac8995ddf3a7dd962622a56a6f0c037ad193fa9bba95bbb7ee9c bcmdhd.cal -8590967fa10388a890fdfafdb1070b9ab22dc89e06a3a8834806c772191e3b67de7b914b0d68e5ddf581cee715cb90f3f24abcb8762c415ff328c6da23e55d52 initfs-hook.sh f8c85b0ffcee751ee30d5f1fd8ed8e8413d9599875839fbc9bcfd85f08dbf203fecbd171fc3fe4e2742c5b8243132f6110142ff41193d6ad7df29b411516e199 90-android-touch-dev.rules" diff --git a/device/device-samsung-maguro/initfs-hook.sh b/device/device-samsung-maguro/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-samsung-maguro/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-samsung-n7100/initfs-hook.sh b/device/device-samsung-n7100/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-samsung-n7100/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-sony-amami/initfs-hook.sh b/device/device-sony-amami/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-sony-amami/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/device/device-sony-aries/initfs-hook.sh b/device/device-sony-aries/initfs-hook.sh deleted file mode 100644 index e7a2ccc87..000000000 --- a/device/device-sony-aries/initfs-hook.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -# set framebuffer resolution -cat /sys/class/graphics/fb0/modes > /sys/class/graphics/fb0/mode diff --git a/main/postmarketos-mkinitfs/APKBUILD b/main/postmarketos-mkinitfs/APKBUILD index 346d795a0..67a80a362 100644 --- a/main/postmarketos-mkinitfs/APKBUILD +++ b/main/postmarketos-mkinitfs/APKBUILD @@ -1,5 +1,5 @@ pkgname=postmarketos-mkinitfs -pkgver=0.3.8 +pkgver=0.3.9 pkgrel=0 pkgdesc="Tool to generate initramfs images for postmarketOS" url="https://github.com/postmarketOS" @@ -21,6 +21,6 @@ package() { "$pkgdir/sbin/mkinitfs" mkdir -p "$pkgdir/etc/postmarketos-mkinitfs/hooks/" } -sha512sums="91860e61cc42b77c02522ab273cf4793b78ee595a75c026c057522a5e6d1fdcc7ec868cbdaea5912c90dea61483468dc609dc69144a6d8e68ef47c9d1459fdb6 init.sh.in -32cd3e1a931cc4ae6f7cab7ccfa19231dcfb5c967026059b090b1b97781c29ef6d168478767031e57a010b84505f016f474c178c64221cdf8896865bbe470413 init_functions.sh +sha512sums="e1849a13ee696e76dc6c734eda984bcc6a6e2e3d8a62a4df0778a8e338dc0bf9d967fa263ae6e57c14a0cb516c6004c6e251262a1711ad47f1ce4c622727a1d7 init.sh.in +0deb35d7e93a4e6d175a935974414732187870f38ab4c8db2dd5cb88c19a98685350c08d1d4152aa0bb6892b263cb5fe5bf4b5c8b73d561cce328963be113628 init_functions.sh e7768173dddd67a7c06a26ccacbc9e1528c5ae652a504df75128def591235e6383e2f6824147629845cac28c270e6c4d9810fd57c5676c8f2b54ad940b6bd42f mkinitfs.sh" diff --git a/main/postmarketos-mkinitfs/init.sh.in b/main/postmarketos-mkinitfs/init.sh.in index 44eab3619..d0af68c27 100644 --- a/main/postmarketos-mkinitfs/init.sh.in +++ b/main/postmarketos-mkinitfs/init.sh.in @@ -24,6 +24,9 @@ for hook in /etc/postmarketos-mkinitfs/hooks/*.sh; do sh "$hook" done +# Fix for framebuffer drivers, which do not have a default mode +set_framebuffer_mode + show_splash /splash-loading.ppm.gz # Always run dhcp daemon/usb networking for now (later this should only diff --git a/main/postmarketos-mkinitfs/init_functions.sh b/main/postmarketos-mkinitfs/init_functions.sh index 1cbdd655c..0622dae41 100644 --- a/main/postmarketos-mkinitfs/init_functions.sh +++ b/main/postmarketos-mkinitfs/init_functions.sh @@ -309,6 +309,15 @@ start_msm_refresher() { fi } +set_framebuffer_mode() { + [ -e "/sys/class/graphics/fb0/modes" ] || return + [ -z "$(cat /sys/class/graphics/fb0/mode)" ] || return + + _mode="$(cat /sys/class/graphics/fb0/modes)" + echo "Setting framebuffer mode to: $_mode" + echo "$_mode" > /sys/class/graphics/fb0/mode +} + loop_forever() { while true; do sleep 1