From ffa2dad8ca790ee0f9fec0b1e3055ff7982cccd6 Mon Sep 17 00:00:00 2001 From: Daniele Debernardi Date: Fri, 4 Jan 2019 02:03:48 +0100 Subject: [PATCH] device-raspberry-pi3: Remove unnecessary kernel subpackage (!127) --- device/device-raspberry-pi3/APKBUILD | 18 ++++-------------- ...stall => device-raspberry-pi3.post-install} | 0 2 files changed, 4 insertions(+), 14 deletions(-) rename device/device-raspberry-pi3/{device-raspberry-pi3-kernel-rpi.post-install => device-raspberry-pi3.post-install} (100%) diff --git a/device/device-raspberry-pi3/APKBUILD b/device/device-raspberry-pi3/APKBUILD index 6b04770b2..fb1847c96 100644 --- a/device/device-raspberry-pi3/APKBUILD +++ b/device/device-raspberry-pi3/APKBUILD @@ -2,17 +2,15 @@ pkgname="device-raspberry-pi3" pkgdesc="Raspberry Pi 3B/3B+" pkgver=0.1 -pkgrel=3 +pkgrel=4 url="https://postmarketos.org" license="MIT" arch="aarch64" options="!check !archcheck" -depends="postmarketos-base raspberrypi-bootloader mesa-dri-vc4 bluetooth-raspberry-pi" +depends="postmarketos-base raspberrypi-bootloader linux-rpi mesa-dri-vc4 bluetooth-raspberry-pi" makedepends="devicepkg-dev" -subpackages=" - $pkgname-kernel-rpi:kernel_rpi - $pkgname-weston -" +install="$pkgname.post-install" +subpackages="$pkgname-weston" source="deviceinfo config.txt usercfg.txt cmdline.txt 95-vchiq-permissions.rules weston.ini" build() { @@ -28,20 +26,12 @@ package() { "$pkgdir"/etc/udev/rules.d/95-vchiq-permissions.rules } -kernel_rpi() { - pkgdesc="Kernel for the Raspberry Pi 3B/3B+ (from Alpine, depends on non free firmware!)" - depends="$pkgname linux-rpi" - install="$subpkgname.post-install" - mkdir "$subpkgdir" -} - weston() { install_if="$pkgname weston" install -Dm644 "$srcdir"/weston.ini \ "$subpkgdir"/etc/xdg/weston/weston.ini } - sha512sums="fea20d9e3818801ddaa627a0291291a7145c9eaba09a4ddadfff85d80c6ebf6e6fc77dc9d2ee2790c1eed49c6d2bf5055d50395541c61eb0dea6ffe172d4f52e deviceinfo b95a66c8fa165aca2170ebb3f8688e78e1dd78d3ddb4d26c289ea77e406eec3bbfecb5a32997df86a692b674128d5b4f673c47f8e12013f33b765a69fec1cb51 config.txt a8e57535523d0f78e9d2ac1ac31b097a1a25468e3c910290647a60c862e631a4b4de94a5f6e4de999e1b9f70e67653a886967200856287dbc819b9f3ac16c548 usercfg.txt diff --git a/device/device-raspberry-pi3/device-raspberry-pi3-kernel-rpi.post-install b/device/device-raspberry-pi3/device-raspberry-pi3.post-install similarity index 100% rename from device/device-raspberry-pi3/device-raspberry-pi3-kernel-rpi.post-install rename to device/device-raspberry-pi3/device-raspberry-pi3.post-install