Reworked =sys-boot/raspberrypi-firmware-9999 to remove file colisions.

6 files changed, 146 insertions, 83 deletions

diff --git a/sys-boot/raspberrypi-firmware/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index c1701b6..8f28a68 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,2 +1,11 @@
-AUX raspberrypi-firmware.envd 120 SHA256 81c6d2802ecb16aebd139895510c138114f6f7fc4eeee5d52e4d05209333bba9 SHA512 5803bd3dd16e07e814b50aeffed12115effb70e1a933faf39a6a29c8851b026ecc03b138943fd0910948bd6e676a37a035ef3fbf5d809e11e0419fd3530632b7 WHIRLPOOL e76830cd70ce750101733684ece8c500b7729db7bb23ea64ba209d98ec592e274fd5638909129fb42825a1897eae3f4274e1ed353bd0460f751de958aac1cabf
-EBUILD raspberrypi-firmware-9999.ebuild 2014 SHA256 d75bc912705ca0b212562e18e270b80794e71968bdf0ac8b5773b96e928686b1 SHA512 3a46de704130fc054b9d3700ff53b46f3c3de6f1064617c8e88abeec7c7461982be2fd223be5419ee686b31969b4ce2886aec9ae1b7007bd3882fd54f25b9313 WHIRLPOOL 34c6aaf22badfdf263fc8d11729ce699b202a8e6ae7cdac6cdd717973f68990cfe4aeaf5cba192c182b5d90b1b273ec3caea988eb3a383fb159d20e92636563f
+AUX raspberrypi-firmware-0_p20130711-cmdline.txt 203 SHA256 4a5b380215cf65e7849ec11071abde3fdb002335747886cda35fa45b6d93fdb3 SHA512 ea4ddd6005bf8979d4299867a8889d67192c91467833beff8785bc01ac8d33544e712b2956da51b58a7b4ab1a1acaf4f27428d294f0dfae87ec91da8a71e3c9f WHIRLPOOL 11245812d1a7363ab0ac2849d92e0fb927d6d1f7a4efdc95508c52db471822e2c62dd9781a3dcb6fa46c3c819392091bc3a271f8408c71ca15f32341729684c1
+AUX raspberrypi-firmware-0_p20130711-config.txt 1706 SHA256 e34a2735eb15dc3927ca0c8f782d7c3b6ba9aa7271aabfa794985eadb3ce5c5a SHA512 2a0a19a84ab871d73e330e870b086b85a7776a1b17dd6054451be735249208a982249ca62f6d2fe51aba74c78f36266143d65ffe0549cdf8afbf20bcf637c78f WHIRLPOOL ba3854d8bc2e352d1e15635d63fcb1508a2d74288e9e3dc6d19fdd79cff439c0ad4fb10f459f9ed88e1898d1f81c6aadb8a2a117c6dcd9d159ca0fd20ca0249d
+AUX raspberrypi-firmware-0_p20130711-envd 53 SHA256 5daacb075f5501dc76c7cacce643ce43b42da5ad69932098eab6d184e36104a8 SHA512 032aa497cbde187ed8cfa5ba5adaf96b28f9dd2babb882d934d9009771ca50e9d8c6a8d5535551a8e8cf8e1932865dd0e4806ba56c9694952cbb3d93f9081ca7 WHIRLPOOL d003045db57217f55c29d8f144a59fa3be7196945512e1d9c9135eb38440ff1c1247edcf8268393e65776f750eeae5136802f46b20065e3bf3783ee1c6f11955
+DIST raspberrypi-firmware-bootcode.bin 17840 SHA256 17b9151c53bae6a9c91cdaf57824efc40ffc085493455898d6a2ee8b57ee0cff SHA512 778ec034512ecfe02fc32986f75e12fda49a7ad51051de92edb90c3df855615e41e5a00b738b8508cfdabc3a5092247a1e1f480f08af9606b86fb7a8bd961c71 WHIRLPOOL a783457126eb393aebc0a1317e11acb198cbdc03fda53886e1782ab899032fdf8ef9f39473de27e32815c1cc4131514d7c1c66dd82b66c95b4eec87549000446
+DIST raspberrypi-firmware-fixup.dat 6066 SHA256 5ce87293a8f44f60fe6ba77dabee22a4d407e6bef884ccf113a78d36e5507379 SHA512 22f369053512ef34a288bb17f953691db83590b8535c2198a3cca77f2f9d35100987ccf63bbd8067a22e6e46260a1d8f9e2b19005330dab940834be1e2a81464 WHIRLPOOL 2cc26c85b965e20d6201ce19fadae9ffbd66ba87aa3f81a368c0960e930b6d6a829d8be4b63a4956f36cbabb82016d2bb3f2eb52a41204b46347126710f46e47
+DIST raspberrypi-firmware-fixup_cd.dat 2279 SHA256 e294bd03ac82a68e4522b792110ae3cd65f9792430d46af87622423eadb6bf92 SHA512 18c3aaf46b5f0f71e763e275b3198dac405336b7f391c37208002598f97ddfad5f9bc04db89fc789344cbe37146932d273a1c0e3719e6423de078a90842eba42 WHIRLPOOL 930feef03cd64494492dc1194a817b926f4bb591f77ef00690fe495ea50096e44748fb45354073942ee2cf51271bf4b4e4d3daad8bc625787bcf11a5c7db5060
+DIST raspberrypi-firmware-fixup_x.dat 9114 SHA256 6ed7f2087ff251d04008f42b0bfcda6041633dd5db9b3a299924b07f0d5af7c5 SHA512 649a4098b3b77c2e393beb54cc35ba7a5e6e8b87573db2874deb215cc95db26cc7e72f740e9c3eade7b142198ae778c1efb39eb68b188a0f8dc73d90feb40ec2 WHIRLPOOL 3e5bf0bf247951039d5801f46d59f328ca905f6710c23e1156d3bbc0f9c9a2a208b80b95e6ef71176322fd53134d24cd089213d7fb2b3751ef12d8b520afb10d
+DIST raspberrypi-firmware-start.elf 2595064 SHA256 258e084e958df70fc62792f06e4ad3f3663dc946994d03266775e5416b14c41a SHA512 420cc4bd698b8e229ad477f1e2d318744e5d09d4b8ff36621139f6d615585a2617c56065f5eef5b8707040947a5da378b67c9ca8d24b6b5ea1665c475b9f4645 WHIRLPOOL 9d0dc266fd444e689d85be747fe3f193c09e3d03ae180202afbd4070c4016b51ed23a4373d98228e27514e3617e8d10b81008b7aa3e82df51a8949bac5f1f4dc
+DIST raspberrypi-firmware-start_cd.elf 528696 SHA256 5734d15a9bbd19fdeb7bb9430a4f9254bcc37c087d7e9380ee07e1673e9319ff SHA512 791d5bed84d936553d948d4d9df4771726ba76a27321365b190f1f16929fc545a3da7d90d09ed08c4a99b8e7988d810128363cdb6f0511c0dc3fc2cd8a9f6b4c WHIRLPOOL 68817ccd2c82b71bbe61cb4aa28c794550fc0ccc83944650646c96d5bae0c12b64e858b05e54f2a13c8f80e28298bb3f911d1c0987f22d45c085b410de7c76b4
+DIST raspberrypi-firmware-start_x.elf 3550344 SHA256 3502e1c0afd20b8a7278739435f60963fd6510a55fa2ebe1bf96d93f9ad3a31d SHA512 eb60028fe913cb676c5255d7b2411923729500ff4e597e5ab6c3198a8cf7c24a4819c482a8fcb4b5aff90f40398c8bdeabaec3fffef81c94ece72b246bbe7ba0 WHIRLPOOL 103d2fe8b429582dec7d0d4d3ec6bc7560c496b9a2b7c35b32ee82e409eeb56ca7b429dcdbd816c32073091db08fa6e283c4f5fd84f79421456d2169f6e22e91
+EBUILD raspberrypi-firmware-9999.ebuild 1708 SHA256 8de1609ed35dcddc5af35b81c3528f0f1b6a3a518ac7d0ded44f403cc81f2149 SHA512 2fb9b51608d0bc6f6026f39f9905908cc1d5302601ef83ea193d1cb2b453d0c52122ef349bf16d3ce7d058987eaf8bf87632931cf591ac80b1679ba8d0f5ef06 WHIRLPOOL 51533b4edc9334352dc8a65bb11d6dfb58022cf37bbd95345ab6850337721bb35cfaf821ecc585ebcf47fdcdcbb32fcdfb4adaf5907da4739d74227f5b1239ad
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-cmdline.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-cmdline.txt
new file mode 100644
index 0000000..39112a2
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-cmdline.txt
@@ -0,0 +1 @@
+ipv6.disable=0 selinux=0 plymouth.enable=0 smsc95xx.turbo_mode=N dwc_otg.lpm_enable=0 console=ttyAMA0,115200 kgdboc=ttyAMA0,115200 console=tty1 root=/dev/mmcblk0p2 rootfstype=ext4 elevator=noop rootwait
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-config.txt b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-config.txt
new file mode 100644
index 0000000..9401530
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-config.txt
@@ -0,0 +1,81 @@
+#from archlinux arm sdcard image
+# 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
+
+# for more options see http://elinux.org/RPi_config.txt
+
+## Some over clocking settings, govenor already set to ondemand
+
+##None
+#arm_freq=700
+#core_freq=250
+#sdram_freq=400
+#over_voltage=0
+
+##Modest
+#arm_freq=800
+#core_freq=300
+#sdram_freq=400
+#over_voltage=0
+
+##Medium
+#arm_freq=900
+#core_freq=333
+#sdram_freq=450
+#over_voltage=2
+
+##High
+#arm_freq=950
+#core_freq=450
+#sdram_freq=450
+#over_voltage=6
+
+##Turbo
+#arm_freq=1000
+#core_freq=500
+#sdram_freq=500
+#over_voltage=6
+
+gpu_mem_512=316
+gpu_mem_256=128
+cma_lwm=16
+cma_hwm=32
+cma_offline_start=16
+
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-envd b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-envd
new file mode 100644
index 0000000..22ed093
--- /dev/null
+++ b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware-0_p20130711-envd
@@ -0,0 +1,2 @@
+CONFIG_PROTECT="/boot/config.txt /boot/cmdline.txt"
+
diff --git a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware.envd b/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware.envd
deleted file mode 100644
index 303814e..0000000
--- a/sys-boot/raspberrypi-firmware/files/raspberrypi-firmware.envd
+++ /dev/null
@@ -1,4 +0,0 @@
-PATH="/opt/vc/bin/:/opt/vc/sbin"
-ROOTPATH="/opt/vc/bin/:/opt/vc/sbin"
-LDPATH="/opt/vc/lib/"
-OPENGL_PROFILE="raspberrypi"
\ No newline at end of file
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index 2b88c9c..79d1097 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -1,87 +1,61 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130815.ebuild,v 1.1 2013/08/15 18:29:55 xmw Exp $
 
-EAPI="4"
+EAPI=5
 
-DESCRIPTION="Proprietary libraries for the Broadcom BCM2835 SoC (including the Raspberry Pi computer)"
-HOMEPAGE="http://www.broadcom.com/ http://www.raspberrypi.org/"
+inherit readme.gentoo
 
-inherit git-2
-
-EGIT_REPO_URI="git://github.com/raspberrypi/firmware.git"
-EGIT_PROJECT="raspberrypi-firmware.git"
+DESCRIPTION="Raspberry PI boot loader and firmware"
+HOMEPAGE="https://github.com/raspberrypi/firmware"
+SRC_URI=""
+for my_src_uri in bootcode.bin fixup{,_cd,_x}.dat start{,_cd,_x}.elf ; do
+	SRC_URI="${SRC_URI} https://raw.githubusercontent.com/raspberrypi/firmware/master/boot/${my_src_uri} -> ${PN}-${my_src_uri}"
+done
 
+LICENSE="GPL-2 raspberrypi-videocore-bin"
 SLOT="0"
-
-KEYWORDS="arm"
-
-# TODO: Make the samples actually optional
-IUSE="X +hardfp +samples"
-
-DEPEND="!media-libs/bcm2835-libs
-	X? ( || ( <media-libs/mesa-8.0[-egl,-gles,-openvg] >=media-libs/mesa-8.0[-egl,-gles1,-gles2,-openvg] ) )"
-RDEPEND="${DEPEND}"
-
-RESTRICT="mirror strip test"
-
-# QA Silencing
-QA_TEXTRELS="
-	opt/vc/lib/libbcm_host.so
-	opt/vc/lib/libGLESv2.so
-	opt/vc/lib/libluammal.so
-	opt/vc/lib/libmmal.so
-	opt/vc/lib/libEGL.so
-	opt/vc/lib/libopenmaxil.so
-"
-
-QA_EXECSTACK="
-	opt/vc/bin/vchiq_test
-	opt/vc/bin/vcdbg
-	opt/vc/bin/vcmemmap
-	opt/vc/bin/tvservice
-	opt/vc/bin/edidparser
-	opt/vc/bin/vcgencmd
-	opt/vc/sbin/vcfiled
-"
-
-src_install() {
-	if use hardfp; then
-		cd "${S}/hardfp/opt/vc"
-	else
-		cd "${S}/opt/vc"
+KEYWORDS="~arm -*"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S=${WORKDIR}
+
+RESTRICT="binchecks strip"
+
+src_unpack() { :; }
+
+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
-	insinto /opt/vc
-	doins -r include lib
-	use samples && doins -r src
-	exeinto /opt/vc/bin
-	doexe bin/*
-	exeinto /opt/vc/sbin
-	doexe sbin/*
-
-	dodoc "LICENCE"
+}
 
-	# Create symlinks for header files
-	local vcos_include_dir
-	vcos_include_dir="/opt/vc/include/interface/vcos"
-	local vcos_includes
-	vcos_includes="vcos_futex_mutex.h"
-	vcos_includes+=" vcos_platform.h"
-	vcos_includes+=" vcos_platform_types.h"
-	for vcos_include in ${vcos_includes}; do
-		dosym "${vcos_include_dir}/pthreads/${vcos_include}" \
-			"${vcos_include_dir}/${vcos_include}"
-	done
-
-	local bcm_includes
-	bcm_includes="bcm_host.h"
-	bcm_includes+=" EGL GLES GLES2 IL"
-	bcm_includes+=" interface KHR"
-	bcm_includes+=" vcinclude VG"
-	for bcm_include in ${bcm_includes}; do
-		dosym /opt/vc/include/${bcm_include} /usr/include/${bcm_include}
+src_install() {
+	insinto /boot
+	local a
+	for a in ${A} ; do
+		newins "${DISTDIR}"/${a} ${a#${PN}-}
 	done
+	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
+}
 
-	insinto /etc/env.d
-	newins "${FILESDIR}/${PN}.envd" "02${PN}"
-}
\ No newline at end of file
+DOC_CONTENTS="Please configure your ram setup by editing /boot/config.txt"