diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
tree | 0625f358789b5e015e49db139cc1dbc9be00428f /sys-boot/raspberrypi-firmware | |
parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) |
gentoo resync : 25.11.2020
Diffstat (limited to 'sys-boot/raspberrypi-firmware')
-rw-r--r-- | sys-boot/raspberrypi-firmware/Manifest | 10 | ||||
-rw-r--r-- | sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt | 1 | ||||
-rw-r--r-- | sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt | 65 | ||||
-rw-r--r-- | sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild | 60 | ||||
-rw-r--r-- | sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild (renamed from sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild) | 64 | ||||
-rw-r--r-- | sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild | 66 |
6 files changed, 146 insertions, 120 deletions
diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest index 76758d3de417..ca35e124f801 100644 --- a/sys-boot/raspberrypi-firmware/Manifest +++ b/sys-boot/raspberrypi-firmware/Manifest @@ -1,11 +1,11 @@ AUX raspberrypi-firmware-0_p20130711-cmdline.txt 203 BLAKE2B 2435f2d4f1dc4c1283e19459bc07fb3fb569042e13724d10c5ae18490fc9f04e0ed4e910947414761386d32fd678c6031d5e53cfb2804d5f547d77dd47ffb840 SHA512 ea4ddd6005bf8979d4299867a8889d67192c91467833beff8785bc01ac8d33544e712b2956da51b58a7b4ab1a1acaf4f27428d294f0dfae87ec91da8a71e3c9f AUX raspberrypi-firmware-0_p20130711-config.txt 1706 BLAKE2B a7086f2f91a3eb26887d6cb2e0edc74282b8c91ae1a6691071cafa29f455b9caff7f597a9a9df88250e6dab3fa74b742bd7733d7de24e150da3c64d1e09bc18e SHA512 2a0a19a84ab871d73e330e870b086b85a7776a1b17dd6054451be735249208a982249ca62f6d2fe51aba74c78f36266143d65ffe0549cdf8afbf20bcf637c78f AUX raspberrypi-firmware-0_p20130711-envd 53 BLAKE2B 52aa8814f82f9c8a5e2f4c3b2be80e6e62b2e969d03a96f3162a998a9aa4621ab79df48d573389d92cc963979c8dd7c0e012cd8d996e5e23252eb66f869f0e74 SHA512 032aa497cbde187ed8cfa5ba5adaf96b28f9dd2babb882d934d9009771ca50e9d8c6a8d5535551a8e8cf8e1932865dd0e4806ba56c9694952cbb3d93f9081ca7 -DIST raspberrypi-firmware-1.20190215.tar.gz 123074917 BLAKE2B cefedb5c979db7dfd47938aad37a567d91d3ad78247c7a63f789362768ab7a39a1967ac116b4b0475e3b210ab11f6474706df042af85a622e8e7905c85ec7498 SHA512 082f26caf427222d838881e5f1e9fa0136765b3eaf74a84877fc33616fd07e49085db0889226c40c655039a9d41a10566510c7d752cfc48a67b4683616a51193 -DIST raspberrypi-firmware-1.20190709.tar.gz 158835870 BLAKE2B 4e63b3308adcd75f69f66966f1c927449aa8dc65211e6ca5a27dd2a0ed6ed32cc85ad42221308f4fb3a852d9f278400cfe4f723f306abe102341568408027174 SHA512 6a0610c97db47441ede8e4f8436958899f678bf065a0fbde06de7945a1ac4d5f754a0e10d928d77759ba1cbf82654d85d9cb9c91b970c3fe9590560267033522 +AUX raspberrypi-firmware-1.20201022-cmdline.txt 108 BLAKE2B b7830fdaf1ffb64cb07a27db79dcb30a73194d7c1cf9b0f05529303f1fe2aea5ee26c71d563e029760a06d78f77d0213a6cda0819c08f7014782997f159f716e SHA512 6dbf694f4df9d5d5dfdd62a33be90aa95d655b113760cbbee9575a59e6250b831e73530cb392e8e89056806f298283626c50665b9d4573663e6686bbcc577d6b +AUX raspberrypi-firmware-1.20201022-config.txt 1784 BLAKE2B 7f37f02c486e6db2767b108e5926dc056f558ef32ae8ac3debea2fe7a210b159a2e4721846be8719520667c9bb86dc5d15c7c815f90dfe2686748f4d474fac61 SHA512 0909fae9bf731417f732486f7823f92a142824f5cab490b1736a16e7f569c9ecd805828c533c238dd3c5d75efcd2679e0d3697d988388000e1475a966fa66f12 DIST raspberrypi-firmware-1.20190925.tar.gz 185571086 BLAKE2B c3a9b2760fa853fbd1dd09bc4048c9e78594f88da5af608c3a761554d4046a4c869db8981c64140a24e82e0a61b8dc776bb8d895df60c6424e44780f78b18cb0 SHA512 4b7b29cc6c2a33d7a37987c492034d9afbb2220364c50cf265e0adf8e5f393c2275dcffaa77c89b3f43b2e98d199741b67590cb60ff8beae8ef677852f63b4a0 -EBUILD raspberrypi-firmware-1.20190215.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce -EBUILD raspberrypi-firmware-1.20190709.ebuild 1634 BLAKE2B 2b9631bc1c22117fd1896a75938713e7b3c3fa796ff291fde38d71d44b40cfefcc32cab2d2158b0a09b2b72ec5c4dc1377ada8666cbda70e3889f6686c70dbec SHA512 122bf1379238e61b1b5fa1324ec3b2e37b14ccc571e6afbc053f44a5adc1466f3d0368467d105ed8ffc7c1c47077776f3513d92246fb182cf5d654a89e1997ce +DIST raspberrypi-firmware-1.20201022.tar.gz 189827375 BLAKE2B 94c38f60d688c8e3ebab830912daccbb6c04bdd3d88f6ca0d07d85be0a6b12c53f0266b4c258ed4694f30bad5db30fb6d30feabfd0b7668735a9a806b820d325 SHA512 876758179df27109984b6c3f4849fdcdc6bdcc2769495fcc83c97fc3ff4d07b9f3cd58086be877503f72c9e5417d2be6d6c33bce4cbb3b862055117c9cc26db8 EBUILD raspberrypi-firmware-1.20190925.ebuild 1911 BLAKE2B 126451fbb0daa5f9d07381fb0e6259cfed1235c2b59773a44c03cbb84eb480a1092138b0e64b2e1e495d9b9ae43fd876ab2a0ef507f976dd36a8847276c28db6 SHA512 3e52692de708837448b18aef8a9df97b065bab94539c43f0c58fc786b8e4aede84a168d402d4dbd118661f433361a817b39cbbfe219caef3966a3d6fbb37e3b4 -EBUILD raspberrypi-firmware-9999.ebuild 1911 BLAKE2B 126451fbb0daa5f9d07381fb0e6259cfed1235c2b59773a44c03cbb84eb480a1092138b0e64b2e1e495d9b9ae43fd876ab2a0ef507f976dd36a8847276c28db6 SHA512 3e52692de708837448b18aef8a9df97b065bab94539c43f0c58fc786b8e4aede84a168d402d4dbd118661f433361a817b39cbbfe219caef3966a3d6fbb37e3b4 +EBUILD raspberrypi-firmware-1.20201022.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a +EBUILD raspberrypi-firmware-9999.ebuild 1892 BLAKE2B 7d3b73f730a94a75f61652eb350c12c7d3cd328cd26b03bf3cf4300df1c4fe9bd7c7d8fed90523645d6d692665a0b35d4db9ea50fa423d50c38115ed76bb7401 SHA512 7f88844eba41233565f6ac795dd2f9f390c94b7e153bb2893e4bc24eaeb28c7984523b44212f1c349a93b21aa51c984b21f102425eb9fff757f11e5753ca950a MISC metadata.xml 324 BLAKE2B 89413ad14dfe3013cc5fe46bdfb743b947f1385e39dd2504b55d4a6c671fc4a006a721f8e810636275c5d5b4f26a259dd57ea0d1dc46a0db7c8c2e6bfb792efa SHA512 d50c8ad607a73dea23813309dcefb33ea5120771a5db38780ca946350a4de2c93d3a61ef7482479f1065de9de0158597683032d0fbdfa18286e0b4f0bffcce2d diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt new file mode 100644 index 000000000000..b815bd89db1f --- /dev/null +++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-cmdline.txt @@ -0,0 +1 @@ +console=serial0,115200 console=tty1 root=ROOTDEV rootfstype=ext4 elevator=deadline fsck.repair=yes rootwait diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt new file mode 100644 index 000000000000..548f4accc250 --- /dev/null +++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-1.20201022-config.txt @@ -0,0 +1,65 @@ +# For more options and information see +# http://rpf.io/configtxt +# Some settings may impact device functionality. See link above for details + +# uncomment if you get no picture on HDMI for a default "safe" mode +#hdmi_safe=1 + +# uncomment this if your display has a black border of unused pixels visible +# and your display can output without overscan +#disable_overscan=1 + +# uncomment the following to adjust overscan. Use positive numbers if console +# goes off screen, and negative if there is too much border +#overscan_left=16 +#overscan_right=16 +#overscan_top=16 +#overscan_bottom=16 + +# uncomment to force a console size. By default it will be display's size minus +# overscan. +#framebuffer_width=1280 +#framebuffer_height=720 + +# uncomment if hdmi display is not detected and composite is being output +#hdmi_force_hotplug=1 + +# uncomment to force a specific HDMI mode (this will force VGA) +#hdmi_group=1 +#hdmi_mode=1 + +# uncomment to force a HDMI mode rather than DVI. This can make audio work in +# DMT (computer monitor) modes +#hdmi_drive=2 + +# uncomment to increase signal to HDMI, if you have interference, blanking, or +# no display +#config_hdmi_boost=4 + +# uncomment for composite PAL +#sdtv_mode=2 + +#uncomment to overclock the arm. 700 MHz is the default. +#arm_freq=800 + +# Uncomment some or all of these to enable the optional hardware interfaces +#dtparam=i2c_arm=on +#dtparam=i2s=on +#dtparam=spi=on + +# Uncomment this to enable infrared communication. +#dtoverlay=gpio-ir,gpio_pin=17 +#dtoverlay=gpio-ir-tx,gpio_pin=18 + +# Additional overlays and parameters are documented /boot/overlays/README + +# Enable audio (loads snd_bcm2835) +dtparam=audio=on + +[pi4] +# Enable DRM VC4 V3D driver on top of the dispmanx display stack +dtoverlay=vc4-fkms-v3d +max_framebuffers=2 + +[all] +#dtoverlay=vc4-fkms-v3d diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild deleted file mode 100644 index 4b06dfa49939..000000000000 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190709.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit mount-boot readme.gentoo-r1 - -DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware" -HOMEPAGE="https://github.com/raspberrypi/firmware" -LICENSE="GPL-2 raspberrypi-videocore-bin" -SLOT="0" - -if [[ "${PV}" == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/raspberrypi/firmware" - EGIT_CLONE_TYPE="shallow" -else - SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="-* ~arm" - S="${WORKDIR}/firmware-${PV}" -fi - -RESTRICT="binchecks strip" - -pkg_preinst() { - if [ -z "${REPLACING_VERSIONS}" ] ; then - local msg="" - if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then - msg+="/boot/cmdline.txt " - fi - if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then - msg+="/boot/config.txt " - fi - if [ -n "${msg}" ] ; then - msg="This package installs following files: ${msg}." - msg="${msg} Please remove(backup) your copies durning install" - msg="${msg} and merge settings afterwards." - msg="${msg} Further updates will be CONFIG_PROTECTed." - die "${msg}" - fi - fi -} - -src_install() { - insinto /boot - cd boot || die - doins bootcode.bin fixup*.dat start*elf - doins *.dtb - doins -r overlays - newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt - newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt - newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} - readme.gentoo_create_doc -} - -pkg_postinst() { - readme.gentoo_print_elog -} - -DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild index 4b06dfa49939..7fe926ad7820 100644 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20190215.ebuild +++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-1.20201022.ebuild @@ -1,39 +1,65 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit mount-boot readme.gentoo-r1 -DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware" -HOMEPAGE="https://github.com/raspberrypi/firmware" -LICENSE="GPL-2 raspberrypi-videocore-bin" -SLOT="0" - if [[ "${PV}" == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/raspberrypi/firmware" EGIT_CLONE_TYPE="shallow" else SRC_URI="https://github.com/raspberrypi/firmware/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="-* ~arm" + KEYWORDS="-* ~arm ~arm64" S="${WORKDIR}/firmware-${PV}" fi +DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware" +HOMEPAGE="https://github.com/raspberrypi/firmware" + +LICENSE="GPL-2 raspberrypi-videocore-bin" +SLOT="0" RESTRICT="binchecks strip" +DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" + +src_prepare() { + default + + cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die + + if use arm64; then + # Force selection of the 64-bit kernel8.img to match our userland + echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die + fi +} + +src_install() { + insinto /boot + cd boot || die + doins bootcode.bin fixup*.dat start*elf + newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt + newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt + newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} + readme.gentoo_create_doc +} + pkg_preinst() { - if [ -z "${REPLACING_VERSIONS}" ] ; then + if [[ -z "${REPLACING_VERSIONS}" ]] ; then local msg="" - if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then + + if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then msg+="/boot/cmdline.txt " fi - if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then + + if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then msg+="/boot/config.txt " fi - if [ -n "${msg}" ] ; then + + if [[ -n "${msg}" ]] ; then msg="This package installs following files: ${msg}." - msg="${msg} Please remove(backup) your copies durning install" + msg="${msg} Please remove (backup) your copies durning install" msg="${msg} and merge settings afterwards." msg="${msg} Further updates will be CONFIG_PROTECTed." die "${msg}" @@ -41,20 +67,6 @@ pkg_preinst() { fi } -src_install() { - insinto /boot - cd boot || die - doins bootcode.bin fixup*.dat start*elf - doins *.dtb - doins -r overlays - newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt - newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt - newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} - readme.gentoo_create_doc -} - pkg_postinst() { readme.gentoo_print_elog } - -DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild index 3b499cf2ad55..7fe926ad7820 100644 --- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild +++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild @@ -1,21 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 inherit mount-boot readme.gentoo-r1 -DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware" -HOMEPAGE="https://github.com/raspberrypi/firmware" -LICENSE="GPL-2 raspberrypi-videocore-bin" -SLOT="0" - -# Temporary safety measure to prevent ending up with a pair of -# sys-kernel/raspberrypi-image and sys-boot/raspberrypi-firmware -# none of which installed device tree files. -# Remove when the mentioned version and all older ones are deleted. -RDEPEND="!<=sys-kernel/raspberrypi-image-4.19.57_p20190709" - if [[ "${PV}" == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/raspberrypi/firmware" @@ -26,20 +15,51 @@ else S="${WORKDIR}/firmware-${PV}" fi +DESCRIPTION="Raspberry Pi (all versions) bootloader and GPU firmware" +HOMEPAGE="https://github.com/raspberrypi/firmware" + +LICENSE="GPL-2 raspberrypi-videocore-bin" +SLOT="0" RESTRICT="binchecks strip" +DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" + +src_prepare() { + default + + cp "${FILESDIR}"/${PN}-1.20201022-config.txt "${WORKDIR}" || die + + if use arm64; then + # Force selection of the 64-bit kernel8.img to match our userland + echo "arm_64bit=1" >> "${WORKDIR}"/${PN}-1.20201022-config.txt || die + fi +} + +src_install() { + insinto /boot + cd boot || die + doins bootcode.bin fixup*.dat start*elf + newins "${WORKDIR}"/${PN}-1.20201022-config.txt config.txt + newins "${FILESDIR}"/${PN}-1.20201022-cmdline.txt cmdline.txt + newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} + readme.gentoo_create_doc +} + pkg_preinst() { - if [ -z "${REPLACING_VERSIONS}" ] ; then + if [[ -z "${REPLACING_VERSIONS}" ]] ; then local msg="" - if [ -e "${D}"/boot/cmdline.txt -a -e /boot/cmdline.txt ] ; then + + if [[ -e "${ED}"/boot/cmdline.txt ]] && [[ -e /boot/cmdline.txt ]] ; then msg+="/boot/cmdline.txt " fi - if [ -e "${D}"/boot/config.txt -a -e /boot/config.txt ] ; then + + if [[ -e "${ED}"/boot/config.txt ]] && [[ -e /boot/config.txt ]] ; then msg+="/boot/config.txt " fi - if [ -n "${msg}" ] ; then + + if [[ -n "${msg}" ]] ; then msg="This package installs following files: ${msg}." - msg="${msg} Please remove(backup) your copies durning install" + msg="${msg} Please remove (backup) your copies durning install" msg="${msg} and merge settings afterwards." msg="${msg} Further updates will be CONFIG_PROTECTed." die "${msg}" @@ -47,18 +67,6 @@ pkg_preinst() { fi } -src_install() { - insinto /boot - cd boot || die - doins bootcode.bin fixup*.dat start*elf - newins "${FILESDIR}"/${PN}-0_p20130711-config.txt config.txt - newins "${FILESDIR}"/${PN}-0_p20130711-cmdline.txt cmdline.txt - newenvd "${FILESDIR}"/${PN}-0_p20130711-envd 90${PN} - readme.gentoo_create_doc -} - pkg_postinst() { readme.gentoo_print_elog } - -DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt" |