kernel-rpi: renamed to rpi-kernel to follow platform naming rules.

srcpkgs/kernel-headers-rpi

@@ -1 +0,0 @@
-kernel-rpi

srcpkgs/rpi-kernel-headers

@@ -0,0 +1 @@
+rpi-kernel

srcpkgs/rpi-kernel/template

@@ -1,24 +1,31 @@
-# Template file for 'kernel-rpi'
+# Template file for 'rpi-kernel'
 #
 # Latest commit as of 20140120
-_githash="943b563"
+_githash="943b563ec9961b53b77a0e7b6c07289826c082a5"
+_gitshort="${_githash:0:7}"
 
-pkgname=kernel-rpi
+pkgname=rpi-kernel
 version=3.10.27
 revision=1
+wrksrc="linux-${_githash}"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://www.kernel.org"
 license="GPL-2"
-short_desc="The Linux kernel and modules for the Raspberry Pi (3.10 series [git ${_githash}])"
+short_desc="The Linux kernel and modules for the Raspberry Pi (${version%.*} series [git ${_gitshort}])"
+distfiles="https://github.com/raspberrypi/linux/archive/${_githash}.tar.gz"
+checksum=f32e41c0bfbc6fb8ed5714d386bcc520f155ea0fdf53227f59db795d603622fd
 
 _kernver="${version}_${revision}"
 
+create_srcdir=yes
 nostrip=yes
 noverifyrdeps=yes
+
 only_for_archs="armv6l"
 hostmakedepends="perl python kmod>=11_2 uboot-mkimage openssl which elfutils bc"
 makedepends="ncurses-devel"
 depends="kmod>=11_2"
+replaces="kernel-rpi>=0"
 triggers="kernel-hooks"
 # These files could be modified when an external module is built.
 mutable_files="
@@ -30,12 +37,7 @@ mutable_files="
 	/usr/lib/modules/${_kernver}/modules.alias.bin
 	/usr/lib/modules/${_kernver}/modules.devname"
 
-do_fetch() {
+pre_configure() {
-	url="git://github.com/raspberrypi/linux.git"
-	msg_normal "Cloning from $url ...\n"
-	git clone --depth 1 $url ${pkgname}-${version}
-	cd ${pkgname}-${version}
-	git checkout ${_githash}
 	# Remove .git directory, otherwise scripts/setkernelversion.sh
 	# modifies KERNELRELEASE and appends + to it.
 	rm -rf .git
@@ -81,7 +83,7 @@ do_install() {
 	cd ${wrksrc}
 	vinstall arch/arm/boot/kernel.img 644 boot
 
-	hdrdest=${DESTDIR}/usr/src/kernel-headers-rpi-${_kernver}
+	hdrdest=${DESTDIR}/usr/src/${sourcepkg}-headers-${_kernver}
 
 	# Switch to /usr.
 	vmkdir usr
@@ -89,7 +91,7 @@ do_install() {
 
 	cd ${DESTDIR}/usr/lib/modules/${_kernver}
 	rm -f source build
-	ln -sf ../../../src/kernel-headers-rpi-${_kernver} build
+	ln -sf ../../../src/${sourcepkg}-headers-${_kernver} build
 
 	cd ${wrksrc}
 	# Install required headers to build external modules
@@ -122,9 +124,6 @@ do_install() {
 	mkdir -p ${hdrdest}/arch/arm/kernel
 
 	cp arch/arm/Makefile ${hdrdest}/arch/arm
-	if [ "$MACHINE_ARCH" = "i686" ]; then
-		cp arch/arm/Makefile_32.cpu ${hdrdest}/arch/arm
-	fi
 	cp arch/arm/kernel/asm-offsets.s ${hdrdest}/arch/arm/kernel
 
 	# Add docbook makefile
@@ -167,10 +166,11 @@ do_install() {
 	depmod -b ${DESTDIR}/usr -F System.map ${_kernver}
 }
 
-kernel-headers-rpi_package() {
+rpi-kernel-headers_package() {
 	nostrip=yes
 	noverifyrdeps=yes
-	short_desc="Linux kernel headers for the RaspberryPI (3.10 series [${_githash}])"
+	replaces="kernel-rpi-headers>=0"
+	short_desc="The Linux kernel headers for the Raspberry Pi (${version%.*} series [git ${_gitshort}])"
 	pkg_install() {
 		vmove usr/src
 		vmove usr/lib/modules/${_kernver}/build