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

Package-Manager: portage-2.2.0_alpha188/cvs/Linux x86_64
Manifest-Sign-Key: 0x62EEF090

7 files changed, 127 insertions, 16 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/Manifest b/sys-boot/raspberrypi-firmware/Manifest
index 995f29520752..789ca845e2c2 100644
--- a/sys-boot/raspberrypi-firmware/Manifest
+++ b/sys-boot/raspberrypi-firmware/Manifest
@@ -1,6 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+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-ba8059e890-bootcode.bin 17816 SHA256 f89d19c5287e566320ecd7e1d70d649f308a1b9d05a29d88a0768c3ba7a2bd14 SHA512 5332b2554cbdd3abb32f52506b851f7b3dc2c76a6f9040ec8ad946f6d9faf479e502dda11070aba7706d83e1c3839ff92ca8fbf8e79b972f91814dedbe19ea48 WHIRLPOOL 24e179152e392fc303e92cdfb8b4ef64e323736854bc826ddd0132a5652c9aa441027791781ff7f16fa7fb761485629977bd0882561b008fb66d4503be171e05
 DIST raspberrypi-firmware-ba8059e890-fixup.dat 5890 SHA256 f70019ed5b4deacb09cbf209c0881555374d3cdf2d136b1a69cfd9bab4e441da SHA512 1fc7b31892fa768f901b05b4b5ebc952b393eeb65a91847fbd346ff636808e9c585d67351280c5250557aab2b15f3563b733ba592b859c13cbd206a7f72fe58f WHIRLPOOL b3c3b7920446693122dc438d99dbda65019fecad1ac18f5f17946d8ee9bfd701d958a2cee2ff8f7a0f78eebd79fb92149b92d5bdd0b94f8cc9d8743f70abf55c
 DIST raspberrypi-firmware-ba8059e890-fixup_cd.dat 2022 SHA256 5cbecdc42a92dbbaa96d1d8c82712b6c3cfe448254ee62fcb6b0a303a86c64d5 SHA512 3d55ee733581d697762dfe39efbcad43ee24b6b369858736886918e539b7280c456d2a1dd7f0f1c07b2c83006e40756959c9f3b1ebc9c23f0bd834a21d1e2f76 WHIRLPOOL 386161d30e03c22f832265be3ae301927f10411c53b5cf2e1ab38d4b99351dc6ce732308409ee745fd763b0f3eb83335aaa791ef913a130cb724ba32c0eaeffb
@@ -8,14 +11,14 @@ DIST raspberrypi-firmware-ba8059e890-fixup_x.dat 8842 SHA256 356d1e0efc343545aa1
 DIST raspberrypi-firmware-ba8059e890-start.elf 2690132 SHA256 324a40f565f49dcb63282133c2ae60c7d113c4a362a09c45d45918c6dba30ac9 SHA512 4e7e3c817936f576a2a033bbf95940804ac19ef133ece9c9603e56e97bee0a1aa46b107c714cb37018bc18bbc4dccbbfabaedc3a7d870eee262763e07130e9fc WHIRLPOOL 3feaf69da05d41bd98e4788f38b3ccf4865cfb8a8f53fd18f11a9689a8018fd0634dddfecc51d4ed118735523e234aa043f4dd649ba1d0081a69e9497c421558
 DIST raspberrypi-firmware-ba8059e890-start_cd.elf 469176 SHA256 5035acc265979ff84a6c96ae6999ee51af9dc4db0630da2351f99500f8cb750e SHA512 5928bb24b476fed695c1a3b18ee19bd719e2f41cfa7af819d7cca27b123b21c304c894347a87fb2399faf59d544ea934b83517c4b9590d42d7e6bbf9155e8cac WHIRLPOOL dddb4d4dee3015e1dd2cbb259b2f1224cc4824890b52aeb407bcadb4e4e51b9a5db0770220e944ff0a522bfa37e0778509bdabf6a9194fd2799b66a1b537ca34
 DIST raspberrypi-firmware-ba8059e890-start_x.elf 3657572 SHA256 9d2e0e7e41521f84de3d2a9ee9330757be0c69015dd47ee4987776284329d998 SHA512 fb815ed410c0d1672aec6d5c17a9f9db88ee8a11e2e637256e52566a26a6e72d5fa13030dec89f7e69efe52431edd87fe352f152b9899db1ed265f877c1833b3 WHIRLPOOL e4f8fa01b7d65a6bf8c70033280b589ff9d25e24cfaca4b27dcce58ba2a9fa6377c961df2acb4ae994f4426cc5df5e164dc5f70146a964f59fbe6bfbab8afba2
-EBUILD raspberrypi-firmware-0_p20130711.ebuild 1172 SHA256 ddfe230cb618afbba3a291e54ca59571e206d72d5eabfcd553c37d97bbf0b112 SHA512 988af47f0ade36ac3d097620cefe6656bbd9a06b9d380ea2c2bc57d3820c21843a0976ba8d314f8952757808eaa2b6454ebe5f8f794c132d05a43810f7b40041 WHIRLPOOL 5baf433202e2a93d7b07063f95aa68ba75f2a1e4ada373ad74ef2ffa86b29e093eb86489ea8b163d3a4e0282e0b57f714357a693dbc483bb0d48aeebebde1e7d
-EBUILD raspberrypi-firmware-9999.ebuild 961 SHA256 8c8d4171a59c9c47ad35654afb8856bf642a42e606e862aa8d01486d29591a12 SHA512 be086d80fba892499ccf76f3b9a8660572c959e53e8c86af425eb94b9ae3bcd7b93b069be95837da57b15772a1eadd52391f4d6857765dc16400c0e11c01a91f WHIRLPOOL c091b9736911c1fcc235eab7539eae1dcce79d76c4b3d04a4643710d5349b85a5111462b7c60efd4a58e0274de86ae70f74fe4b5f39d1605618397b3dc5817be
-MISC ChangeLog 531 SHA256 4f9b3b40ee89a2e612ec6e5a1359282bfc49ea80aba656b37335f7ff8bd55e0a SHA512 ff965f24164488e54d6966b02cb2cd6a0e9050a9fb3a4a0db82aeb36a6fbce27c99551427e9eb94cfe822033f8355756b6aacbcc743104b959460e4350e4cd23 WHIRLPOOL 4537a22021c3dc7d622a6e52c748babe8ea85b79e0e495ef1d522bcfc3e7bce21e3d4df8204fd2be4bdd1f1826c786cd9a0fa1e76124ae22b6707285f7bcf82a
+EBUILD raspberrypi-firmware-0_p20130711.ebuild 1469 SHA256 6c2d5aa9d946d3e3641bd45c90b0faf6e234bbf8e551dfb0b80e09d73f814186 SHA512 a631f575c133a285b5de4fd2061e452a2dc38aa614c463197f8e5cbaf475cfa8b8015b276b8e00c23113ea6325846438b3ea3e0505a4f8bdfe6b48aeef415350 WHIRLPOOL d26f3614e7ea3e47a896968374de64e40d80d3598b0914fbb3202462a2aabfcde268de68f56aa5577496582f300b110c1296ca9ea6ec531629f2725faf18c206
+EBUILD raspberrypi-firmware-9999.ebuild 1244 SHA256 6e6cc0a5f07412f6b5c3b392f67ac8598d471bddc6458c1e602cbffb081eeea3 SHA512 34cb4a1b9b4143470400c2640d3bc8b924b7d3171a2a7c08f79875bed9aa81b97c39403495116c83c70efac69baabcb9c55f9186553f43cded9c0c5e585f54e8 WHIRLPOOL 18586dd6abde6a0132402be252e3f86ad3d265e6ac81503eaf23b99664436b1ed1f7eaf125e017ec6b91aad6ca4c44e30a06ff9a6d1afbd8a1b6e52aa914ee61
+MISC ChangeLog 920 SHA256 3cdd191f0c341f68db734873a5db9215ce0466d47c78d05ed35e583ee661f18f SHA512 7fdcee1ca1f5bd9b107f0c71119fecd084548df9b9ddf63bc8655858455666064a7bd5efabb9711a716eda94f1b258ebf924a79136123a1b75236343c5f7e70a WHIRLPOOL e88c5fa6c8d94ee5ff2832adec35871e1e4c8235578e821af84a227f98dbe6fdd04935d325349594c8b865ff375b85e23eb42c4880f15fa05c4837c0bcc36bd1
 MISC metadata.xml 223 SHA256 89097f936927d56068988263e382edb683f359b27293955708e9ade4d256220d SHA512 c9f6a48b2aa05afdf73b8bd824c65480d76e54b659ca39928398c66f764d34faf186255d8aea034737424a962cf35151b610d078a01f8193b027c63e1e3c51b5 WHIRLPOOL 1ce20c98a7e177b8f510ef41f3935b0db5e04b2ecf465a683b2f2515f6a3043c33e6e9efc87f5aaaf59b2ed9be376d9d16bc8beff66b11aaa50ea899bfdc1f62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlHjnaQACgkQknrdDGLu8JBOcAD/cxAdgOjiJFW90Yx6loqajKeI
-CpyiV9+E2eAccXJQVzsA/jsCN5WKsYeyoYz2XGA4VPTT9wJ0RzirOkE+7zOGAX9r
-=jGnY
+iF4EAREIAAYFAlHj3kcACgkQknrdDGLu8JAkFwD/cmamDmzWEWWDh4rEwyA7BocL
++xIh/M4IbonGy9n2Hz4A/AoXJzH76OsxNRB1QF5kaiUVTrvFf4o+tvRA+he9xKGm
+=U6al
 -----END PGP SIGNATURE-----
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
 }