From f5b9af638e98615333654be1ead03f0514095c54 Mon Sep 17 00:00:00 2001 From: Martijn Braam Date: Wed, 27 Feb 2019 14:09:53 +0000 Subject: [PATCH] main/linux-postmarketos-stable: Fix ARMv7 This makes the linux-postmarketos-stable kernel generate an armv7 package instead of armhf. The contents of the package were armv7 already but now it can be correct with the new Alpine support. --- device/device-nokia-n900/APKBUILD | 4 ++-- device/device-nokia-n900/deviceinfo | 2 +- device/device-qemu-vexpress/APKBUILD | 4 ++-- device/device-qemu-vexpress/deviceinfo | 2 +- main/linux-postmarketos-stable/APKBUILD | 6 +++--- ...rketos-stable.armhf => config-postmarketos-stable.armv7} | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename main/linux-postmarketos-stable/{config-postmarketos-stable.armhf => config-postmarketos-stable.armv7} (100%) diff --git a/device/device-nokia-n900/APKBUILD b/device/device-nokia-n900/APKBUILD index ab4f63126..1d420ead0 100644 --- a/device/device-nokia-n900/APKBUILD +++ b/device/device-nokia-n900/APKBUILD @@ -3,7 +3,7 @@ pkgver=4 pkgrel=1 pkgdesc="Nokia N900" url="https://postmarketos.org" -arch="armhf" +arch="armv7" license="MIT" depends="postmarketos-base linux-postmarketos-stable uboot-tools kbd kbd-bkeymaps ofono mesa-dri-swrast" makedepends="uboot-tools kbd kbd-bkeymaps" @@ -114,7 +114,7 @@ nonfree_firmware() { mkdir "$subpkgdir" } -sha512sums="aa87322229d47baeb2af18b4a41d40d436654078981575ab7b779bfbd96e69bf52b18adbb1362af56e65061a21b7c6d75305cd22312124254bfd960e5bed70e1 deviceinfo +sha512sums="aeb63c2b7f0efe686c431b161d3c7bedbca21cb9bd4745d474f625ca51e51f5ea24253cde1ab317db49de0cd4602e8ee5e54948b099ae7095206c5523b169b38 deviceinfo 8f5b68b86f5345698114a2d70fd174699e5729f6c157659e4e57bef1dcab8c1209c13b30df6f5c2e8f31fee077039ffbc7817ca201f0745467b693e7550eaf6b uboot-script.cmd 3d55e34b95791636e44a5f41754f3d0de039dbba41f7a556d43a95c9e64afcfa930046b4b96b40020b6f196096ffba93514682927e32fa4488686fdd19c6da5a backlight-enable.sh c6012aef28b096141b924fced226ec99fb93eb53b69c064a8887d8fecdf8dc08a3ba3db399e18d88374c6ef4c59013a30699c7e4d76e5cb771040582573a0527 90-touchscreen-dev.rules diff --git a/device/device-nokia-n900/deviceinfo b/device/device-nokia-n900/deviceinfo index 1396d2cab..822d8fb7a 100644 --- a/device/device-nokia-n900/deviceinfo +++ b/device/device-nokia-n900/deviceinfo @@ -14,7 +14,7 @@ deviceinfo_modules_initfs="tsc2005 tsc200x-core omap_wdt twl4030_wdt omap-sham" deviceinfo_external_storage="true" deviceinfo_flash_method="0xffff" deviceinfo_generate_legacy_uboot_initfs="true" -deviceinfo_arch="armhf" +deviceinfo_arch="armv7" deviceinfo_dev_touchscreen="/dev/input/event3" deviceinfo_dev_keyboard="/dev/input/event1" deviceinfo_swap_size_recommended="1024" diff --git a/device/device-qemu-vexpress/APKBUILD b/device/device-qemu-vexpress/APKBUILD index ad18d6e39..11955a5e5 100644 --- a/device/device-qemu-vexpress/APKBUILD +++ b/device/device-qemu-vexpress/APKBUILD @@ -3,7 +3,7 @@ pkgver=1 pkgrel=21 pkgdesc="Simulated device in qemu with vexpress soc" url="https://postmarketos.org" -arch="armhf" +arch="armv7" license="MIT" # NOTE: 'pmbootstrap init' allows you to choose the mesa-dri-* package depends="postmarketos-base linux-postmarketos-stable" @@ -17,4 +17,4 @@ package() { "$pkgdir"/etc/deviceinfo } -sha512sums="05c699570be3cf8a9d84e141880c85511424c424e127493754fbfc2dcf902330830955513f795bce6887213603b7699eaf6aa9583b53f95230d12cbc4b3792fe deviceinfo" +sha512sums="7a190c67ae5e8a2e59140f8ec481d670620cc67ada65b93cc6d8db4aba66f03e889f5421fc7a5011a7f55f7728c55ad0a889e50a3fc8d77176adba259e2b8d4f deviceinfo" diff --git a/device/device-qemu-vexpress/deviceinfo b/device/device-qemu-vexpress/deviceinfo index 1e972aa2c..fd5e1de89 100644 --- a/device/device-qemu-vexpress/deviceinfo +++ b/device/device-qemu-vexpress/deviceinfo @@ -13,7 +13,7 @@ deviceinfo_modules_initfs="amba-clcd virtio_net virtio_mmio ambakmi libps2 pcips deviceinfo_external_storage="true" deviceinfo_flash_method="none" deviceinfo_generate_legacy_uboot_initfs="false" -deviceinfo_arch="armhf" +deviceinfo_arch="armv7" deviceinfo_kernel_cmdline="console=ttyAMA0,38400n8 console=tty1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE" # Splash diff --git a/main/linux-postmarketos-stable/APKBUILD b/main/linux-postmarketos-stable/APKBUILD index 3bac9c25f..b59bb2ae0 100644 --- a/main/linux-postmarketos-stable/APKBUILD +++ b/main/linux-postmarketos-stable/APKBUILD @@ -11,7 +11,7 @@ case $pkgver in esac pkgrel=2 -arch="x86_64 armhf aarch64" +arch="x86_64 armv7 aarch64" pkgdesc="Linux for pmOS supported chipsets (stable)" url="https://kernel.org/" depends="" @@ -20,7 +20,7 @@ options="!strip !check !tracedeps" install= source=" https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver.tar.xz - config-${_flavor}.armhf + config-${_flavor}.armv7 config-${_flavor}.aarch64 config-${_flavor}.x86_64 " @@ -191,7 +191,7 @@ dev() { } sha512sums="950eb85ac743b291afe9f21cd174d823e25f11883ee62cecfbfff8fe8c5672aae707654b1b8f29a133b1f2e3529e63b9f7fba4c45d6dacccc8000b3a9a9ae038 linux-4.18.tar.xz -a428ce2a9c65bae3e7f88a43b0112e2524298ba068cf85732b25f18c5f92d101089ab3589582050c0dc9fca3571ea7fb89f9398d0c9dede03f1754b3f5fe455c config-postmarketos-stable.armhf +a428ce2a9c65bae3e7f88a43b0112e2524298ba068cf85732b25f18c5f92d101089ab3589582050c0dc9fca3571ea7fb89f9398d0c9dede03f1754b3f5fe455c config-postmarketos-stable.armv7 b24240f2c8e011ffa1ff141cf8d623dcbe4cbde389322e59e264edf1b01985b3527576a06c1f0d8e5ef67519f95cc9a9ff9f2636178d00e4272cd472e268f1ec config-postmarketos-stable.aarch64 77ae0b80272d871475043cc17ae54e20d5456da8c729ea832906c2881389c53e4d800aaeab38090f3f878f15045b2c70dc4912b62742753c40f80ad69ed51599 config-postmarketos-stable.x86_64 f8a4a1056bd29c29361f5529f711318fdb7546ff7469a3592601ae2d69d84b7d62ff4f75cf9d5aad4c1523ae71a7c1a88d9ee33bfce719e91686ca219ad13ed8 patch-4.18.4.xz" diff --git a/main/linux-postmarketos-stable/config-postmarketos-stable.armhf b/main/linux-postmarketos-stable/config-postmarketos-stable.armv7 similarity index 100% rename from main/linux-postmarketos-stable/config-postmarketos-stable.armhf rename to main/linux-postmarketos-stable/config-postmarketos-stable.armv7