[PR PATCH] Remove rpi3-{firmware,base}

[ericonr <ericonr@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages rpi3
https://github.com/void-linux/void-packages/pull/24024

Remove rpi3-{firmware,base}


A patch file from https://github.com/void-linux/void-packages/pull/24024.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-rpi3-24024.patch --]
[-- Type: text/x-diff, Size: 4926 bytes --]

From 15fa666c10e1aa7f5dc34b3de53b055ce1c51286 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 3 Aug 2020 14:16:19 -0300
Subject: [PATCH 1/2] rpi3-firmware: remove package.

Obsolete.
---
 srcpkgs/rpi3-firmware/files/cmdline.txt |  1 -
 srcpkgs/rpi3-firmware/files/config.txt  |  7 -----
 srcpkgs/rpi3-firmware/template          | 41 -------------------------
 3 files changed, 49 deletions(-)
 delete mode 100755 srcpkgs/rpi3-firmware/files/cmdline.txt
 delete mode 100755 srcpkgs/rpi3-firmware/files/config.txt
 delete mode 100644 srcpkgs/rpi3-firmware/template

diff --git a/srcpkgs/rpi3-firmware/files/cmdline.txt b/srcpkgs/rpi3-firmware/files/cmdline.txt
deleted file mode 100755
index 530b7f20424..00000000000
--- a/srcpkgs/rpi3-firmware/files/cmdline.txt
+++ /dev/null
@@ -1 +0,0 @@
-root=/dev/mmcblk0p2 rw rootwait console=ttyS0,115200 smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 loglevel=4 elevator=noop
diff --git a/srcpkgs/rpi3-firmware/files/config.txt b/srcpkgs/rpi3-firmware/files/config.txt
deleted file mode 100755
index 0c8ee03208e..00000000000
--- a/srcpkgs/rpi3-firmware/files/config.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# 64-bit mode
-arm_control=0x200
-
-enable_uart=1
-
-device_tree=dtbs/bcm2837-rpi-3-b.dtb
-kernel=vmlinux-rpi3
diff --git a/srcpkgs/rpi3-firmware/template b/srcpkgs/rpi3-firmware/template
deleted file mode 100644
index a7076ab3da0..00000000000
--- a/srcpkgs/rpi3-firmware/template
+++ /dev/null
@@ -1,41 +0,0 @@
-# Template file for 'rpi3-firmware'
-_githash="6df93defc76d5b511838d6802a01a05072964582"
-_gitshort="${_githash:0:7}"
-
-pkgname=rpi3-firmware
-version=20170113
-revision=1
-archs="aarch64*"
-wrksrc="firmware-${_githash}"
-short_desc="Firmware files for the Raspberry Pi 3 (git ${_gitshort})"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="3-clause-BSD"
-homepage="https://github.com/raspberrypi/firmware"
-distfiles="https://github.com/raspberrypi/firmware/archive/${_githash}.tar.gz"
-checksum=45e243ce22d2f34f065328d52629cc9bbf52032a23862c6d4c1f044613fc0c48
-nostrip=yes
-
-conf_files="/boot/cmdline.txt /boot/config.txt"
-
-do_install() {
-	rm -f boot/*.img
-	rm -rf boot/overlays
-	rm -f boot/*.dtb
-	rm -f boot/COPYING.linux
-
-	vmkdir boot
-	cp -R boot/* ${DESTDIR}/boot
-
-	vmkdir usr/share/licenses/${pkgname}
-	mv ${DESTDIR}/boot/LICENCE.broadcom ${DESTDIR}/usr/share/licenses/${pkgname}
-
-	# Install configuration files.
-	vinstall ${FILESDIR}/cmdline.txt 644 boot
-	vinstall ${FILESDIR}/config.txt 644 boot
-
-	# Firmware for rpi3 wifi chip
-	for f in bin txt; do
-		$XBPS_FETCH_CMD https://archlinuxarm.org/builder/src/brcmfmac43430-sdio.${f}
-		vinstall brcmfmac43430-sdio.${f} 0644 usr/lib/firmware/brcm
-	done
-}

From df462500693ad5e7105f992f1d574c14e5931f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Mon, 3 Aug 2020 14:16:35 -0300
Subject: [PATCH 2/2] rpi3-base: remove package.

Obsolete, RPi3 users should use rpi-base and rpi-kernel.
---
 srcpkgs/rpi3-base/INSTALL       |  9 ---------
 srcpkgs/rpi3-base/files/20-rpi3 |  6 ------
 srcpkgs/rpi3-base/template      | 19 -------------------
 3 files changed, 34 deletions(-)
 delete mode 100644 srcpkgs/rpi3-base/INSTALL
 delete mode 100644 srcpkgs/rpi3-base/files/20-rpi3
 delete mode 100644 srcpkgs/rpi3-base/template

diff --git a/srcpkgs/rpi3-base/INSTALL b/srcpkgs/rpi3-base/INSTALL
deleted file mode 100644
index 805997ab294..00000000000
--- a/srcpkgs/rpi3-base/INSTALL
+++ /dev/null
@@ -1,9 +0,0 @@
-case "$ACTION" in
-post)
-	mkdir -p etc/runit/runsvdir/default/
-	ln -sf /etc/sv/sshd etc/runit/runsvdir/default/
-	ln -sf /etc/sv/ntpd etc/runit/runsvdir/default/
-	ln -sf /etc/sv/dhcpcd etc/runit/runsvdir/default/
-	ln -sf /etc/sv/agetty-ttyS0 etc/runit/runsvdir/default/
-	;;
-esac
diff --git a/srcpkgs/rpi3-base/files/20-rpi3 b/srcpkgs/rpi3-base/files/20-rpi3
deleted file mode 100644
index aaf322d1c99..00000000000
--- a/srcpkgs/rpi3-base/files/20-rpi3
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh -e
-PKGNAME="$1"
-VERSION="$2"
-
-echo "Setting RPi3 kernel to ${VERSION}."
-cp /boot/vmlinux-${VERSION} /boot/vmlinux-rpi3
diff --git a/srcpkgs/rpi3-base/template b/srcpkgs/rpi3-base/template
deleted file mode 100644
index 2364b755da5..00000000000
--- a/srcpkgs/rpi3-base/template
+++ /dev/null
@@ -1,19 +0,0 @@
-# Template file for 'rpi3-base'
-pkgname=rpi3-base
-version=0.1
-revision=3
-homepage="http://www.voidlinux.org"
-short_desc="Void Linux RaspberryPi3 (64 bit) base files"
-maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="Public Domain"
-
-archs="aarch64*"
-depends="virtual?ntp-daemon rpi3-firmware linux"
-
-do_install() {
-	# Fix permissions for the vchiq device.
-	vmkdir usr/lib/udev/rules.d
-	echo 'SUBSYSTEM=="vchiq", GROUP="video", MODE="0660"' > \
-		${DESTDIR}/usr/lib/udev/rules.d/71-raspberrypi.rules
-	vinstall ${FILESDIR}/20-rpi3 0755 etc/kernel.d/post-install
-}