fixed up armv7 sources with upstream config and imx use flag (use=-imx should give you back gentoo-sources)

3 files changed, 26 insertions, 9 deletions

diff --git a/sys-kernel/armv7multi-sources/Manifest b/sys-kernel/armv7multi-sources/Manifest
index ba6e9ab..79f2817 100644
--- a/sys-kernel/armv7multi-sources/Manifest
+++ b/sys-kernel/armv7multi-sources/Manifest
@@ -1,5 +1,6 @@
 DIST genpatches-4.1-8.base.tar.xz 136372 SHA256 9be08b05eb8a10387d791d496ec5a4e7eb22c07dabb93bbba21f2aa11fb5be61 SHA512 67110c4191d8a40a435bd767a8024edac7bb00de507703a3faf5798d484f2d373aa1257bb23209f0151c394b08fb2577af5b8bd621a6654bfdbc247e4a083c58 WHIRLPOOL 26e727302e2c790805748e85610c5673e7b0c2869be9bf2938df07c18ed15c44ed278c285d073d71c69d83614bdee2c3058b82cb3720188ad91994fdde442820
 DIST genpatches-4.1-8.experimental.tar.xz 214924 SHA256 89ed455ba8d8aee207993b600b79b067d3fdf329b143ddbc00fe7b562bdf9893 SHA512 0722ea9d5219a06e6bee24a1be46fccf098367c2845e9c2196c29412fd64815db06f42ad724fd96bbd94527e84bb01929b744059add8b5fb555dcc87d2e8a593 WHIRLPOOL f4b3a57bdf713c4a5819276cc2a6f441741c91ae58aacf49076bfe889b617f67f158b5a61a27341318a02bb8de1b1959860433339d9a3a2337a62098a11e6261
 DIST genpatches-4.1-8.extras.tar.xz 16172 SHA256 8968ac71a0bf7c9d17600c5ac09d78216e14c54cfa9873aabce9c972747b3aa8 SHA512 654154fb0c7701083bcc530448cf1eb1a93bb0bfdc1f7816f40a5f8777b3e2209ed49f23954b095d99cd38cb83a676f0597cde13499b8ed7cce94eac464a7329 WHIRLPOOL c4d629ffb6211a71771ffa5165409bf29091e0c34e4350d6142617dc63f48c1d9d5bbc14b0b39d068d21ea1353f2b7496ae2b2d399734fd69d338f867876e695
+DIST gentoo-armv7multi_defconfig 141107 SHA256 2d38efb49424ecc320a8ed90c9d6079d5766cbc06f00ea84202b0aa4872e5cd7 SHA512 62a0b663323d33b2cee108ac785bfaa1be6db371b1673d8809ccd2a15eb1574d59be3546736fc31bfa494683b3c14e751db48e44f9b1a3d8534d2249a9097449 WHIRLPOOL f486d52c8c896af0ac24a16d1c56b17121309051c75a77c8411bcc6eb1df996dc7f420b59c5a31590ef5e4a3ccdb89c134ee1ff7040be4d47e78459cff8ea527
 DIST linux-4.1.tar.xz 83017828 SHA256 caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0 WHIRLPOOL 85fcfdb67ea7f865272a85d3b4c3ec1f5a1267f4664bf073c562bb3875e9d96ad68486259d8866a9aced98c95de16840ec531d89745aec75b7315a64ebe650b8
 DIST patch-4.1.4-armv7-x2.diff.gz 314399 SHA256 cafd32e1bf11a7f14204d6fcecbc88f5eacb93bf5f53e63a2016465f2f3d118b SHA512 6ece3a6bafc8975cde1408f08665ab3c26490c2cb52a9b51a1e055485bc15a494d274741eef6909ff4e1182587d9d8784ad8d1ccfc9310075733ff6334c7e238 WHIRLPOOL 4f84206f491f7ccd642401cd8b391d8d45ee3592a6b2de97ce17a2e3410a227c00171bb564b1d9fe40bf2ea749acee66fda2a9336e009952c4a08659bfa6fbdb
diff --git a/sys-kernel/armv7multi-sources/armv7multi-sources-4.1.4-r2.ebuild b/sys-kernel/armv7multi-sources/armv7multi-sources-4.1.4-r2.ebuild
index 34edaf1..b525bdb 100644
--- a/sys-kernel/armv7multi-sources/armv7multi-sources-4.1.4-r2.ebuild
+++ b/sys-kernel/armv7multi-sources/armv7multi-sources-4.1.4-r2.ebuild
@@ -5,6 +5,7 @@
 EAPI="5"
 
 ETYPE="sources"
+K_DEFCONFIG="gentoo-armv7multi_defconfig"
 UNIPATCH_STRICTORDER="1"
 K_WANT_GENPATCHES="base extras experimental"
 K_GENPATCHES_VER="8"
@@ -22,26 +23,30 @@ EXTRAVERSION="-${MY_PR}"
 MY_P="${OKV}-${MY_PR}"
 
 MULTI_PATCH="patch-${MY_P}.diff"
-MULTI_URI="https://rcn-ee.com/deb/sid-armhf/v${MY_P}/${MULTI_PATCH}.gz"
+MULTI_CONFIG="defconfig"
+MULTI_URI="https://rcn-ee.com/deb/sid-armhf/v${MY_P}"
+M_PATCH_URI="${MULTI_URI}/${MULTI_PATCH}.gz"
+M_CONFIG_URI="${MULTI_URI}/${MULTI_CONFIG}"
 
 KEYWORDS="~arm"
-HOMEPAGE="https://eewiki.net/display/linuxonarm/Home"
+HOMEPAGE="https://eewiki.net/display/linuxonarm/Wandboard"
 
 DESCRIPTION="Full sources for ${OKV} kernel plus Wandboard, Udoo, and BeagleBone patches"
 SRC_URI="
 	${KERNEL_URI}
-	${MULTI_URI}
 	${ARCH_URI}
-	imx? ( ${GENPATCHES_URI} )
-	"
+	${GENPATCHES_URI}
+	imx? ( ${M_PATCH_URI}
+		${M_CONFIG_URI} -> ${K_DEFCONFIG} )"
 
 KEYWORDS="~arm"
-IUSE="experimental imx"
+IUSE="experimental +imx"
 
 K_EXTRAELOG="This is the bleeding-edge patch set on full gentoo-sources
- kernel from LinuxOnArm maintainer Robert C Nelson.  Intended mainly
- for i.MX-based boards like Wand or Udoo (use bone-sources for building
- a beaglebone kernel)."
+kernel from LinuxOnArm maintainer Robert C Nelson.  Intended mainly
+for i.MX-based boards like Wand or Udoo (use bone-sources for building
+a beaglebone kernel).  A copy of the latest config has been installed as
+${K_DEFCONFIG}.  If you are reading this, you know what to do..."
 
 RDEPEND=""
 DEPEND="${RDEPEND}
@@ -64,6 +69,8 @@ src_prepare() {
 			patch -p1 "${WORKDIR}"/${MULTI_PATCH}
 		eend $? || return
 	fi
+
+	use imx && update_config
 }
 
 pkg_postinst() {
@@ -75,3 +82,9 @@ pkg_postinst() {
 pkg_postrm() {
 	kernel-2_pkg_postrm
 }
+
+update_config() {
+	cp -f "${DISTDIR}"/${K_DEFCONFIG} "${S}"/arch/arm/configs/ \
+		|| die "failed to install ${K_DEFCONFIG}!"
+}
+
diff --git a/sys-kernel/armv7multi-sources/metadata.xml b/sys-kernel/armv7multi-sources/metadata.xml
index 6872235..232b3a5 100644
--- a/sys-kernel/armv7multi-sources/metadata.xml
+++ b/sys-kernel/armv7multi-sources/metadata.xml
@@ -5,6 +5,9 @@
 	<email>nerdboy@gentoo.org</email>
 	<name>Steve Arnold</name>
 </maintainer>
+<upstream>
+	<remote-id type="github">RobertCNelson/armv7-multiplatform</remote-id>
+</upstream>
 <use>
 	<flag name="imx">Apply upstream patch (mostly) for i.MX boards</flag>
 </use>