Protect existing cmdline.txt & config.txt, add files dir (thanks chithead and Pim Vullers, bug 476896).

(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 62EEF090)

6 files changed, 118 insertions, 10 deletions

diff --git a/sys-boot/raspberrypi-firmware/ChangeLog b/sys-boot/raspberrypi-firmware/ChangeLog
index c94c82aea7d3..c95b85431ae3 100644
--- a/sys-boot/raspberrypi-firmware/ChangeLog
+++ b/sys-boot/raspberrypi-firmware/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-boot/raspberrypi-firmware
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/ChangeLog,v 1.1 2013/07/15 06:58:46 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/ChangeLog,v 1.2 2013/07/15 11:34:34 xmw Exp $
+
+  15 Jul 2013; Michael Weber <xmw@gentoo.org>
+  +files/raspberrypi-firmware-0_p20130711-cmdline.txt,
+  +files/raspberrypi-firmware-0_p20130711-config.txt,
+  +files/raspberrypi-firmware-0_p20130711-envd,
+  raspberrypi-firmware-0_p20130711.ebuild, raspberrypi-firmware-9999.ebuild:
+  Protect existing cmdline.txt & config.txt, add files dir (thanks chithead and
+  Pim Vullers, bug 476896).
 
 *raspberrypi-firmware-0_p20130711 (15 Jul 2013)
 *raspberrypi-firmware-9999 (15 Jul 2013)
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 000000000000..39112a2dba61
--- /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 000000000000..9401530925de
--- /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 000000000000..22ed09320464
--- /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/raspberrypi-firmware-0_p20130711.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild
index 86f88bb29569..54a3a8cf157d 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild,v 1.1 2013/07/15 06:58:46 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-0_p20130711.ebuild,v 1.2 2013/07/15 11:34:34 xmw Exp $
 
 EAPI=5
 
@@ -28,15 +28,23 @@ RESTRICT="binchecks strip"
 
 src_unpack() { :; }
 
+pkg_preinst() {
+	if [ -z "${REPLACING_VERSIONS}" ] ; then
+		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
+			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		fi
+	fi
+}
+
 src_install() {
 	insinto /boot
 	local a
 	for a in ${A} ; do
-		newins "${DISTDIR}"/${a} ${a#${P}-}
+		newins "${DISTDIR}"/${a} ${a#${PN}-${MY_COMMIT}-}
 	done
-	newins "${FILESDIR}"/${P}-config.txt config.txt
-	newins "${FILESDIR}"/${P}-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${P}-envd 90${PN}
+	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
 }
 
diff --git a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
index 27a9ef22dc75..37b38beddfb7 100644
--- a/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
+++ b/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild,v 1.1 2013/07/15 06:58:46 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-boot/raspberrypi-firmware/raspberrypi-firmware-9999.ebuild,v 1.2 2013/07/15 11:34:34 xmw Exp $
 
 EAPI=5
 
@@ -21,12 +21,20 @@ RDEPEND="!sys-boot/raspberrypi-loader"
 
 RESTRICT="binchecks strip"
 
+pkg_preinst() {
+	if [ -z "${REPLACING_VERSIONS}" ] ; then
+		if [ -e /boot/cmdline.txt -o -e /boot/config.txt ] ; then
+			die "Please backup and remove /boot/cmdline.txt and /boot/config.txt to and merge configs after installation."
+		fi
+	fi
+}
+
 src_install() {
 	insinto /boot
 	doins bootcode.bin boot/fixup*.dat boot/start*.elf
-	newins "${FILESDIR}"/${P}-config.txt config.txt
-	newins "${FILESDIR}"/${P}-cmdline.txt cmdline.txt
-	newenvd "${FILESDIR}"/${P}-envd 90${PN}
+	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
 }